@btc-vision/transaction 1.0.50 → 1.0.52

package/browser/metadata/tokens.d.ts

@@ -1,6 +1,6 @@
 import { Address } from '@btc-vision/bsi-binary';
-export declare const FACTORY_ADDRESS: Address;
-export declare const POOL_ADDRESS: Address;
-export declare const WBTC_ADDRESS: Address;
-export declare const MOTO_ADDRESS: Address;
-export declare const ROUTER_ADDRESS: Address;
+export declare const FACTORY_ADDRESS_REGTEST: Address;
+export declare const POOL_ADDRESS_REGTEST: Address;
+export declare const WBTC_ADDRESS_REGTEST: Address;
+export declare const MOTO_ADDRESS_REGTEST: Address;
+export declare const ROUTER_ADDRESS_REGTEST: Address;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.50";
+export declare const version = "1.0.52";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.50';
+export const version = '1.0.52';

package/build/generators/AddressGenerator.js

@@ -1,7 +1,7 @@
 import { bech32 } from 'bech32';
 import { initEccLib } from 'bitcoinjs-lib';
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { ripemd160 } from 'bitcoinjs-lib/src/crypto';
+import { ripemd160 } from 'bitcoinjs-lib/src/crypto.js';
 initEccLib(ecc);
 export class AddressGenerator {
     static generatePKSH(sha256Hash, network) {

package/build/metadata/contracts/wBTC.js

@@ -1,5 +1,6 @@
 import { networks } from 'bitcoinjs-lib';
 import { ContractBaseMetadata } from '../ContractBaseMetadata.js';
+import { WBTC_ADDRESS_REGTEST } from '../tokens.js';
 export class wBTC extends ContractBaseMetadata {
     network;
     tokenName = 'Wrapped Bitcoin';
@@ -16,7 +17,7 @@ export class wBTC extends ContractBaseMetadata {
             case networks.bitcoin.bech32:
                 return 'unknown';
             case networks.regtest.bech32:
-                return 'bcrt1q99qtptumw027cw8w274tqzd564q66u537vn0lh';
+                return WBTC_ADDRESS_REGTEST;
             case networks.testnet.bech32:
                 return 'tb1qj58a6yf4pez426nqvf8wyu6ssggcajw8kr44vy';
             default:

package/build/metadata/tokens.d.ts

@@ -1,6 +1,6 @@
 import { Address } from '@btc-vision/bsi-binary';
-export declare const FACTORY_ADDRESS: Address;
-export declare const POOL_ADDRESS: Address;
-export declare const WBTC_ADDRESS: Address;
-export declare const MOTO_ADDRESS: Address;
-export declare const ROUTER_ADDRESS: Address;
+export declare const FACTORY_ADDRESS_REGTEST: Address;
+export declare const POOL_ADDRESS_REGTEST: Address;
+export declare const WBTC_ADDRESS_REGTEST: Address;
+export declare const MOTO_ADDRESS_REGTEST: Address;
+export declare const ROUTER_ADDRESS_REGTEST: Address;

package/build/metadata/tokens.js

@@ -1,5 +1,5 @@
-export const FACTORY_ADDRESS = 'bcrt1qz98txrd6csz0ljhp0v2rw8846k0zgn57uul8c9';
-export const POOL_ADDRESS = 'bcrt1qzwth3t3wdgy83tt9xegq7yww5dx0rhy3ezglg9';
-export const WBTC_ADDRESS = 'bcrt1q99qtptumw027cw8w274tqzd564q66u537vn0lh';
-export const MOTO_ADDRESS = 'bcrt1qwx9h2fvqlzx84t6jhxa424y7g2ynayt8p9rs38';
-export const ROUTER_ADDRESS = 'bcrt1qelqwcguvwkgr90w6u5f2q0a7gqlnq4w8rl26ht';
+export const FACTORY_ADDRESS_REGTEST = 'bcrt1qgph2k9dahptnz2vu72ezd9r2p4phjm2pkgu7ht';
+export const POOL_ADDRESS_REGTEST = 'bcrt1q5nkjpjmh6xwweprcyeylwdw7aud4een7p9pphd';
+export const WBTC_ADDRESS_REGTEST = 'bcrt1qefq0lwqwpt5lx7hl2dr2r8q6z063725tccuqrg';
+export const MOTO_ADDRESS_REGTEST = 'bcrt1q8reuxx9naek4mqesrfsgdpjv3q7a5g2llkh6ua';
+export const ROUTER_ADDRESS_REGTEST = 'bcrt1qyx492l440f6cm5hdppw5pmkd2fc7k3qayuuvh6';

package/build/tests/factory/createPairReg.js

@@ -1,12 +1,12 @@
 import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
-import { MOTO_ADDRESS, WBTC_ADDRESS } from '../../metadata/tokens.js';
+import { MOTO_ADDRESS_REGTEST, WBTC_ADDRESS_REGTEST } from '../../metadata/tokens.js';
 const abiCoder = new ABICoder();
 const createPoolSelector = Number(`0x` + abiCoder.encodeSelector('createPool'));
 function generateCalldata() {
     const addCalldata = new BinaryWriter();
     addCalldata.writeSelector(createPoolSelector);
-    addCalldata.writeAddress(WBTC_ADDRESS);
-    addCalldata.writeAddress(MOTO_ADDRESS);
+    addCalldata.writeAddress(WBTC_ADDRESS_REGTEST);
+    addCalldata.writeAddress(MOTO_ADDRESS_REGTEST);
     return Buffer.from(addCalldata.getBuffer());
 }
 const calldata = generateCalldata();

package/build/tests/moto/airdropToken.js

@@ -1,6 +1,6 @@
 import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
 import { interact } from '../shared/interaction.js';
-import { MOTO_ADDRESS } from '../../metadata/tokens.js';
+import { MOTO_ADDRESS_REGTEST } from '../../metadata/tokens.js';
 const abiCoder = new ABICoder();
 const airdropSelector = Number(`0x` + abiCoder.encodeSelector('airdrop'));
 function expandToDecimals(n, decimals = 18n) {
@@ -18,4 +18,4 @@ const tokenAmount = expandToDecimals(1000, 8n);
 const receiver = 'bcrt1ppqk36azyunxdpadza7gtf568elqxnhu3lwufg98daek3kz07390swyvzd2';
 const calldata = airdropToken(tokenAmount, receiver);
 console.log('airdrop ->', calldata.toString('hex'));
-await interact(MOTO_ADDRESS, calldata);
+await interact(MOTO_ADDRESS_REGTEST, calldata);

package/build/tests/moto/airdropTokens.d.ts

@@ -0,0 +1 @@
+export {};

package/build/tests/moto/airdropTokens.js

@@ -0,0 +1,50 @@
+import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
+const abiCoder = new ABICoder();
+const airdropSelector = Number(`0x` + abiCoder.encodeSelector('airdropDefined'));
+function expandToDecimals(n, decimals = 18n) {
+    return BigInt(n) * 10n ** decimals;
+}
+function generateFakeAddress() {
+    const prefix = 'bcrt1';
+    const base58Chars = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+    const addressLength = 59;
+    let address = prefix;
+    while (address.length < addressLength) {
+        const randomIndex = Math.floor(Math.random() * base58Chars.length);
+        address += base58Chars[randomIndex];
+    }
+    return address;
+}
+const tokenAmount = expandToDecimals(10, 8n);
+const amountOfWallets = 1;
+const maxMB = 1;
+const maxBytes = maxMB * 1024 * 1024;
+function generateAirdropCalldata(tokenAmount) {
+    const calldata = new BinaryWriter();
+    calldata.writeSelector(airdropSelector);
+    calldata.writeU256(tokenAmount);
+    calldata.writeU32(amountOfWallets * 2);
+    for (let i = 0; i < amountOfWallets; i++) {
+        const taprootAddress = generateFakeAddress();
+        calldata.writeAddress(taprootAddress);
+        calldata.writeAddress(taprootAddress);
+    }
+    const buf = Buffer.from(calldata.getBuffer());
+    if (buf.byteLength > maxBytes) {
+        throw new Error(`Calldata too big. Max size: ${maxMB} MB`);
+    }
+    console.log('calldata', buf.toString('hex'));
+    return buf;
+}
+async function sendTx() {
+    const calldata = generateAirdropCalldata(tokenAmount);
+    console.log(`Calldata generated. Raw size: ${calldata.byteLength} bytes`);
+}
+for (let i = 0; i < 1; i++) {
+    try {
+        await sendTx();
+    }
+    catch (e) {
+        i--;
+    }
+}

package/build/tests/moto/allowance.js

@@ -1,5 +1,5 @@
-import { ROUTER_ADDRESS } from '../../metadata/tokens.js';
+import { ROUTER_ADDRESS_REGTEST } from '../../metadata/tokens.js';
 import { wallet } from '../shared/interaction.js';
 import { allowance } from '../writers/allowance.js';
-const calldata = allowance(wallet.p2tr, ROUTER_ADDRESS);
+const calldata = allowance(wallet.p2tr, ROUTER_ADDRESS_REGTEST);
 console.log('allowance ->', calldata.toString('hex'));

package/build/tests/moto/approve.js

@@ -1,11 +1,10 @@
 import { approve, MAX_UINT256 } from '../writers/approve.js';
-import { MOTO_ADDRESS, ROUTER_ADDRESS } from '../../metadata/tokens.js';
+import { MOTO_ADDRESS_REGTEST, ROUTER_ADDRESS_REGTEST } from '../../metadata/tokens.js';
 import { interact } from '../shared/interaction.js';
-const calldata = approve(ROUTER_ADDRESS, MAX_UINT256);
+const calldata = approve(ROUTER_ADDRESS_REGTEST, MAX_UINT256);
 console.log('approve ->', calldata.toString('hex'));
-const interaction = await interact(MOTO_ADDRESS, calldata, false);
+const interaction = await interact(MOTO_ADDRESS_REGTEST, calldata, false);
 console.log(interaction);
 if (!interaction) {
     throw new Error('Interaction failed');
 }
-const interaction2 = await interact(MOTO_ADDRESS, calldata, false, interaction[2]);

package/build/tests/moto/transfer.js

@@ -1,7 +1,7 @@
 import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
 import { interact } from '../shared/interaction.js';
 import { expandToDecimals } from '../shared/Utils.js';
-import { MOTO_ADDRESS } from '../../metadata/tokens.js';
+import { MOTO_ADDRESS_REGTEST } from '../../metadata/tokens.js';
 const abiCoder = new ABICoder();
 const transferSelector = Number(`0x` + abiCoder.encodeSelector('transfer'));
 function getTransferToCalldata(to, amount) {
@@ -13,4 +13,4 @@ function getTransferToCalldata(to, amount) {
 }
 const tokenAmount = expandToDecimals(250, 8n);
 const calldata = getTransferToCalldata('bcrt1pst60scy2zdyxkfzqs593aevx2jypah32zzjjx2kmz57yzf228wjq5wtyc5', tokenAmount);
-await interact(MOTO_ADDRESS, calldata, false);
+await interact(MOTO_ADDRESS_REGTEST, calldata, false);

package/build/tests/motoswap/deployMoto.js

@@ -27,10 +27,12 @@ const utxoSetting = {
     minAmount: 10000n,
     requestedAmount: requestedAmount,
 };
+console.log('Fetching UTXOs');
 const utxos = await utxoManager.fetchUTXOMultiAddr(utxoSetting);
 if (!utxos) {
     throw new Error('No UTXOs found');
 }
+console.log('Shuffling UTXOs', utxos.length);
 shuffleArray(utxos);
 export async function deployMoto(contracts) {
     let deployed = [];

package/build/tests/motoswap/deployPool.js

@@ -1,5 +1,5 @@
 import { deployMoto } from './deployMoto.js';
 console.log(`Step 1: Deploying MotoSwap contracts`);
-const contractsToDeploy = ['./bytecode/pool.wasm'];
+const contractsToDeploy = ['./bytecode/moto.wasm'];
 const contracts = await deployMoto(contractsToDeploy);
 console.log(`Contracts deployed:`, contracts);

package/build/tests/motoswap/routerAddLiquidity.js

@@ -2,7 +2,7 @@ import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
 import { interact, wallet } from '../shared/interaction.js';
 import { wBTC } from '../../metadata/contracts/wBTC.js';
 import { networks } from 'bitcoinjs-lib';
-import { MOTO_ADDRESS, ROUTER_ADDRESS } from '../../metadata/tokens.js';
+import { MOTO_ADDRESS_REGTEST, ROUTER_ADDRESS_REGTEST } from '../../metadata/tokens.js';
 import { expandToDecimals } from '../shared/Utils.js';
 const abiCoder = new ABICoder();
 const addLiquiditySelector = Number(`0x` + abiCoder.encodeSelector('addLiquidity'));
@@ -23,7 +23,7 @@ const token0Amount = expandToDecimals(1000, 8n);
 const token1Amount = 600000n;
 const receiver = wallet.p2tr;
 const calldata = addLiquidity({
-    tokenA: MOTO_ADDRESS,
+    tokenA: MOTO_ADDRESS_REGTEST,
     tokenB: wBTC.getAddress(networks.regtest),
     amountADesired: token0Amount,
     amountBDesired: token1Amount,
@@ -33,4 +33,4 @@ const calldata = addLiquidity({
     deadline: 5000n,
 });
 console.log('add liquidity:', calldata.toString('hex'));
-await interact(ROUTER_ADDRESS, calldata);
+await interact(ROUTER_ADDRESS_REGTEST, calldata);

package/build/tests/shared/interaction.d.ts

@@ -2,5 +2,6 @@
 import { Wallet } from '../../keypair/Wallet.js';
 import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { Address } from '@btc-vision/bsi-binary';
+import { BroadcastResponse } from '../../utxo/interfaces/BroadcastResponse.js';
 export declare const wallet: Wallet;
-export declare function interact(contract: Address, calldata: Buffer, mine?: boolean, UTXOs?: UTXO[]): Promise<[string, string, UTXO[]] | undefined>;
+export declare function interact(contract: Address, calldata: Buffer, mine?: boolean, UTXOs?: UTXO[], feeRate?: number, priorityFee?: bigint): Promise<[[string, string, UTXO[]] | undefined, BroadcastResponse | undefined]>;

package/build/tests/shared/interaction.js

@@ -19,7 +19,7 @@ async function mineBlock() {
     return !!ok.length;
 }
 await rpc.init(Regtest.config);
-const requestedAmount = 10n ** 8n * 1n;
+const requestedAmount = 10n ** 8n * 50n;
 const utxoSetting = {
     addresses: [wallet.p2wpkh, wallet.p2tr],
     minAmount: 10000n,
@@ -30,7 +30,14 @@ shuffleArray(utxos);
 if (!utxos) {
     throw new Error('No UTXOs found');
 }
-export async function interact(contract, calldata, mine = false, UTXOs = utxos) {
+export async function interact(contract, calldata, mine = false, UTXOs = utxos, feeRate = 450, priorityFee = 10000n) {
+    if (!UTXOs.length) {
+        UTXOs = utxos;
+    }
+    if (!UTXOs.length) {
+        throw new Error('No UTXOs found');
+    }
+    let txid;
     let finalTx;
     for (let i = 0; i < UTXOs.length; i += 1) {
         let utxo = UTXOs[i];
@@ -40,13 +47,12 @@ export async function interact(contract, calldata, mine = false, UTXOs = utxos)
             utxos: [utxo],
             signer: wallet.keypair,
             network: network,
-            feeRate: 450,
-            priorityFee: 10000n,
+            feeRate: feeRate,
+            priorityFee: priorityFee,
             calldata: calldata,
         };
         try {
             finalTx = await factory.signInteraction(interactionParameters);
-            let txid;
             try {
                 txid = await utxoManager.broadcastTransaction(finalTx[0], false);
                 console.log(`Transaction ID:`, txid);
@@ -75,5 +81,5 @@ export async function interact(contract, calldata, mine = false, UTXOs = utxos)
         await mineBlock();
     }
     rpc.destroy();
-    return finalTx;
+    return [finalTx, txid];
 }

package/build/tests/wbtc/approve.js

@@ -1,6 +1,6 @@
 import { approve, MAX_UINT256 } from '../writers/approve.js';
-import { ROUTER_ADDRESS, WBTC_ADDRESS } from '../../metadata/tokens.js';
+import { ROUTER_ADDRESS_REGTEST, WBTC_ADDRESS_REGTEST } from '../../metadata/tokens.js';
 import { interact } from '../shared/interaction.js';
-const calldata = approve(ROUTER_ADDRESS, MAX_UINT256);
+const calldata = approve(ROUTER_ADDRESS_REGTEST, MAX_UINT256);
 console.log('approve ->', calldata.toString('hex'));
-await interact(WBTC_ADDRESS, calldata, false);
+await interact(WBTC_ADDRESS_REGTEST, calldata, false);

package/build/utxo/OPNetLimitedProvider.js

@@ -104,7 +104,7 @@ export class OPNetLimitedProvider {
         try {
             const resp = await fetch(url, params);
             if (!resp.ok) {
-                throw new Error(`Failed to fetch wrap parameters: ${resp.statusText}`);
+                throw new Error(`Failed to fetch to rpc: ${resp.statusText}`);
             }
             const fetchedData = await resp.json();
             if (!fetchedData) {
@@ -112,7 +112,7 @@ export class OPNetLimitedProvider {
             }
             const result = fetchedData.result;
             if (!result) {
-                throw new Error('No wrap parameters found');
+                throw new Error('No rpc parameters found');
             }
             if ('error' in result) {
                 throw new Error(`Error in fetching to rpc ${result.error}`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.50",
+    "version": "1.0.52",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -86,7 +86,7 @@
     "dependencies": {
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bsi-binary": "^1.0.28",
+        "@btc-vision/bsi-binary": "^1.0.37",
         "@btc-vision/bsi-bitcoin-rpc": "^1.0.22",
         "@btc-vision/bsi-common": "^1.0.16",
         "@btc-vision/logger": "^1.0.2",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.50';
+export const version = '1.0.52';

package/src/generators/AddressGenerator.ts

@@ -1,7 +1,7 @@
 import { bech32 } from 'bech32';
 import { initEccLib, Network } from 'bitcoinjs-lib';
 import * as ecc from '@bitcoinerlab/secp256k1';
-import { ripemd160 } from 'bitcoinjs-lib/src/crypto';
+import { ripemd160 } from 'bitcoinjs-lib/src/crypto.js';
 
 initEccLib(ecc);
 

package/src/metadata/contracts/wBTC.ts

@@ -1,6 +1,7 @@
 import { Network, networks } from 'bitcoinjs-lib';
 import { ContractBaseMetadata } from '../ContractBaseMetadata.js';
 import { Address } from '@btc-vision/bsi-binary';
+import { WBTC_ADDRESS_REGTEST } from '../tokens.js';
 
 /**
  * @description Wrapped Bitcoin (wBTC) contract metadata.
@@ -34,7 +35,7 @@ export class wBTC extends ContractBaseMetadata {
             case networks.bitcoin.bech32:
                 return 'unknown';
             case networks.regtest.bech32:
-                return 'bcrt1q99qtptumw027cw8w274tqzd564q66u537vn0lh';
+                return WBTC_ADDRESS_REGTEST;
             case networks.testnet.bech32:
                 return 'tb1qj58a6yf4pez426nqvf8wyu6ssggcajw8kr44vy';
             default:

package/src/metadata/tokens.ts

@@ -1,7 +1,7 @@
 import { Address } from '@btc-vision/bsi-binary';
 
-export const FACTORY_ADDRESS: Address = 'bcrt1qz98txrd6csz0ljhp0v2rw8846k0zgn57uul8c9';
-export const POOL_ADDRESS: Address = 'bcrt1qzwth3t3wdgy83tt9xegq7yww5dx0rhy3ezglg9';
-export const WBTC_ADDRESS: Address = 'bcrt1q99qtptumw027cw8w274tqzd564q66u537vn0lh';
-export const MOTO_ADDRESS: Address = 'bcrt1qwx9h2fvqlzx84t6jhxa424y7g2ynayt8p9rs38';
-export const ROUTER_ADDRESS: Address = 'bcrt1qelqwcguvwkgr90w6u5f2q0a7gqlnq4w8rl26ht';
+export const FACTORY_ADDRESS_REGTEST: Address = 'bcrt1qgph2k9dahptnz2vu72ezd9r2p4phjm2pkgu7ht';
+export const POOL_ADDRESS_REGTEST: Address = 'bcrt1q5nkjpjmh6xwweprcyeylwdw7aud4een7p9pphd';
+export const WBTC_ADDRESS_REGTEST: Address = 'bcrt1qefq0lwqwpt5lx7hl2dr2r8q6z063725tccuqrg';
+export const MOTO_ADDRESS_REGTEST: Address = 'bcrt1q8reuxx9naek4mqesrfsgdpjv3q7a5g2llkh6ua';
+export const ROUTER_ADDRESS_REGTEST: Address = 'bcrt1qyx492l440f6cm5hdppw5pmkd2fc7k3qayuuvh6';

package/src/utxo/OPNetLimitedProvider.ts

@@ -165,7 +165,7 @@ export class OPNetLimitedProvider {
         try {
             const resp: Response = await fetch(url, params);
             if (!resp.ok) {
-                throw new Error(`Failed to fetch wrap parameters: ${resp.statusText}`);
+                throw new Error(`Failed to fetch to rpc: ${resp.statusText}`);
             }
 
             const fetchedData = await resp.json();
@@ -175,7 +175,7 @@ export class OPNetLimitedProvider {
 
             const result = fetchedData.result;
             if (!result) {
-                throw new Error('No wrap parameters found');
+                throw new Error('No rpc parameters found');
             }
 
             if ('error' in result) {