Merge branch 'main' into feat(lint)/custom-rule-nullish-checks

.eslintrc.cjs

@@ -46,6 +46,7 @@ module.exports = {
 		}
 	],
 	rules: {
+		'@typescript-eslint/consistent-type-definitions': 'error',
 		'@typescript-eslint/no-inferrable-types': 'error',
 		'@typescript-eslint/no-unnecessary-type-assertion': 'error',
 		'@typescript-eslint/no-unused-vars': [
@@ -60,6 +61,7 @@ module.exports = {
 		'@typescript-eslint/prefer-reduce-type-parameter': 'error',
 		'arrow-body-style': ['warn', 'as-needed'],
 		curly: 'error',
+		'local-rules/prefer-object-params': 'warn',
 		'local-rules/no-svelte-store-in-api': 'error',
 		'local-rules/use-nullish-checks': 'warn',
 		'local-rules/use-option-type-wrapper': 'warn',

.github/dependabot.yml

@@ -3,7 +3,21 @@
 
 version: 2
 updates:
-  - package-ecosystem: "cargo"
+  - package-ecosystem: cargo
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: weekly
+
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: weekly
+    allow:
+      - dependency-type: development
+    ignore:
+      - dependency-name: "@dfinity/*"
+      - dependency-name: "@types/*"
+      - dependency-name: "@typescript-eslint/*"
+      - dependency-name: "eslint"
+      - dependency-name: "eslint-*"
+      - dependency-name: "typescript"

.nvmrc

@@ -1 +1 @@
-v20
+v20.17.0

.prettierrc

@@ -1,8 +1,36 @@
 {
-	"useTabs": true,
-	"singleQuote": true,
-	"trailingComma": "none",
-	"printWidth": 100,
-	"plugins": ["prettier-plugin-svelte", "prettier-plugin-organize-imports"],
-	"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
+  "useTabs": true,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "printWidth": 100,
+  "plugins": [
+    "prettier-plugin-svelte",
+    "prettier-plugin-organize-imports"
+  ],
+  "overrides": [
+    {
+      "files": "*.svelte",
+      "options": {
+        "parser": "svelte"
+      }
+    },
+    {
+      "files": [
+		"src/frontend/src/lib/components/buy/**/*.svelte",
+		"src/frontend/src/lib/components/common/**/*.svelte",
+		"src/frontend/src/lib/components/exchange/**/*.svelte",
+		"src/frontend/src/lib/components/guard/**/*.svelte",
+		"src/frontend/src/lib/components/info/**/*.svelte",
+		"src/frontend/src/lib/components/core/**/*.svelte",
+		"src/frontend/src/lib/components/icons/**/*.svelte",
+		"src/frontend/src/lib/components/manage/**/*.svelte",
+		"src/frontend/src/lib/components/networks/**/*.svelte",
+		"src/frontend/src/lib/components/receive/**/*.svelte"
+	  ],
+      "options": {
+        "plugins": ["prettier-plugin-svelte", "prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"],
+		"parser": "svelte"
+      }
+    }
+  ]
 }

Cargo.toml

@@ -23,7 +23,6 @@ hex = "0.4"
 k256 = "0.13"
 lazy_static = "1.5.0"
 pocket-ic = "2.2.0"
-pretty_assertions = "1.4.0"
-bitcoin = "0.32.2"
+pretty_assertions = "1.4.1"
 strum = "0.26.3"
 strum_macros = "0.26.4"

Dockerfile.frontend

@@ -0,0 +1,38 @@
+FROM --platform=linux/amd64 ubuntu@sha256:bbf3d1baa208b7649d1d0264ef7d522e1dc0deeeaaf6085bf8e4618867f03494 AS deps
+# Note: The above is ubuntu 22.04
+
+# Install required tools
+RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install node
+RUN curl --fail -sSf https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
+ENV NVM_DIR=/root/.nvm
+COPY .nvmrc .node-version
+RUN cat .node-version
+RUN . "$NVM_DIR/nvm.sh" && nvm install "$(cat .node-version)"
+RUN . "$NVM_DIR/nvm.sh" && nvm use "$(cat .node-version)"
+RUN . "$NVM_DIR/nvm.sh" && nvm alias default "$(cat .node-version)"
+RUN ln -s "$NVM_DIR/versions/node/$(cat .node-version)" "$NVM_DIR/versions/node/default"
+ENV PATH="$NVM_DIR/versions/node/default/bin/:${PATH}"
+RUN node --version
+RUN npm --version
+
+FROM deps AS build_frontend
+
+COPY . .
+
+ARG network="staging"
+ENV ENV=$network
+ENV DFX_NETWORK=$network
+
+RUN echo $ENV
+RUN echo $DFX_NETWORK
+
+RUN npm ci
+RUN npm run build
+
+
+FROM scratch AS scratch_frontend
+COPY --from=build_frontend /build /frontend

README.md

@@ -1,6 +1,6 @@
 <div style="display:flex;flex-direction:column;">
   <a href="https://oisy.com/">
-    <img src="./src/frontend/static/images/meta-share-v1.jpg" alt="Oisy Wallet logo" role="presentation"/>
+    <img src="./src/frontend/static/images/meta-share-v2.jpg" alt="Oisy Wallet logo" role="presentation"/>
   </a>
 
 <br/>

dfx.json

@@ -64,6 +64,25 @@
 				}
 			}
 		},
+		"cycles_ledger": {
+			"type": "custom",
+			"candid": "https://github.com/dfinity/cycles-ledger/releases/download/cycles-ledger-v1.0.1/cycles-ledger.did",
+			"wasm": "https://github.com/dfinity/cycles-ledger/releases/download/cycles-ledger-v1.0.1/cycles-ledger.wasm.gz",
+			"init_arg": "( variant { Init = record { index_id = null; max_blocks_per_request = 9_999 : nat64 }},)",
+			"remote": {
+				"id": {
+					"ic": "um5iw-rqaaa-aaaaq-qaaba-cai"
+				}
+			}
+		},
+		"cycles_depositor": {
+			"dependencies": ["cycles_ledger"],
+			"type": "custom",
+			"build": "scripts/build.cycles_depositor.sh",
+			"init_arg_file": "out/cycles_depositor.args.did",
+			"wasm": "out/cycles_depositor.wasm",
+			"candid": "out/cycles_depositor.did"
+		},
 		"pouh_issuer": {
 			"type": "custom",
 			"candid": "https://github.com/dfinity/verifiable-credentials-sdk/releases/download/release-2024-07-01/dummy_issuer.did",