@btc-vision/transaction 1.0.53 → 1.0.54

package/browser/transaction/browser/Web3Provider.d.ts

@@ -13,7 +13,7 @@ export interface BroadcastedTransaction {
     readonly identifier: bigint | string;
 }
 export interface Web3Provider {
-    signInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[]]>;
+    signInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<[string, string, UTXO[]]>;
     signAndBroadcastInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[]]>;
     broadcast(transactions: BroadcastTransactionOptions[]): Promise<BroadcastedTransaction[]>;
 }

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.53";
+export declare const version = "1.0.54";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.0.53';
+export const version = '1.0.54';

package/build/tests/deploy/deployMoto.d.ts

@@ -0,0 +1,4 @@
+export declare function deployMoto(contracts: string[]): Promise<{
+    contract: string;
+    file: string;
+}[]>;

package/build/tests/deploy/deployMoto.js

@@ -0,0 +1,89 @@
+import { Wallet } from '../../keypair/Wallet.js';
+import { Regtest } from '../Regtest.js';
+import { OPNetLimitedProvider } from '../../utxo/OPNetLimitedProvider.js';
+import { networks } from 'bitcoinjs-lib';
+import { TransactionFactory } from '../../transaction/TransactionFactory.js';
+import { BitcoinRPC } from '@btc-vision/bsi-bitcoin-rpc';
+import * as fs from 'fs';
+import { shuffleArray } from '../shared/Utils.js';
+const network = networks.regtest;
+const rpc = new BitcoinRPC();
+const wallet = new Wallet(Regtest.wallet, network);
+const utxoManager = new OPNetLimitedProvider('http://localhost:9001');
+const factory = new TransactionFactory();
+const shouldMineBlock = false;
+async function mineBlock() {
+    const ok = await rpc.generateToAddress(1, wallet.p2wpkh, 'default');
+    if (!ok) {
+        throw new Error('Could not mine block');
+    }
+    console.log(`Mined block`, ok);
+    return !!ok.length;
+}
+await rpc.init(Regtest.config);
+const requestedAmount = 100000000000n;
+const utxoSetting = {
+    addresses: [wallet.p2wpkh, wallet.p2tr],
+    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 = [];
+    for (let contract of contracts) {
+        const bytecode = fs.readFileSync(contract);
+        for (let utxo of utxos) {
+            const deploymentParameters = {
+                from: wallet.p2wpkh,
+                utxos: [utxo],
+                signer: wallet.keypair,
+                network: network,
+                feeRate: 500,
+                priorityFee: 50000n,
+                bytecode: bytecode,
+            };
+            try {
+                const finalTx = await factory.signDeployment(deploymentParameters);
+                console.log(`Final transaction:`, finalTx);
+                let txid;
+                try {
+                    txid = await utxoManager.broadcastTransaction(finalTx.transaction[0], false);
+                    console.log(`Transaction ID:`, txid);
+                }
+                catch (e) {
+                    continue;
+                }
+                if (!txid) {
+                    continue;
+                }
+                try {
+                    txid = await utxoManager.broadcastTransaction(finalTx.transaction[1], false);
+                    console.log(`Transaction ID:`, txid);
+                }
+                catch (e) {
+                    continue;
+                }
+                if (!txid) {
+                    continue;
+                }
+                deployed.push({ contract: finalTx.contractAddress, file: contract });
+                console.log(`Contract deployed at ${finalTx.contractAddress}`);
+            }
+            catch (e) {
+                continue;
+            }
+            break;
+        }
+    }
+    if (shouldMineBlock) {
+        await mineBlock();
+    }
+    rpc.destroy();
+    return deployed;
+}

package/build/tests/deploy/deployPool.d.ts

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

package/build/tests/deploy/deployPool.js

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

package/build/tests/deploy/deployStep1.d.ts

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

package/build/tests/deploy/deployStep1.js

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

package/build/tests/deploy/deployStep2.d.ts

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

