Skip to content

Commit 37636bd

Browse files
duanyytopduanyytop
committed
refactor: Clean ckb lib import packages
1 parent 6d0c830 commit 37636bd

17 files changed

+120
-216
lines changed

Diff for: ‎packages/ckb/src/collector/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import axios from 'axios';
22
import CKB from '@nervosnetwork/ckb-sdk-core';
3-
import { toCamelcase } from '../utils/case-parser';
43
import { CollectConfig, CollectResult, CollectUdtResult, IndexerCell } from '../types/collector';
54
import { MIN_CAPACITY } from '../constants';
65
import { CapacityNotEnoughError, IndexerError, UdtAmountNotEnoughError } from '../error';
7-
import { isRgbppLockCellIgnoreChain, leToU128, remove0x } from '../utils';
6+
import { isRgbppLockCellIgnoreChain, leToU128, remove0x, toCamelcase } from '../utils';
87
import { Hex } from '../types';
98

109
interface IndexerScript {

Diff for: ‎packages/ckb/src/index.ts

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
2-
export const serializeScript = ckbUtils.serializeScript;
3-
41
export * from './schemas/generated/blockchain';
52
export * from './schemas/generated/rgbpp';
63
export * from './collector';

Diff for: ‎packages/ckb/src/paymaster/index.ts

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
21
import { ConstructPaymasterParams } from '../types/rgbpp';
32
import { NoLiveCellError } from '../error';
43
import { CKB_UNIT, MAX_FEE, SECP256K1_WITNESS_LOCK_SIZE, getSecp256k1CellDep } from '../constants';
5-
import { append0x, calculateTransactionFee } from '../utils';
6-
7-
const { AddressPrefix, addressToScript, getTransactionSize, privateKeyToAddress } = ckbUtils;
4+
import {
5+
append0x,
6+
calculateTransactionFee,
7+
AddressPrefix,
8+
addressToScript,
9+
getTransactionSize,
10+
privateKeyToAddress,
11+
} from '../utils';
812

913
const SECP256K1_MIN_CAPACITY = BigInt(61) * CKB_UNIT;
1014

Diff for: ‎packages/ckb/src/rgbpp/btc-jump-ckb.ts

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { RgbppCkbVirtualTx, BtcJumpCkbVirtualTxParams, BtcJumpCkbVirtualTxResult } from '../types/rgbpp';
2-
import { blockchain } from '@ckb-lumos/base';
32
import { TypeAssetNotSupportedError } from '../error';
43
import {
54
append0x,
@@ -11,8 +10,8 @@ import {
1110
isScriptEqual,
1211
isUDTTypeSupported,
1312
u128ToLe,
14-
} from '../utils';
15-
import {
13+
addressToScript,
14+
getTransactionSize,
1615
buildPreLockArgs,
1716
calculateCommitment,
1817
throwErrorWhenTxInputsExceeded,
@@ -22,12 +21,10 @@ import {
2221
genRgbppLockScript,
2322
throwErrorWhenRgbppCellsInvalid,
2423
isRgbppCapacitySufficientForChange,
25-
} from '../utils/rgbpp';
24+
blockchain,
25+
} from '../utils';
2626
import { Hex, IndexerCell } from '../types';
2727
import { RGBPP_WITNESS_PLACEHOLDER, getSecp256k1CellDep } from '../constants';
28-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
29-
30-
const { addressToScript, getTransactionSize } = ckbUtils;
3128

3229
/**
3330
* Generate the virtual ckb transaction for the jumping tx from BTC to CKB

Diff for: ‎packages/ckb/src/rgbpp/btc-time.ts

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
21
import {
32
BTC_JUMP_CONFIRMATION_BLOCKS,
43
SECP256K1_WITNESS_LOCK_SIZE,
@@ -16,20 +15,17 @@ import {
1615
genBtcTimeLockArgs,
1716
lockScriptFromBtcTimeLockArgs,
1817
transformSpvProof,
19-
} from '../utils';
20-
import { buildSpvClientCellDep } from '../utils';
21-
import { blockchain } from '@ckb-lumos/base';
22-
import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses.js';
23-
24-
const {
2518
addressToScript,
2619
bytesToHex,
2720
getTransactionSize,
2821
rawTransactionToHash,
2922
scriptToHash,
3023
serializeOutPoint,
3124
serializeWitnessArgs,
32-
} = ckbUtils;
25+
buildSpvClientCellDep,
26+
blockchain,
27+
signWitnesses,
28+
} from '../utils';
3329

3430
export const buildBtcTimeUnlockWitness = (btcTxProof: Hex): Hex => {
3531
const btcTimeUnlock = BTCTimeUnlock.pack({ btcTxProof: blockchain.Bytes.pack(btcTxProof) });

Diff for: ‎packages/ckb/src/rgbpp/btc-transfer.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
BtcTransferVirtualTxResult,
77
RgbppCkbVirtualTx,
88
} from '../types/rgbpp';
9-
import { blockchain } from '@ckb-lumos/base';
109
import { NoLiveCellError, NoRgbppLiveCellError, TypeAssetNotSupportedError } from '../error';
1110
import {
1211
append0x,
@@ -17,8 +16,11 @@ import {
1716
isScriptEqual,
1817
isUDTTypeSupported,
1918
u128ToLe,
20-
} from '../utils';
21-
import {
19+
addressToScript,
20+
getTransactionSize,
21+
rawTransactionToHash,
22+
scriptToHash,
23+
serializeWitnessArgs,
2224
buildPreLockArgs,
2325
calculateCommitment,
2426
compareInputs,
@@ -27,7 +29,9 @@ import {
2729
isRgbppCapacitySufficientForChange,
2830
throwErrorWhenRgbppCellsInvalid,
2931
throwErrorWhenTxInputsExceeded,
30-
} from '../utils/rgbpp';
32+
blockchain,
33+
signWitnesses,
34+
} from '../utils';
3135
import { Hex, IndexerCell } from '../types';
3236
import {
3337
MAX_FEE,
@@ -37,10 +41,6 @@ import {
3741
getRgbppLockScript,
3842
getSecp256k1CellDep,
3943
} from '../constants';
40-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
41-
import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses.js';
42-
43-
const { addressToScript, getTransactionSize, rawTransactionToHash, scriptToHash, serializeWitnessArgs } = ckbUtils;
4444

4545
/**
4646
* Generate the virtual ckb transaction for the btc transfer tx

Diff for: ‎packages/ckb/src/rgbpp/ckb-builder.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
21
import {
32
UpdateCkbTxWithRealBtcTxIdParams,
43
AppendPaymasterCellAndSignTxParams,
@@ -14,14 +13,17 @@ import {
1413
replaceLockArgsWithRealBtcTxId,
1514
transformSpvProof,
1615
u8ToHex,
16+
bytesToHex,
17+
getTransactionSize,
18+
rawTransactionToHash,
19+
scriptToHash,
20+
serializeWitnessArgs,
21+
blockchain,
22+
signWitnesses,
1723
} from '../utils';
1824
import { InputsCapacityNotEnoughError } from '../error';
19-
import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses.js';
2025
import { buildSpvClientCellDep } from '../utils';
2126
import { RGBPPUnlock, Uint16 } from '../schemas/generated/rgbpp';
22-
import { Bytes } from '@ckb-lumos/base/lib/blockchain.js';
23-
24-
const { bytesToHex, getTransactionSize, rawTransactionToHash, scriptToHash, serializeWitnessArgs } = ckbUtils;
2527

2628
export const buildRgbppUnlockWitness = (
2729
btcTxBytes: Hex,
@@ -32,14 +34,14 @@ export const buildRgbppUnlockWitness = (
3234
const inputLen = append0x(u8ToHex(inputsLen));
3335
const outputLen = append0x(u8ToHex(outputsLen));
3436

35-
const btcTx = Bytes.pack(append0x(btcTxBytes));
37+
const btcTx = blockchain.Bytes.pack(append0x(btcTxBytes));
3638

3739
const version = Uint16.pack([0, 0]);
3840
const rgbppUnlock = RGBPPUnlock.pack({
3941
version,
4042
extraData: { inputLen, outputLen },
4143
btcTx,
42-
btcTxProof: bytesToHex(Bytes.pack(append0x(btcTxProof))),
44+
btcTxProof: bytesToHex(blockchain.Bytes.pack(append0x(btcTxProof))),
4345
});
4446
return append0x(bytesToHex(rgbppUnlock));
4547
};

Diff for: ‎packages/ckb/src/rgbpp/ckb-jump-btc.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { CkbBatchJumpBtcVirtualTxParams, CkbJumpBtcVirtualTxParams } from '../types/rgbpp';
2-
import { blockchain } from '@ckb-lumos/base';
32
import { NoLiveCellError, NoXudtLiveCellError, TypeAssetNotSupportedError } from '../error';
43
import {
54
append0x,
@@ -9,12 +8,12 @@ import {
98
fetchTypeIdCellDeps,
109
isTypeAssetSupported,
1110
u128ToLe,
11+
addressToScript,
12+
getTransactionSize,
13+
genRgbppLockScript,
14+
blockchain,
1215
} from '../utils';
13-
import { genRgbppLockScript } from '../utils/rgbpp';
1416
import { MAX_FEE, MIN_CAPACITY, RGBPP_TX_WITNESS_MAX_SIZE } from '../constants';
15-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
16-
17-
const { addressToScript, getTransactionSize } = ckbUtils;
1817

1918
/**
2019
* Generate the virtual ckb transaction for the jumping tx from CKB to BTC

Diff for: ‎packages/ckb/src/rgbpp/launch.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import {
77
fetchTypeIdCellDeps,
88
generateUniqueTypeArgs,
99
u128ToLe,
10-
} from '../utils';
11-
import {
10+
getTransactionSize,
11+
scriptToHash,
1212
buildPreLockArgs,
1313
calculateCommitment,
1414
encodeRgbppTokenInfo,
1515
genBtcTimeLockScript,
1616
genRgbppLockScript,
17-
} from '../utils/rgbpp';
17+
} from '../utils';
1818
import { Hex } from '../types';
1919
import {
2020
MAX_FEE,
@@ -24,9 +24,6 @@ import {
2424
getUniqueTypeScript,
2525
UNLOCKABLE_LOCK_SCRIPT,
2626
} from '../constants';
27-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
28-
29-
const { getTransactionSize, scriptToHash } = ckbUtils;
3027

3128
/**
3229
* Generate the virtual ckb transaction for the btc transfer tx

Diff for: ‎packages/ckb/src/spore/cluster.ts

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
import { RgbppCkbVirtualTx } from '../types/rgbpp';
21
import { packRawClusterData } from '@spore-sdk/core';
3-
import { append0x, calculateTransactionFee, fetchTypeIdCellDeps } from '../utils';
4-
import { buildPreLockArgs, calculateCommitment, genRgbppLockScript } from '../utils/rgbpp';
2+
import { RgbppCkbVirtualTx } from '../types/rgbpp';
3+
import {
4+
append0x,
5+
calculateTransactionFee,
6+
fetchTypeIdCellDeps,
7+
bytesToHex,
8+
getTransactionSize,
9+
buildPreLockArgs,
10+
calculateCommitment,
11+
genRgbppLockScript,
12+
generateClusterCreateCoBuild,
13+
generateClusterId,
14+
} from '../utils';
515
import { CreateClusterCkbVirtualTxParams, Hex, SporeVirtualTxResult } from '../types';
616
import {
717
RGBPP_TX_WITNESS_MAX_SIZE,
818
RGBPP_WITNESS_PLACEHOLDER,
919
getClusterTypeDep,
1020
getClusterTypeScript,
1121
} from '../constants';
12-
import { generateClusterCreateCoBuild, generateClusterId } from '../utils/spore';
1322
import { NoRgbppLiveCellError } from '../error';
14-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
15-
16-
const { bytesToHex, getTransactionSize } = ckbUtils;
1723

1824
/**
1925
* Generate the virtual ckb transaction for creating cluster

Diff for: ‎packages/ckb/src/spore/leap.ts

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
import { BtcTimeCellsParams, RgbppCkbVirtualTx } from '../types/rgbpp';
2-
import { append0x, calculateTransactionFee, fetchTypeIdCellDeps } from '../utils';
32
import {
3+
append0x,
4+
calculateTransactionFee,
5+
fetchTypeIdCellDeps,
6+
addressToScript,
7+
getTransactionSize,
8+
serializeOutPoint,
9+
serializeWitnessArgs,
410
btcTxIdFromBtcTimeLockArgs,
511
buildSpvClientCellDep,
612
calculateCommitment,
713
compareInputs,
814
genBtcTimeLockScript,
915
lockScriptFromBtcTimeLockArgs,
1016
transformSpvProof,
11-
} from '../utils/rgbpp';
17+
generateSporeTransferCoBuild,
18+
throwErrorWhenSporeCellsInvalid,
19+
blockchain,
20+
} from '../utils';
1221
import {
1322
Hex,
1423
LeapSporeFromBtcToCkbVirtualTxParams,
@@ -22,14 +31,9 @@ import {
2231
getRgbppLockScript,
2332
getSporeTypeDep,
2433
} from '../constants';
25-
import { generateSporeTransferCoBuild, throwErrorWhenSporeCellsInvalid } from '../utils/spore';
2634
import { NoRgbppLiveCellError } from '../error';
27-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
28-
import { blockchain } from '@ckb-lumos/base';
2935
import { buildBtcTimeUnlockWitness } from '../rgbpp';
3036

31-
const { addressToScript, getTransactionSize, serializeOutPoint, serializeWitnessArgs } = ckbUtils;
32-
3337
/**
3438
* Generate the virtual ckb transaction for leaping spore from BTC to CKB
3539
* @param collector The collector that collects CKB live cells and transactions

Diff for: ‎packages/ckb/src/spore/spore.ts

+14-12
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,21 @@ import {
66
calculateTransactionFee,
77
fetchTypeIdCellDeps,
88
isClusterSporeTypeSupported,
9+
addressToScript,
10+
bytesToHex,
11+
getTransactionSize,
12+
rawTransactionToHash,
13+
scriptToHash,
14+
serializeWitnessArgs,
15+
buildPreLockArgs,
16+
calculateCommitment,
17+
genRgbppLockScript,
18+
generateSporeCreateCoBuild,
19+
generateSporeId,
20+
generateSporeTransferCoBuild,
21+
throwErrorWhenSporeCellsInvalid,
22+
signWitnesses,
923
} from '../utils';
10-
import { buildPreLockArgs, calculateCommitment, genRgbppLockScript } from '../utils/rgbpp';
1124
import {
1225
AppendIssuerCellToSporeCreate,
1326
BuildAppendingIssuerCellTxParams,
@@ -29,23 +42,12 @@ import {
2942
getSporeTypeDep,
3043
getSporeTypeScript,
3144
} from '../constants';
32-
import {
33-
generateSporeCreateCoBuild,
34-
generateSporeId,
35-
generateSporeTransferCoBuild,
36-
throwErrorWhenSporeCellsInvalid,
37-
} from '../utils/spore';
3845
import {
3946
NoLiveCellError,
4047
NoRgbppLiveCellError,
4148
RgbppUtxoBindMultiTypeAssetsError,
4249
TypeAssetNotSupportedError,
4350
} from '../error';
44-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
45-
import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses.js';
46-
47-
const { addressToScript, bytesToHex, getTransactionSize, rawTransactionToHash, scriptToHash, serializeWitnessArgs } =
48-
ckbUtils;
4951

5052
/**
5153
* Generate the virtual ckb transaction for creating spores

Diff for: ‎packages/ckb/src/utils/ckb-tx.ts

+21-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { calculateTransactionFee as calculateTxFee } from '@nervosnetwork/ckb-sdk-utils/lib/calculateTransactionFee.js';
22
import { RawClusterData, packRawClusterData, SporeDataProps, packRawSporeData } from '@spore-sdk/core';
3+
import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses.js';
4+
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
35
import { remove0x, u64ToLe } from './hex';
46
import {
57
CKB_UNIT,
@@ -9,12 +11,29 @@ import {
911
getXudtTypeScript,
1012
} from '../constants';
1113
import { Hex, RgbppTokenInfo } from '../types';
12-
import * as ckbUtils from '@nervosnetwork/ckb-sdk-utils';
1314
import { encodeRgbppTokenInfo, genBtcTimeLockScript } from './rgbpp';
1415
import { Collector } from '../collector';
1516
import { NoLiveCellError } from '../error';
1617

17-
const { PERSONAL, blake2b, hexToBytes, serializeInput, serializeScript } = ckbUtils;
18+
export { blockchain } from '@ckb-lumos/base';
19+
export { signWitnesses };
20+
export const {
21+
PERSONAL,
22+
blake2b,
23+
hexToBytes,
24+
serializeInput,
25+
serializeScript,
26+
AddressPrefix,
27+
addressToScript,
28+
privateKeyToAddress,
29+
bytesToHex,
30+
getTransactionSize,
31+
rawTransactionToHash,
32+
scriptToHash,
33+
serializeOutPoint,
34+
serializeOutput,
35+
serializeWitnessArgs,
36+
} = ckbUtils;
1837

1938
export const calculateTransactionFee = (txSize: number, feeRate?: bigint): bigint => {
2039
const rate = feeRate ?? BigInt(1100);

0 commit comments

Comments
 (0)