chore: Upgrade ckb-sdk-js

duanyytop · duanyytop · commit cd3f61801fbb · 2024-07-19T14:16:43.000+08:00
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - develop
+      - ref/support-esm
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
diff --git a/examples/rgbpp/package.json b/examples/rgbpp/package.json
@@ -10,7 +10,7 @@
     "lint:fix": "tsc && eslint --fix --ext .js,.ts . && prettier --write '**/*.{js,ts}'"
   },
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-utils": "^0.109.1",
+    "@nervosnetwork/ckb-sdk-utils": "0.109.2-alpha.1",
     "rgbpp": "^0.4.0"
   },
   "devDependencies": {
diff --git a/examples/xudt-on-ckb/package.json b/examples/xudt-on-ckb/package.json
@@ -10,7 +10,7 @@
     "lint:fix": "tsc && eslint --fix --ext .ts . && prettier --write '**/*.ts'"
   },
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-utils": "^0.109.1",
+    "@nervosnetwork/ckb-sdk-utils": "0.109.2-alpha.1",
     "rgbpp": "^0.4.0"
   },
   "devDependencies": {
diff --git a/packages/btc/package.json b/packages/btc/package.json
@@ -30,7 +30,7 @@
   "dependencies": {
     "@bitcoinerlab/secp256k1": "^1.1.1",
     "@ckb-lumos/codec": "0.22.2",
-    "@nervosnetwork/ckb-types": "^0.109.1",
+    "@nervosnetwork/ckb-types": "0.109.2-alpha.1",
     "@rgbpp-sdk/ckb": "workspace:^",
     "@rgbpp-sdk/service": "workspace:^",
     "bip32": "^4.0.0",
diff --git a/packages/ckb/package.json b/packages/ckb/package.json
@@ -32,9 +32,9 @@
     "@ckb-lumos/base": "^0.22.2",
     "@ckb-lumos/codec": "^0.22.2",
     "@spore-sdk/core": "^0.2.0-beta.6",
-    "@nervosnetwork/ckb-sdk-core": "^0.109.1",
-    "@nervosnetwork/ckb-sdk-utils": "^0.109.1",
-    "@nervosnetwork/ckb-types": "^0.109.1",
+    "@nervosnetwork/ckb-sdk-core": "0.109.2-alpha.1",
+    "@nervosnetwork/ckb-sdk-utils": "0.109.2-alpha.1",
+    "@nervosnetwork/ckb-types": "0.109.2-alpha.1",
     "@rgbpp-sdk/service": "workspace:^",
     "@exact-realty/multipart-parser": "^1.0.13",
     "axios": "^1.6.8",
diff --git a/packages/ckb/src/collector/index.ts b/packages/ckb/src/collector/index.ts
@@ -168,7 +168,6 @@ export class Collector {
 
   async getLiveCells(outPoints: CKBComponents.OutPoint[], withData = false): Promise<CKBComponents.LiveCell[]> {
     const ckb = new CKB(this.ckbNodeUrl);
-    /* @ts-expect-error The parameters data types of batch request don't support boolean */
     const batch = ckb.rpc.createBatchRequest(outPoints.map((outPoint) => ['getLiveCell', outPoint, withData]));
     return batch.exec().then((liveCells) => liveCells.map((liveCell) => liveCell.cell));
   }
diff --git a/packages/ckb/src/paymaster/index.ts b/packages/ckb/src/paymaster/index.ts
@@ -1,14 +1,8 @@
 import { ConstructPaymasterParams } from '../types/rgbpp';
 import { NoLiveCellError } from '../error';
 import { CKB_UNIT, MAX_FEE, SECP256K1_WITNESS_LOCK_SIZE, getSecp256k1CellDep } from '../constants';
-import {
-  append0x,
-  calculateTransactionFee,
-  AddressPrefix,
-  addressToScript,
-  getTransactionSize,
-  privateKeyToAddress,
-} from '../utils';
+import { append0x, calculateTransactionFee } from '../utils';
+import { AddressPrefix, addressToScript, getTransactionSize, privateKeyToAddress } from '@nervosnetwork/ckb-sdk-utils';
 
 const SECP256K1_MIN_CAPACITY = BigInt(61) * CKB_UNIT;
 
diff --git a/packages/ckb/src/rgbpp/btc-jump-ckb.ts b/packages/ckb/src/rgbpp/btc-jump-ckb.ts
@@ -10,8 +10,6 @@ import {
   isScriptEqual,
   isUDTTypeSupported,
   u128ToLe,
-  addressToScript,
-  getTransactionSize,
   buildPreLockArgs,
   calculateCommitment,
   throwErrorWhenTxInputsExceeded,
@@ -25,6 +23,7 @@ import {
 } from '../utils';
 import { Hex, IndexerCell } from '../types';
 import { RGBPP_WITNESS_PLACEHOLDER, getSecp256k1CellDep } from '../constants';
+import { addressToScript, getTransactionSize } from '@nervosnetwork/ckb-sdk-utils';
 
 /**
  * Generate the virtual ckb transaction for the jumping tx from BTC to CKB
diff --git a/packages/ckb/src/rgbpp/btc-time.ts b/packages/ckb/src/rgbpp/btc-time.ts
@@ -1,3 +1,12 @@
+import {
+  addressToScript,
+  bytesToHex,
+  getTransactionSize,
+  rawTransactionToHash,
+  scriptToHash,
+  serializeOutPoint,
+  serializeWitnessArgs,
+} from '@nervosnetwork/ckb-sdk-utils';
 import {
   BTC_JUMP_CONFIRMATION_BLOCKS,
   SECP256K1_WITNESS_LOCK_SIZE,
@@ -15,13 +24,6 @@ import {
   genBtcTimeLockArgs,
   lockScriptFromBtcTimeLockArgs,
   transformSpvProof,
-  addressToScript,
-  bytesToHex,
-  getTransactionSize,
-  rawTransactionToHash,
-  scriptToHash,
-  serializeOutPoint,
-  serializeWitnessArgs,
   buildSpvClientCellDep,
   blockchain,
   signWitnesses,
diff --git a/packages/ckb/src/rgbpp/btc-transfer.ts b/packages/ckb/src/rgbpp/btc-transfer.ts
@@ -16,11 +16,6 @@ import {
   isScriptEqual,
   isUDTTypeSupported,
   u128ToLe,
-  addressToScript,
-  getTransactionSize,
-  rawTransactionToHash,
-  scriptToHash,
-  serializeWitnessArgs,
   buildPreLockArgs,
   calculateCommitment,
   compareInputs,
@@ -41,6 +36,13 @@ import {
   getRgbppLockScript,
   getSecp256k1CellDep,
 } from '../constants';
+import {
+  addressToScript,
+  getTransactionSize,
+  rawTransactionToHash,
+  scriptToHash,
+  serializeWitnessArgs,
+} from '@nervosnetwork/ckb-sdk-utils';
 
 /**
  * Generate the virtual ckb transaction for the btc transfer tx
diff --git a/packages/ckb/src/rgbpp/ckb-builder.ts b/packages/ckb/src/rgbpp/ckb-builder.ts
@@ -13,17 +13,19 @@ import {
   replaceLockArgsWithRealBtcTxId,
   transformSpvProof,
   u8ToHex,
-  bytesToHex,
-  getTransactionSize,
-  rawTransactionToHash,
-  scriptToHash,
-  serializeWitnessArgs,
   blockchain,
   signWitnesses,
 } from '../utils';
 import { InputsCapacityNotEnoughError } from '../error';
 import { buildSpvClientCellDep } from '../utils';
 import { RGBPPUnlock, Uint16 } from '../schemas/generated/rgbpp';
+import {
+  bytesToHex,
+  getTransactionSize,
+  rawTransactionToHash,
+  scriptToHash,
+  serializeWitnessArgs,
+} from '@nervosnetwork/ckb-sdk-utils';
 
 export const buildRgbppUnlockWitness = (
   btcTxBytes: Hex,
diff --git a/packages/ckb/src/rgbpp/ckb-jump-btc.ts b/packages/ckb/src/rgbpp/ckb-jump-btc.ts
@@ -8,12 +8,11 @@ import {
   fetchTypeIdCellDeps,
   isTypeAssetSupported,
   u128ToLe,
-  addressToScript,
-  getTransactionSize,
   genRgbppLockScript,
   blockchain,
 } from '../utils';
 import { MAX_FEE, MIN_CAPACITY, RGBPP_TX_WITNESS_MAX_SIZE } from '../constants';
+import { addressToScript, getTransactionSize } from '@nervosnetwork/ckb-sdk-utils';
 
 /**
  * Generate the virtual ckb transaction for the jumping tx from CKB to BTC
diff --git a/packages/ckb/src/rgbpp/launch.ts b/packages/ckb/src/rgbpp/launch.ts
@@ -7,8 +7,6 @@ import {
   fetchTypeIdCellDeps,
   generateUniqueTypeArgs,
   u128ToLe,
-  getTransactionSize,
-  scriptToHash,
   buildPreLockArgs,
   calculateCommitment,
   encodeRgbppTokenInfo,
@@ -24,6 +22,7 @@ import {
   getUniqueTypeScript,
   UNLOCKABLE_LOCK_SCRIPT,
 } from '../constants';
+import { getTransactionSize, scriptToHash } from '@nervosnetwork/ckb-sdk-utils';
 
 /**
  * Generate the virtual ckb transaction for the btc transfer tx
diff --git a/packages/ckb/src/spore/cluster.ts b/packages/ckb/src/spore/cluster.ts
@@ -4,8 +4,6 @@ import {
   append0x,
   calculateTransactionFee,
   fetchTypeIdCellDeps,
-  bytesToHex,
-  getTransactionSize,
   buildPreLockArgs,
   calculateCommitment,
   genRgbppLockScript,
@@ -20,6 +18,7 @@ import {
   getClusterTypeScript,
 } from '../constants';
 import { NoRgbppLiveCellError } from '../error';
+import { bytesToHex, getTransactionSize } from '@nervosnetwork/ckb-sdk-utils';
 
 /**
  * Generate the virtual ckb transaction for creating cluster
diff --git a/packages/ckb/src/spore/leap.ts b/packages/ckb/src/spore/leap.ts
@@ -3,10 +3,6 @@ import {
   append0x,
   calculateTransactionFee,
   fetchTypeIdCellDeps,
-  addressToScript,
-  getTransactionSize,
-  serializeOutPoint,
-  serializeWitnessArgs,
   btcTxIdFromBtcTimeLockArgs,
   buildSpvClientCellDep,
   calculateCommitment,
@@ -33,6 +29,12 @@ import {
 } from '../constants';
 import { NoRgbppLiveCellError } from '../error';
 import { buildBtcTimeUnlockWitness } from '../rgbpp';
+import {
+  addressToScript,
+  getTransactionSize,
+  serializeOutPoint,
+  serializeWitnessArgs,
+} from '@nervosnetwork/ckb-sdk-utils';
 
 /**
  * Generate the virtual ckb transaction for leaping spore from BTC to CKB
diff --git a/packages/ckb/src/spore/spore.ts b/packages/ckb/src/spore/spore.ts
@@ -6,12 +6,6 @@ import {
   calculateTransactionFee,
   fetchTypeIdCellDeps,
   isClusterSporeTypeSupported,
-  addressToScript,
-  bytesToHex,
-  getTransactionSize,
-  rawTransactionToHash,
-  scriptToHash,
-  serializeWitnessArgs,
   buildPreLockArgs,
   calculateCommitment,
   genRgbppLockScript,
@@ -48,6 +42,14 @@ import {
   RgbppUtxoBindMultiTypeAssetsError,
   TypeAssetNotSupportedError,
 } from '../error';
+import {
+  addressToScript,
+  bytesToHex,
+  getTransactionSize,
+  rawTransactionToHash,
+  scriptToHash,
+  serializeWitnessArgs,
+} from '@nervosnetwork/ckb-sdk-utils';
 
 /**
  * Generate the virtual ckb transaction for creating spores
diff --git a/packages/ckb/src/utils/ckb-tx.ts b/packages/ckb/src/utils/ckb-tx.ts
@@ -1,7 +1,13 @@
-import { calculateTransactionFee as calculateTxFee } from '@nervosnetwork/ckb-sdk-utils/lib/calculateTransactionFee.js';
+import {
+  calculateTransactionFee as calculateTxFee,
+  PERSONAL,
+  blake2b,
+  hexToBytes,
+  serializeInput,
+  serializeScript,
+} from '@nervosnetwork/ckb-sdk-utils';
 import { RawClusterData, packRawClusterData, SporeDataProps, packRawSporeData } from '@spore-sdk/core';
-import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses.js';
-import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
+import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses';
 import { remove0x, u64ToLe } from './hex';
 import {
   CKB_UNIT,
@@ -16,24 +22,7 @@ import { Collector } from '../collector';
 import { NoLiveCellError } from '../error';
 
 export { blockchain } from '@ckb-lumos/base';
-export { signWitnesses };
-export const {
-  PERSONAL,
-  blake2b,
-  hexToBytes,
-  serializeInput,
-  serializeScript,
-  AddressPrefix,
-  addressToScript,
-  privateKeyToAddress,
-  bytesToHex,
-  getTransactionSize,
-  rawTransactionToHash,
-  scriptToHash,
-  serializeOutPoint,
-  serializeOutput,
-  serializeWitnessArgs,
-} = ckbUtils;
+export { signWitnesses, serializeScript };
 
 export const calculateTransactionFee = (txSize: number, feeRate?: bigint): bigint => {
   const rate = feeRate ?? BigInt(1100);
diff --git a/packages/ckb/src/utils/hex.ts b/packages/ckb/src/utils/hex.ts
@@ -1,4 +1,4 @@
-import { hexToBytes, bytesToHex } from './ckb-tx';
+import { hexToBytes, bytesToHex } from '@nervosnetwork/ckb-sdk-utils';
 import { Hex } from '../types';
 
 export const remove0x = (hex: string): string => {
diff --git a/packages/ckb/src/utils/rgbpp.ts b/packages/ckb/src/utils/rgbpp.ts
@@ -21,17 +21,14 @@ import {
   RgbppCkbTxInputsExceededError,
   RgbppUtxoBindMultiTypeAssetsError,
 } from '../error';
+import { calculateRgbppCellCapacity, isScriptEqual, isUDTTypeSupported, blockchain } from './ckb-tx';
 import {
-  calculateRgbppCellCapacity,
-  isScriptEqual,
-  isUDTTypeSupported,
   bytesToHex,
   hexToBytes,
   serializeOutPoint,
   serializeOutput,
   serializeScript,
-  blockchain,
-} from './ckb-tx';
+} from '@nervosnetwork/ckb-sdk-utils';
 
 export const genRgbppLockScript = (rgbppLockArgs: Hex, isMainnet: boolean, btcTestnetType?: BTCTestnetType) => {
   return {
diff --git a/packages/ckb/src/utils/spore.ts b/packages/ckb/src/utils/spore.ts
@@ -11,7 +11,8 @@ import {
 import { u64ToLe } from './hex';
 import { Hex, IndexerCell, SporesCreateCobuildParams } from '../types';
 import { NoRgbppLiveCellError, RgbppSporeTypeMismatchError, RgbppUtxoBindMultiTypeAssetsError } from '../error';
-import { isScriptEqual, isSporeTypeSupported, PERSONAL, blake2b, hexToBytes, serializeInput } from './ckb-tx';
+import { isScriptEqual, isSporeTypeSupported } from './ckb-tx';
+import { blake2b, hexToBytes, PERSONAL, serializeInput } from '@nervosnetwork/ckb-sdk-utils';
 
 // Generate type id for cluster id
 export const generateClusterId = (firstInput: CKBComponents.CellInput, firstOutputIndex: number) => {
diff --git a/packages/rgbpp/package.json b/packages/rgbpp/package.json
@@ -61,7 +61,7 @@
     "@rgbpp-sdk/btc": "workspace:*",
     "@rgbpp-sdk/ckb": "workspace:*",
     "@rgbpp-sdk/service": "workspace:*",
-    "@nervosnetwork/ckb-sdk-utils": "^0.109.1"
+    "@nervosnetwork/ckb-sdk-utils": "0.109.2-alpha.1"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/service/package.json b/packages/service/package.json
@@ -30,7 +30,7 @@
   "dependencies": {
     "@ckb-lumos/codec": "0.22.2",
     "@ckb-lumos/base": "0.22.2",
-    "@nervosnetwork/ckb-types": "^0.109.1",
+    "@nervosnetwork/ckb-types": "0.109.2-alpha.1",
     "lodash": "^4.17.21"
   },
   "publishConfig": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/rgbpp/package.json b/tests/rgbpp/package.json

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,6 @@ export class Collector {`
`168`	`168`
`169`	`169`	`async getLiveCells(outPoints: CKBComponents.OutPoint[], withData = false): Promise<CKBComponents.LiveCell[]> {`
`170`	`170`	`const ckb = new CKB(this.ckbNodeUrl);`
`171`		`- /* @ts-expect-error The parameters data types of batch request don't support boolean */`
`172`	`171`	`const batch = ckb.rpc.createBatchRequest(outPoints.map((outPoint) => ['getLiveCell', outPoint, withData]));`
`173`	`172`	`return batch.exec().then((liveCells) => liveCells.map((liveCell) => liveCell.cell));`
`174`	`173`	`}`