package/build/tests/deploy/deployStep2.js

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

package/build/tests/deploy/deployStep3.d.ts

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

package/build/tests/deploy/deployStep3.js

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

package/build/tests/moto/allowance.js

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

package/build/tests/motoswap-router/addLiquidity.d.ts

@@ -0,0 +1,11 @@
+import { Address } from '@btc-vision/bsi-binary';
+export interface AddLiquidityParameters {
+    readonly tokenA: Address;
+    readonly tokenB: Address;
+    readonly amountADesired: bigint;
+    readonly amountBDesired: bigint;
+    readonly amountAMin: bigint;
+    readonly amountBMin: bigint;
+    readonly to: Address;
+    readonly deadline: bigint;
+}

package/build/tests/motoswap-router/addLiquidity.js

@@ -0,0 +1,35 @@
+import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
+import { wallet } from '../shared/interaction.js';
+import { wBTC } from '../../metadata/contracts/wBTC.js';
+import { networks } from 'bitcoinjs-lib';
+import { MOTO_ADDRESS_REGTEST } from '../../metadata/tokens.js';
+import { expandToDecimals } from '../shared/Utils.js';
+const abiCoder = new ABICoder();
+const addLiquiditySelector = Number(`0x` + abiCoder.encodeSelector('addLiquidity'));
+function addLiquidity(parameters) {
+    const calldata = new BinaryWriter();
+    calldata.writeSelector(addLiquiditySelector);
+    calldata.writeAddress(parameters.tokenA);
+    calldata.writeAddress(parameters.tokenB);
+    calldata.writeU256(parameters.amountADesired);
+    calldata.writeU256(parameters.amountBDesired);
+    calldata.writeU256(parameters.amountAMin);
+    calldata.writeU256(parameters.amountBMin);
+    calldata.writeAddress(parameters.to);
+    calldata.writeU64(parameters.deadline);
+    return Buffer.from(calldata.getBuffer());
+}
+const token0Amount = expandToDecimals(1000, 8n);
+const token1Amount = 600000n;
+const receiver = wallet.p2tr;
+const calldata = addLiquidity({
+    tokenA: MOTO_ADDRESS_REGTEST,
+    tokenB: wBTC.getAddress(networks.regtest),
+    amountADesired: token0Amount,
+    amountBDesired: token1Amount,
+    amountAMin: 0n,
+    amountBMin: 0n,
+    to: receiver,
+    deadline: 5000n,
+});
+console.log('add liquidity:', calldata.toString('hex'));

package/build/tests/motoswap-router/deployMoto.d.ts

@@ -0,0 +1,4 @@
+export declare function deployMoto(contracts: string[]): Promise<{
+    contract: string;
+    file: string;
+}[]>;

package/build/tests/motoswap-router/deployMoto.js

