Merge branch 'master' into mraszyk/pic

dfinity · Nov 4, 2024 · 848eec4 · 848eec4
2 parents a196075 + 4bc2a65
commit 848eec4
Show file tree

Hide file tree

Showing 38 changed files with 142 additions and 8,419 deletions.
diff --git a/archive/motoko/auth_client_demo/package.json b/archive/motoko/auth_client_demo/package.json
@@ -47,11 +47,11 @@
     "last 2 edge version"
   ],
   "dependencies": {
-    "@dfinity/agent": "^1.4.0",
-    "@dfinity/auth-client": "^1.4.0",
-    "@dfinity/candid": "^1.4.0",
-    "@dfinity/identity": "^1.4.0",
-    "@dfinity/principal": "^1.4.0",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/auth-client": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/identity": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
     "lit-html": "^2.4.0",
     "pinia": "^2.0.36",
     "react": "^18.2.0",

diff --git a/archive/motoko/defi/src/frontend/package.json b/archive/motoko/defi/src/frontend/package.json
@@ -22,12 +22,12 @@
     "svelte": "^3.49.0"
   },
   "dependencies": {
-    "@dfinity/agent": "^0.10.4",
-    "@dfinity/auth-client": "^0.10.4",
-    "@dfinity/authentication": "^0.10.4",
-    "@dfinity/candid": "^0.10.4",
-    "@dfinity/identity": "^0.10.4",
-    "@dfinity/principal": "0.10.4",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/auth-client": "^2.1.3",
+    "@dfinity/authentication": "^0.14.2",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/identity": "^2.1.3",
+    "@dfinity/principal": "2.1.3",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "crc": "^4.1.0",

diff --git a/archive/motoko/hello/package.json b/archive/motoko/hello/package.json
@@ -16,9 +16,9 @@
     "generate": "dfx generate hello"
   },
   "devDependencies": {
-    "@dfinity/agent": "^0.15.1",
-    "@dfinity/candid": "^0.15.1",
-    "@dfinity/principal": "^0.15.1",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
     "assert": "2.0.0",
     "buffer": "6.0.3",
     "events": "3.3.0",

diff --git a/archive/motoko/ios-notifications/dapp-demo/package.json b/archive/motoko/ios-notifications/dapp-demo/package.json
@@ -34,12 +34,12 @@
     "last 2 edge version"
   ],
   "dependencies": {
-    "@dfinity/agent": "0.14.0",
-    "@dfinity/auth-client": "^0.14.0",
-    "@dfinity/authentication": "^0.14.0",
-    "@dfinity/candid": "0.14.0",
-    "@dfinity/identity": "^0.14.0",
-    "@dfinity/principal": "0.14.0",
+    "@dfinity/agent": "2.1.3",
+    "@dfinity/auth-client": "^2.1.3",
+    "@dfinity/authentication": "^0.14.2",
+    "@dfinity/candid": "2.1.3",
+    "@dfinity/identity": "^2.1.3",
+    "@dfinity/principal": "2.1.3",
     "lit-html": "^2.4.0",
     "ts-loader": "^9.4.1",
     "typescript": "^4.8.4"

diff --git a/archive/motoko/phone-book/package.json b/archive/motoko/phone-book/package.json
@@ -16,9 +16,9 @@
     "generate": "dfx generate phone_book"
   },
   "devDependencies": {
-    "@dfinity/agent": "^0.15.1",
-    "@dfinity/candid": "^0.15.1",
-    "@dfinity/principal": "^0.15.1",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
     "assert": "2.0.0",
     "buffer": "6.0.3",
     "css-loader": "^6.0.0",

diff --git a/hosting/photo-storage/package.json b/hosting/photo-storage/package.json
@@ -3,11 +3,11 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@dfinity/agent": "^0.15.0",
-    "@dfinity/assets": "^0.15.0",
-    "@dfinity/candid": "^0.15.0",
-    "@dfinity/identity": "^0.15.0",
-    "@dfinity/principal": "^0.15.0",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/assets": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/identity": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-masonry-css": "^1.0.16",

diff --git a/motoko/cert-var/package.json b/motoko/cert-var/package.json
@@ -16,9 +16,9 @@
     "generate": "dfx generate cert_var"
   },
   "devDependencies": {
-    "@dfinity/agent": "^1.4.0",
-    "@dfinity/candid": "^1.4.0",
-    "@dfinity/principal": "^1.4.0",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
     "assert": "2.0.0",
     "buffer": "6.0.3",
     "css-loader": "^6.0.0",

diff --git a/motoko/encrypted-notes-dapp-vetkd/package.json b/motoko/encrypted-notes-dapp-vetkd/package.json
@@ -56,11 +56,11 @@
     "typescript": "^4.0.0"
   },
   "dependencies": {
-    "@dfinity/agent": "^0.15.1",
-    "@dfinity/auth-client": "^0.15.1",
-    "@dfinity/candid": "^0.15.1",
-    "@dfinity/identity": "^0.15.1",
-    "@dfinity/principal": "^0.15.1",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/auth-client": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/identity": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
     "sirv-cli": "^1.0.0",
     "svelte-icons": "^2.1.0",
     "svelte-router-spa": "^6.0.3",

diff --git a/motoko/encrypted-notes-dapp/package.json b/motoko/encrypted-notes-dapp/package.json
@@ -54,11 +54,11 @@
     "typescript": "^4.0.0"
   },
   "dependencies": {
-    "@dfinity/agent": "^0.15.1",
-    "@dfinity/auth-client": "^0.15.1",
-    "@dfinity/candid": "^0.15.1",
-    "@dfinity/identity": "^0.15.1",
-    "@dfinity/principal": "^0.15.1",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/auth-client": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/identity": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
     "crypto-js": "^4.2.0",
     "idb": "^7.0.0",
     "sirv-cli": "^1.0.0",

diff --git a/motoko/ic-pos/package.json b/motoko/ic-pos/package.json
@@ -34,11 +34,11 @@
     "dfx:generate": "dfx generate"
   },
   "dependencies": {
-    "@dfinity/agent": "^0.19.2",
-    "@dfinity/candid": "^0.19.2",
-    "@dfinity/ledger": "^0.0.15",
-    "@dfinity/principal": "^0.19.2",
-    "@dfinity/utils": "^0.0.22",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/ledger": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
+    "@dfinity/utils": "^2.1.3",
     "@hookform/resolvers": "^3.1.1",
     "@internet-identity-labs/react-ic-ii-auth": "^0.0.19",
     "@radix-ui/react-icons": "^1.3.0",
@@ -64,8 +64,8 @@
     "zod": "^3.22.3"
   },
   "devDependencies": {
-    "@dfinity/auth-client": "^0.19.2",
-    "@dfinity/identity": "^0.19.2",
+    "@dfinity/auth-client": "^2.1.3",
+    "@dfinity/identity": "^2.1.3",
     "@tailwindcss/forms": "^0.5.3",
     "@tailwindcss/typography": "^0.5.9",
     "@types/node": "^20.6.0",

diff --git a/motoko/icrc2-swap/package.json b/motoko/icrc2-swap/package.json
@@ -16,10 +16,10 @@
     "fmt": "prettier --write ."
   },
   "dependencies": {
-    "@dfinity/agent": "^0.19.2",
-    "@dfinity/candid": "^0.19.2",
-    "@dfinity/identity": "^0.19.3",
-    "@dfinity/principal": "^0.19.2"
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/identity": "^2.1.3",
+    "@dfinity/principal": "^2.1.3"
   },
   "devDependencies": {
     "@babel/core": "^7.22.20",

diff --git a/motoko/icrc2-swap/test/swap/identity.ts b/motoko/icrc2-swap/test/swap/identity.ts
@@ -4,11 +4,15 @@ import { Ed25519KeyIdentity } from "@dfinity/identity";
 //
 // This key is not a secret. Only use it for testing! It is from:
 // https://internetcomputer.org/docs/current/references/cli-reference/dfx-nns/#example-accessing-icp-on-the-command-line
+const minterPublicKey = Buffer.from(
+  "Uu8wv55BKmk9ZErr6OIt5XR1kpEGXcOSOC1OYzrAwuk=",
+  "base64",
+);
 const minterPrivateKey = Buffer.from(
   "N3HB8Hh2PrWqhWH2Qqgr1vbU9T3gb1zgdBD8ZOdlQnVS7zC/nkEqaT1kSuvo4i3ldHWSkQZdw5I4LU5jOsDC6Q==",
   "base64",
 );
-export const minter = Ed25519KeyIdentity.fromSecretKey(minterPrivateKey);
+export const minter = Ed25519KeyIdentity.fromKeyPair(minterPublicKey, minterPrivateKey);
 
 // Randomly generate a new test account each run so there are no collisions,
 // and our tests are forced to be robust.

diff --git a/motoko/internet_identity_integration/package.json b/motoko/internet_identity_integration/package.json
@@ -16,11 +16,11 @@
     "generate": "dfx generate greet_backend"
   },
   "devDependencies": {
-    "@dfinity/agent": "0.15.3",
-    "@dfinity/auth-client": "^0.15.3",
-    "@dfinity/candid": "0.15.3",
-    "@dfinity/identity": "^0.15.3",
-    "@dfinity/principal": "0.15.3",
+    "@dfinity/agent": "2.1.3",
+    "@dfinity/auth-client": "^2.1.3",
+    "@dfinity/candid": "2.1.3",
+    "@dfinity/identity": "^2.1.3",
+    "@dfinity/principal": "2.1.3",
     "assert": "2.0.0",
     "buffer": "6.0.3",
     "copy-webpack-plugin": "^11.0.0",

diff --git a/motoko/life/package.json b/motoko/life/package.json
@@ -16,9 +16,9 @@
     "generate": "dfx generate life"
   },
   "devDependencies": {
-    "@dfinity/agent": "^0.15.1",
-    "@dfinity/candid": "^0.15.1",
-    "@dfinity/principal": "^0.15.1",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
     "assert": "2.0.0",
     "buffer": "6.0.3",
     "css-loader": "^6.0.0",

diff --git a/motoko/minimal-counter-dapp/src/minimal_dapp_frontend/package.json b/motoko/minimal-counter-dapp/src/minimal_dapp_frontend/package.json
@@ -7,7 +7,7 @@
       "setup": "npm i && dfx canister create minimal_dapp_backend && dfx generate minimal_dapp_backend && dfx deploy",
       "start": "vite --port 3000",
       "prebuild": "dfx generate",
-      "build": "tsc && vite build",
+      "build": "vite build",
       "format": "prettier --write \"src/**/*.{json,js,jsx,ts,tsx,css,scss}\""
     },
     "devDependencies": {
@@ -26,4 +26,4 @@
       "@dfinity/principal": "^1.4.0",
       "lit-html": "^2.8.0"
     }
