From 41e43cc3173f1c63835048417c886a208a89d2a7 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:18:54 -0500 Subject: [PATCH 1/6] bump to latest devchain beta release --- packages/identity/package.json | 2 +- packages/identity/src/test-utils/setup.global.ts | 3 +-- yarn.lock | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/identity/package.json b/packages/identity/package.json index 025e44579..a8977a17a 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -40,7 +40,7 @@ "io-ts": "2.0.1" }, "devDependencies": { - "@celo/celo-devchain": "6.0.3", + "@celo/celo-devchain": "7.0.0-beta.0", "@celo/dev-utils": "0.0.1-beta.1", "@celo/wallet-local": "^5.1.2", "@types/elliptic": "^6.4.16", diff --git a/packages/identity/src/test-utils/setup.global.ts b/packages/identity/src/test-utils/setup.global.ts index e21e54735..29c408fbf 100644 --- a/packages/identity/src/test-utils/setup.global.ts +++ b/packages/identity/src/test-utils/setup.global.ts @@ -1,6 +1,5 @@ import baseSetup from '@celo/dev-utils/lib/ganache-setup' // Has to import the matchers somewhere so that typescript knows the matchers have been made available -import _unused from '@celo/dev-utils/lib/matchers' import { waitForPortOpen } from '@celo/dev-utils/lib/network' import * as path from 'path' @@ -16,7 +15,7 @@ export default async function globalSetup() { path.dirname(require.resolve('@celo/celo-devchain')), '../chains', ) - await baseSetup(path.resolve(chainDataPath), 'v10.tar.gz', { + await baseSetup(path.resolve(chainDataPath), 'v11.tar.gz', { from_targz: true, }) await waitForPortOpen('localhost', 8545, 60) diff --git a/yarn.lock b/yarn.lock index 2270b321d..1fffc9186 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1322,9 +1322,9 @@ __metadata: languageName: node linkType: hard -"@celo/celo-devchain@npm:6.0.3": - version: 6.0.3 - resolution: "@celo/celo-devchain@npm:6.0.3" +"@celo/celo-devchain@npm:7.0.0-beta.0": + version: 7.0.0-beta.0 + resolution: "@celo/celo-devchain@npm:7.0.0-beta.0" dependencies: commander: "npm:^10.0.0" ganache: "npm:@celo/ganache@7.8.0-unofficial.0" @@ -1333,7 +1333,7 @@ __metadata: tmp: "npm:^0.2.1" bin: celo-devchain: dist/run.js - checksum: 10/23acd0626b13e2805c2d3e57614f3998ec18fe6b0d8bcba9bca3d59d0e8f9d70b6f115f161fcec6e11b98f2e9acef14cdf106a2657d5c94abfb5980eba0df034 + checksum: 10/491f4185e946b8b6bc632e2a7f8983bc4c76ae263e37d22f5d45be9428dc08ae2303bf22f07affad2a607506994b26996edccc9b2ea3f55e0f6b200a0bd6ae77 languageName: node linkType: hard @@ -1468,7 +1468,7 @@ __metadata: resolution: "@celo/identity@workspace:packages/identity" dependencies: "@celo/base": "npm:^6.0.0" - "@celo/celo-devchain": "npm:6.0.3" + "@celo/celo-devchain": "npm:7.0.0-beta.0" "@celo/contractkit": "npm:^7.0.0" "@celo/dev-utils": "npm:0.0.1-beta.1" "@celo/odis-identifiers": "npm:^1.0.0" From 56164f943cfaea328224c39c04b5c13e985ac563 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:28:08 -0500 Subject: [PATCH 2/6] ++ CS --- .changeset/rude-hounds-jam.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/rude-hounds-jam.md diff --git a/.changeset/rude-hounds-jam.md b/.changeset/rude-hounds-jam.md new file mode 100644 index 000000000..066d3f769 --- /dev/null +++ b/.changeset/rude-hounds-jam.md @@ -0,0 +1,5 @@ +--- +"@celo/identity": patch +--- + +Updated devchain to support CELO CR11 From 12b3807850ec9093926dae3ec1bd9a67b4253712 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:04:10 -0500 Subject: [PATCH 3/6] re-add matchers import --- packages/identity/src/test-utils/setup.global.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/identity/src/test-utils/setup.global.ts b/packages/identity/src/test-utils/setup.global.ts index 29c408fbf..302c52d23 100644 --- a/packages/identity/src/test-utils/setup.global.ts +++ b/packages/identity/src/test-utils/setup.global.ts @@ -1,5 +1,6 @@ import baseSetup from '@celo/dev-utils/lib/ganache-setup' // Has to import the matchers somewhere so that typescript knows the matchers have been made available +import _unused from '@celo/dev-utils/lib/matchers' import { waitForPortOpen } from '@celo/dev-utils/lib/network' import * as path from 'path' From 506f88c9ecae2b1a1953a2d96e7c7b1abefa31c8 Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:24:33 -0500 Subject: [PATCH 4/6] updated `reset-modules` script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4bcb1565a..901fbdef5 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "prettify:diff": "yarn run prettier --config .prettierrc.js --list-different '**/*.+(ts|js)'", "reset": "yarn reset-modules && yarn reset-cache", "reset-cache": "yarn reset-yarn && yarn reset-rn", - "reset-modules": "rm -rf node_modules/ packages/*/node_modules", + "reset-modules": "rm -rf node_modules/", "reset-yarn": "yarn cache clean", "test": "yarn workspaces foreach --all run test", "test:fast": "yarn workspaces foreach -ip --since --exclude '{odis,apps/combiner}' run test", From 9ba22890dc5ceb7270202ae2ad086142b79883eb Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:37:29 -0500 Subject: [PATCH 5/6] update to latest release --- packages/identity/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/identity/package.json b/packages/identity/package.json index a8977a17a..a9557143d 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -40,7 +40,7 @@ "io-ts": "2.0.1" }, "devDependencies": { - "@celo/celo-devchain": "7.0.0-beta.0", + "@celo/celo-devchain": "7.0.0", "@celo/dev-utils": "0.0.1-beta.1", "@celo/wallet-local": "^5.1.2", "@types/elliptic": "^6.4.16", diff --git a/yarn.lock b/yarn.lock index 1fffc9186..83fce9705 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1322,9 +1322,9 @@ __metadata: languageName: node linkType: hard -"@celo/celo-devchain@npm:7.0.0-beta.0": - version: 7.0.0-beta.0 - resolution: "@celo/celo-devchain@npm:7.0.0-beta.0" +"@celo/celo-devchain@npm:7.0.0": + version: 7.0.0 + resolution: "@celo/celo-devchain@npm:7.0.0" dependencies: commander: "npm:^10.0.0" ganache: "npm:@celo/ganache@7.8.0-unofficial.0" @@ -1333,7 +1333,7 @@ __metadata: tmp: "npm:^0.2.1" bin: celo-devchain: dist/run.js - checksum: 10/491f4185e946b8b6bc632e2a7f8983bc4c76ae263e37d22f5d45be9428dc08ae2303bf22f07affad2a607506994b26996edccc9b2ea3f55e0f6b200a0bd6ae77 + checksum: 10/91f3fd48475eb0a9ee1e0c8ad1adb9461ac884023ae87b49e5080421f66b57c9d28764bcdd21cb4c5de0af72b802037330bf8e5b1a82177d716aaf1c3f64bb8f languageName: node linkType: hard @@ -1468,7 +1468,7 @@ __metadata: resolution: "@celo/identity@workspace:packages/identity" dependencies: "@celo/base": "npm:^6.0.0" - "@celo/celo-devchain": "npm:7.0.0-beta.0" + "@celo/celo-devchain": "npm:7.0.0" "@celo/contractkit": "npm:^7.0.0" "@celo/dev-utils": "npm:0.0.1-beta.1" "@celo/odis-identifiers": "npm:^1.0.0" From 34f63ebbaf087f7d0323e0706a5bfea98857260e Mon Sep 17 00:00:00 2001 From: soloseng <102702451+soloseng@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:46:55 -0500 Subject: [PATCH 6/6] Bump contractkit version --- apps/combiner/package.json | 2 +- apps/monitor/package.json | 2 +- apps/signer/package.json | 2 +- packages/common/package.json | 2 +- packages/identity/package.json | 2 +- yarn.lock | 12 ++++++------ 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/combiner/package.json b/apps/combiner/package.json index 9b4d5d0ae..19a339480 100644 --- a/apps/combiner/package.json +++ b/apps/combiner/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@celo/base": "^6.0.0", - "@celo/contractkit": "^7.0.0", + "@celo/contractkit": "^7.1.0", "@celo/encrypted-backup": "^5.0.5", "@celo/identity": "^5.1.1", "@celo/phone-number-privacy-common": "^3.1.1", diff --git a/apps/monitor/package.json b/apps/monitor/package.json index 52a3af94e..e3d02cc89 100644 --- a/apps/monitor/package.json +++ b/apps/monitor/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@celo/base": "^6.0.0", - "@celo/contractkit": "^7.0.0", + "@celo/contractkit": "^7.1.0", "@celo/cryptographic-utils": "^5.0.7", "@celo/encrypted-backup": "^5.0.5", "@celo/identity": "^5.1.1", diff --git a/apps/signer/package.json b/apps/signer/package.json index 97e610a7a..5e670f628 100644 --- a/apps/signer/package.json +++ b/apps/signer/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@celo/base": "^6.0.0", - "@celo/contractkit": "^7.0.0", + "@celo/contractkit": "^7.1.0", "@celo/phone-number-privacy-common": "^3.1.1", "@celo/poprf": "^0.1.9", "@celo/utils": "^6.0.0", diff --git a/packages/common/package.json b/packages/common/package.json index 7c7ab2621..763dc7f57 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -19,7 +19,7 @@ ], "dependencies": { "@celo/base": "^6.0.0", - "@celo/contractkit": "^7.0.0", + "@celo/contractkit": "^7.1.0", "@celo/utils": "^6.0.0", "@types/bunyan": "1.8.10", "bignumber.js": "^9.1.2", diff --git a/packages/identity/package.json b/packages/identity/package.json index a9557143d..d8158a230 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@celo/base": "^6.0.0", - "@celo/contractkit": "^7.0.0", + "@celo/contractkit": "^7.1.0", "@celo/odis-identifiers": "^1.0.0", "@celo/phone-number-privacy-common": "^3.1.1", "@celo/utils": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index 83fce9705..1130cfc49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1380,7 +1380,7 @@ __metadata: languageName: node linkType: hard -"@celo/contractkit@npm:^7.0.0": +"@celo/contractkit@npm:^7.1.0": version: 7.1.0 resolution: "@celo/contractkit@npm:7.1.0" dependencies: @@ -1469,7 +1469,7 @@ __metadata: dependencies: "@celo/base": "npm:^6.0.0" "@celo/celo-devchain": "npm:7.0.0" - "@celo/contractkit": "npm:^7.0.0" + "@celo/contractkit": "npm:^7.1.0" "@celo/dev-utils": "npm:0.0.1-beta.1" "@celo/odis-identifiers": "npm:^1.0.0" "@celo/phone-number-privacy-common": "npm:^3.1.1" @@ -1506,7 +1506,7 @@ __metadata: resolution: "@celo/phone-number-privacy-combiner@workspace:apps/combiner" dependencies: "@celo/base": "npm:^6.0.0" - "@celo/contractkit": "npm:^7.0.0" + "@celo/contractkit": "npm:^7.1.0" "@celo/encrypted-backup": "npm:^5.0.5" "@celo/identity": "npm:^5.1.1" "@celo/phone-number-privacy-common": "npm:^3.1.1" @@ -1550,7 +1550,7 @@ __metadata: resolution: "@celo/phone-number-privacy-common@workspace:packages/common" dependencies: "@celo/base": "npm:^6.0.0" - "@celo/contractkit": "npm:^7.0.0" + "@celo/contractkit": "npm:^7.1.0" "@celo/poprf": "npm:^0.1.9" "@celo/utils": "npm:^6.0.0" "@celo/wallet-local": "npm:^5.1.2" @@ -1579,7 +1579,7 @@ __metadata: resolution: "@celo/phone-number-privacy-monitor@workspace:apps/monitor" dependencies: "@celo/base": "npm:^6.0.0" - "@celo/contractkit": "npm:^7.0.0" + "@celo/contractkit": "npm:^7.1.0" "@celo/cryptographic-utils": "npm:^5.0.7" "@celo/encrypted-backup": "npm:^5.0.5" "@celo/identity": "npm:^5.1.1" @@ -1601,7 +1601,7 @@ __metadata: resolution: "@celo/phone-number-privacy-signer@workspace:apps/signer" dependencies: "@celo/base": "npm:^6.0.0" - "@celo/contractkit": "npm:^7.0.0" + "@celo/contractkit": "npm:^7.1.0" "@celo/phone-number-privacy-common": "npm:^3.1.1" "@celo/poprf": "npm:^0.1.9" "@celo/utils": "npm:^6.0.0"