@@ -0,0 +1,89 @@
+import { Wallet } from '../../keypair/Wallet.js';
+import { Regtest } from '../Regtest.js';
+import { OPNetLimitedProvider } from '../../utxo/OPNetLimitedProvider.js';
+import { networks } from 'bitcoinjs-lib';
+import { TransactionFactory } from '../../transaction/TransactionFactory.js';
+import { BitcoinRPC } from '@btc-vision/bsi-bitcoin-rpc';
+import * as fs from 'fs';
+import { shuffleArray } from '../shared/Utils.js';
+const network = networks.regtest;
+const rpc = new BitcoinRPC();
+const wallet = new Wallet(Regtest.wallet, network);
+const utxoManager = new OPNetLimitedProvider('http://localhost:9001');
+const factory = new TransactionFactory();
+const shouldMineBlock = false;
+async function mineBlock() {
+    const ok = await rpc.generateToAddress(1, wallet.p2wpkh, 'default');
+    if (!ok) {
+        throw new Error('Could not mine block');
+    }
+    console.log(`Mined block`, ok);
+    return !!ok.length;
+}
+await rpc.init(Regtest.config);
+const requestedAmount = 100000000000n;
+const utxoSetting = {
+    addresses: [wallet.p2wpkh, wallet.p2tr],
+    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 = [];
+    for (let contract of contracts) {
+        const bytecode = fs.readFileSync(contract);
+        for (let utxo of utxos) {
+            const deploymentParameters = {
+                from: wallet.p2wpkh,
+                utxos: [utxo],
+                signer: wallet.keypair,
+                network: network,
+                feeRate: 500,
+                priorityFee: 50000n,
+                bytecode: bytecode,
+            };
+            try {
+                const finalTx = await factory.signDeployment(deploymentParameters);
+                console.log(`Final transaction:`, finalTx);
+                let txid;
+                try {
+                    txid = await utxoManager.broadcastTransaction(finalTx.transaction[0], false);
+                    console.log(`Transaction ID:`, txid);
+                }
+                catch (e) {
+                    continue;
+                }
+                if (!txid) {
+                    continue;
+                }
+                try {
+                    txid = await utxoManager.broadcastTransaction(finalTx.transaction[1], false);
+                    console.log(`Transaction ID:`, txid);
+                }
+                catch (e) {
+                    continue;
+                }
+                if (!txid) {
+                    continue;
+                }
+                deployed.push({ contract: finalTx.contractAddress, file: contract });
+                console.log(`Contract deployed at ${finalTx.contractAddress}`);
+            }
+            catch (e) {
+                continue;
+            }
+            break;
+        }
+    }
+    if (shouldMineBlock) {
+        await mineBlock();
+    }
+    rpc.destroy();
+    return deployed;
+}

package/build/tests/motoswap-router/deployPool.d.ts

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

package/build/tests/motoswap-router/deployPool.js

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

package/build/tests/motoswap-router/deployStep1.d.ts

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

package/build/tests/motoswap-router/deployStep1.js

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

package/build/tests/motoswap-router/deployStep2.d.ts

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

package/build/tests/motoswap-router/deployStep2.js

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

package/build/tests/motoswap-router/deployStep3.d.ts

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

package/build/tests/motoswap-router/deployStep3.js

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

package/build/tests/motoswap-router/getAmountsOut.d.ts

@@ -0,0 +1,5 @@
+import { Address } from '@btc-vision/bsi-binary';
+export interface AddLiquidityParameters {
+    readonly path: Address[];
+    readonly amount: bigint;
+}

package/build/tests/motoswap-router/getAmountsOut.js

@@ -0,0 +1,34 @@
+import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
+import { expandToDecimals } from '../shared/Utils.js';
+import { MOTO_ADDRESS_REGTEST, WBTC_ADDRESS_REGTEST } from '../../metadata/tokens.js';
+const abiCoder = new ABICoder();
+const getAmountsOutSelector = Number(`0x` + abiCoder.encodeSelector('getAmountsOut'));
+const quoteSelector = Number(`0x` + abiCoder.encodeSelector('quote'));
+function getAmountsOut(parameters) {
+    console.log(parameters);
+    const calldata = new BinaryWriter();
+    calldata.writeSelector(getAmountsOutSelector);
+    calldata.writeU256(parameters.amount);
+    calldata.writeAddressArray(parameters.path);
+    return Buffer.from(calldata.getBuffer());
+}
+const token0Amount = 1000n;
+const path = [WBTC_ADDRESS_REGTEST, MOTO_ADDRESS_REGTEST];
+const calldata = getAmountsOut({ path, amount: token0Amount });
+console.log('calldata', calldata.toString('hex'));
+function quote(parameters) {
+    console.log(parameters);
+    const calldata = new BinaryWriter();
+    calldata.writeSelector(quoteSelector);
+    calldata.writeU256(parameters.amountA);
+    calldata.writeU256(parameters.reserveA);
+    calldata.writeU256(parameters.reserveB);
+    return Buffer.from(calldata.getBuffer());
+}
+const quoteParams = {
+    amountA: token0Amount,
+    reserveA: expandToDecimals(1, 8n),
+    reserveB: expandToDecimals(1000, 18n),
+};
+const quoteCalldata = quote(quoteParams);
+console.log('quoteCalldata', quoteCalldata.toString('hex'));

