Skip to content
This repository was archived by the owner on May 27, 2025. It is now read-only.

Commit a73806c

Browse files
FlouseFlouse
authored
Merge pull request #262 from ckb-cell/fix/integration-tests
test: resolve integration test failures due to insufficient test tokens
2 parents 80cc35d + 5599bed commit a73806c

File tree

11 files changed

+58
-30
lines changed

11 files changed

+58
-30
lines changed

‎.github/workflows/integration-test.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ name: Integration Tests
44

55
on:
66
workflow_dispatch:
7+
pull_request:
78
# Run integration-tests every day
89
schedule:
910
- cron: '59 0 * * *'
@@ -48,9 +49,9 @@ jobs:
4849
if: ${{ matrix.env_set == 'xudt' }}
4950
run: pnpm run integration:xudt
5051
env:
51-
VITE_SERVICE_URL: https://api.signet.rgbpp.io
52-
VITE_SERVICE_TOKEN: ${{ secrets.SIGNET_SERVICE_TOKEN }}
53-
VITE_SERVICE_ORIGIN: https://api.signet.rgbpp.io
52+
VITE_SERVICE_URL: https://btc-assets-api.testnet.mibao.pro
53+
VITE_SERVICE_TOKEN: ${{ secrets.TESTNET_SERVICE_TOKEN }}
54+
VITE_SERVICE_ORIGIN: https://btc-assets-api.testnet.mibao.pro
5455
INTEGRATION_CKB_PRIVATE_KEY: ${{ secrets.INTEGRATION_CKB_PRIVATE_KEY }}
5556
INTEGRATION_BTC_PRIVATE_KEY: ${{ secrets.INTEGRATION_BTC_PRIVATE_KEY }}
5657

@@ -59,8 +60,8 @@ jobs:
5960
if: ${{ matrix.env_set == 'spore' }}
6061
run: pnpm run integration:spore
6162
env:
62-
VITE_SERVICE_URL: https://api.signet.rgbpp.io
63-
VITE_SERVICE_TOKEN: ${{ secrets.SIGNET_SERVICE_TOKEN }}
64-
VITE_SERVICE_ORIGIN: https://api.signet.rgbpp.io
63+
VITE_SERVICE_URL: https://btc-assets-api.testnet.mibao.pro
64+
VITE_SERVICE_TOKEN: ${{ secrets.TESTNET_SERVICE_TOKEN }}
65+
VITE_SERVICE_ORIGIN: https://btc-assets-api.testnet.mibao.pro
6566
INTEGRATION_CKB_PRIVATE_KEY: ${{ secrets.INTEGRATION_CKB_SPORE_PRIVATE_KEY }}
6667
INTEGRATION_BTC_PRIVATE_KEY: ${{ secrets.INTEGRATION_BTC_SPORE_PRIVATE_KEY }}

‎tests/rgbpp/env.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dotenv.config({ path: __dirname + '/.env' });
1515

1616
export const isMainnet = false;
1717

18-
export const BTC_TESTNET_TYPE = 'Signet';
18+
export const BTC_TESTNET_TYPE = 'Testnet3';
1919

