opnet 1.0.39 → 1.0.40

package/cjs/opnet.js

@@ -63,9 +63,27 @@ __exportStar(require("./providers/interfaces/JSONRpc.js"), exports);
 __exportStar(require("./providers/interfaces/JSONRpcMethods.js"), exports);
 __exportStar(require("./providers/interfaces/JSONRpcParams.js"), exports);
 __exportStar(require("./providers/interfaces/JSONRpcResult.js"), exports);
+__exportStar(require("./transactions/decoders/UnwrapTransaction.js"), exports);
+__exportStar(require("./transactions/interfaces/transactions/IUnwrapTransaction.js"), exports);
 __exportStar(require("./common/CommonTypes.js"), exports);
 __exportStar(require("./bitcoin/BitcoinAddress.js"), exports);
 __exportStar(require("./bitcoin/UTXOs.js"), exports);
 __exportStar(require("./bitcoin/interfaces/IUTXO.js"), exports);
 var bsi_binary_1 = require("@btc-vision/bsi-binary");
 Object.defineProperty(exports, "ABIDataTypes", { enumerable: true, get: function () { return bsi_binary_1.ABIDataTypes; } });
+__exportStar(require("./abi/shared/json/OP_20_ABI.js"), exports);
+__exportStar(require("./abi/shared/json/OP_NET_ABI.js"), exports);
+__exportStar(require("./abi/shared/json/WBTC_ABI.js"), exports);
+__exportStar(require("./abi/shared/json/STAKING_ABI.js"), exports);
+__exportStar(require("./abi/shared/json/MOTOSWAP_FACTORY_ABI.js"), exports);
+__exportStar(require("./abi/shared/json/MOTO_TOKEN_ABI.js"), exports);
+__exportStar(require("./abi/shared/json/MOTOSWAP_POOL_ABI.js"), exports);
+__exportStar(require("./abi/shared/json/MOTOSWAP_ROUTER_ABI.js"), exports);
+__exportStar(require("./abi/shared/interfaces/IOP_20Contract.js"), exports);
+__exportStar(require("./abi/shared/interfaces/IOP_NETContract.js"), exports);
+__exportStar(require("./abi/shared/interfaces/IWBTCContract.js"), exports);
+__exportStar(require("./abi/shared/interfaces/IStackingContract.js"), exports);
+__exportStar(require("./abi/shared/interfaces/IMotoswapFactoryContract.js"), exports);
+__exportStar(require("./abi/shared/interfaces/IMotoContract.js"), exports);
+__exportStar(require("./abi/shared/interfaces/IMotoswapPoolContract.js"), exports);
+__exportStar(require("./abi/shared/interfaces/IMotoswapRouterContract.js"), exports);

package/cjs/providers/AbstractRpcProvider.d.ts

@@ -14,7 +14,7 @@ import { BroadcastedTransaction } from '../transactions/interfaces/BroadcastedTr
 import { TransactionReceipt } from '../transactions/metadata/TransactionReceipt.js';
 import { TransactionBase } from '../transactions/Transaction.js';
 import { JsonRpcPayload } from './interfaces/JSONRpc.js';
