Merge pull request utxostack#191 from ckb-cell/feat/dynamic-fetch-cel…

…l-dep

feat(ckb|example): Dynamic fetching cell deps deployed by TypeID

examples/xudt-on-ckb/1-issue-xudt.ts

@@ -11,12 +11,11 @@ import {
   getUniqueTypeScript,
   u128ToLe,
   encodeRgbppTokenInfo,
-  getXudtDep,
-  getUniqueTypeDep,
   SECP256K1_WITNESS_LOCK_SIZE,
   calculateTransactionFee,
   generateUniqueTypeArgs,
   calculateXudtTokenInfoCellCapacity,
+  fetchTypeIdCellDeps,
 } from 'rgbpp/ckb';
 import { CKB_PRIVATE_KEY, ckbAddress, collector, isMainnet } from './env';
 
@@ -77,7 +76,10 @@ const issueXudt = async ({ xudtTotalAmount, tokenInfo }: { xudtTotalAmount: bigi
   const emptyWitness = { lock: '', inputType: '', outputType: '' };
   const witnesses = inputs.map((_, index) => (index === 0 ? emptyWitness : '0x'));
 
-  const cellDeps = [getSecp256k1CellDep(isMainnet), getUniqueTypeDep(isMainnet), getXudtDep(isMainnet)];
+  const cellDeps = [
+    getSecp256k1CellDep(isMainnet),
+    ...(await fetchTypeIdCellDeps(isMainnet, { xudt: true, unique: true })),
+  ];
 
   const unsignedTx = {
     version: '0x0',

examples/xudt-on-ckb/2-transfer-xudt.ts

@@ -8,11 +8,10 @@ import {
   MIN_CAPACITY,
   append0x,
   u128ToLe,
-  getXudtDep,
-  getUniqueTypeDep,
   SECP256K1_WITNESS_LOCK_SIZE,
   calculateTransactionFee,
   NoXudtLiveCellError,
+  fetchTypeIdCellDeps,
 } from 'rgbpp/ckb';
 import { CKB_PRIVATE_KEY, ckbAddress, collector, isMainnet } from './env';
 
@@ -104,7 +103,7 @@ const transferXudt = async ({ xudtType, receivers }: XudtTransferParams) => {
   const emptyWitness = { lock: '', inputType: '', outputType: '' };
   const witnesses = inputs.map((_, index) => (index === 0 ? emptyWitness : '0x'));
 
-  const cellDeps = [getSecp256k1CellDep(isMainnet), getUniqueTypeDep(isMainnet), getXudtDep(isMainnet)];
+  const cellDeps = [getSecp256k1CellDep(isMainnet), ...(await fetchTypeIdCellDeps(isMainnet, { xudt: true }))];
 
   const unsignedTx = {
     version: '0x0',

packages/ckb/src/collector/index.ts

@@ -159,9 +159,9 @@ export class Collector {
     return { inputs, sumInputsCapacity, sumAmount };
   }
 
-  async getLiveCell(outPoint: CKBComponents.OutPoint): Promise<CKBComponents.LiveCell> {
+  async getLiveCell(outPoint: CKBComponents.OutPoint, withData = true): Promise<CKBComponents.LiveCell> {
     const ckb = new CKB(this.ckbNodeUrl);
-    const { cell } = await ckb.rpc.getLiveCell(outPoint, true);
+    const { cell } = await ckb.rpc.getLiveCell(outPoint, withData);
     return cell;
   }
 }

packages/ckb/src/rgbpp/btc-jump-ckb.ts

@@ -6,6 +6,7 @@ import {
   calculateRgbppCellCapacity,
   calculateTransactionFee,
   deduplicateList,
+  fetchTypeIdCellDeps,
   isLockArgsSizeExceeded,
   isScriptEqual,
   isUDTTypeSupported,
@@ -23,13 +24,7 @@ import {
   isRgbppCapacitySufficientForChange,
 } from '../utils/rgbpp';
 import { Hex, IndexerCell } from '../types';
-import {
-  RGBPP_WITNESS_PLACEHOLDER,
-  getRgbppLockConfigDep,
-  getRgbppLockDep,
-  getSecp256k1CellDep,
-  getXudtDep,
-} from '../constants';
+import { RGBPP_WITNESS_PLACEHOLDER, getSecp256k1CellDep } from '../constants';
 import { addressToScript, getTransactionSize } from '@nervosnetwork/ckb-sdk-utils';
 
 /**
@@ -139,7 +134,7 @@ export const genBtcJumpCkbVirtualTx = async ({
     outputsData.push(otherRgbppCell.outputData);
   }
 
-  const cellDeps = [getRgbppLockDep(isMainnet), getXudtDep(isMainnet), getRgbppLockConfigDep(isMainnet)];
+  const cellDeps = await fetchTypeIdCellDeps(isMainnet, { rgbpp: true, xudt: true });
   if (needPaymasterCell) {
     cellDeps.push(getSecp256k1CellDep(isMainnet));
   }

packages/ckb/src/rgbpp/btc-time.ts

@@ -10,11 +10,8 @@ import {
 import {
   BTC_JUMP_CONFIRMATION_BLOCKS,
   SECP256K1_WITNESS_LOCK_SIZE,
-  getBtcTimeLockConfigDep,
-  getBtcTimeLockDep,
   getBtcTimeLockScript,
   getSecp256k1CellDep,
-  getXudtDep,
 } from '../constants';
 import { BTCTimeUnlock } from '../schemas/generated/rgbpp';
 import { BtcTimeCellStatusParams, BtcTimeCellsParams, Hex, SignBtcTimeCellsTxParams } from '../types';
@@ -23,6 +20,7 @@ import {
   btcTxIdFromBtcTimeLockArgs,
   calculateTransactionFee,
   compareInputs,
+  fetchTypeIdCellDeps,
   genBtcTimeLockArgs,
   lockScriptFromBtcTimeLockArgs,
   transformSpvProof,
@@ -62,11 +60,7 @@ export const buildBtcTimeCellsSpentTx = async ({
 
   const outputsData = sortedBtcTimeCells.map((cell) => cell.outputData);
 
-  const cellDeps: CKBComponents.CellDep[] = [
-    getBtcTimeLockDep(isMainnet),
-    getXudtDep(isMainnet),
-    getBtcTimeLockConfigDep(isMainnet),
-  ];
+  const cellDeps: CKBComponents.CellDep[] = await fetchTypeIdCellDeps(isMainnet, { btcTime: true, xudt: true });
 
   const witnesses: Hex[] = [];
 

packages/ckb/src/rgbpp/btc-transfer.ts

@@ -13,6 +13,7 @@ import {
   calculateRgbppCellCapacity,
   calculateTransactionFee,
   deduplicateList,
+  fetchTypeIdCellDeps,
   isScriptEqual,
   isUDTTypeSupported,
   u128ToLe,
@@ -33,11 +34,8 @@ import {
   MIN_CAPACITY,
   RGBPP_WITNESS_PLACEHOLDER,
   SECP256K1_WITNESS_LOCK_SIZE,
-  getRgbppLockConfigDep,
-  getRgbppLockDep,
   getRgbppLockScript,
   getSecp256k1CellDep,
-  getXudtDep,
 } from '../constants';
 import {
   addressToScript,
@@ -172,7 +170,7 @@ export const genBtcTransferCkbVirtualTx = async ({
     handleNonTargetRgbppCells(outputs.length);
   }
 
-  const cellDeps = [getRgbppLockDep(isMainnet), getXudtDep(isMainnet), getRgbppLockConfigDep(isMainnet)];
+  const cellDeps = await fetchTypeIdCellDeps(isMainnet, { rgbpp: true, xudt: true });
   if (needPaymasterCell) {
     cellDeps.push(getSecp256k1CellDep(isMainnet));
   }
@@ -287,12 +285,9 @@ export const genBtcBatchTransferCkbVirtualTx = async ({
   }
 
   const cellDeps = [
-    getRgbppLockDep(isMainnet),
-    getXudtDep(isMainnet),
-    getRgbppLockConfigDep(isMainnet),
+    ...(await fetchTypeIdCellDeps(isMainnet, { rgbpp: true, xudt: true })),
     getSecp256k1CellDep(isMainnet),
   ];
-
   const witnesses: Hex[] = [];
   const lockArgsSet: Set<string> = new Set();
   for (const cell of rgbppCells) {

packages/ckb/src/rgbpp/ckb-jump-btc.ts

@@ -6,11 +6,12 @@ import {
   calculateRgbppCellCapacity,
   calculateTransactionFee,
   calculateUdtCellCapacity,
+  fetchTypeIdCellDeps,
   isTypeAssetSupported,
   u128ToLe,
 } from '../utils';
 import { genRgbppLockScript } from '../utils/rgbpp';
-import { MAX_FEE, MIN_CAPACITY, RGBPP_TX_WITNESS_MAX_SIZE, getXudtDep } from '../constants';
+import { MAX_FEE, MIN_CAPACITY, RGBPP_TX_WITNESS_MAX_SIZE } from '../constants';
 import { addressToScript, getTransactionSize } from '@nervosnetwork/ckb-sdk-utils';
 
 /**
@@ -98,7 +99,7 @@ export const genCkbJumpBtcVirtualTx = async ({
   });
   outputsData.push('0x');
 
-  const cellDeps = [getXudtDep(isMainnet)];
+  const cellDeps = await fetchTypeIdCellDeps(isMainnet, { xudt: true });
   const witnesses = inputs.map(() => '0x');
 
   const ckbRawTx: CKBComponents.RawTransaction = {
@@ -206,7 +207,7 @@ export const genCkbBatchJumpBtcVirtualTx = async ({
   });
   outputsData.push('0x');
 
-  const cellDeps = [getXudtDep(isMainnet)];
+  const cellDeps = await fetchTypeIdCellDeps(isMainnet, { xudt: true });
   const witnesses = inputs.map(() => '0x');
 
   const ckbRawTx: CKBComponents.RawTransaction = {

packages/ckb/src/rgbpp/launch.ts

@@ -4,6 +4,7 @@ import {
   append0x,
   calculateRgbppTokenInfoCellCapacity,
   calculateTransactionFee,
+  fetchTypeIdCellDeps,
   generateUniqueTypeArgs,
   u128ToLe,
 } from '../utils';
@@ -19,13 +20,9 @@ import {
   MAX_FEE,
   RGBPP_TX_WITNESS_MAX_SIZE,
   RGBPP_WITNESS_PLACEHOLDER,
-  getRgbppLockDep,
-  getXudtDep,
   getXudtTypeScript,
   getUniqueTypeScript,
-  getUniqueTypeDep,
   UNLOCKABLE_LOCK_SCRIPT,
-  getRgbppLockConfigDep,
 } from '../constants';
 import { getTransactionSize, scriptToHash } from '@nervosnetwork/ckb-sdk-utils';
 
@@ -80,12 +77,7 @@ export const genRgbppLaunchCkbVirtualTx = async ({
   ];
 
   const outputsData = [append0x(u128ToLe(launchAmount)), encodeRgbppTokenInfo(rgbppTokenInfo)];
-  const cellDeps = [
-    getRgbppLockDep(isMainnet),
-    getRgbppLockConfigDep(isMainnet),
-    getXudtDep(isMainnet),
-    getUniqueTypeDep(isMainnet),
-  ];
+  const cellDeps = await fetchTypeIdCellDeps(isMainnet, { rgbpp: true, xudt: true, unique: true });
 
   const witnesses: Hex[] = inputs.map((_, index) => (index === 0 ? RGBPP_WITNESS_PLACEHOLDER : '0x'));
 

packages/ckb/src/spore/cluster.ts

@@ -1,15 +1,13 @@
 import { RgbppCkbVirtualTx } from '../types/rgbpp';
 import { packRawClusterData } from '@spore-sdk/core';
-import { append0x, calculateTransactionFee } from '../utils';
+import { append0x, calculateTransactionFee, fetchTypeIdCellDeps } from '../utils';
 import { buildPreLockArgs, calculateCommitment, genRgbppLockScript } from '../utils/rgbpp';
 import { CreateClusterCkbVirtualTxParams, Hex, SporeVirtualTxResult } from '../types';
 import {
   RGBPP_TX_WITNESS_MAX_SIZE,
   RGBPP_WITNESS_PLACEHOLDER,
   getClusterTypeDep,
   getClusterTypeScript,
-  getRgbppLockConfigDep,
-  getRgbppLockDep,
   getRgbppLockScript,
 } from '../constants';
 import { generateClusterCreateCoBuild, generateClusterId } from '../utils/spore';
@@ -62,7 +60,7 @@ export const genCreateClusterCkbVirtualTx = async ({
     },
   ];
   const outputsData: Hex[] = [bytesToHex(packRawClusterData(clusterData))];
-  const cellDeps = [getRgbppLockDep(isMainnet), getRgbppLockConfigDep(isMainnet), getClusterTypeDep(isMainnet)];
+  const cellDeps = [...(await fetchTypeIdCellDeps(isMainnet, { rgbpp: true })), getClusterTypeDep(isMainnet)];
   const sporeCoBuild = generateClusterCreateCoBuild(outputs[0], outputsData[0]);
   const witnesses = [RGBPP_WITNESS_PLACEHOLDER, sporeCoBuild];
 

packages/ckb/src/spore/leap.ts

@@ -1,5 +1,5 @@
 import { BtcTimeCellsParams, RgbppCkbVirtualTx } from '../types/rgbpp';
-import { append0x, calculateTransactionFee } from '../utils';
+import { append0x, calculateTransactionFee, fetchTypeIdCellDeps } from '../utils';
 import {
   btcTxIdFromBtcTimeLockArgs,
   buildSpvClientCellDep,
@@ -19,10 +19,6 @@ import {
   BTC_JUMP_CONFIRMATION_BLOCKS,
   RGBPP_TX_WITNESS_MAX_SIZE,
   RGBPP_WITNESS_PLACEHOLDER,
-  getBtcTimeLockConfigDep,
-  getBtcTimeLockDep,
-  getRgbppLockConfigDep,
-  getRgbppLockDep,
   getRgbppLockScript,
   getSporeTypeDep,
 } from '../constants';
@@ -80,7 +76,7 @@ export const genLeapSporeFromBtcToCkbVirtualTx = async ({
     },
   ];
   const outputsData: Hex[] = [sporeCell.outputData];
-  const cellDeps = [getRgbppLockDep(isMainnet), getRgbppLockConfigDep(isMainnet), getSporeTypeDep(isMainnet)];
+  const cellDeps = [...(await fetchTypeIdCellDeps(isMainnet, { rgbpp: true })), getSporeTypeDep(isMainnet)];
   const sporeCoBuild = generateSporeTransferCoBuild([sporeCell], outputs);
   const witnesses = [RGBPP_WITNESS_PLACEHOLDER, sporeCoBuild];
 
@@ -142,9 +138,8 @@ export const buildSporeBtcTimeCellsSpentTx = async ({
   const outputsData = sortedBtcTimeCells.map((cell) => cell.outputData);
 
   const cellDeps: CKBComponents.CellDep[] = [
-    getBtcTimeLockDep(isMainnet),
+    ...(await fetchTypeIdCellDeps(isMainnet, { btcTime: true })),
     getSporeTypeDep(isMainnet),
-    getBtcTimeLockConfigDep(isMainnet),
   ];
 
   const witnesses: Hex[] = [];
@@ -233,7 +228,7 @@ export const genLeapSporeFromCkbToBtcRawTx = async ({
     },
   ];
   const outputsData: Hex[] = [sporeCell.outputData];
-  const cellDeps = [getRgbppLockDep(isMainnet), getRgbppLockConfigDep(isMainnet), getSporeTypeDep(isMainnet)];
+  const cellDeps = [...(await fetchTypeIdCellDeps(isMainnet, { rgbpp: true })), getSporeTypeDep(isMainnet)];
   const sporeCoBuild = generateSporeTransferCoBuild([sporeCell], outputs);
   const witnesses = [RGBPP_WITNESS_PLACEHOLDER, sporeCoBuild];
 

packages/ckb/src/spore/spore.ts

@@ -4,6 +4,7 @@ import {
   append0x,
   calculateRgbppSporeCellCapacity,
   calculateTransactionFee,
+  fetchTypeIdCellDeps,
   isClusterSporeTypeSupported,
 } from '../utils';
 import { buildPreLockArgs, calculateCommitment, genRgbppLockScript } from '../utils/rgbpp';
@@ -23,8 +24,6 @@ import {
   RGBPP_WITNESS_PLACEHOLDER,
   SECP256K1_WITNESS_LOCK_SIZE,
   getClusterTypeDep,
-  getRgbppLockConfigDep,
-  getRgbppLockDep,
   getRgbppLockScript,
   getSecp256k1CellDep,
   getSporeTypeDep,
@@ -117,8 +116,7 @@ export const genCreateSporeCkbVirtualTx = async ({
   ];
   const outputsData: Hex[] = [clusterCell.outputData, ...sporeOutputsData];
   const cellDeps = [
-    getRgbppLockDep(isMainnet),
-    getRgbppLockConfigDep(isMainnet),
+    ...(await fetchTypeIdCellDeps(isMainnet, { rgbpp: true })),
     getClusterTypeDep(isMainnet),
     getSporeTypeDep(isMainnet),
     clusterCellDep,
@@ -323,7 +321,7 @@ export const genTransferSporeCkbVirtualTx = async ({
     },
   ];
   const outputsData: Hex[] = [sporeCell.outputData];
-  const cellDeps = [getRgbppLockDep(isMainnet), getRgbppLockConfigDep(isMainnet), getSporeTypeDep(isMainnet)];
+  const cellDeps = [...(await fetchTypeIdCellDeps(isMainnet, { rgbpp: true })), getSporeTypeDep(isMainnet)];
   const sporeCoBuild = generateSporeTransferCoBuild([sporeCell], outputs);
   const witnesses = [RGBPP_WITNESS_PLACEHOLDER, sporeCoBuild];