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
celo-org · Nov 14, 2024 · c4b9c6d · c4b9c6d
1 parent fb08485
commit c4b9c6d
Show file tree

Hide file tree

Showing 33 changed files with 209 additions and 74 deletions.
diff --git a/.changeset/few-seals-matter.md 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'