refactor: bypass named importing from @nervosnetwork/ckb-sdk-utils directly

ShookLyngs · ShookLyngs · commit 53fc8eec4fb1 · 2024-07-05T16:58:58.000+08:00
diff --git a/packages/ckb/src/index.ts b/packages/ckb/src/index.ts
@@ -1,4 +1,5 @@
-export { serializeScript } from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
+export const serializeScript = ckbUtils.serializeScript;
 
 export * from './schemas/generated/blockchain';
 export * from './schemas/generated/rgbpp';
diff --git a/packages/ckb/src/paymaster/index.ts b/packages/ckb/src/paymaster/index.ts
@@ -1,9 +1,11 @@
-import { AddressPrefix, addressToScript, getTransactionSize, privateKeyToAddress } from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import { ConstructPaymasterParams } from '../types/rgbpp';
 import { NoLiveCellError } from '../error';
 import { CKB_UNIT, MAX_FEE, SECP256K1_WITNESS_LOCK_SIZE, getSecp256k1CellDep } from '../constants';
 import { append0x, calculateTransactionFee } from '../utils';
 
+const { AddressPrefix, addressToScript, getTransactionSize, privateKeyToAddress } = ckbUtils;
+
 const SECP256K1_MIN_CAPACITY = BigInt(61) * CKB_UNIT;
 
 export const splitMultiCellsWithSecp256k1 = async ({
diff --git a/packages/ckb/src/rgbpp/btc-jump-ckb.ts b/packages/ckb/src/rgbpp/btc-jump-ckb.ts
@@ -25,7 +25,9 @@ import {
 } from '../utils/rgbpp';
 import { Hex, IndexerCell } from '../types';
 import { RGBPP_WITNESS_PLACEHOLDER, getSecp256k1CellDep } from '../constants';
-import { addressToScript, getTransactionSize } from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
+
+const { addressToScript, getTransactionSize } = ckbUtils;
 
 /**
  * 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,12 +1,4 @@
-import {
-  addressToScript,
-  bytesToHex,
-  getTransactionSize,
-  rawTransactionToHash,
-  scriptToHash,
-  serializeOutPoint,
-  serializeWitnessArgs,
-} from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import {
   BTC_JUMP_CONFIRMATION_BLOCKS,
   SECP256K1_WITNESS_LOCK_SIZE,
@@ -29,6 +21,16 @@ import { buildSpvClientCellDep } from '../utils';
 import { blockchain } from '@ckb-lumos/base';
 import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses.js';
 
+const {
+  addressToScript,
+  bytesToHex,
+  getTransactionSize,
+  rawTransactionToHash,
+  scriptToHash,
+  serializeOutPoint,
+  serializeWitnessArgs,
+} = ckbUtils;
+
 export const buildBtcTimeUnlockWitness = (btcTxProof: Hex): Hex => {
   const btcTimeUnlock = BTCTimeUnlock.pack({ btcTxProof: blockchain.Bytes.pack(btcTxProof) });
   return append0x(bytesToHex(btcTimeUnlock));
diff --git a/packages/ckb/src/rgbpp/btc-transfer.ts b/packages/ckb/src/rgbpp/btc-transfer.ts
@@ -37,15 +37,11 @@ import {
   getRgbppLockScript,
   getSecp256k1CellDep,
 } from '../constants';
-import {
-  addressToScript,
-  getTransactionSize,
-  rawTransactionToHash,
-  scriptToHash,
-  serializeWitnessArgs,
-} from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses.js';
 
+const { addressToScript, getTransactionSize, rawTransactionToHash, scriptToHash, serializeWitnessArgs } = ckbUtils;
+
 /**
  * Generate the virtual ckb transaction for the btc transfer tx
  * @param collector The collector that collects CKB live cells and transactions
diff --git a/packages/ckb/src/rgbpp/ckb-builder.ts b/packages/ckb/src/rgbpp/ckb-builder.ts
@@ -1,10 +1,4 @@
-import {
-  bytesToHex,
-  getTransactionSize,
-  rawTransactionToHash,
-  scriptToHash,
-  serializeWitnessArgs,
-} from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import {
   UpdateCkbTxWithRealBtcTxIdParams,
   AppendPaymasterCellAndSignTxParams,
@@ -27,6 +21,8 @@ import { buildSpvClientCellDep } from '../utils';
 import { RGBPPUnlock, Uint16 } from '../schemas/generated/rgbpp';
 import { Bytes } from '@ckb-lumos/base/lib/blockchain.js';
 
+const { bytesToHex, getTransactionSize, rawTransactionToHash, scriptToHash, serializeWitnessArgs } = ckbUtils;
+
 export const buildRgbppUnlockWitness = (
   btcTxBytes: Hex,
   btcTxProof: Hex,
diff --git a/packages/ckb/src/rgbpp/ckb-jump-btc.ts b/packages/ckb/src/rgbpp/ckb-jump-btc.ts
@@ -12,7 +12,9 @@ import {
 } from '../utils';
 import { genRgbppLockScript } from '../utils/rgbpp';
 import { MAX_FEE, MIN_CAPACITY, RGBPP_TX_WITNESS_MAX_SIZE } from '../constants';
-import { addressToScript, getTransactionSize } from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
+
+const { addressToScript, getTransactionSize } = ckbUtils;
 
 /**
  * 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
@@ -24,7 +24,9 @@ import {
   getUniqueTypeScript,
   UNLOCKABLE_LOCK_SCRIPT,
 } from '../constants';
-import { getTransactionSize, scriptToHash } from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
+
+const { getTransactionSize, scriptToHash } = ckbUtils;
 
 /**
  * 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
@@ -11,7 +11,9 @@ import {
 } from '../constants';
 import { generateClusterCreateCoBuild, generateClusterId } from '../utils/spore';
 import { NoRgbppLiveCellError } from '../error';
-import { bytesToHex, getTransactionSize } from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
+
+const { bytesToHex, getTransactionSize } = ckbUtils;
 
 /**
  * Generate the virtual ckb transaction for creating cluster
diff --git a/packages/ckb/src/spore/leap.ts b/packages/ckb/src/spore/leap.ts
@@ -24,15 +24,12 @@ import {
 } from '../constants';
 import { generateSporeTransferCoBuild, throwErrorWhenSporeCellsInvalid } from '../utils/spore';
 import { NoRgbppLiveCellError } from '../error';
-import {
-  addressToScript,
-  getTransactionSize,
-  serializeOutPoint,
-  serializeWitnessArgs,
-} from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import { blockchain } from '@ckb-lumos/base';
 import { buildBtcTimeUnlockWitness } from '../rgbpp';
 
+const { addressToScript, getTransactionSize, serializeOutPoint, serializeWitnessArgs } = ckbUtils;
+
 /**
  * Generate the virtual ckb transaction for leaping spore from BTC to CKB
  * @param collector The collector that collects CKB live cells and transactions
diff --git a/packages/ckb/src/spore/spore.ts b/packages/ckb/src/spore/spore.ts
@@ -41,16 +41,12 @@ import {
   RgbppUtxoBindMultiTypeAssetsError,
   TypeAssetNotSupportedError,
 } from '../error';
-import {
-  addressToScript,
-  bytesToHex,
-  getTransactionSize,
-  rawTransactionToHash,
-  scriptToHash,
-  serializeWitnessArgs,
-} from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses.js';
 
+const { addressToScript, bytesToHex, getTransactionSize, rawTransactionToHash, scriptToHash, serializeWitnessArgs } =
+  ckbUtils;
+
 /**
  * Generate the virtual ckb transaction for creating spores
  * @param collector The collector that collects CKB live cells and transactions
diff --git a/packages/ckb/src/utils/ckb-tx.ts b/packages/ckb/src/utils/ckb-tx.ts
@@ -9,11 +9,13 @@ import {
   getXudtTypeScript,
 } from '../constants';
 import { Hex, RgbppTokenInfo } from '../types';
-import { PERSONAL, blake2b, hexToBytes, serializeInput, serializeScript } from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import { encodeRgbppTokenInfo, genBtcTimeLockScript } from './rgbpp';
 import { Collector } from '../collector';
 import { NoLiveCellError } from '../error';
 
+const { PERSONAL, blake2b, hexToBytes, serializeInput, serializeScript } = ckbUtils;
+
 export const calculateTransactionFee = (txSize: number, feeRate?: bigint): bigint => {
   const rate = feeRate ?? BigInt(1100);
   const fee = calculateTxFee(BigInt(txSize), rate);
diff --git a/packages/ckb/src/utils/hex.ts b/packages/ckb/src/utils/hex.ts
@@ -1,6 +1,8 @@
-import { hexToBytes, bytesToHex } from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import { Hex } from '../types';
 
+const { hexToBytes, bytesToHex } = ckbUtils;
+
 export const remove0x = (hex: string): string => {
   if (hex.startsWith('0x')) {
     return hex.substring(2);
diff --git a/packages/ckb/src/utils/rgbpp.ts b/packages/ckb/src/utils/rgbpp.ts
@@ -10,13 +10,7 @@ import {
   getBtcTimeLockScript,
   getRgbppLockScript,
 } from '../constants';
-import {
-  bytesToHex,
-  hexToBytes,
-  serializeOutPoint,
-  serializeOutput,
-  serializeScript,
-} from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import { BTCTimeLock } from '../schemas/generated/rgbpp';
 import { Script } from '../schemas/generated/blockchain';
 import { blockchain } from '@ckb-lumos/base';
@@ -31,6 +25,8 @@ import {
 } from '../error';
 import { calculateRgbppCellCapacity, isScriptEqual, isUDTTypeSupported } from './ckb-tx';
 
+const { bytesToHex, hexToBytes, serializeOutPoint, serializeOutput, serializeScript } = ckbUtils;
+
 export const genRgbppLockScript = (rgbppLockArgs: Hex, isMainnet: boolean, btcTestnetType?: BTCTestnetType) => {
   return {
     ...getRgbppLockScript(isMainnet, btcTestnetType),
diff --git a/packages/ckb/src/utils/spore.ts b/packages/ckb/src/utils/spore.ts
@@ -1,4 +1,4 @@
-import { PERSONAL, blake2b, hexToBytes, serializeInput } from '@nervosnetwork/ckb-sdk-utils';
+import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
 import { Cell as LumosCell } from '@ckb-lumos/base';
 import { UnpackResult } from '@ckb-lumos/codec';
 import {
@@ -14,6 +14,8 @@ import { Hex, IndexerCell, SporesCreateCobuildParams } from '../types';
 import { NoRgbppLiveCellError, RgbppSporeTypeMismatchError, RgbppUtxoBindMultiTypeAssetsError } from '../error';
 import { isScriptEqual, isSporeTypeSupported } from './ckb-tx';
 
+const { PERSONAL, blake2b, hexToBytes, serializeInput } = ckbUtils;
+
 // Generate type id for cluster id
 export const generateClusterId = (firstInput: CKBComponents.CellInput, firstOutputIndex: number) => {
   const input = hexToBytes(serializeInput(firstInput));
diff --git a/packages/rgbpp/src/rgbpp/xudt.ts b/packages/rgbpp/src/rgbpp/xudt.ts
@@ -1,5 +1,4 @@
-import { genBtcTransferCkbVirtualTx, getXudtTypeScript } from '@rgbpp-sdk/ckb';
-import { serializeScript } from '@nervosnetwork/ckb-sdk-utils';
+import { genBtcTransferCkbVirtualTx, getXudtTypeScript, serializeScript } from '@rgbpp-sdk/ckb';
 import { sendRgbppUtxos } from '@rgbpp-sdk/btc';
 import { RgbppTransferTxParams, RgbppTransferTxResult } from './types';
 
