From 2e6ee847862e91dbdfa106d74537f38792b8437d Mon Sep 17 00:00:00 2001 From: homura Date: Fri, 17 Nov 2023 16:48:37 +0800 Subject: [PATCH 1/3] refactor: make withdraw compatible with the light client --- packages/neuron-wallet/package.json | 1 + .../src/services/transaction-sender.ts | 24 ++++- yarn.lock | 95 +++++++++++++++++++ 3 files changed, 116 insertions(+), 4 deletions(-) diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json index 2fbc19f631..89465f40fe 100644 --- a/packages/neuron-wallet/package.json +++ b/packages/neuron-wallet/package.json @@ -46,6 +46,7 @@ "@ckb-lumos/bi": "^0.21.0-next.1", "@ckb-lumos/ckb-indexer": "^0.21.0-next.1", "@ckb-lumos/codec": "^0.21.0-next.1", + "@ckb-lumos/common-scripts": "^0.21.0-next.1", "@ckb-lumos/config-manager": "^0.21.0-next.1", "@ckb-lumos/hd": "^0.21.0-next.1", "@ckb-lumos/helpers": "^0.21.0-next.1", diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts index 65eaa02ccd..e25bc57611 100644 --- a/packages/neuron-wallet/src/services/transaction-sender.ts +++ b/packages/neuron-wallet/src/services/transaction-sender.ts @@ -41,11 +41,11 @@ import { getMultisigStatus } from '../utils/multisig' import { SignStatus } from '../models/offline-sign' import NetworksService from './networks' import { generateRPC } from '../utils/ckb-rpc' -import { CKBRPC } from '@ckb-lumos/rpc' import CellsService from './cells' import hd from '@ckb-lumos/hd' import { getClusterCellByOutPoint } from '@spore-sdk/core' import CellDep, { DepType } from '../models/chain/cell-dep' +import { dao } from '@ckb-lumos/common-scripts' interface SignInfo { witnessArgs: WitnessArgs @@ -840,9 +840,25 @@ export default class TransactionSender { withdrawBlockHash: string ): Promise => { const currentNetwork = NetworksService.getInstance().getCurrent() - const ckb = new CKBRPC(currentNetwork.remote) - const result = await ckb.calculateDaoMaximumWithdraw(depositOutPoint.toSDK(), withdrawBlockHash) - return BigInt(result) + const rpc = generateRPC(currentNetwork.remote, currentNetwork.type) + + let tx = await rpc.getTransaction(depositOutPoint.txHash) + if (tx.txStatus.status !== 'committed') throw new Error('Transaction is not committed yet') + const depositBlockHash = tx.txStatus.blockHash + + const cellOutput = tx.transaction.outputs[+depositOutPoint.index] + const cellOutputData = tx.transaction.outputsData[+depositOutPoint.index] + + const [depositHeader, withDrawHeader] = await Promise.all([ + rpc.getHeader(depositBlockHash), + rpc.getHeader(withdrawBlockHash), + ]) + + return dao.calculateMaximumWithdraw( + { outPoint: depositOutPoint.toSDK(), data: cellOutputData, cellOutput: cellOutput }, + depositHeader.dao, + withDrawHeader.dao + ) } private parseEpoch = (epoch: bigint) => { diff --git a/yarn.lock b/yarn.lock index 7457799bb0..b84bcb659b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1717,6 +1717,20 @@ js-xxhash "^1.0.4" lodash.isequal "^4.5.0" +"@ckb-lumos/base@0.21.0-next.2": + version "0.21.0-next.2" + resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.21.0-next.2.tgz#8d7ba32aa98f63de64f0140ef2e530a16450a382" + integrity sha512-1QiuVR7BD6RV2oq3CpM1RBMoPQ0E+F4e4MLwtg1kWRkN0UQWLin8OIDewb7hXsifU/ZpoTdluoCOGGV0CY1DkQ== + dependencies: + "@ckb-lumos/bi" "0.21.0-next.2" + "@ckb-lumos/codec" "0.21.0-next.2" + "@ckb-lumos/toolkit" "0.21.0-next.2" + "@types/blake2b" "^2.1.0" + "@types/lodash.isequal" "^4.5.5" + blake2b "^2.1.3" + js-xxhash "^1.0.4" + lodash.isequal "^4.5.0" + "@ckb-lumos/bi@0.20.0", "@ckb-lumos/bi@^0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.20.0.tgz#4fa3beca641737b7b83a64d56668067e38cc288d" @@ -1731,6 +1745,13 @@ dependencies: jsbi "^4.1.0" +"@ckb-lumos/bi@0.21.0-next.2": + version "0.21.0-next.2" + resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.21.0-next.2.tgz#0797e8774c00d3f4e609833050529e0f6e022620" + integrity sha512-3c8jC94eO57vFFo30g9Rh6qrfk5EF+7OD58hX1GknXaHwykMs3EBQodmA7DUV517dswkHy5IzI5gt5ROn9asjQ== + dependencies: + jsbi "^4.1.0" + "@ckb-lumos/ckb-indexer@0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.20.0.tgz#c6792821e3b903f998a891b14892ff67229d3957" @@ -1770,6 +1791,13 @@ dependencies: "@ckb-lumos/bi" "0.21.0-next.1" +"@ckb-lumos/codec@0.21.0-next.2": + version "0.21.0-next.2" + resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.21.0-next.2.tgz#d29465fc22c2b98182b6079453be7deb7d3fd1ba" + integrity sha512-yTtWIG9LESLTU3tBb9fHREWo2mO0Ts7SSL1Jp3MSqYbnl90JZeYr/skvn+vaV9/2Cl/6qEgeKYa1AnHNSLchkw== + dependencies: + "@ckb-lumos/bi" "0.21.0-next.2" + "@ckb-lumos/common-scripts@0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.20.0.tgz#7f95fb91d3c275ff557197269225a15a634811b6" @@ -1784,6 +1812,20 @@ "@ckb-lumos/toolkit" "0.20.0" immutable "^4.0.0-rc.12" +"@ckb-lumos/common-scripts@^0.21.0-next.1": + version "0.21.0-next.2" + resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.21.0-next.2.tgz#222e58a96d92a4ddfa9e501fe2f0a5428c036e96" + integrity sha512-43r7DvXSccsi80NcXh0jaZT0MdQ+rhsElWBO2U3zRUt/55rV4HBaoo26Rj8h7esi0tVfDbiDrnc16ymN1V+B3w== + dependencies: + "@ckb-lumos/base" "0.21.0-next.2" + "@ckb-lumos/bi" "0.21.0-next.2" + "@ckb-lumos/codec" "0.21.0-next.2" + "@ckb-lumos/config-manager" "0.21.0-next.2" + "@ckb-lumos/helpers" "0.21.0-next.2" + "@ckb-lumos/rpc" "0.21.0-next.2" + "@ckb-lumos/toolkit" "0.21.0-next.2" + immutable "^4.3.0" + "@ckb-lumos/config-manager@0.20.0", "@ckb-lumos/config-manager@^0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.20.0.tgz#f24946971005f62df62e22c3306947b5e820c181" @@ -1806,6 +1848,17 @@ "@types/deep-freeze-strict" "^1.1.0" deep-freeze-strict "^1.1.1" +"@ckb-lumos/config-manager@0.21.0-next.2": + version "0.21.0-next.2" + resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.21.0-next.2.tgz#ef08003193a49b248440fc73ce9207b1bb6a2a5f" + integrity sha512-dVyMcd5hbnTpN2nuukLOWv2J73hpuMf3ZRSO3asqAodKGZek74JhwOtZD9saCOItLYeOWdRRmzfXad34lDgHXg== + dependencies: + "@ckb-lumos/base" "0.21.0-next.2" + "@ckb-lumos/bi" "0.21.0-next.2" + "@ckb-lumos/codec" "0.21.0-next.2" + "@types/deep-freeze-strict" "^1.1.0" + deep-freeze-strict "^1.1.1" + "@ckb-lumos/hd@0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.20.0.tgz#4b51fb881313ca193a876ae93257f2d5a13df46c" @@ -1844,6 +1897,19 @@ bech32 "^2.0.0" immutable "^4.0.0-rc.12" +"@ckb-lumos/helpers@0.21.0-next.2": + version "0.21.0-next.2" + resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.0-next.2.tgz#4a3ac9ff9e52f2063ce2c3670e2c72bb94acad45" + integrity sha512-pZkJwn4jV9uFICtS0Un0ftBnRvlC5BHAueeIBXwa7uclSFHxAejqr2lsM0KLavLBjK/kerOq182mejK9ejX/fQ== + dependencies: + "@ckb-lumos/base" "0.21.0-next.2" + "@ckb-lumos/bi" "0.21.0-next.2" + "@ckb-lumos/codec" "0.21.0-next.2" + "@ckb-lumos/config-manager" "0.21.0-next.2" + "@ckb-lumos/toolkit" "0.21.0-next.2" + bech32 "^2.0.0" + immutable "^4.3.0" + "@ckb-lumos/helpers@^0.21.0-next.1": version "0.21.0-next.1" resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.0-next.1.tgz#f0f2d9e231f5a266d53df0c60e7b7610b87e10b5" @@ -1894,6 +1960,16 @@ axios "0.27.2" tslib "2.3.1" +"@ckb-lumos/rpc@0.21.0-next.2": + version "0.21.0-next.2" + resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.21.0-next.2.tgz#a840f18535c419448e982807f49ede7012ac7daf" + integrity sha512-WWV1x+I2mS8/CFlstSC2POrQ64TIgr7H8YjdA0jMT7o8Pt7qo2KXO4bFwSuPMgtdo2DKPSxTUS9zFjiZsWmXRw== + dependencies: + "@ckb-lumos/base" "0.21.0-next.2" + "@ckb-lumos/bi" "0.21.0-next.2" + abort-controller "^3.0.0" + cross-fetch "^3.1.5" + "@ckb-lumos/toolkit@0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.20.0.tgz#8f71043324e50c8a3e94c65414325482d874cfca" @@ -1906,6 +1982,13 @@ dependencies: "@ckb-lumos/bi" "0.21.0-next.1" +"@ckb-lumos/toolkit@0.21.0-next.2": + version "0.21.0-next.2" + resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.21.0-next.2.tgz#13a4b0c39cd8240dde24647ac50890f2f7ef1970" + integrity sha512-pTTXn6NwwNv3Ms3uj9ywzA4UtiI84IDBw5TEWCAlz4JVwh2dqlncci0O0YboaNA0gg1cVYCITQFLJBQvXQkDRw== + dependencies: + "@ckb-lumos/bi" "0.21.0-next.2" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -5464,6 +5547,13 @@ abbrev@1, abbrev@^1.0.0: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + abstract-leveldown@^6.1.1, abstract-leveldown@^6.2.1: version "6.3.0" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz#d25221d1e6612f820c35963ba4bd739928f6026a" @@ -9344,6 +9434,11 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + eventemitter3@^4.0.0, eventemitter3@^4.0.4: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" From c25556a53a04fecce8dcac3256d5d21d68955f5e Mon Sep 17 00:00:00 2001 From: homura Date: Fri, 17 Nov 2023 19:18:48 +0800 Subject: [PATCH 2/3] test: ci failed because of unmock methods --- .../tests/services/tx/transaction-sender.test.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts index fae1b30919..692208d273 100644 --- a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts +++ b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts @@ -158,10 +158,20 @@ jest.doMock('@ckb-lumos/rpc', () => { } }) +jest.doMock('@ckb-lumos/common-scripts', () => { + return { + dao: { + calculateMaximumWithdraw: stubbedCalculateDaoMaximumWithdraw, + }, + } +}) + jest.doMock('utils/ckb-rpc.ts', () => ({ generateRPC() { return { sendTransaction: stubbedSendTransaction, + getTransaction: stubbedGetTransaction, + getHeader: stubbedGetHeader, } }, })) @@ -802,7 +812,7 @@ describe('TransactionSender Test', () => { } stubbedGetHeader.mockResolvedValue(withdrawBlockHeader) - stubbedCalculateDaoMaximumWithdraw.mockResolvedValue(10300000000) + stubbedCalculateDaoMaximumWithdraw.mockResolvedValue(BigInt(10300000000)) stubbedGetNextAddress.mockReturnValue({ address: fakeAddress1, }) From cc3f44b5e078efddde428138324b6f9515a3ff08 Mon Sep 17 00:00:00 2001 From: homura Date: Sun, 19 Nov 2023 21:26:11 +0800 Subject: [PATCH 3/3] chore: unifying and fixing lumos version --- packages/neuron-wallet/package.json | 18 ++--- yarn.lock | 121 +++++----------------------- 2 files changed, 29 insertions(+), 110 deletions(-) diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json index 89465f40fe..db9ddb637f 100644 --- a/packages/neuron-wallet/package.json +++ b/packages/neuron-wallet/package.json @@ -42,15 +42,15 @@ ] }, "dependencies": { - "@ckb-lumos/base": "^0.21.0-next.1", - "@ckb-lumos/bi": "^0.21.0-next.1", - "@ckb-lumos/ckb-indexer": "^0.21.0-next.1", - "@ckb-lumos/codec": "^0.21.0-next.1", - "@ckb-lumos/common-scripts": "^0.21.0-next.1", - "@ckb-lumos/config-manager": "^0.21.0-next.1", - "@ckb-lumos/hd": "^0.21.0-next.1", - "@ckb-lumos/helpers": "^0.21.0-next.1", - "@ckb-lumos/rpc": "^0.21.0-next.1", + "@ckb-lumos/base": "0.21.0-next.1", + "@ckb-lumos/bi": "0.21.0-next.1", + "@ckb-lumos/ckb-indexer": "0.21.0-next.1", + "@ckb-lumos/codec": "0.21.0-next.1", + "@ckb-lumos/common-scripts": "0.21.0-next.1", + "@ckb-lumos/config-manager": "0.21.0-next.1", + "@ckb-lumos/hd": "0.21.0-next.1", + "@ckb-lumos/helpers": "0.21.0-next.1", + "@ckb-lumos/rpc": "0.21.0-next.1", "@iarna/toml": "2.2.5", "@ledgerhq/hw-transport-node-hid": "6.27.16", "@spore-sdk/core": "0.1.0-beta.9", diff --git a/yarn.lock b/yarn.lock index b84bcb659b..8a2996bbc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1703,7 +1703,7 @@ js-xxhash "^1.0.4" lodash.isequal "^4.5.0" -"@ckb-lumos/base@0.21.0-next.1", "@ckb-lumos/base@^0.21.0-next.1": +"@ckb-lumos/base@0.21.0-next.1": version "0.21.0-next.1" resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.21.0-next.1.tgz#ad82d0147c479b84bc0e80c3e32ad6a39ee75285" integrity sha512-dJL3pqa28oJcNfYLNOuWRIJCeWhUq9l7l2/SZItb9wIT4MX5pD0Z1tA8/s9qbvwmmsab+QGKaLCHXNNeOvS0hg== @@ -1717,20 +1717,6 @@ js-xxhash "^1.0.4" lodash.isequal "^4.5.0" -"@ckb-lumos/base@0.21.0-next.2": - version "0.21.0-next.2" - resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.21.0-next.2.tgz#8d7ba32aa98f63de64f0140ef2e530a16450a382" - integrity sha512-1QiuVR7BD6RV2oq3CpM1RBMoPQ0E+F4e4MLwtg1kWRkN0UQWLin8OIDewb7hXsifU/ZpoTdluoCOGGV0CY1DkQ== - dependencies: - "@ckb-lumos/bi" "0.21.0-next.2" - "@ckb-lumos/codec" "0.21.0-next.2" - "@ckb-lumos/toolkit" "0.21.0-next.2" - "@types/blake2b" "^2.1.0" - "@types/lodash.isequal" "^4.5.5" - blake2b "^2.1.3" - js-xxhash "^1.0.4" - lodash.isequal "^4.5.0" - "@ckb-lumos/bi@0.20.0", "@ckb-lumos/bi@^0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.20.0.tgz#4fa3beca641737b7b83a64d56668067e38cc288d" @@ -1738,20 +1724,13 @@ dependencies: jsbi "^4.1.0" -"@ckb-lumos/bi@0.21.0-next.1", "@ckb-lumos/bi@^0.21.0-next.1": +"@ckb-lumos/bi@0.21.0-next.1": version "0.21.0-next.1" resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.21.0-next.1.tgz#357b8da31882ab5e3e3f8aca54c30dd576e4544d" integrity sha512-FaMKBbtr826upcEVYt9/K/hutxHySD21t7ut5yv8lfj6LYcg6hWjtrbCM2INVV6/8HatfAf8YV2KsNRaluyt3A== dependencies: jsbi "^4.1.0" -"@ckb-lumos/bi@0.21.0-next.2": - version "0.21.0-next.2" - resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.21.0-next.2.tgz#0797e8774c00d3f4e609833050529e0f6e022620" - integrity sha512-3c8jC94eO57vFFo30g9Rh6qrfk5EF+7OD58hX1GknXaHwykMs3EBQodmA7DUV517dswkHy5IzI5gt5ROn9asjQ== - dependencies: - jsbi "^4.1.0" - "@ckb-lumos/ckb-indexer@0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.20.0.tgz#c6792821e3b903f998a891b14892ff67229d3957" @@ -1764,7 +1743,7 @@ cross-fetch "^3.1.5" events "^3.3.0" -"@ckb-lumos/ckb-indexer@^0.21.0-next.1": +"@ckb-lumos/ckb-indexer@0.21.0-next.1": version "0.21.0-next.1" resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.21.0-next.1.tgz#bc2fd6fcd2c482040565c255d7a9f8fd9269b462" integrity sha512-ftT8Rodv/oXIOZLfsXEOLQnHy05c8Wj3h6QasXPlZlRGMdtWrThGz+XVI6lz4VSIfVMPSbwnYT+Dv7bf8fDfdw== @@ -1784,20 +1763,13 @@ dependencies: "@ckb-lumos/bi" "0.20.0" -"@ckb-lumos/codec@0.21.0-next.1", "@ckb-lumos/codec@^0.21.0-next.1": +"@ckb-lumos/codec@0.21.0-next.1": version "0.21.0-next.1" resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.21.0-next.1.tgz#a75f5331026039799afb4f3419bea388e220d26c" integrity sha512-b1w4wbIAbuYngNTKtu6np93EYgnmM4tb6NGdaYN0vZ3kyunlODkLWyRHyMo+FGeBdWQjBwBbmxGNyXwDxtTEGQ== dependencies: "@ckb-lumos/bi" "0.21.0-next.1" -"@ckb-lumos/codec@0.21.0-next.2": - version "0.21.0-next.2" - resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.21.0-next.2.tgz#d29465fc22c2b98182b6079453be7deb7d3fd1ba" - integrity sha512-yTtWIG9LESLTU3tBb9fHREWo2mO0Ts7SSL1Jp3MSqYbnl90JZeYr/skvn+vaV9/2Cl/6qEgeKYa1AnHNSLchkw== - dependencies: - "@ckb-lumos/bi" "0.21.0-next.2" - "@ckb-lumos/common-scripts@0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.20.0.tgz#7f95fb91d3c275ff557197269225a15a634811b6" @@ -1812,18 +1784,18 @@ "@ckb-lumos/toolkit" "0.20.0" immutable "^4.0.0-rc.12" -"@ckb-lumos/common-scripts@^0.21.0-next.1": - version "0.21.0-next.2" - resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.21.0-next.2.tgz#222e58a96d92a4ddfa9e501fe2f0a5428c036e96" - integrity sha512-43r7DvXSccsi80NcXh0jaZT0MdQ+rhsElWBO2U3zRUt/55rV4HBaoo26Rj8h7esi0tVfDbiDrnc16ymN1V+B3w== - dependencies: - "@ckb-lumos/base" "0.21.0-next.2" - "@ckb-lumos/bi" "0.21.0-next.2" - "@ckb-lumos/codec" "0.21.0-next.2" - "@ckb-lumos/config-manager" "0.21.0-next.2" - "@ckb-lumos/helpers" "0.21.0-next.2" - "@ckb-lumos/rpc" "0.21.0-next.2" - "@ckb-lumos/toolkit" "0.21.0-next.2" +"@ckb-lumos/common-scripts@0.21.0-next.1": + version "0.21.0-next.1" + resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.21.0-next.1.tgz#92e0295f9e123f3fdfe80e02706cc08c6310ffca" + integrity sha512-KhnWbNY1fNKTxp9CR4GAGyWsjjN1eOvidNLFwltLY03n8er2jtoHRbx3t944fIhUMtIwUVkWBi43SqpUCgSJbw== + dependencies: + "@ckb-lumos/base" "0.21.0-next.1" + "@ckb-lumos/bi" "0.21.0-next.1" + "@ckb-lumos/codec" "0.21.0-next.1" + "@ckb-lumos/config-manager" "0.21.0-next.1" + "@ckb-lumos/helpers" "0.21.0-next.1" + "@ckb-lumos/rpc" "0.21.0-next.1" + "@ckb-lumos/toolkit" "0.21.0-next.1" immutable "^4.3.0" "@ckb-lumos/config-manager@0.20.0", "@ckb-lumos/config-manager@^0.20.0": @@ -1837,7 +1809,7 @@ "@types/deep-freeze-strict" "^1.1.0" deep-freeze-strict "^1.1.1" -"@ckb-lumos/config-manager@0.21.0-next.1", "@ckb-lumos/config-manager@^0.21.0-next.1": +"@ckb-lumos/config-manager@0.21.0-next.1": version "0.21.0-next.1" resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.21.0-next.1.tgz#927e21a5d9450155ebf766422a707fd3b0856a14" integrity sha512-G8CO+q1RH/Gt8ou8p/N99AUh5hIdU+MZcTZHwABOa4CLbXk2xFenRfeGhHv4u4ddYZ3SLx1zND7pSnbImmrh2A== @@ -1848,17 +1820,6 @@ "@types/deep-freeze-strict" "^1.1.0" deep-freeze-strict "^1.1.1" -"@ckb-lumos/config-manager@0.21.0-next.2": - version "0.21.0-next.2" - resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.21.0-next.2.tgz#ef08003193a49b248440fc73ce9207b1bb6a2a5f" - integrity sha512-dVyMcd5hbnTpN2nuukLOWv2J73hpuMf3ZRSO3asqAodKGZek74JhwOtZD9saCOItLYeOWdRRmzfXad34lDgHXg== - dependencies: - "@ckb-lumos/base" "0.21.0-next.2" - "@ckb-lumos/bi" "0.21.0-next.2" - "@ckb-lumos/codec" "0.21.0-next.2" - "@types/deep-freeze-strict" "^1.1.0" - deep-freeze-strict "^1.1.1" - "@ckb-lumos/hd@0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.20.0.tgz#4b51fb881313ca193a876ae93257f2d5a13df46c" @@ -1872,7 +1833,7 @@ sha3 "^2.1.3" uuid "^8.3.0" -"@ckb-lumos/hd@^0.21.0-next.1": +"@ckb-lumos/hd@0.21.0-next.1": version "0.21.0-next.1" resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.21.0-next.1.tgz#ffa4b80b974187982bbfa280138ca1dab0b2df0e" integrity sha512-gISrSs4OWoBVecRnYMfjYQc83aE0Khjjs1KmAkAg1J53PWGeU3kjbUQSCHjF6poFL5ylEARX9vOKixRfm6nktg== @@ -1897,20 +1858,7 @@ bech32 "^2.0.0" immutable "^4.0.0-rc.12" -"@ckb-lumos/helpers@0.21.0-next.2": - version "0.21.0-next.2" - resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.0-next.2.tgz#4a3ac9ff9e52f2063ce2c3670e2c72bb94acad45" - integrity sha512-pZkJwn4jV9uFICtS0Un0ftBnRvlC5BHAueeIBXwa7uclSFHxAejqr2lsM0KLavLBjK/kerOq182mejK9ejX/fQ== - dependencies: - "@ckb-lumos/base" "0.21.0-next.2" - "@ckb-lumos/bi" "0.21.0-next.2" - "@ckb-lumos/codec" "0.21.0-next.2" - "@ckb-lumos/config-manager" "0.21.0-next.2" - "@ckb-lumos/toolkit" "0.21.0-next.2" - bech32 "^2.0.0" - immutable "^4.3.0" - -"@ckb-lumos/helpers@^0.21.0-next.1": +"@ckb-lumos/helpers@0.21.0-next.1": version "0.21.0-next.1" resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.0-next.1.tgz#f0f2d9e231f5a266d53df0c60e7b7610b87e10b5" integrity sha512-lSvn2L97be7IlONFTdjjz+/jG6QlpEGyETyrcSfJxeOOtgjicPFaLXLnaTBIt/IElRZ2ZpclbTFvSNcbVOvKdQ== @@ -1949,7 +1897,7 @@ axios "0.27.2" tslib "2.3.1" -"@ckb-lumos/rpc@0.21.0-next.1", "@ckb-lumos/rpc@^0.21.0-next.1": +"@ckb-lumos/rpc@0.21.0-next.1": version "0.21.0-next.1" resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.21.0-next.1.tgz#f31610fc1713ae63e25475d3653ee8cc3eeabc0f" integrity sha512-6IjnME2wGg1rmVnajQ7CTBqbLnXkdNqRERRmnD1J9EnoHBc+onSYSfkC58ZCVCOe0xZIR2vNKmOUQ++dmlKKiQ== @@ -1960,16 +1908,6 @@ axios "0.27.2" tslib "2.3.1" -"@ckb-lumos/rpc@0.21.0-next.2": - version "0.21.0-next.2" - resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.21.0-next.2.tgz#a840f18535c419448e982807f49ede7012ac7daf" - integrity sha512-WWV1x+I2mS8/CFlstSC2POrQ64TIgr7H8YjdA0jMT7o8Pt7qo2KXO4bFwSuPMgtdo2DKPSxTUS9zFjiZsWmXRw== - dependencies: - "@ckb-lumos/base" "0.21.0-next.2" - "@ckb-lumos/bi" "0.21.0-next.2" - abort-controller "^3.0.0" - cross-fetch "^3.1.5" - "@ckb-lumos/toolkit@0.20.0": version "0.20.0" resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.20.0.tgz#8f71043324e50c8a3e94c65414325482d874cfca" @@ -1982,13 +1920,6 @@ dependencies: "@ckb-lumos/bi" "0.21.0-next.1" -"@ckb-lumos/toolkit@0.21.0-next.2": - version "0.21.0-next.2" - resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.21.0-next.2.tgz#13a4b0c39cd8240dde24647ac50890f2f7ef1970" - integrity sha512-pTTXn6NwwNv3Ms3uj9ywzA4UtiI84IDBw5TEWCAlz4JVwh2dqlncci0O0YboaNA0gg1cVYCITQFLJBQvXQkDRw== - dependencies: - "@ckb-lumos/bi" "0.21.0-next.2" - "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -5547,13 +5478,6 @@ abbrev@1, abbrev@^1.0.0: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -abort-controller@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" - integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== - dependencies: - event-target-shim "^5.0.0" - abstract-leveldown@^6.1.1, abstract-leveldown@^6.2.1: version "6.3.0" resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz#d25221d1e6612f820c35963ba4bd739928f6026a" @@ -9434,11 +9358,6 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -event-target-shim@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" - integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== - eventemitter3@^4.0.0, eventemitter3@^4.0.4: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"