Skip to content

Commit

Permalink
Fix rebase error
Browse files Browse the repository at this point in the history
  • Loading branch information
@duanyytop
duanyytop committed Jul 31, 2024
1 parent 119dfb8 commit 5853b1f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 23 deletions.
2 changes: 1 addition & 1 deletion examples/rgbpp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion examples/xudt-on-ckb/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 2 additions & 0 deletions packages/ckb/src/utils/ckb-tx.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
26 changes: 6 additions & 20 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/rgbpp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

1 comment on commit 5853b1f

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New snapshot version of the rgbpp-sdk packages have been released:

Name Version
@rgbpp-sdk/btc 0.0.0-snap-20240731124931
@rgbpp-sdk/ckb 0.0.0-snap-20240731124931
rgbpp 0.0.0-snap-20240731124931
@rgbpp-sdk/service 0.0.0-snap-20240731124931

Please sign in to comment.