2020
export const collector = new Collector({
2121
ckbNodeUrl: 'https://testnet.ckb.dev/rpc',

‎tests/rgbpp/shared/prepare-utxo.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { sendBtc } from 'rgbpp/btc';
2-
import { writeStepLog } from './utils';
2+
import { getFastestFeeRate, writeStepLog } from './utils';
33
import { BtcAssetsApiError } from 'rgbpp/service';
44
import { btcAccount, btcDataSource, btcKeyPair, btcService } from '../env';
55

66
const prepareUtxo = async (index: string | number) => {
77
console.log(btcAccount.from);
8-
8+
const feeRate = await getFastestFeeRate();
9+
console.log('feeRate = ', feeRate);
910
// Send BTC tx
1011
const psbt = await sendBtc({
1112
from: btcAccount.from!,
@@ -16,7 +17,7 @@ const prepareUtxo = async (index: string | number) => {
1617
minUtxoSatoshi: 546,
1718
},
1819
],
19-
feeRate: 1,
20+
feeRate: feeRate,
2021
source: btcDataSource,
2122
});
2223

@@ -29,7 +30,7 @@ const prepareUtxo = async (index: string | number) => {
2930
console.log(tx.toHex());
3031

3132
const { txid: btcTxId } = await btcService.sendBtcTransaction(tx.toHex());
32-
console.log(`explorer: https://mempool.space/signet/tx/${btcTxId}`);
33+
console.log(`explorer: https://mempool.space/testnet/tx/${btcTxId}`);
3334

3435
writeStepLog(String(index), {
3536
txid: btcTxId,

‎tests/rgbpp/shared/utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const network = 'testnet';
77

88
export async function getFastestFeeRate() {
99
const fees = await btcService.getBtcRecommendedFeeRates();
10-
return Math.ceil(fees.fastestFee * 3);
10+
return fees.fastestFee + 5;
1111
}
1212

1313
export async function writeStepLog(step: string, data: string | object) {

‎tests/rgbpp/spore/4-transfer-spore.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { genTransferSporeCkbVirtualTx, sendRgbppUtxos } from 'rgbpp';
33
import { getSporeTypeScript, Hex } from 'rgbpp/ckb';
44
import { serializeScript } from '@nervosnetwork/ckb-sdk-utils';
55
import { isMainnet, collector, btcDataSource, btcService, btcAccount, BTC_TESTNET_TYPE } from '../env';
6-
import { readStepLog } from '../shared/utils';
6+
import { getFastestFeeRate, readStepLog } from '../shared/utils';
77
import { saveCkbVirtualTxResult } from '../../../examples/rgbpp/shared/utils';
88
import { signAndSendPsbt } from '../../../examples/rgbpp/shared/btc-account';
99

@@ -15,6 +15,10 @@ interface SporeTransferParams {
1515

1616
const transferSpore = async ({ sporeRgbppLockArgs, toBtcAddress, sporeTypeArgs }: SporeTransferParams) => {
1717
const { retry } = await import('zx');
18+
19+
const feeRate = await getFastestFeeRate();
20+
console.log('feeRate = ', feeRate);
21+
1822
await retry(20, '10s', async () => {
1923
const sporeTypeBytes = serializeScript({
2024
...getSporeTypeScript(isMainnet),
@@ -44,12 +48,12 @@ const transferSpore = async ({ sporeRgbppLockArgs, toBtcAddress, sporeTypeArgs }
4448
from: btcAccount.from,
4549
fromPubkey: btcAccount.fromPubkey,
4650
source: btcDataSource,
47-
feeRate: 1,
51+
feeRate: feeRate,
4852
});
4953

5054
const { txId: btcTxId } = await signAndSendPsbt(psbt, btcAccount, btcService);
5155
console.log('BTC TxId: ', btcTxId);
52-
console.log(`explorer: https://mempool.space/signet/tx/${btcTxId}`);
56+
console.log(`explorer: https://mempool.space/testnet/tx/${btcTxId}`);
5357

5458
await btcService.sendRgbppCkbTransaction({ btc_txid: btcTxId, ckb_virtual_result: ckbVirtualTxResult });
5559

‎tests/rgbpp/spore/5-leap-spore-to-ckb.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { genLeapSporeFromBtcToCkbVirtualTx, sendRgbppUtxos } from 'rgbpp';
33
import { getSporeTypeScript, Hex } from 'rgbpp/ckb';
44
import { serializeScript } from '@nervosnetwork/ckb-sdk-utils';
55
import { isMainnet, collector, btcDataSource, btcService, btcAccount, BTC_TESTNET_TYPE } from '../env';
6-
import { readStepLog } from '../shared/utils';
6+
import { getFastestFeeRate, readStepLog } from '../shared/utils';
77
import { saveCkbVirtualTxResult } from '../../../examples/rgbpp/shared/utils';
88
import { signAndSendPsbt } from '../../../examples/rgbpp/shared/btc-account';
99

@@ -15,6 +15,10 @@ interface SporeLeapParams {
1515

1616
const leapSporeFromBtcToCkb = async ({ sporeRgbppLockArgs, toCkbAddress, sporeTypeArgs }: SporeLeapParams) => {
1717
const { retry } = await import('zx');
18+
19+
const feeRate = await getFastestFeeRate();
20+
console.log('feeRate = ', feeRate);
21+
1822
await retry(20, '10s', async () => {
1923
const sporeTypeBytes = serializeScript({
2024
...getSporeTypeScript(isMainnet),
@@ -45,12 +49,12 @@ const leapSporeFromBtcToCkb = async ({ sporeRgbppLockArgs, toCkbAddress, sporeTy
4549
from: btcAccount.from,
4650
fromPubkey: btcAccount.fromPubkey,
4751
source: btcDataSource,
48-
feeRate: 1,
52+
feeRate: feeRate,
4953
});
5054

5155
const { txId: btcTxId } = await signAndSendPsbt(psbt, btcAccount, btcService);
5256
console.log('BTC TxId: ', btcTxId);
53-
console.log(`explorer: https://mempool.space/signet/tx/${btcTxId}`);
57+
console.log(`explorer: https://mempool.space/testnet/tx/${btcTxId}`);
5458

5559
await btcService.sendRgbppCkbTransaction({ btc_txid: btcTxId, ckb_virtual_result: ckbVirtualTxResult });
5660

‎tests/rgbpp/spore/launch/2-create-cluster.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@ import {
88
sendCkbTx,
99
updateCkbTxWithRealBtcTxId,
1010
} from 'rgbpp/ckb';
11-
import { readStepLog, writeStepLog } from '../../shared/utils';
11+
import { getFastestFeeRate, readStepLog, writeStepLog } from '../../shared/utils';
1212
import { saveCkbVirtualTxResult } from '../../../../examples/rgbpp/shared/utils';
1313
import { signAndSendPsbt } from '../../../../examples/rgbpp/shared/btc-account';
1414

1515
// Warning: Before runing this file, please run 1-prepare-cluster.ts
1616
const createCluster = async ({ ownerRgbppLockArgs }: { ownerRgbppLockArgs: string }) => {
1717
console.log(btcAccount.from);
1818
const { retry } = await import('zx');
19+
20+
const feeRate = await getFastestFeeRate();
21+
console.log('feeRate = ', feeRate);
22+
1923
await retry(20, '10s', async () => {
2024
const ckbVirtualTxResult = await genCreateClusterCkbVirtualTx({
2125
collector,
@@ -46,7 +50,7 @@ const createCluster = async ({ ownerRgbppLockArgs }: { ownerRgbppLockArgs: strin
4650
from: btcAccount.from,
4751
fromPubkey: btcAccount.fromPubkey,
4852
source: btcDataSource,
49-
feeRate: 1,
53+
feeRate: feeRate,
5054
});
5155

5256
const { txId: btcTxId, rawTxHex: btcTxBytes } = await signAndSendPsbt(psbt, btcAccount, btcService);
@@ -56,7 +60,7 @@ const createCluster = async ({ ownerRgbppLockArgs }: { ownerRgbppLockArgs: strin
5660
index: 1,
5761
});
5862
console.log('BTC TxId: ', btcTxId);
59-
console.log(`explorer: https://mempool.space/signet/tx/${btcTxId}`);
63+
console.log(`explorer: https://mempool.space/testnet/tx/${btcTxId}`);
6064

6165
const interval = setInterval(async () => {
6266
try {

‎tests/rgbpp/spore/launch/3-create-spores.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
RawSporeData,
1212
} from 'rgbpp/ckb';
1313
import { utf8ToBuffer } from 'rgbpp/btc';
14-
import { readStepLog, writeStepLog } from '../../shared/utils';
14+
import { getFastestFeeRate, readStepLog, writeStepLog } from '../../shared/utils';
1515
import { saveCkbVirtualTxResult } from '../../../../examples/rgbpp/shared/utils';
1616
import { BTC_TESTNET_TYPE, btcAccount } from '../../env';
1717
import { signAndSendPsbt } from '../../../../examples/rgbpp/shared/btc-account';
@@ -27,6 +27,10 @@ interface SporeCreateParams {
2727
// Warning: Before runing this file for the first time, please run 2-prepare-cluster.ts
2828
const createSpores = async ({ clusterRgbppLockArgs, receivers }: SporeCreateParams) => {
2929
const { retry } = await import('zx');
30+
31+
const feeRate = await getFastestFeeRate();
32+
console.log('feeRate = ', feeRate);
33+
3034
await retry(20, '10s', async () => {
3135
const ckbVirtualTxResult = await genCreateSporeCkbVirtualTx({
3236
collector,
@@ -54,7 +58,7 @@ const createSpores = async ({ clusterRgbppLockArgs, receivers }: SporeCreatePara
5458
from: btcAccount.from,
5559
fromPubkey: btcAccount.fromPubkey,
5660
source: btcDataSource,
57-
feeRate: 1,
61+
feeRate: feeRate,
5862
});
5963

6064
const { txId: btcTxId, rawTxHex: btcTxBytes } = await signAndSendPsbt(psbt, btcAccount, btcService);
@@ -63,7 +67,7 @@ const createSpores = async ({ clusterRgbppLockArgs, receivers }: SporeCreatePara
6367
txid: btcTxId,
6468
});
6569
console.log('BTC TxId: ', btcTxId);
66-
console.log(`explorer: https://mempool.space/signet/tx/${btcTxId}`);
70+
console.log(`explorer: https://mempool.space/testnet/tx/${btcTxId}`);
6771

6872
const interval = setInterval(async () => {
6973
try {

‎tests/rgbpp/xudt/2-btc-transfer.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { buildRgbppLockArgs } from 'rgbpp/ckb';
22
import { buildRgbppTransferTx } from 'rgbpp';
33
import { isMainnet, collector, btcService, btcDataSource, BTC_TESTNET_TYPE, btcAccount } from '../env';
4-
import { readStepLog, writeStepLog } from '../shared/utils';
4+
import { getFastestFeeRate, readStepLog, writeStepLog } from '../shared/utils';
55
import { saveCkbVirtualTxResult } from '../../../examples/rgbpp/shared/utils';
66
import { bitcoin } from 'rgbpp/btc';
77
import { signAndSendPsbt } from '../../../examples/rgbpp/shared/btc-account';
@@ -15,6 +15,10 @@ interface RgbppTransferParams {
1515

1616
const transfer = async ({ rgbppLockArgsList, toBtcAddress, xudtTypeArgs, transferAmount }: RgbppTransferParams) => {
1717
const { retry } = await import('zx');
18+
19+
const feeRate = await getFastestFeeRate();
20+
console.log('feeRate = ', feeRate);
21+
1822
await retry(120, '10s', async () => {
1923
const { ckbVirtualTxResult, btcPsbtHex } = await buildRgbppTransferTx({
2024
ckb: {
@@ -29,7 +33,7 @@ const transfer = async ({ rgbppLockArgsList, toBtcAddress, xudtTypeArgs, transfe
2933
fromPubkey: btcAccount.fromPubkey,
3034
dataSource: btcDataSource,
3135
testnetType: BTC_TESTNET_TYPE,
32-
feeRate: 1,
36+
feeRate: feeRate,
3337
},
3438
isMainnet,
3539
});
@@ -41,7 +45,7 @@ const transfer = async ({ rgbppLockArgsList, toBtcAddress, xudtTypeArgs, transfe
4145
const psbt = bitcoin.Psbt.fromHex(btcPsbtHex);
4246
const { txId: btcTxId } = await signAndSendPsbt(psbt, btcAccount, btcService);
4347
console.log(`BTC ${BTC_TESTNET_TYPE} TxId: ${btcTxId}`);
44-
console.log(`explorer: https://mempool.space/signet/tx/${btcTxId}`);
48+
console.log(`explorer: https://mempool.space/testnet/tx/${btcTxId}`);
4549

4650
writeStepLog('transfer-id', {
4751
txid: btcTxId,

‎tests/rgbpp/xudt/3-btc-leap-ckb.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { buildRgbppLockArgs, getXudtTypeScript } from 'rgbpp/ckb';
22
import { serializeScript } from '@nervosnetwork/ckb-sdk-utils';
33
import { genBtcJumpCkbVirtualTx, sendRgbppUtxos } from 'rgbpp';
44
import { isMainnet, collector, btcService, btcDataSource, btcAccount, BTC_TESTNET_TYPE } from '../env';
5-
import { readStepLog } from '../shared/utils';
5+
import { getFastestFeeRate, readStepLog } from '../shared/utils';
66
import { saveCkbVirtualTxResult } from '../../../examples/rgbpp/shared/utils';
77
import { signAndSendPsbt } from '../../../examples/rgbpp/shared/btc-account';
88

@@ -15,6 +15,10 @@ interface LeapToCkbParams {
1515

1616
const leapFromBtcToCKB = async ({ rgbppLockArgsList, toCkbAddress, xudtTypeArgs, transferAmount }: LeapToCkbParams) => {
1717
const { retry } = await import('zx');
18+
19+
const feeRate = await getFastestFeeRate();
20+
console.log('feeRate = ', feeRate);
21+
1822
await retry(120, '10s', async () => {
1923
const xudtType: CKBComponents.Script = {
2024
...getXudtTypeScript(isMainnet),
@@ -29,6 +33,7 @@ const leapFromBtcToCKB = async ({ rgbppLockArgsList, toCkbAddress, xudtTypeArgs,
2933
toCkbAddress,
3034
isMainnet,
3135
btcTestnetType: BTC_TESTNET_TYPE,
36+
// btcConfirmationBlocks: 20, // default value is 6
3237
});
3338

3439
// Save ckbVirtualTxResult
@@ -45,12 +50,12 @@ const leapFromBtcToCKB = async ({ rgbppLockArgsList, toCkbAddress, xudtTypeArgs,
4550
from: btcAccount.from,
4651
fromPubkey: btcAccount.fromPubkey,
4752
source: btcDataSource,
48-
feeRate: 1,
53+
feeRate: feeRate,
4954
});
5055

5156
const { txId: btcTxId } = await signAndSendPsbt(psbt, btcAccount, btcService);
5257
console.log(`BTC ${BTC_TESTNET_TYPE} TxId: ${btcTxId}`);
53-
console.log(`explorer: https://mempool.space/signet/tx/${btcTxId}`);
58+
console.log(`explorer: https://mempool.space/testnet/tx/${btcTxId}`);
5459

5560
await btcService.sendRgbppCkbTransaction({ btc_txid: btcTxId, ckb_virtual_result: ckbVirtualTxResult });
5661

0 commit comments

Comments
 (0)