-  }
+  }
diff --git a/motoko/random_maze/package.json b/motoko/random_maze/package.json
@@ -16,9 +16,9 @@
     "generate": "dfx generate random_maze"
   },
   "devDependencies": {
-    "@dfinity/agent": "^0.15.1",
-    "@dfinity/candid": "^0.15.1",
-    "@dfinity/principal": "^0.15.1",
+    "@dfinity/agent": "^2.1.3",
+    "@dfinity/candid": "^2.1.3",
+    "@dfinity/principal": "^2.1.3",
     "assert": "2.0.0",
     "buffer": "6.0.3",
     "css-loader": "^6.0.0",

diff --git a/motoko/send_http_get/Makefile b/motoko/send_http_get/Makefile
@@ -1,35 +1,18 @@
 .PHONY: all
 all: build
 
-.PHONY: node_modules
-.SILENT: node_modules
-node_modules:
-	npm install
-
 .PHONY: build
 .SILENT: build
-build: node_modules
-	dfx canister create send_http_get_backend
-	dfx build
-
-.PHONY: install
-.SILENT: install
-install: build
-	dfx canister install send_http_get_backend --mode reinstall --yes
-
-
-.PHONY: upgrade
-.SILENT: upgrade
-upgrade: build
-	dfx canister install send_http_get_backend --mode=upgrade
+build:
+	dfx deploy send_http_get_backend
 
 .PHONY: test
 .SILENT: test
-test: install
+test: build
 	dfx canister call send_http_get_backend get_icp_usd_exchange \
 		| grep '\[1682978460,5\.714,5\.718,5\.714,5\.714,243\.5678\]' && echo 'PASS'
 
 .PHONY: clean
 .SILENT: clean
 clean:
-	rm -fr .dfx
+	rm -fr .dfx
diff --git a/motoko/send_http_get/dfx.json b/motoko/send_http_get/dfx.json
@@ -5,12 +5,6 @@
       "type": "motoko"
     }
   },
-  "defaults": {
-    "build": {
-      "args": "",
-      "packtool": ""
-    }
-  },
   "output_env_file": ".env",
   "version": 1
-}
+}