diff --git a/.ckb-version b/.ckb-version index de4d9773e7..003d88e0df 100644 --- a/.ckb-version +++ b/.ckb-version @@ -1 +1 @@ -v0.114.0 +v0.115.0 diff --git a/_typos.toml b/_typos.toml index ae82742a0c..0afbdd74c5 100644 --- a/_typos.toml +++ b/_typos.toml @@ -1,6 +1,8 @@ [default.extend-words] thur = "thur" numer = "numer" +HD = "HD" +hd = "hd" # defined in database schema lastest = "lastest" diff --git a/compatible.json b/compatible.json index c2c41af8a5..bdf141600c 100644 --- a/compatible.json +++ b/compatible.json @@ -1,5 +1,6 @@ { "fullVersions": [ + "0.115", "0.114", "0.113", "0.112", @@ -20,6 +21,7 @@ "compatible": { "0.111": { "full": [ + "0.115", "0.114", "0.113", "0.112", @@ -34,6 +36,7 @@ }, "0.110": { "full": [ + "0.115", "0.114", "0.113", "0.112", @@ -64,6 +67,7 @@ }, "0.112": { "full": [ + "0.115", "0.114", "0.113", "0.112", @@ -78,6 +82,7 @@ }, "0.114": { "full": [ + "0.115", "0.114", "0.113", "0.112", diff --git a/package.json b/package.json index 9d0c793ed0..aa0b2ab372 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,8 @@ "dependencies": {}, "resolutions": { "@types/react": "18.2.45", - "react-i18next": ">=11.16.4" + "react-i18next": ">=11.16.4", + "react-refresh": "0.14.0" }, "volta": { "node": "20.10.0" diff --git a/packages/neuron-ui/src/components/HardwareSign/hooks.ts b/packages/neuron-ui/src/components/HardwareSign/hooks.ts index cec9567a50..2ccc38400b 100644 --- a/packages/neuron-ui/src/components/HardwareSign/hooks.ts +++ b/packages/neuron-ui/src/components/HardwareSign/hooks.ts @@ -85,6 +85,8 @@ export default ({ switch (offlineSignJSON?.type) { case OfflineSignType.CreateSUDTAccount: return 'create-sudt-account' + case OfflineSignType.SendAcpSUDTToNewCell: + return 'send-acp-sudt-to-new-cell' case OfflineSignType.SendSUDT: return 'send-sudt' case OfflineSignType.UnlockDAO: diff --git a/packages/neuron-ui/src/components/PasswordRequest/hooks.ts b/packages/neuron-ui/src/components/PasswordRequest/hooks.ts index 9e335c9e4e..dbb4073155 100644 --- a/packages/neuron-ui/src/components/PasswordRequest/hooks.ts +++ b/packages/neuron-ui/src/components/PasswordRequest/hooks.ts @@ -56,9 +56,10 @@ export default ({ switch (actionType) { case 'create-sudt-account': return OfflineSignType.CreateSUDTAccount + case 'send-acp-sudt-to-new-cell': + return OfflineSignType.SendAcpSUDTToNewCell case 'send-ckb-asset': case 'send-acp-ckb-to-new-cell': - case 'send-acp-sudt-to-new-cell': case 'transfer-to-sudt': case 'send-sudt': return OfflineSignType.SendSUDT diff --git a/packages/neuron-ui/src/services/remote/offline.ts b/packages/neuron-ui/src/services/remote/offline.ts index f2ed6f88e3..6824bd9c0a 100644 --- a/packages/neuron-ui/src/services/remote/offline.ts +++ b/packages/neuron-ui/src/services/remote/offline.ts @@ -13,6 +13,7 @@ export enum OfflineSignType { UnlockDAO = 'UnlockDAO', CreateSUDTAccount = 'CreateSUDTAccount', SendSUDT = 'SendSUDT', + SendAcpSUDTToNewCell = 'SendAcpSUDTToNewCell', SendFromMultisigOnlySig = 'SendFromMultisigOnlySig', Invalid = 'Invalid', } diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts index d91b4e7b74..139e6f8179 100644 --- a/packages/neuron-wallet/src/services/transaction-sender.ts +++ b/packages/neuron-wallet/src/services/transaction-sender.ts @@ -674,8 +674,8 @@ export default class TransactionSender { const currentNetwork = NetworksService.getInstance().getCurrent() const rpcService = new RpcService(currentNetwork.remote, currentNetwork.type) - const depositeOutput = await CellsService.getLiveCell(outPoint) - if (!depositeOutput) { + const depositOutput = await CellsService.getLiveCell(outPoint) + if (!depositOutput) { throw new CellIsNotYetLive() } const prevTx = await rpcService.getTransaction(outPoint.txHash) @@ -690,7 +690,7 @@ export default class TransactionSender { const tx: Transaction = await TransactionGenerator.startWithdrawFromDao( walletID, outPoint, - depositeOutput, + depositOutput, depositBlockHeader!.number, depositBlockHeader!.hash, changeAddress!.address, @@ -736,13 +736,13 @@ export default class TransactionSender { if (!withdrawOutput.depositOutPoint) { throw new Error('DAO has not finish step first withdraw') } - const depositeTx = await rpcService.getTransaction(withdrawOutput.depositOutPoint.txHash) - if (!depositeTx?.txStatus.blockHash) { - throw new Error(`Get deposite block hash failed with tx hash ${withdrawOutput.depositOutPoint.txHash}`) + const depositTx = await rpcService.getTransaction(withdrawOutput.depositOutPoint.txHash) + if (!depositTx?.txStatus.blockHash) { + throw new Error(`Get deposit block hash failed with tx hash ${withdrawOutput.depositOutPoint.txHash}`) } - const depositBlockHeader = await rpcService.getHeader(depositeTx.txStatus.blockHash) + const depositBlockHeader = await rpcService.getHeader(depositTx.txStatus.blockHash) if (!depositBlockHeader) { - throw new Error(`Get Header failed with blockHash ${depositeTx.txStatus.blockHash}`) + throw new Error(`Get Header failed with blockHash ${depositTx.txStatus.blockHash}`) } const depositEpoch = this.parseEpoch(BigInt(depositBlockHeader.epoch)) const depositCapacity: bigint = BigInt(withdrawOutput.capacity) diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts index 3bb81943f1..8d3dcd17d1 100644 --- a/packages/neuron-wallet/tests/services/cells.test.ts +++ b/packages/neuron-wallet/tests/services/cells.test.ts @@ -630,7 +630,7 @@ describe('CellsService', () => { ) ).rejects.toThrow(new LiveCapacityNotEnough()) }) - it('left capcity not enough for a cell throw CapacityNotEnoughForChange', async () => { + it('left capacity not enough for a cell throw CapacityNotEnoughForChange', async () => { await createMultisigCell(toShannon('1000'), OutputStatus.Sent, multisigInfo) await expect( CellsService.gatherInputs( @@ -660,7 +660,7 @@ describe('CellsService', () => { ) ).rejects.toThrow(new LiveCapacityNotEnough()) }) - it('left capcity not enough for a cell throw CapacityNotEnoughForChange', async () => { + it('left capacity not enough for a cell throw CapacityNotEnoughForChange', async () => { await expect( CellsService.gatherInputs( toShannon('990'), diff --git a/yarn.lock b/yarn.lock index e1cb24f982..4bc5833a23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17127,12 +17127,7 @@ react-is@^17.0.0, react-is@^17.0.1, react-is@^17.0.2: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-refresh@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046" - integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A== - -react-refresh@^0.14.0: +react-refresh@0.14.0, react-refresh@^0.11.0, react-refresh@^0.14.0: version "0.14.0" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e" integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==