diff --git a/packages/cli/src/commands/network/whitelist.test.ts b/packages/cli/src/commands/network/whitelist.test.ts index dc4e0b541..50f0fc3e7 100644 --- a/packages/cli/src/commands/network/whitelist.test.ts +++ b/packages/cli/src/commands/network/whitelist.test.ts @@ -19,9 +19,9 @@ testWithGanache('network:whitelist cmd', () => { await testLocally(Whitelist, []) expect(spy.mock.calls[0][0]).toMatchInlineSnapshot(` "Available currencies: - 0x5315e44798395d4a952530d131249fE00f554565 - Celo Dollar (cUSD) - 0x965D352283a3C8A016b9BBbC9bf6306665d495E7 - Celo Brazilian Real (cREAL) - 0xdD66C23e07b4D6925b6089b5Fe6fc9E62941aFE8 - Celo Euro (cEUR)" + 0x5315e44798395d4a952530d131249fE00f554565 - Celo Dollar (cUSD) - 18 decimals + 0x965D352283a3C8A016b9BBbC9bf6306665d495E7 - Celo Brazilian Real (cREAL) - 18 decimals + 0xdD66C23e07b4D6925b6089b5Fe6fc9E62941aFE8 - Celo Euro (cEUR) - 18 decimals" `) }) @@ -35,7 +35,7 @@ testWithGanache('network:whitelist cmd', () => { symbol: 'MCK', address: '0x123', adaptedToken: '0x456', - decimals: 18, + decimals: 69, }, ]) ) @@ -44,7 +44,7 @@ testWithGanache('network:whitelist cmd', () => { expect(spy.mock.calls[0][0]).toMatchInlineSnapshot(` "Available currencies: - 0x123 - mock token (MCK) (adapted token: 0x456)" + 0x123 - mock token (MCK) (adapted token: 0x456) - 69 decimals" `) mock.mockClear() diff --git a/packages/cli/src/commands/network/whitelist.ts b/packages/cli/src/commands/network/whitelist.ts index 6aa1349d5..74c59668b 100644 --- a/packages/cli/src/commands/network/whitelist.ts +++ b/packages/cli/src/commands/network/whitelist.ts @@ -17,10 +17,10 @@ export default class Whitelist extends BaseCommand { const feeCurrencyWhitelist = await kit.contracts.getFeeCurrencyWhitelist() const validFeeCurrencies = await feeCurrencyWhitelist.getWhitelist() const pairs = (await feeCurrencyWhitelist.getFeeCurrencyInformation(validFeeCurrencies)).map( - ({ name, symbol, address, adaptedToken }) => + ({ name, symbol, address, adaptedToken, decimals }) => `${address} - ${name || 'unknown name'} (${symbol || 'N/A'})${ adaptedToken ? ` (adapted token: ${adaptedToken})` : '' - }` + } - ${decimals} decimals` ) console.log(`Available currencies:\n${pairs.join('\n')}`) } diff --git a/packages/sdk/wallets/wallet-ledger/package.json b/packages/sdk/wallets/wallet-ledger/package.json index 98674c059..cfd6a4d9d 100644 --- a/packages/sdk/wallets/wallet-ledger/package.json +++ b/packages/sdk/wallets/wallet-ledger/package.json @@ -41,8 +41,8 @@ "devDependencies": { "@celo/contractkit": "^8.0.0", "@ledgerhq/hw-transport-node-hid": "^6.28.5", - "@noble/hashes": "^1.3.3", "@noble/curves": "^1.4.0", + "@noble/hashes": "^1.3.3", "patch-package": "^8.0.0", "ts-node": "^10.9.2", "web3": "1.10.4" diff --git a/yarn.lock b/yarn.lock index 89a81b352..7a0f14e15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1874,10 +1874,10 @@ __metadata: languageName: unknown linkType: soft -"@celo/ledger-token-signer@npm:^0.2.0": - version: 0.2.0 - resolution: "@celo/ledger-token-signer@npm:0.2.0" - checksum: c03ff8609859fb571c53043df228eea62e350152907ca8374a2f731637b99187ebcddfa34e42e2f21a2774e16a97867aeada0eb12ab0c623d4294979c85f7beb +"@celo/ledger-token-signer@npm:^0.4.0": + version: 0.4.0 + resolution: "@celo/ledger-token-signer@npm:0.4.0" + checksum: 8cd9638c4092f699b22e3d02a188710afbf562997e0c6682e530e38bbe26d57dbc3cf73e4383b7cb5b2c72c0915016f258b985eb2390e10b902abb23ee42a8b5 languageName: node linkType: hard @@ -2122,7 +2122,7 @@ __metadata: "@celo/base": "npm:^6.0.1" "@celo/connect": "npm:^5.3.0" "@celo/contractkit": "npm:^8.0.0" - "@celo/ledger-token-signer": "npm:^0.2.0" + "@celo/ledger-token-signer": "npm:^0.4.0" "@celo/utils": "npm:^6.0.1" "@celo/wallet-base": "npm:^5.2.0" "@celo/wallet-remote": "npm:^5.2.0" @@ -2131,6 +2131,7 @@ __metadata: "@ledgerhq/hw-app-eth": "npm:6.36.1" "@ledgerhq/hw-transport": "npm:^6.30.6" "@ledgerhq/hw-transport-node-hid": "npm:^6.28.5" + "@noble/curves": "npm:^1.4.0" "@noble/hashes": "npm:^1.3.3" debug: "npm:^4.1.1" patch-package: "npm:^8.0.0" @@ -3848,6 +3849,15 @@ __metadata: languageName: node linkType: hard +"@noble/curves@npm:^1.4.0": + version: 1.4.0 + resolution: "@noble/curves@npm:1.4.0" + dependencies: + "@noble/hashes": "npm:1.4.0" + checksum: b21b30a36ff02bfcc0f5e6163d245cdbaf7f640511fff97ccf83fc207ee79cfd91584b4d97977374de04cb118a55eb63a7964c82596a64162bbc42bc685ae6d9 + languageName: node + linkType: hard + "@noble/hashes@npm:1.2.0, @noble/hashes@npm:~1.2.0": version: 1.2.0 resolution: "@noble/hashes@npm:1.2.0" @@ -3876,6 +3886,13 @@ __metadata: languageName: node linkType: hard +"@noble/hashes@npm:1.4.0": + version: 1.4.0 + resolution: "@noble/hashes@npm:1.4.0" + checksum: e156e65794c473794c52fa9d06baf1eb20903d0d96719530f523cc4450f6c721a957c544796e6efd0197b2296e7cd70efeb312f861465e17940a3e3c7e0febc6 + languageName: node + linkType: hard + "@noble/hashes@npm:~1.3.0, @noble/hashes@npm:~1.3.1": version: 1.3.2 resolution: "@noble/hashes@npm:1.3.2"