Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix versions being too high #434

Merged
merged 1 commit into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .changeset/few-seals-matter.md
Original file line number Diff line number Diff line change
@@ -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
18 changes: 9 additions & 9 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- master
- changeset-release/master
- prerelease/*
- hotfixes
pull_request:
types: [opened, reopened, synchronize, edited, ready_for_review]

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ name: Release Packages
on:
push:
branches:
- main
- master
- 'prerelease/*'
- hotfixes

concurrency: ${{ github.workflow }}-${{ github.ref }}

Expand Down
12 changes: 12 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
## 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/[email protected]
- @celo/[email protected]
- @celo/[email protected]

## 5.2.1

Expand Down
8 changes: 4 additions & 4 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions packages/dev-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@

- Updated dependencies []:
- @celo/[email protected]
## 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

Expand Down
2 changes: 1 addition & 1 deletion packages/dev-utils/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/contractkit/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
## 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

Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/contractkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/metadata-claims/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/network-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/transactions-uri/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/sdk/wallets/wallet-base/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
## 6.0.2

## 6.0.1

Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/wallets/wallet-base/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 4 additions & 0 deletions packages/sdk/wallets/wallet-hsm-aws/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# @celo/wallet-hsm-aws

## 6.0.2-beta.2
## 6.0.2

### Patch Changes

Expand Down Expand Up @@ -28,6 +29,9 @@
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]

## 6.0.1

Expand Down
8 changes: 4 additions & 4 deletions packages/sdk/wallets/wallet-hsm-aws/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions packages/sdk/wallets/wallet-hsm-azure/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# @celo/wallet-hsm-azure

## 6.0.2-beta.2
## 6.0.2

### Patch Changes

Expand Down Expand Up @@ -29,6 +30,9 @@
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]

## 6.0.1

Expand Down
8 changes: 4 additions & 4 deletions packages/sdk/wallets/wallet-hsm-azure/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions packages/sdk/wallets/wallet-hsm-gcp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# @celo/wallet-hsm-gcp

## 6.0.2-beta.2
## 6.0.2

### Patch Changes

Expand Down Expand Up @@ -28,6 +29,9 @@
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]

## 6.0.1

Expand Down
8 changes: 4 additions & 4 deletions packages/sdk/wallets/wallet-hsm-gcp/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/sdk/wallets/wallet-hsm/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

- Updated dependencies [[`4ef76eb`](https://github.com/celo-org/developer-tooling/commit/4ef76eb174454f60304080d0ef63a859cd8d931b)]:
- @celo/[email protected]
## 6.0.2

## 6.0.1

Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/wallets/wallet-hsm/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
9 changes: 9 additions & 0 deletions packages/sdk/wallets/wallet-ledger/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@
- @celo/[email protected]
- @celo/[email protected]
- @celo/[email protected]
## 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/[email protected]
- @celo/[email protected]

## 6.0.1

Expand Down
6 changes: 3 additions & 3 deletions packages/sdk/wallets/wallet-ledger/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/wallets/wallet-ledger/src/ledger-signer.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
Loading
Loading