From c4b9c6d60bf938950007a67df4e7c8ec35066fb3 Mon Sep 17 00:00:00 2001 From: Aaron DeRuvo Date: Thu, 14 Nov 2024 11:17:20 +0100 Subject: [PATCH] fix versions being too high (#434) ### Description version conflict between the releases done on hotfix branch for wallets and for the master branch led to beta 6.0.2-beta.2 being head of the already released 6.0.2 which caused issues when installing. solution will be to set base version to 6.0.3 and continue betas from there --- .changeset/few-seals-matter.md | 12 ++ .changeset/pre.json | 18 +-- .github/workflows/ci.yml | 1 + .github/workflows/release.yaml | 3 +- packages/cli/CHANGELOG.md | 12 ++ packages/cli/package.json | 8 +- packages/dev-utils/CHANGELOG.md | 5 + packages/dev-utils/package.json | 2 +- packages/sdk/contractkit/CHANGELOG.md | 5 + packages/sdk/contractkit/package.json | 2 +- packages/sdk/explorer/package.json | 2 +- packages/sdk/metadata-claims/package.json | 2 +- packages/sdk/network-utils/package.json | 2 +- packages/sdk/transactions-uri/package.json | 2 +- packages/sdk/wallets/wallet-base/CHANGELOG.md | 1 + packages/sdk/wallets/wallet-base/package.json | 2 +- .../sdk/wallets/wallet-hsm-aws/CHANGELOG.md | 4 + .../sdk/wallets/wallet-hsm-aws/package.json | 8 +- .../sdk/wallets/wallet-hsm-azure/CHANGELOG.md | 4 + .../sdk/wallets/wallet-hsm-azure/package.json | 8 +- .../sdk/wallets/wallet-hsm-gcp/CHANGELOG.md | 4 + .../sdk/wallets/wallet-hsm-gcp/package.json | 8 +- packages/sdk/wallets/wallet-hsm/CHANGELOG.md | 1 + packages/sdk/wallets/wallet-hsm/package.json | 2 +- .../sdk/wallets/wallet-ledger/CHANGELOG.md | 9 ++ .../sdk/wallets/wallet-ledger/package.json | 6 +- .../wallet-ledger/src/ledger-signer.ts | 2 +- .../wallet-ledger/src/ledger-wallet.test.ts | 2 +- .../sdk/wallets/wallet-local/CHANGELOG.md | 1 + .../sdk/wallets/wallet-local/package.json | 4 +- .../sdk/wallets/wallet-remote/CHANGELOG.md | 2 + .../sdk/wallets/wallet-remote/package.json | 4 +- yarn.lock | 135 ++++++++++++++---- 33 files changed, 209 insertions(+), 74 deletions(-) create mode 100644 .changeset/few-seals-matter.md diff --git a/.changeset/few-seals-matter.md b/.changeset/few-seals-matter.md new file mode 100644 index 000000000..0331144a7 --- /dev/null +++ b/.changeset/few-seals-matter.md @@ -0,0 +1,12 @@ +--- +'@celo/wallet-hsm-azure': patch +'@celo/wallet-hsm-aws': patch +'@celo/wallet-hsm-gcp': patch +'@celo/wallet-ledger': patch +'@celo/wallet-remote': patch +'@celo/wallet-local': patch +'@celo/wallet-base': patch +'@celo/wallet-hsm': patch +--- + +Force patch bump wallets to deal with version conflict diff --git a/.changeset/pre.json b/.changeset/pre.json index e6b219b9b..8ce071057 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -3,7 +3,7 @@ "tag": "beta", "initialVersions": { "@celo/celocli": "5.2.1", - "@celo/dev-utils": "0.0.5", + "@celo/dev-utils": "0.0.6", "@celo/base": "6.1.0", "@celo/connect": "6.0.2", "@celo/contractkit": "8.3.0", @@ -16,14 +16,14 @@ "@celo/phone-utils": "6.0.3", "@celo/transactions-uri": "5.0.11", "@celo/utils": "7.0.0", - "@celo/wallet-base": "6.0.1", - "@celo/wallet-hsm": "6.0.1", - "@celo/wallet-hsm-aws": "6.0.1", - "@celo/wallet-hsm-azure": "6.0.1", - "@celo/wallet-hsm-gcp": "6.0.1", - "@celo/wallet-ledger": "6.0.1", - "@celo/wallet-local": "6.0.1", - "@celo/wallet-remote": "6.0.1", + "@celo/wallet-base": "6.0.2", + "@celo/wallet-hsm": "6.0.2", + "@celo/wallet-hsm-aws": "6.0.2", + "@celo/wallet-hsm-azure": "6.0.2", + "@celo/wallet-hsm-gcp": "6.0.2", + "@celo/wallet-ledger": "6.0.2", + "@celo/wallet-local": "6.0.2", + "@celo/wallet-remote": "6.0.2", "@celo/typescript": "0.0.1", "@celo/viem-account-ledger": "0.0.1" }, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03ac8102b..5f12fd928 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,7 @@ on: - master - changeset-release/master - prerelease/* + - hotfixes pull_request: types: [opened, reopened, synchronize, edited, ready_for_review] diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5c35874d0..5fd95d32b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,9 +3,8 @@ name: Release Packages on: push: branches: - - main - master - - 'prerelease/*' + - hotfixes concurrency: ${{ github.workflow }}-${{ github.ref }} diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 5de96be9a..dc85e2943 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -72,6 +72,18 @@ - @celo/phone-utils@6.0.4-beta.0 - @celo/wallet-hsm-azure@6.0.2-beta.0 - @celo/wallet-local@6.0.2-beta.0 +## 5.2.2 + +### Patch Changes + +- [#396](https://github.com/celo-org/developer-tooling/pull/396) [`d58929c`](https://github.com/celo-org/developer-tooling/commit/d58929c5160b334cb91b109645381aa49fa76011) Thanks [@aaronmgdr](https://github.com/aaronmgdr)! - Fix incorrect message where the transfered token was used as gas token in the messaging but not in actuality + +- [#396](https://github.com/celo-org/developer-tooling/pull/396) [`d58929c`](https://github.com/celo-org/developer-tooling/commit/d58929c5160b334cb91b109645381aa49fa76011) Thanks [@aaronmgdr](https://github.com/aaronmgdr)! - Fix Transfering, exchanging cusd (and other fee tokens) and or using gasCurrency flag with ledger devices prior to 1.2 + +- Updated dependencies [[`d58929c`](https://github.com/celo-org/developer-tooling/commit/d58929c5160b334cb91b109645381aa49fa76011)]: + - @celo/wallet-ledger@6.0.2 + - @celo/wallet-hsm-azure@6.0.2 + - @celo/wallet-local@6.0.2 ## 5.2.1 diff --git a/packages/cli/package.json b/packages/cli/package.json index 300bf4800..ffcf6436b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -49,9 +49,9 @@ "@celo/metadata-claims": "^1.0.0-beta.0", "@celo/phone-utils": "^6.0.4-beta.0", "@celo/utils": "^8.0.0-beta.0", - "@celo/wallet-hsm-azure": "^6.0.2-beta.2", - "@celo/wallet-ledger": "^6.0.2-beta.2", - "@celo/wallet-local": "^6.0.2-beta.2", + "@celo/wallet-hsm-azure": "^6.0.3-beta.0", + "@celo/wallet-ledger": "^6.0.3-beta.0", + "@celo/wallet-local": "^6.0.3-beta.0", "@ethereumjs/util": "8.0.5", "@ledgerhq/hw-transport-node-hid": "^6.28.5", "@mento-protocol/mento-sdk": "^1.0.1", @@ -81,7 +81,7 @@ }, "devDependencies": { "@celo/celo-devchain": "^7.0.0", - "@celo/dev-utils": "0.0.6-beta.1", + "@celo/dev-utils": "0.0.7-beta.0", "@celo/typescript": "workspace:^", "@types/debug": "^4.1.4", "@types/fs-extra": "^8.0.0", diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md index 66147c769..27bd17410 100644 --- a/packages/dev-utils/CHANGELOG.md +++ b/packages/dev-utils/CHANGELOG.md @@ -12,6 +12,11 @@ - Updated dependencies []: - @celo/connect@6.0.3-beta.0 +## 0.0.6 + +### Patch Changes + +- [#409](https://github.com/celo-org/developer-tooling/pull/409) [`e709b88`](https://github.com/celo-org/developer-tooling/commit/e709b8821315e354e418649320b5f93a7a464c16) Thanks [@aaronmgdr](https://github.com/aaronmgdr)! - Upgrades to latest devchain ## 0.0.5 diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index d22f57ef6..61b009d0f 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@ { "name": "@celo/dev-utils", - "version": "0.0.6-beta.1", + "version": "0.0.7-beta.0", "description": "util package for celo packages that should only be a devDependency", "main": "./lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/sdk/contractkit/CHANGELOG.md b/packages/sdk/contractkit/CHANGELOG.md index f7a765ea5..3ff721e77 100644 --- a/packages/sdk/contractkit/CHANGELOG.md +++ b/packages/sdk/contractkit/CHANGELOG.md @@ -63,6 +63,11 @@ - @celo/utils@8.0.0-beta.0 - @celo/connect@6.0.3-beta.0 - @celo/wallet-local@6.0.2-beta.0 +## 8.3.1 + +### Patch Changes + +- [#409](https://github.com/celo-org/developer-tooling/pull/409) [`e709b88`](https://github.com/celo-org/developer-tooling/commit/e709b8821315e354e418649320b5f93a7a464c16) Thanks [@aaronmgdr](https://github.com/aaronmgdr)! - Renames `getElected` and its usages to `getElectedAccounts` for `EpochManagerWrapper` ## 8.3.0 diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json index 7ae6d8783..8db976cb8 100644 --- a/packages/sdk/contractkit/package.json +++ b/packages/sdk/contractkit/package.json @@ -43,7 +43,7 @@ }, "devDependencies": { "@celo/celo-devchain": "^7.0.0", - "@celo/dev-utils": "0.0.6-beta.1", + "@celo/dev-utils": "0.0.7-beta.0", "@celo/odis-identifiers": "^1.0.1", "@celo/typescript": "workspace:^", "@truffle/contract": "4.6.31", diff --git a/packages/sdk/explorer/package.json b/packages/sdk/explorer/package.json index bded469b0..6415d396c 100644 --- a/packages/sdk/explorer/package.json +++ b/packages/sdk/explorer/package.json @@ -32,7 +32,7 @@ "debug": "^4.1.1" }, "devDependencies": { - "@celo/dev-utils": "0.0.6-beta.1", + "@celo/dev-utils": "0.0.7-beta.0", "@celo/typescript": "workspace:^", "@types/debug": "^4.1.12", "fetch-mock": "^10.0.7", diff --git a/packages/sdk/metadata-claims/package.json b/packages/sdk/metadata-claims/package.json index 1a8a8e268..c2d72c667 100644 --- a/packages/sdk/metadata-claims/package.json +++ b/packages/sdk/metadata-claims/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@celo/celo-devchain": "^7.0.0", "@celo/contractkit": "workspace:^", - "@celo/dev-utils": "0.0.6-beta.1", + "@celo/dev-utils": "0.0.7-beta.0", "@celo/odis-identifiers": "^1.0.1", "@celo/typescript": "workspace:^", "@types/node": "18.7.6", diff --git a/packages/sdk/network-utils/package.json b/packages/sdk/network-utils/package.json index bd56070c8..b87cad8b3 100644 --- a/packages/sdk/network-utils/package.json +++ b/packages/sdk/network-utils/package.json @@ -27,7 +27,7 @@ "debug": "^4.1.1" }, "devDependencies": { - "@celo/dev-utils": "0.0.6-beta.1", + "@celo/dev-utils": "0.0.7-beta.0", "@celo/typescript": "workspace:^", "@types/debug": "^4.1.12", "fetch-mock": "^10.0.7" diff --git a/packages/sdk/transactions-uri/package.json b/packages/sdk/transactions-uri/package.json index b97d01e0a..3e005de27 100644 --- a/packages/sdk/transactions-uri/package.json +++ b/packages/sdk/transactions-uri/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@celo/contractkit": "^9.0.0-beta.1", - "@celo/dev-utils": "0.0.6-beta.1", + "@celo/dev-utils": "0.0.7-beta.0", "@celo/typescript": "workspace:^", "cross-fetch": "3.1.5", "dotenv": "^8.2.0", diff --git a/packages/sdk/wallets/wallet-base/CHANGELOG.md b/packages/sdk/wallets/wallet-base/CHANGELOG.md index ef698b672..14dd65524 100644 --- a/packages/sdk/wallets/wallet-base/CHANGELOG.md +++ b/packages/sdk/wallets/wallet-base/CHANGELOG.md @@ -16,6 +16,7 @@ - @celo/base@7.0.0-beta.0 - @celo/utils@8.0.0-beta.0 - @celo/connect@6.0.3-beta.0 +## 6.0.2 ## 6.0.1 diff --git a/packages/sdk/wallets/wallet-base/package.json b/packages/sdk/wallets/wallet-base/package.json index 28944d082..0753cf922 100644 --- a/packages/sdk/wallets/wallet-base/package.json +++ b/packages/sdk/wallets/wallet-base/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-base", - "version": "6.0.2-beta.2", + "version": "6.0.3-beta.0", "description": "Wallet base implementation", "author": "Celo", "license": "Apache-2.0", diff --git a/packages/sdk/wallets/wallet-hsm-aws/CHANGELOG.md b/packages/sdk/wallets/wallet-hsm-aws/CHANGELOG.md index 517f0300d..f35cb6717 100644 --- a/packages/sdk/wallets/wallet-hsm-aws/CHANGELOG.md +++ b/packages/sdk/wallets/wallet-hsm-aws/CHANGELOG.md @@ -1,6 +1,7 @@ # @celo/wallet-hsm-aws ## 6.0.2-beta.2 +## 6.0.2 ### Patch Changes @@ -28,6 +29,9 @@ - @celo/wallet-base@6.0.2-beta.0 - @celo/wallet-hsm@6.0.2-beta.0 - @celo/wallet-remote@6.0.2-beta.0 + - @celo/wallet-base@6.0.2 + - @celo/wallet-hsm@6.0.2 + - @celo/wallet-remote@6.0.2 ## 6.0.1 diff --git a/packages/sdk/wallets/wallet-hsm-aws/package.json b/packages/sdk/wallets/wallet-hsm-aws/package.json index 53bffbcb4..c3ff910c3 100644 --- a/packages/sdk/wallets/wallet-hsm-aws/package.json +++ b/packages/sdk/wallets/wallet-hsm-aws/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-hsm-aws", - "version": "6.0.2-beta.2", + "version": "6.0.3-beta.0", "description": "AWS HSM wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -24,9 +24,9 @@ "dependencies": { "@celo/connect": "^6.0.3-beta.0", "@celo/utils": "^8.0.0-beta.0", - "@celo/wallet-base": "^6.0.2-beta.2", - "@celo/wallet-hsm": "^6.0.2-beta.2", - "@celo/wallet-remote": "^6.0.2-beta.2", + "@celo/wallet-base": "^6.0.3-beta.0", + "@celo/wallet-hsm": "^6.0.3-beta.0", + "@celo/wallet-remote": "^6.0.3-beta.0", "@ethereumjs/util": "8.0.5", "@types/debug": "^4.1.5", "@types/secp256k1": "^4.0.0", diff --git a/packages/sdk/wallets/wallet-hsm-azure/CHANGELOG.md b/packages/sdk/wallets/wallet-hsm-azure/CHANGELOG.md index 54e58add8..7144da743 100644 --- a/packages/sdk/wallets/wallet-hsm-azure/CHANGELOG.md +++ b/packages/sdk/wallets/wallet-hsm-azure/CHANGELOG.md @@ -1,6 +1,7 @@ # @celo/wallet-hsm-azure ## 6.0.2-beta.2 +## 6.0.2 ### Patch Changes @@ -29,6 +30,9 @@ - @celo/wallet-base@6.0.2-beta.0 - @celo/wallet-hsm@6.0.2-beta.0 - @celo/wallet-remote@6.0.2-beta.0 + - @celo/wallet-base@6.0.2 + - @celo/wallet-hsm@6.0.2 + - @celo/wallet-remote@6.0.2 ## 6.0.1 diff --git a/packages/sdk/wallets/wallet-hsm-azure/package.json b/packages/sdk/wallets/wallet-hsm-azure/package.json index b5775893e..4438fcdc5 100644 --- a/packages/sdk/wallets/wallet-hsm-azure/package.json +++ b/packages/sdk/wallets/wallet-hsm-azure/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-hsm-azure", - "version": "6.0.2-beta.2", + "version": "6.0.3-beta.0", "description": "Azure HSM wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -28,9 +28,9 @@ "@celo/base": "^7.0.0-beta.0", "@celo/connect": "^6.0.3-beta.0", "@celo/utils": "^8.0.0-beta.0", - "@celo/wallet-base": "^6.0.2-beta.2", - "@celo/wallet-hsm": "^6.0.2-beta.2", - "@celo/wallet-remote": "^6.0.2-beta.2", + "@celo/wallet-base": "^6.0.3-beta.0", + "@celo/wallet-hsm": "^6.0.3-beta.0", + "@celo/wallet-remote": "^6.0.3-beta.0", "@ethereumjs/util": "8.0.5", "@types/secp256k1": "^4.0.0", "bignumber.js": "^9.0.0", diff --git a/packages/sdk/wallets/wallet-hsm-gcp/CHANGELOG.md b/packages/sdk/wallets/wallet-hsm-gcp/CHANGELOG.md index 062f6558b..241150351 100644 --- a/packages/sdk/wallets/wallet-hsm-gcp/CHANGELOG.md +++ b/packages/sdk/wallets/wallet-hsm-gcp/CHANGELOG.md @@ -1,6 +1,7 @@ # @celo/wallet-hsm-gcp ## 6.0.2-beta.2 +## 6.0.2 ### Patch Changes @@ -28,6 +29,9 @@ - @celo/wallet-base@6.0.2-beta.0 - @celo/wallet-hsm@6.0.2-beta.0 - @celo/wallet-remote@6.0.2-beta.0 + - @celo/wallet-base@6.0.2 + - @celo/wallet-hsm@6.0.2 + - @celo/wallet-remote@6.0.2 ## 6.0.1 diff --git a/packages/sdk/wallets/wallet-hsm-gcp/package.json b/packages/sdk/wallets/wallet-hsm-gcp/package.json index f8607fa9a..f89eb0ec4 100644 --- a/packages/sdk/wallets/wallet-hsm-gcp/package.json +++ b/packages/sdk/wallets/wallet-hsm-gcp/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-hsm-gcp", - "version": "6.0.2-beta.2", + "version": "6.0.3-beta.0", "description": "GCP HSM wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -22,9 +22,9 @@ "dependencies": { "@celo/connect": "^6.0.3-beta.0", "@celo/utils": "^8.0.0-beta.0", - "@celo/wallet-base": "^6.0.2-beta.2", - "@celo/wallet-hsm": "^6.0.2-beta.2", - "@celo/wallet-remote": "^6.0.2-beta.2", + "@celo/wallet-base": "^6.0.3-beta.0", + "@celo/wallet-hsm": "^6.0.3-beta.0", + "@celo/wallet-remote": "^6.0.3-beta.0", "@ethereumjs/util": "8.0.5", "@google-cloud/kms": "~2.9.0", "@noble/curves": "^1.3.0", diff --git a/packages/sdk/wallets/wallet-hsm/CHANGELOG.md b/packages/sdk/wallets/wallet-hsm/CHANGELOG.md index 7fe026a1b..8808771b7 100644 --- a/packages/sdk/wallets/wallet-hsm/CHANGELOG.md +++ b/packages/sdk/wallets/wallet-hsm/CHANGELOG.md @@ -10,6 +10,7 @@ - Updated dependencies [[`4ef76eb`](https://github.com/celo-org/developer-tooling/commit/4ef76eb174454f60304080d0ef63a859cd8d931b)]: - @celo/base@7.0.0-beta.0 +## 6.0.2 ## 6.0.1 diff --git a/packages/sdk/wallets/wallet-hsm/package.json b/packages/sdk/wallets/wallet-hsm/package.json index 682faa3d6..5905ba5f7 100644 --- a/packages/sdk/wallets/wallet-hsm/package.json +++ b/packages/sdk/wallets/wallet-hsm/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-hsm", - "version": "6.0.2-beta.2", + "version": "6.0.3-beta.0", "description": "HSM wallet implementation utils", "author": "Celo", "license": "Apache-2.0", diff --git a/packages/sdk/wallets/wallet-ledger/CHANGELOG.md b/packages/sdk/wallets/wallet-ledger/CHANGELOG.md index 4b71dbc25..9586fedb2 100644 --- a/packages/sdk/wallets/wallet-ledger/CHANGELOG.md +++ b/packages/sdk/wallets/wallet-ledger/CHANGELOG.md @@ -32,6 +32,15 @@ - @celo/connect@6.0.3-beta.0 - @celo/wallet-base@6.0.2-beta.0 - @celo/wallet-remote@6.0.2-beta.0 +## 6.0.2 + +### Patch Changes + +- [#396](https://github.com/celo-org/developer-tooling/pull/396) [`d58929c`](https://github.com/celo-org/developer-tooling/commit/d58929c5160b334cb91b109645381aa49fa76011) Thanks [@aaronmgdr](https://github.com/aaronmgdr)! - Fix issue where ledger running celo firmware app 1.1.10 could not send fee token transactions or perform and interactions with those contracts + +- Updated dependencies []: + - @celo/wallet-base@6.0.2 + - @celo/wallet-remote@6.0.2 ## 6.0.1 diff --git a/packages/sdk/wallets/wallet-ledger/package.json b/packages/sdk/wallets/wallet-ledger/package.json index a5c058891..fbfe17ba9 100644 --- a/packages/sdk/wallets/wallet-ledger/package.json +++ b/packages/sdk/wallets/wallet-ledger/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-ledger", - "version": "6.0.2-beta.2", + "version": "6.0.3-beta.0", "description": "Ledger wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -29,8 +29,8 @@ "@celo/hw-app-eth": "^1.0.0", "@celo/ledger-token-signer": "^0.4.0", "@celo/utils": "^8.0.0-beta.0", - "@celo/wallet-base": "^6.0.2-beta.2", - "@celo/wallet-remote": "^6.0.2-beta.2", + "@celo/wallet-base": "^6.0.3-beta.0", + "@celo/wallet-remote": "^6.0.3-beta.0", "@ethereumjs/util": "8.0.5", "@ledgerhq/errors": "^6.16.4", "@ledgerhq/hw-transport": "^6.30.6", diff --git a/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts b/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts index 4d020b41d..c6b1ec7b1 100644 --- a/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts +++ b/packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts @@ -1,10 +1,10 @@ import { ensureLeading0x, trimLeading0x } from '@celo/base/lib/address' import { RLPEncodedTx, Signer } from '@celo/connect' +import Ledger from '@celo/hw-app-eth' import { EIP712TypedData, structHash } from '@celo/utils/lib/sign-typed-data-utils' import { LegacyEncodedTx } from '@celo/wallet-base' import * as ethUtil from '@ethereumjs/util' import { TransportStatusError } from '@ledgerhq/errors' -import Ledger from '@celo/hw-app-eth' import debugFactory from 'debug' import { SemVer } from 'semver' import { meetsVersionRequirements, transportErrorFriendlyMessage } from './ledger-utils' diff --git a/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts b/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts index f3179a834..4e32ab951 100644 --- a/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts +++ b/packages/sdk/wallets/wallet-ledger/src/ledger-wallet.test.ts @@ -6,6 +6,7 @@ import { } from '@celo/base/lib/address' import { CeloTx, EncodedTransaction, Hex } from '@celo/connect' import { StableToken, newKit } from '@celo/contractkit' +import Ledger from '@celo/hw-app-eth' import { privateKeyToAddress, privateKeyToPublicKey } from '@celo/utils/lib/address' import { generateTypedDataHash } from '@celo/utils/lib/sign-typed-data-utils' import { verifySignature } from '@celo/utils/lib/signatureUtils' @@ -18,7 +19,6 @@ import { verifyEIP712TypedDataSigner, } from '@celo/wallet-base' import * as ethUtil from '@ethereumjs/util' -import Ledger from '@celo/hw-app-eth' import TransportNodeHid from '@ledgerhq/hw-transport-node-hid' import { VerifyPublicKeyInput, createVerify } from 'crypto' import { readFileSync } from 'fs' diff --git a/packages/sdk/wallets/wallet-local/CHANGELOG.md b/packages/sdk/wallets/wallet-local/CHANGELOG.md index bd1643605..cd6be27f0 100644 --- a/packages/sdk/wallets/wallet-local/CHANGELOG.md +++ b/packages/sdk/wallets/wallet-local/CHANGELOG.md @@ -25,6 +25,7 @@ - @celo/utils@8.0.0-beta.0 - @celo/connect@6.0.3-beta.0 - @celo/wallet-base@6.0.2-beta.0 + - @celo/wallet-base@6.0.2 ## 6.0.1 diff --git a/packages/sdk/wallets/wallet-local/package.json b/packages/sdk/wallets/wallet-local/package.json index 607b702bf..de65092f8 100644 --- a/packages/sdk/wallets/wallet-local/package.json +++ b/packages/sdk/wallets/wallet-local/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-local", - "version": "6.0.2-beta.2", + "version": "6.0.3-beta.0", "description": "Local wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -25,7 +25,7 @@ "@celo/base": "^7.0.0-beta.0", "@celo/connect": "^6.0.3-beta.0", "@celo/utils": "^8.0.0-beta.0", - "@celo/wallet-base": "^6.0.2-beta.2", + "@celo/wallet-base": "^6.0.3-beta.0", "@ethereumjs/util": "8.0.5" }, "devDependencies": { diff --git a/packages/sdk/wallets/wallet-remote/CHANGELOG.md b/packages/sdk/wallets/wallet-remote/CHANGELOG.md index 39d285437..f1c80d382 100644 --- a/packages/sdk/wallets/wallet-remote/CHANGELOG.md +++ b/packages/sdk/wallets/wallet-remote/CHANGELOG.md @@ -1,6 +1,7 @@ # @celo/wallet-remote ## 6.0.2-beta.2 +## 6.0.2 ### Patch Changes @@ -22,6 +23,7 @@ - @celo/utils@8.0.0-beta.0 - @celo/connect@6.0.3-beta.0 - @celo/wallet-base@6.0.2-beta.0 + - @celo/wallet-base@6.0.2 ## 6.0.1 diff --git a/packages/sdk/wallets/wallet-remote/package.json b/packages/sdk/wallets/wallet-remote/package.json index c7a6c3a66..77fb63420 100644 --- a/packages/sdk/wallets/wallet-remote/package.json +++ b/packages/sdk/wallets/wallet-remote/package.json @@ -1,6 +1,6 @@ { "name": "@celo/wallet-remote", - "version": "6.0.2-beta.2", + "version": "6.0.3-beta.0", "description": "Remote wallet implementation", "author": "Celo", "license": "Apache-2.0", @@ -24,7 +24,7 @@ "dependencies": { "@celo/connect": "^6.0.3-beta.0", "@celo/utils": "^8.0.0-beta.0", - "@celo/wallet-base": "^6.0.2-beta.2", + "@celo/wallet-base": "^6.0.3-beta.0", "@ethereumjs/util": "8.0.5", "@types/debug": "^4.1.5" }, diff --git a/yarn.lock b/yarn.lock index 569762198..39292f7c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1645,7 +1645,7 @@ __metadata: languageName: node linkType: hard -"@celo/base@npm:^6.0.0, @celo/base@npm:^6.0.1": +"@celo/base@npm:^6.0.0, @celo/base@npm:^6.0.1, @celo/base@npm:^6.1.0": version: 6.1.0 resolution: "@celo/base@npm:6.1.0" checksum: e70a5b1313d5fafc2b048a0badc31d9de8f48dfe00eba60b45f6275f46a68ff82e90c5388dbbdd9eb6bdbed8dc91b7c86750587989e469c8dd94b71942951b7f @@ -1701,7 +1701,7 @@ __metadata: "@celo/connect": "npm:^6.0.3-beta.0" "@celo/contractkit": "npm:^9.0.0-beta.1" "@celo/cryptographic-utils": "npm:^5.1.1-beta.0" - "@celo/dev-utils": "npm:0.0.6-beta.1" + "@celo/dev-utils": "npm:0.0.7-beta.0" "@celo/explorer": "npm:^5.0.13-beta.0" "@celo/governance": "npm:^5.1.4-beta.0" "@celo/identity": "npm:^5.1.2" @@ -1709,9 +1709,9 @@ __metadata: "@celo/phone-utils": "npm:^6.0.4-beta.0" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" - "@celo/wallet-hsm-azure": "npm:^6.0.2-beta.2" - "@celo/wallet-ledger": "npm:^6.0.2-beta.2" - "@celo/wallet-local": "npm:^6.0.2-beta.2" + "@celo/wallet-hsm-azure": "npm:^6.0.3-beta.0" + "@celo/wallet-ledger": "npm:^6.0.3-beta.0" + "@celo/wallet-local": "npm:^6.0.3-beta.0" "@ethereumjs/util": "npm:8.0.5" "@ledgerhq/hw-transport-node-hid": "npm:^6.28.5" "@mento-protocol/mento-sdk": "npm:^1.0.1" @@ -1784,6 +1784,27 @@ __metadata: languageName: node linkType: hard +"@celo/connect@npm:^6.0.1": + version: 6.0.2 + resolution: "@celo/connect@npm:6.0.2" + dependencies: + "@celo/base": "npm:^6.1.0" + "@celo/utils": "npm:^7.0.0" + "@ethereumjs/util": "npm:8.0.5" + "@types/debug": "npm:^4.1.5" + "@types/utf8": "npm:^2.1.6" + bignumber.js: "npm:^9.0.0" + debug: "npm:^4.1.1" + utf8: "npm:3.0.0" + web3-core: "npm:1.10.4" + web3-eth: "npm:1.10.4" + web3-eth-contract: "npm:1.10.4" + peerDependencies: + web3: 1.10.4 + checksum: 5e35881487f89a7400b9f24e28b368dc5b0d161d35f125774f159714cd1777057d50f43136443d5fab7653e7b52b670fa021c09351127c239917de4bcaaeadce + languageName: node + linkType: hard + "@celo/connect@npm:^6.0.3-beta.0, @celo/connect@workspace:packages/sdk/connect": version: 0.0.0-use.local resolution: "@celo/connect@workspace:packages/sdk/connect" @@ -1839,7 +1860,7 @@ __metadata: "@celo/base": "npm:^7.0.0-beta.0" "@celo/celo-devchain": "npm:^7.0.0" "@celo/connect": "npm:^6.0.3-beta.0" - "@celo/dev-utils": "npm:0.0.6-beta.1" + "@celo/dev-utils": "npm:0.0.7-beta.0" "@celo/odis-identifiers": "npm:^1.0.1" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" @@ -1900,7 +1921,7 @@ __metadata: languageName: node linkType: hard -"@celo/dev-utils@npm:0.0.6-beta.1, @celo/dev-utils@workspace:packages/dev-utils": +"@celo/dev-utils@npm:0.0.7-beta.0, @celo/dev-utils@workspace:packages/dev-utils": version: 0.0.0-use.local resolution: "@celo/dev-utils@workspace:packages/dev-utils" dependencies: @@ -1936,7 +1957,7 @@ __metadata: "@celo/base": "npm:^7.0.0-beta.0" "@celo/connect": "npm:^6.0.3-beta.0" "@celo/contractkit": "npm:^9.0.0-beta.1" - "@celo/dev-utils": "npm:0.0.6-beta.1" + "@celo/dev-utils": "npm:0.0.7-beta.0" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" "@types/debug": "npm:^4.1.12" @@ -2042,7 +2063,7 @@ __metadata: "@celo/base": "npm:^7.0.0-beta.0" "@celo/celo-devchain": "npm:^7.0.0" "@celo/contractkit": "workspace:^" - "@celo/dev-utils": "npm:0.0.6-beta.1" + "@celo/dev-utils": "npm:0.0.7-beta.0" "@celo/odis-identifiers": "npm:^1.0.1" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" @@ -2061,7 +2082,7 @@ __metadata: version: 0.0.0-use.local resolution: "@celo/network-utils@workspace:packages/sdk/network-utils" dependencies: - "@celo/dev-utils": "npm:0.0.6-beta.1" + "@celo/dev-utils": "npm:0.0.7-beta.0" "@celo/typescript": "workspace:^" "@types/debug": "npm:^4.1.12" cross-fetch: "npm:3.1.5" @@ -2125,7 +2146,7 @@ __metadata: "@celo/base": "npm:^7.0.0-beta.0" "@celo/connect": "npm:^6.0.3-beta.0" "@celo/contractkit": "npm:^9.0.0-beta.1" - "@celo/dev-utils": "npm:0.0.6-beta.1" + "@celo/dev-utils": "npm:0.0.7-beta.0" "@celo/typescript": "workspace:^" "@types/bn.js": "npm:^5.1.0" "@types/debug": "npm:^4.1.5" @@ -2165,6 +2186,27 @@ __metadata: languageName: node linkType: hard +"@celo/utils@npm:^7.0.0": + version: 7.0.0 + resolution: "@celo/utils@npm:7.0.0" + dependencies: + "@celo/base": "npm:^6.1.0" + "@ethereumjs/rlp": "npm:^5.0.2" + "@ethereumjs/util": "npm:8.0.5" + "@noble/ciphers": "npm:0.4.1" + "@noble/curves": "npm:1.3.0" + "@noble/hashes": "npm:1.3.3" + "@types/bn.js": "npm:^5.1.0" + "@types/node": "npm:^18.7.16" + bignumber.js: "npm:^9.0.0" + fp-ts: "npm:2.1.1" + io-ts: "npm:2.0.1" + web3-eth-abi: "npm:1.10.4" + web3-utils: "npm:1.10.4" + checksum: f29dfe41d27395e50cf84fe73e6b2a2552ef3aeba5885b2c8165ced1e704f02b2db2f3ff757bf5f64bf998396e72de0c4c1c5674e5ebed978b1d1e09a8c5a49f + languageName: node + linkType: hard + "@celo/utils@npm:^8.0.0-beta.0, @celo/utils@workspace:^, @celo/utils@workspace:packages/sdk/utils": version: 0.0.0-use.local resolution: "@celo/utils@workspace:packages/sdk/utils" @@ -2231,7 +2273,27 @@ __metadata: languageName: node linkType: hard -"@celo/wallet-base@npm:^6.0.2-beta.2, @celo/wallet-base@workspace:^, @celo/wallet-base@workspace:packages/sdk/wallets/wallet-base": +"@celo/wallet-base@npm:^6.0.2": + version: 6.0.2 + resolution: "@celo/wallet-base@npm:6.0.2" + dependencies: + "@celo/base": "npm:^6.1.0" + "@celo/connect": "npm:^6.0.1" + "@celo/utils": "npm:^7.0.0" + "@ethereumjs/rlp": "npm:^5.0.2" + "@ethereumjs/util": "npm:8.0.5" + "@noble/curves": "npm:^1.3.0" + "@noble/hashes": "npm:^1.3.3" + "@types/debug": "npm:^4.1.5" + bignumber.js: "npm:^9.0.0" + debug: "npm:^4.1.1" + web3: "npm:1.10.4" + web3-eth-accounts: "npm:1.10.4" + checksum: bae3d86c7710feee20b280332b524a0fba92453064cd004659b5f48444777fd9d7a7cda8cf3ff8e2316ccca43e846a4a60a6f8250257389479efa927c0f4af64 + languageName: node + linkType: hard + +"@celo/wallet-base@npm:^6.0.3-beta.0, @celo/wallet-base@workspace:^, @celo/wallet-base@workspace:packages/sdk/wallets/wallet-base": version: 0.0.0-use.local resolution: "@celo/wallet-base@workspace:packages/sdk/wallets/wallet-base" dependencies: @@ -2259,9 +2321,9 @@ __metadata: "@celo/connect": "npm:^6.0.3-beta.0" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" - "@celo/wallet-base": "npm:^6.0.2-beta.2" - "@celo/wallet-hsm": "npm:^6.0.2-beta.2" - "@celo/wallet-remote": "npm:^6.0.2-beta.2" + "@celo/wallet-base": "npm:^6.0.3-beta.0" + "@celo/wallet-hsm": "npm:^6.0.3-beta.0" + "@celo/wallet-remote": "npm:^6.0.3-beta.0" "@ethereumjs/util": "npm:8.0.5" "@noble/ciphers": "npm:0.4.1" "@noble/curves": "npm:1.3.0" @@ -2276,7 +2338,7 @@ __metadata: languageName: unknown linkType: soft -"@celo/wallet-hsm-azure@npm:^6.0.2-beta.2, @celo/wallet-hsm-azure@workspace:packages/sdk/wallets/wallet-hsm-azure": +"@celo/wallet-hsm-azure@npm:^6.0.3-beta.0, @celo/wallet-hsm-azure@workspace:packages/sdk/wallets/wallet-hsm-azure": version: 0.0.0-use.local resolution: "@celo/wallet-hsm-azure@workspace:packages/sdk/wallets/wallet-hsm-azure" dependencies: @@ -2287,9 +2349,9 @@ __metadata: "@celo/connect": "npm:^6.0.3-beta.0" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" - "@celo/wallet-base": "npm:^6.0.2-beta.2" - "@celo/wallet-hsm": "npm:^6.0.2-beta.2" - "@celo/wallet-remote": "npm:^6.0.2-beta.2" + "@celo/wallet-base": "npm:^6.0.3-beta.0" + "@celo/wallet-hsm": "npm:^6.0.3-beta.0" + "@celo/wallet-remote": "npm:^6.0.3-beta.0" "@ethereumjs/util": "npm:8.0.5" "@noble/ciphers": "npm:0.4.1" "@noble/curves": "npm:1.3.0" @@ -2310,9 +2372,9 @@ __metadata: "@celo/connect": "npm:^6.0.3-beta.0" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" - "@celo/wallet-base": "npm:^6.0.2-beta.2" - "@celo/wallet-hsm": "npm:^6.0.2-beta.2" - "@celo/wallet-remote": "npm:^6.0.2-beta.2" + "@celo/wallet-base": "npm:^6.0.3-beta.0" + "@celo/wallet-hsm": "npm:^6.0.3-beta.0" + "@celo/wallet-remote": "npm:^6.0.3-beta.0" "@ethereumjs/util": "npm:8.0.5" "@google-cloud/kms": "npm:~2.9.0" "@noble/ciphers": "npm:0.4.1" @@ -2327,7 +2389,7 @@ __metadata: languageName: unknown linkType: soft -"@celo/wallet-hsm@npm:^6.0.2-beta.2, @celo/wallet-hsm@workspace:packages/sdk/wallets/wallet-hsm": +"@celo/wallet-hsm@npm:^6.0.3-beta.0, @celo/wallet-hsm@workspace:packages/sdk/wallets/wallet-hsm": version: 0.0.0-use.local resolution: "@celo/wallet-hsm@workspace:packages/sdk/wallets/wallet-hsm" dependencies: @@ -2346,7 +2408,7 @@ __metadata: languageName: unknown linkType: soft -"@celo/wallet-ledger@npm:^6.0.2-beta.2, @celo/wallet-ledger@workspace:packages/sdk/wallets/wallet-ledger": +"@celo/wallet-ledger@npm:^6.0.3-beta.0, @celo/wallet-ledger@workspace:packages/sdk/wallets/wallet-ledger": version: 0.0.0-use.local resolution: "@celo/wallet-ledger@workspace:packages/sdk/wallets/wallet-ledger" dependencies: @@ -2357,8 +2419,8 @@ __metadata: "@celo/ledger-token-signer": "npm:^0.4.0" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" - "@celo/wallet-base": "npm:^6.0.2-beta.2" - "@celo/wallet-remote": "npm:^6.0.2-beta.2" + "@celo/wallet-base": "npm:^6.0.3-beta.0" + "@celo/wallet-remote": "npm:^6.0.3-beta.0" "@ethereumjs/util": "npm:8.0.5" "@ledgerhq/errors": "npm:^6.16.4" "@ledgerhq/hw-transport": "npm:^6.30.6" @@ -2388,7 +2450,20 @@ __metadata: languageName: node linkType: hard -"@celo/wallet-local@npm:^6.0.2-beta.0, @celo/wallet-local@npm:^6.0.2-beta.1, @celo/wallet-local@npm:^6.0.2-beta.2, @celo/wallet-local@workspace:packages/sdk/wallets/wallet-local": +"@celo/wallet-local@npm:^6.0.2-beta.0, @celo/wallet-local@npm:^6.0.2-beta.1": + version: 6.0.2 + resolution: "@celo/wallet-local@npm:6.0.2" + dependencies: + "@celo/base": "npm:^6.1.0" + "@celo/connect": "npm:^6.0.1" + "@celo/utils": "npm:^7.0.0" + "@celo/wallet-base": "npm:^6.0.2" + "@ethereumjs/util": "npm:8.0.5" + checksum: c0588b3ce20948296c614ebbfa000c8a5c1e17680fe999b7a70f845b9e8e985b28ebeb081c957d0128382dd033b3ffd1648dbbc5667ce3eea95c77245e2792c6 + languageName: node + linkType: hard + +"@celo/wallet-local@npm:^6.0.3-beta.0, @celo/wallet-local@workspace:packages/sdk/wallets/wallet-local": version: 0.0.0-use.local resolution: "@celo/wallet-local@workspace:packages/sdk/wallets/wallet-local" dependencies: @@ -2396,7 +2471,7 @@ __metadata: "@celo/connect": "npm:^6.0.3-beta.0" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" - "@celo/wallet-base": "npm:^6.0.2-beta.2" + "@celo/wallet-base": "npm:^6.0.3-beta.0" "@ethereumjs/util": "npm:8.0.5" "@types/debug": "npm:^4.1.12" debug: "npm:^4.3.5" @@ -2405,14 +2480,14 @@ __metadata: languageName: unknown linkType: soft -"@celo/wallet-remote@npm:^6.0.2-beta.2, @celo/wallet-remote@workspace:^, @celo/wallet-remote@workspace:packages/sdk/wallets/wallet-remote": +"@celo/wallet-remote@npm:^6.0.3-beta.0, @celo/wallet-remote@workspace:^, @celo/wallet-remote@workspace:packages/sdk/wallets/wallet-remote": version: 0.0.0-use.local resolution: "@celo/wallet-remote@workspace:packages/sdk/wallets/wallet-remote" dependencies: "@celo/connect": "npm:^6.0.3-beta.0" "@celo/typescript": "workspace:^" "@celo/utils": "npm:^8.0.0-beta.0" - "@celo/wallet-base": "npm:^6.0.2-beta.2" + "@celo/wallet-base": "npm:^6.0.3-beta.0" "@ethereumjs/util": "npm:8.0.5" "@types/debug": "npm:^4.1.5" web3: "npm:1.10.4"