-import { JsonRpcCallResult } from './interfaces/JSONRpcResult.js';
+import { JsonRpcCallResult, JsonRpcResult } from './interfaces/JSONRpcResult.js';
 import { ReorgInformation } from './interfaces/ReorgInformation.js';
 export declare abstract class AbstractRpcProvider {
     private nextId;
@@ -23,6 +23,7 @@ export declare abstract class AbstractRpcProvider {
     protected constructor();
     getBlockNumber(): Promise<bigint>;
     getBlock(blockNumberOrHash: BlockTag, prefetchTxs?: boolean): Promise<Block>;
+    getBlocks(blockNumbers: BlockTag[], prefetchTxs?: boolean): Promise<Block[]>;
     getBlockByHash(blockHash: string): Promise<Block>;
     getBalance(addressLike: BitcoinAddressLike): Promise<bigint>;
     getUXTOs(address: BitcoinAddressLike, optimize?: boolean): Promise<unknown>;
@@ -37,10 +38,11 @@ export declare abstract class AbstractRpcProvider {
     getBlockWitness(height?: BigNumberish | -1, trusted?: boolean, limit?: number, page?: number): Promise<BlockWitnesses>;
     getReorg(fromBlock?: BigNumberish, toBlock?: BigNumberish): Promise<ReorgInformation[]>;
     requestTrustedPublicKeyForBitcoinWrapping(amount: BigNumberish): Promise<WrappedGeneration>;
-    abstract _send(payload: JsonRpcPayload): Promise<JsonRpcCallResult>;
+    abstract _send(payload: JsonRpcPayload | JsonRpcPayload[]): Promise<JsonRpcCallResult>;
+    callPayloadSingle(payload: JsonRpcPayload): Promise<JsonRpcResult>;
+    callMultiplePayloads(payloads: JsonRpcPayload[]): Promise<JsonRpcCallResult>;
     protected abstract providerUrl(url: string): string;
     private bufferToHex;
     private bigintToBase64;
-    private callPayloadSingle;
     private buildJsonRpcPayload;
 }

package/cjs/providers/AbstractRpcProvider.js

@@ -37,6 +37,26 @@ class AbstractRpcProvider {
         const result = block.result;
         return new Block_js_1.Block(result);
     }
+    async getBlocks(blockNumbers, prefetchTxs = false) {
+        const payloads = blockNumbers.map((blockNumber) => {
+            return this.buildJsonRpcPayload(JSONRpcMethods_js_1.JSONRpcMethods.GET_BLOCK_BY_NUMBER, [
+                blockNumber,
+                prefetchTxs,
+            ]);
+        });
+        const blocks = await this.callMultiplePayloads(payloads);
+        if ('error' in blocks) {
+            const error = blocks.error;
+            throw new Error(`Error fetching block: ${error.message}`);
+        }
+        return blocks.map((block) => {
+            if ('error' in block) {
+                throw new Error(`Error fetching block: ${block.error}`);
+            }
+            const result = block.result;
+            return new Block_js_1.Block(result);
+        });
+    }
     async getBlockByHash(blockHash) {
         return await this.getBlock(blockHash);
     }
@@ -68,6 +88,9 @@ class AbstractRpcProvider {
         const payload = this.buildJsonRpcPayload(JSONRpcMethods_js_1.JSONRpcMethods.GET_TRANSACTION_BY_HASH, [txHash]);
         const rawTransaction = await this.callPayloadSingle(payload);
         const result = rawTransaction.result;
+        if ('error' in rawTransaction) {
+            throw new Error(`Error fetching transaction: ${rawTransaction.error?.message || 'Unknown error'}`);
+        }
         return TransactionParser_js_1.TransactionParser.parseTransaction(result);
     }
     async getTransactionReceipt(txHash) {
@@ -157,7 +180,7 @@ class AbstractRpcProvider {
     }
     async sendRawTransaction(tx, psbt) {
         if (!/^[0-9A-Fa-f]+$/.test(tx)) {
-            throw new Error('Invalid hex string');
+            throw new Error('sendRawTransaction: Invalid hex string');
         }
         const payload = this.buildJsonRpcPayload(JSONRpcMethods_js_1.JSONRpcMethods.BROADCAST_TRANSACTION, [tx, psbt]);
         const rawTx = await this.callPayloadSingle(payload);
@@ -213,12 +236,6 @@ class AbstractRpcProvider {
         const result = rawPublicKey.result;
         return new transaction_1.WrappedGeneration(result);
     }
-    bufferToHex(buffer) {
-        return buffer.toString('hex');
-    }
-    bigintToBase64(bigint) {
-        return Buffer.from(bsi_binary_1.BufferHelper.pointerToUint8Array(bigint)).toString('base64');
-    }
     async callPayloadSingle(payload) {
         const rawData = await this._send(payload);
         if (!rawData.length) {
@@ -230,6 +247,23 @@ class AbstractRpcProvider {
         }
         return data;
     }
+    async callMultiplePayloads(payloads) {
+        const rawData = (await this._send(payloads));
+        if ('error' in rawData) {
+            throw new Error(`Error fetching block: ${rawData.error}`);
+        }
+        const data = rawData.shift();
+        if (!data) {
+            throw new Error('Block not found');
+        }
+        return data;
+    }
+    bufferToHex(buffer) {
+        return buffer.toString('hex');
+    }
+    bigintToBase64(bigint) {
+        return Buffer.from(bsi_binary_1.BufferHelper.pointerToUint8Array(bigint)).toString('base64');
+    }
     buildJsonRpcPayload(method, params) {
         return {
             method: method,

package/cjs/providers/JSONRpcProvider.d.ts

@@ -4,6 +4,6 @@ import { JsonRpcCallResult } from './interfaces/JSONRpcResult.js';
 export declare class JSONRpcProvider extends AbstractRpcProvider {
     private readonly url;
     constructor(url: string);
-    _send(payload: JsonRpcPayload): Promise<JsonRpcCallResult>;
+    _send(payload: JsonRpcPayload | JsonRpcPayload[]): Promise<JsonRpcCallResult>;
     protected providerUrl(url: string): string;
 }

package/cjs/scripts/testMethods.js

@@ -1,13 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const Contract_js_1 = require("../contracts/Contract.js");
 const JSONRpcProvider_js_1 = require("../providers/JSONRpcProvider.js");
-const ITestContract_js_1 = require("./ITestContract.js");
-const provider = new JSONRpcProvider_js_1.JSONRpcProvider('https://testnet.opnet.org');
-const contract = (0, Contract_js_1.getContract)('tb1qs4d69qpw57cm3pxyeuamenkv0aswtnhpgxry06', ITestContract_js_1.wBTCAbi, provider);
-const myWBTCBalance = await contract.balanceOf('tb1pvajdvghss0tc737z72sq02cga9hd7wvdua9vcqj357a6yqhlhy4seud439');
-if ('error' in myWBTCBalance)
-    throw new Error(myWBTCBalance.error);
-console.log('My WBTC balance:', myWBTCBalance.decoded[0]);
-const tx = await provider.getTransaction('4076964e2d70c44562cb4bb8afb074c723e850a7807abc73eb9a33682ec93f44');
-console.log('Transaction:', tx);
+const provider = new JSONRpcProvider_js_1.JSONRpcProvider('http://localhost:9001');
+const tx = await provider.getTransaction('335f66a330ba3cce82c271c1cbe3e9fa35ed6e47aa5d9104049066a2d52269e6');
+console.log(tx);

package/cjs/scripts/testMethodsReg.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const transaction_1 = require("@btc-vision/transaction");
+const WBTC_ABI_js_1 = require("../abi/shared/json/WBTC_ABI.js");
+const Contract_js_1 = require("../contracts/Contract.js");
 const JSONRpcProvider_js_1 = require("../providers/JSONRpcProvider.js");
 const provider = new JSONRpcProvider_js_1.JSONRpcProvider('http://localhost:9001');
-(async () => {
-    const tx = await provider.getTransaction('3309cceb2026f3ca22f787c4305670384cb8f824ca9175c7ab1a65ec40374f24');
-    console.log('Transaction:', tx);
-    const c = await provider.getCode('', false);
-    console.log(c);
-    const d = await provider.getCode('bcrt1qmsx5vpm6yfwtex5ygag0nwktnmj7a48eew2qn0', false);
-    console.log(d);
-})();
+const contract = (0, Contract_js_1.getContract)(transaction_1.MOTO_ADDRESS_REGTEST, WBTC_ABI_js_1.WBTC_ABI, provider, 'bcrt1p2m2yz9hae5lkypuf8heh6udnt0tchmxhaftcfslqsr5vrwzh34yqgn6hs6');
+const decimals = contract.encodeCalldata('decimals', []);
+console.log(decimals);

package/cjs/scripts/testWBTCContract.d.ts

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

package/cjs/scripts/testWBTCContract.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const OP_20_ABI_js_1 = require("../abi/shared/json/OP_20_ABI.js");
+const Contract_js_1 = require("../contracts/Contract.js");
+const JSONRpcProvider_js_1 = require("../providers/JSONRpcProvider.js");
+const provider = new JSONRpcProvider_js_1.JSONRpcProvider('https://regtest.opnet.org');
+const contract = (0, Contract_js_1.getContract)('bcrt1qxeyh0pacdtkqmlna9n254fztp3ptadkkfu6efl', OP_20_ABI_js_1.OP_20_ABI, provider);
+const balanceExample = await contract.balanceOf('bcrt1pyrs3eqwnrmd4ql3nwvx66yzp0wc24xd2t9pf8699ln340pjs7f3sar3tum');
+if ('error' in balanceExample)
+    throw new Error('Error in fetching balance');
+console.log('Balance:', balanceExample.decoded);
+const owner = (await contract.owner());
+console.log('Owner:', owner.properties);

package/cjs/transactions/TransactionParser.js

@@ -5,6 +5,7 @@ const OPNetTransactionTypes_js_1 = require("../interfaces/opnet/OPNetTransaction
 const DeploymentTransaction_js_1 = require("./decoders/DeploymentTransaction.js");
 const GenericTransaction_js_1 = require("./decoders/GenericTransaction.js");
 const InteractionTransaction_js_1 = require("./decoders/InteractionTransaction.js");
+const UnwrapTransaction_js_1 = require("./decoders/UnwrapTransaction.js");
 const WrapTransaction_js_1 = require("./decoders/WrapTransaction.js");
 class TransactionParser {
     static parseTransactions(transactions) {
@@ -13,11 +14,15 @@ class TransactionParser {
         }
         const transactionArray = [];
         for (let transaction of transactions) {
+            if (!transaction)
+                throw new Error(`Something went wrong while parsing transactions`);
             transactionArray.push(this.parseTransaction(transaction));
         }
         return transactionArray;
     }
     static parseTransaction(transaction) {
+        if (!transaction)
+            throw new Error('Transaction is required');
         const opnetType = transaction.OPNetType;
         switch (opnetType) {
             case OPNetTransactionTypes_js_1.OPNetTransactionTypes.Generic:
@@ -28,6 +33,8 @@ class TransactionParser {
                 return new DeploymentTransaction_js_1.DeploymentTransaction(transaction);
             case OPNetTransactionTypes_js_1.OPNetTransactionTypes.WrapInteraction:
                 return new WrapTransaction_js_1.WrapTransaction(transaction);
+            case OPNetTransactionTypes_js_1.OPNetTransactionTypes.UnwrapInteraction:
+                return new UnwrapTransaction_js_1.UnwrapTransaction(transaction);
             default:
                 throw new Error('Unknown transaction type');
         }

package/cjs/transactions/decoders/UnwrapTransaction.d.ts

@@ -0,0 +1,11 @@
+import { IUnwrapTransaction, ParsedPartialWBTCUTXODocument, UsedUTXO } from '../interfaces/transactions/IUnwrapTransaction.js';
+import { InteractionTransaction } from './InteractionTransaction.js';
+export declare class UnwrapTransaction extends InteractionTransaction implements IUnwrapTransaction {
+    readonly authorizedBy: string[];
+    readonly usedUTXOs: UsedUTXO[];
+    readonly consolidatedVault: ParsedPartialWBTCUTXODocument | undefined;
+    readonly unwrapAmount: bigint;
+    readonly requestedAmount: bigint;
+    constructor(transaction: IUnwrapTransaction);
+    private decodePartialWBTCUTXODocument;
+}

package/cjs/transactions/decoders/UnwrapTransaction.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnwrapTransaction = void 0;
+const InteractionTransaction_js_1 = require("./InteractionTransaction.js");
+class UnwrapTransaction extends InteractionTransaction_js_1.InteractionTransaction {
+    authorizedBy;
+    usedUTXOs;
+    consolidatedVault;
+    unwrapAmount;
+    requestedAmount;
+    constructor(transaction) {
+        super(transaction);
+        this.authorizedBy = transaction.authorizedBy;
+        this.usedUTXOs = transaction.usedUTXOs;
+        this.consolidatedVault = this.decodePartialWBTCUTXODocument(transaction.consolidatedVault);
+        this.unwrapAmount = BigInt(transaction.unwrapAmount);
+        this.requestedAmount = BigInt(transaction.requestedAmount);
+    }
+    decodePartialWBTCUTXODocument(document) {
+        if (!document) {
+            return undefined;
+        }
+        console.log(document);
+        return {
+            vault: document.vault,
+            hash: document.hash,
+            value: BigInt(document.value),
+            outputIndex: document.outputIndex,
+            output: Buffer.from(document.output, 'base64'),
+        };
+    }
+}
+exports.UnwrapTransaction = UnwrapTransaction;

package/cjs/transactions/interfaces/transactions/IUnwrapTransaction.d.ts

@@ -0,0 +1,28 @@
+/// <reference types="node" />
+import { Address } from '@btc-vision/bsi-binary';
+import { IInteractionTransaction } from './IInteractionTransaction.js';
+export interface UsedUTXO {
+    readonly hash: string;
+    readonly outputIndex: number;
+}
+export interface PartialWBTCUTXODocument {
+    readonly vault: Address;
+    readonly hash: string;
+    readonly value: string;
+    readonly outputIndex: number;
+    readonly output: string;
+}
+export interface ParsedPartialWBTCUTXODocument {
+    readonly vault: Address;
+    readonly hash: string;
+    readonly value: bigint;
+    readonly outputIndex: number;
+    readonly output: Buffer;
+}
+export interface IUnwrapTransaction extends IInteractionTransaction {
+    readonly authorizedBy: string[];
+    readonly usedUTXOs: UsedUTXO[];
+    readonly consolidatedVault: PartialWBTCUTXODocument | ParsedPartialWBTCUTXODocument | undefined;
+    readonly unwrapAmount: bigint | string;
+    readonly requestedAmount: bigint | string;
+}

package/cjs/transactions/interfaces/transactions/IUnwrapTransaction.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.39",
+    "version": "1.0.40",
     "author": "BlobMaster41",
     "description": "The perfect library for building Bitcoin based applications.",
     "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.0.39';
+export const version = '1.0.40';

package/src/abi/shared/json/MOTOSWAP_POOL_ABI.ts

@@ -2,7 +2,6 @@ import { ABIDataTypes } from '@btc-vision/bsi-binary';
 import { BitcoinAbiTypes } from '../../BitcoinAbiTypes.js';
 import { BitcoinInterfaceAbi } from '../../interfaces/BitcoinInterfaceAbi.js';
 import { OP_20_ABI } from './OP_20_ABI.js';
-import { OP_NET_ABI } from './OP_NET_ABI.js';
 
 /**
  * @category Events
@@ -94,9 +93,6 @@ export const MotoSwapPoolEvents: BitcoinInterfaceAbi = [
  * @category ABI
  */
 export const MotoswapPoolAbi: BitcoinInterfaceAbi = [
-    // OP_NET
-    ...OP_NET_ABI,
-
     // OP_20
     ...OP_20_ABI,
 

package/src/scripts/testMethodsReg.ts

@@ -1,3 +1,4 @@
+import { MOTO_ADDRESS_REGTEST } from '@btc-vision/transaction';
 import { IWBTCContract } from '../abi/shared/interfaces/IWBTCContract.js';
 import { WBTC_ABI } from '../abi/shared/json/WBTC_ABI.js';
 import { getContract } from '../contracts/Contract.js';
@@ -6,12 +7,16 @@ import { JSONRpcProvider } from '../providers/JSONRpcProvider.js';
 const provider: JSONRpcProvider = new JSONRpcProvider('http://localhost:9001');
 
 const contract: IWBTCContract = getContract<IWBTCContract>(
-    'bcrt1q99qtptumw027cw8w274tqzd564q66u537vn0lh',
+    MOTO_ADDRESS_REGTEST,
     WBTC_ABI,
     provider,
     'bcrt1p2m2yz9hae5lkypuf8heh6udnt0tchmxhaftcfslqsr5vrwzh34yqgn6hs6',
 );
 
+const decimals = contract.encodeCalldata('decimals', []);
+
+console.log(decimals);
+
 //const transferCalldata = await contract.transfer(amount, transferToAddress);
 
 //if ('error' in transferCalldata) throw transferCalldata.error;
@@ -31,7 +36,7 @@ console.log(owner);
 const name = await contract.name();
 console.log(name);*/
 
-for (let i = 0; i < 10; i++) {
+/*for (let i = 0; i < 10; i++) {
     (async () => {
         try {
             const blocks = await provider.getBlocks([1, 2, 3, 4, 5, 6, 7]);
@@ -40,4 +45,4 @@ for (let i = 0; i < 10; i++) {
             console.log((e as Error).message);
         }
     })();
-}
+}*/