package/build/tests/motoswap-router/routerAddLiquidity.d.ts

@@ -0,0 +1,11 @@
+import { Address } from '@btc-vision/bsi-binary';
+export interface AddLiquidityParameters {
+    readonly tokenA: Address;
+    readonly tokenB: Address;
+    readonly amountADesired: bigint;
+    readonly amountBDesired: bigint;
+    readonly amountAMin: bigint;
+    readonly amountBMin: bigint;
+    readonly to: Address;
+    readonly deadline: bigint;
+}

package/build/tests/motoswap-router/routerAddLiquidity.js

@@ -0,0 +1,35 @@
+import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
+import { wallet } from '../shared/interaction.js';
+import { wBTC } from '../../metadata/contracts/wBTC.js';
+import { networks } from 'bitcoinjs-lib';
+import { MOTO_ADDRESS_REGTEST } from '../../metadata/tokens.js';
+import { expandToDecimals } from '../shared/Utils.js';
+const abiCoder = new ABICoder();
+const addLiquiditySelector = Number(`0x` + abiCoder.encodeSelector('addLiquidity'));
+function addLiquidity(parameters) {
+    const calldata = new BinaryWriter();
+    calldata.writeSelector(addLiquiditySelector);
+    calldata.writeAddress(parameters.tokenA);
+    calldata.writeAddress(parameters.tokenB);
+    calldata.writeU256(parameters.amountADesired);
+    calldata.writeU256(parameters.amountBDesired);
+    calldata.writeU256(parameters.amountAMin);
+    calldata.writeU256(parameters.amountBMin);
+    calldata.writeAddress(parameters.to);
+    calldata.writeU64(parameters.deadline);
+    return Buffer.from(calldata.getBuffer());
+}
+const token0Amount = expandToDecimals(1000, 8n);
+const token1Amount = 600000n;
+const receiver = wallet.p2tr;
+const calldata = addLiquidity({
+    tokenA: MOTO_ADDRESS_REGTEST,
+    tokenB: wBTC.getAddress(networks.regtest),
+    amountADesired: token0Amount,
+    amountBDesired: token1Amount,
+    amountAMin: 0n,
+    amountBMin: 0n,
+    to: receiver,
+    deadline: 5000n,
+});
+console.log('add liquidity:', calldata.toString('hex'));

package/build/tests/motoswap-router/swap.d.ts

@@ -0,0 +1,8 @@
+import { Address } from '@btc-vision/bsi-binary';
+export interface SwapParameters {
+    readonly amountIn: bigint;
+    readonly amountOutMin: bigint;
+    readonly path: Address[];
+    readonly to: Address;
+    readonly deadline: bigint;
+}

package/build/tests/motoswap-router/swap.js

@@ -0,0 +1,24 @@
+import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
+import { wallet } from '../shared/interaction.js';
+import { MOTO_ADDRESS_REGTEST, WBTC_ADDRESS_REGTEST } from '../../metadata/tokens.js';
+import { expandToDecimals } from '../shared/Utils.js';
+const abiCoder = new ABICoder();
+const swapSelector = Number(`0x` + abiCoder.encodeSelector('swap'));
+function generateSwap(parameters) {
+    const calldata = new BinaryWriter();
+    calldata.writeSelector(swapSelector);
+    calldata.writeU256(parameters.amountIn);
+    calldata.writeU256(parameters.amountOutMin);
+    calldata.writeAddressArray(parameters.path);
+    calldata.writeAddress(parameters.to);
+    calldata.writeU64(parameters.deadline);
+    return Buffer.from(calldata.getBuffer());
+}
+const calldata = generateSwap({
+    amountIn: expandToDecimals(0.01, 8n),
+    amountOutMin: 0n,
+    path: [WBTC_ADDRESS_REGTEST, MOTO_ADDRESS_REGTEST],
+    to: wallet.p2tr,
+    deadline: 10000n,
+});
+console.log('swap:', calldata.toString('hex'));

