From 5853b1febbdc405a462ee6aa678a394936098d26 Mon Sep 17 00:00:00 2001 From: Dylan Duan Date: Wed, 31 Jul 2024 20:46:02 +0800 Subject: [PATCH] Fix rebase error --- examples/rgbpp/package.json | 2 +- examples/xudt-on-ckb/package.json | 2 +- packages/ckb/src/utils/ckb-tx.ts | 2 ++ pnpm-lock.yaml | 26 ++++++-------------------- tests/rgbpp/package.json | 2 +- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/examples/rgbpp/package.json b/examples/rgbpp/package.json index 55ed09c3..aa756e8c 100644 --- 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.2", + "@nervosnetwork/ckb-sdk-utils": "0.109.1", "rgbpp": "workspace:*" }, "devDependencies": { diff --git a/examples/xudt-on-ckb/package.json b/examples/xudt-on-ckb/package.json index b495d5db..a33425af 100644 --- 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.2-alpha.1", + "@nervosnetwork/ckb-sdk-utils": "0.109.1", "rgbpp": "^0.4.0" }, "devDependencies": { diff --git a/packages/ckb/src/utils/ckb-tx.ts b/packages/ckb/src/utils/ckb-tx.ts index 9c8bfc2d..812f1765 100644 --- a/packages/ckb/src/utils/ckb-tx.ts +++ b/packages/ckb/src/utils/ckb-tx.ts @@ -13,6 +13,8 @@ import { encodeRgbppTokenInfo, genBtcTimeLockScript } from './rgbpp'; import { Collector } from '../collector'; import { NoLiveCellError } from '../error'; +export { serializeScript }; + export const calculateTransactionFee = (txSize: number, feeRate?: bigint): bigint => { const rate = feeRate ?? BigInt(1100); const ratio = BigInt(1000); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 20ee5c64..6aa30f46 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -127,8 +127,8 @@ importers: examples/rgbpp: dependencies: '@nervosnetwork/ckb-sdk-utils': - specifier: 0.109.2 - version: 0.109.2 + specifier: 0.109.1 + version: 0.109.1 rgbpp: specifier: workspace:* version: link:../../packages/rgbpp @@ -149,8 +149,8 @@ importers: examples/xudt-on-ckb: dependencies: '@nervosnetwork/ckb-sdk-utils': - specifier: 0.109.2-alpha.1 - version: 0.109.2-alpha.1 + specifier: 0.109.1 + version: 0.109.1 rgbpp: specifier: ^0.4.0 version: 0.4.0(@ckb-lumos/lumos@0.22.0-next.5)(lodash@4.17.21) @@ -268,8 +268,8 @@ importers: tests/rgbpp: dependencies: '@nervosnetwork/ckb-sdk-utils': - specifier: 0.109.2 - version: 0.109.2 + specifier: 0.109.1 + version: 0.109.1 rgbpp: specifier: workspace:* version: link:../../packages/rgbpp @@ -2017,16 +2017,6 @@ packages: tslib: 2.3.1 dev: false - /@nervosnetwork/ckb-sdk-utils@0.109.2-alpha.1: - resolution: {integrity: sha512-a3dT8SExjJNMftVOeuI9/qISvlKeGFoLzHECbgrh3qO2nT6+1zTMoFE+u5aDQG21iP1ZlFXR2s0cDIm1naoR0w==} - dependencies: - '@nervosnetwork/ckb-types': 0.109.2-alpha.1 - bech32: 2.0.0 - elliptic: 6.5.4 - jsbi: 3.1.3 - tslib: 2.3.1 - dev: false - /@nervosnetwork/ckb-types@0.109.1: resolution: {integrity: sha512-mD5mOCGa1JertKZekHSUVYwFPW27VJ0/MdwblWvEEK7pNIU6az+dLiIxgvl4TxR+j+7/GqmXNH1U59CM92y/wg==} dev: false @@ -2035,10 +2025,6 @@ packages: resolution: {integrity: sha512-NAQbUi+j6tWlUYijvHqWIUwrbawIeAeSlxUQm0wkqSKbtAEoiR4L6RZS7cgn7uH+SMsp78mciXP8gixrfH3rEQ==} dev: false - /@nervosnetwork/ckb-types@0.109.2-alpha.1: - resolution: {integrity: sha512-O4rhLuGTpkatdNzYRAOO3nzjyvSMFM4If3TQtDXZ5AM7YXxJRnj7IJBs1Jl/mSZbQn6vCqccqZ/nRM5IMu3etA==} - dev: false - /@nestjs/cli@10.4.2(esbuild@0.23.0): resolution: {integrity: sha512-fQexIfLHfp6GUgX+CO4fOg+AEwV5ox/LHotQhyZi9wXUQDyIqS0NTTbumr//62EcX35qV4nU0359nYnuEdzG+A==} engines: {node: '>= 16.14'} diff --git a/tests/rgbpp/package.json b/tests/rgbpp/package.json index a7ca218a..fb7e5443 100644 --- a/tests/rgbpp/package.json +++ b/tests/rgbpp/package.json @@ -12,7 +12,7 @@ "integration:spore": "npx ts-node shared/prepare-utxo.ts && npx ts-node spore/launch/1-prepare-cluster.ts && npx ts-node spore/launch/2-create-cluster.ts && npx ts-node spore/launch/3-create-spores.ts && npx ts-node spore/4-transfer-spore.ts && npx ts-node spore/5-leap-spore-to-ckb.ts" }, "dependencies": { - "@nervosnetwork/ckb-sdk-utils": "0.109.2", + "@nervosnetwork/ckb-sdk-utils": "0.109.1", "rgbpp": "workspace:*", "zx": "^8.0.2" },