package/build/tests/pool/reserves.js

@@ -1,4 +1,6 @@
 import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
+import { AddressGenerator } from '../../generators/AddressGenerator.js';
+import { networks } from 'bitcoinjs-lib';
 const abiCoder = new ABICoder();
 const reservesSelector = Number(`0x` + abiCoder.encodeSelector('getReserves'));
 function getReserves() {
@@ -8,3 +10,9 @@ function getReserves() {
 }
 const calldata = getReserves();
 console.log('reserves ->', calldata.toString('hex'));
+const writer = new BinaryWriter();
+writer.writeU256(45230079600746738308285183004243888412290717325243858060208446020071790796183n);
+const virtualAddress = Buffer.from(writer.getBuffer());
+console.log('virtualAddress ->', virtualAddress);
+const poolAddress = AddressGenerator.generatePKSH(virtualAddress, networks.regtest);
+console.log('poolAddress ->', poolAddress);

package/build/tests/shared/Utils.js

@@ -1,5 +1,10 @@
+import BigNumber from 'bignumber.js';
+BigNumber.config({ EXPONENTIAL_AT: 256 });
 export function expandToDecimals(n, decimals = 18n) {
-    return BigInt(n) * 10n ** decimals;
+    const amount = new BigNumber(n)
+        .multipliedBy(new BigNumber(10).pow(decimals.toString()))
+        .decimalPlaces(0);
+    return BigInt(amount.toString());
 }
 export function shuffleArray(array) {
     for (let i = array.length - 1; i > 0; i--) {

package/build/tests/writers/approve.js

@@ -1,7 +1,7 @@
 import { ABICoder, BinaryWriter } from '@btc-vision/bsi-binary';
 const abiCoder = new ABICoder();
 const approveSelector = Number(`0x` + abiCoder.encodeSelector('approve'));
-export const MAX_UINT256 = 2n ** 256n - 2n;
+export const MAX_UINT256 = 2n ** 256n - 1n;
 export function approve(spender, amount = MAX_UINT256) {
     const calldata = new BinaryWriter();
     calldata.writeSelector(approveSelector);

package/build/transaction/browser/Web3Provider.d.ts

@@ -13,7 +13,7 @@ export interface BroadcastedTransaction {
     readonly identifier: bigint | string;
 }
 export interface Web3Provider {
-    signInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[]]>;
+    signInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<[string, string, UTXO[]]>;
     signAndBroadcastInteraction(interactionParameters: InteractionParametersWithoutSigner): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[]]>;
     broadcast(transactions: BroadcastTransactionOptions[]): Promise<BroadcastedTransaction[]>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.53",
+    "version": "1.0.54",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {
@@ -96,6 +96,7 @@
         "babel-preset-react": "^6.24.1",
         "babelify": "^10.0.0",
         "bech32": "^2.0.0",
+        "bignumber.js": "^9.1.2",
         "bip32": "^4.0.0",
         "bitcoinjs-lib": "github:btc-vision/bitcoinjs-lib",
         "browserify-zlib": "^0.2.0",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.53';
+export const version = '1.0.54';

package/src/transaction/browser/Web3Provider.ts

@@ -36,7 +36,7 @@ export interface BroadcastedTransaction {
 export interface Web3Provider {
     signInteraction(
         interactionParameters: InteractionParametersWithoutSigner,
-    ): Promise<[BroadcastedTransaction, BroadcastedTransaction, UTXO[]]>;
+    ): Promise<[string, string, UTXO[]]>;
 
     signAndBroadcastInteraction(
         interactionParameters: InteractionParametersWithoutSigner,