opnet 1.3.1 → 1.3.3

package/build/abi/shared/json/motoswap/MOTOSWAP_STAKING_ABI.d.ts

@@ -1,3 +1,2 @@
 import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi.js';
-export declare const MotoswapStakingEvents: BitcoinInterfaceAbi;
 export declare const MOTOSWAP_STAKING_ABI: BitcoinInterfaceAbi;

package/build/abi/shared/json/motoswap/MOTOSWAP_STAKING_ABI.js

@@ -1,9 +1,50 @@
 import { ABIDataTypes } from '@btc-vision/transaction';
 import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
 import { OP_NET_ABI } from '../opnet/OP_NET_ABI.js';
-import OWNABLE_ABI from './OWNABLE_ABI.js';
-import { REENTRANCY_GUARD_ABI } from './REENTRANCY_GUARD_ABI.js';
-export const MotoswapStakingEvents = [
+const MOTOSWAP_OWNABLE_REENTRANCY_GUARD_ABI = [
+    {
+        name: 'admin',
+        type: BitcoinAbiTypes.Function,
+        constant: true,
+        inputs: [],
+        outputs: [
+            {
+                name: 'adminAddress',
+                type: ABIDataTypes.ADDRESS,
+            },
+        ],
+    },
+    {
+        name: 'changeAdmin',
+        type: BitcoinAbiTypes.Function,
+        constant: false,
+        payable: false,
+        inputs: [
+            {
+                name: 'newAdmin',
+                type: ABIDataTypes.ADDRESS,
+            },
+        ],
+        outputs: [
+            {
+                name: 'success',
+                type: ABIDataTypes.BOOL,
+            },
+        ],
+    },
+    {
+        name: 'status',
+        inputs: [],
+        outputs: [
+            {
+                name: 'status',
+                type: ABIDataTypes.UINT256,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
+];
+const MotoswapStakingEvents = [
     {
         name: 'RewardTokenAdded',
         type: BitcoinAbiTypes.Event,
@@ -159,8 +200,7 @@ export const MOTOSWAP_STAKING_ABI = [
         inputs: [],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
     },
+    ...MOTOSWAP_OWNABLE_REENTRANCY_GUARD_ABI,
     ...MotoswapStakingEvents,
     ...OP_NET_ABI,
-    ...REENTRANCY_GUARD_ABI,
-    ...OWNABLE_ABI,
 ];

package/build/abi/shared/json/motoswap/MOTO_ABI.d.ts

@@ -0,0 +1,2 @@
+import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi';
+export declare const MOTO_ABI: BitcoinInterfaceAbi;

package/build/abi/shared/json/motoswap/{ADMINISTERD_OP_20_ABI.js → MOTO_ABI.js}

@@ -1,15 +1,14 @@
 import { ABIDataTypes } from '@btc-vision/transaction';
-import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
-import { OP_20_ABI } from '../opnet/OP_20_ABI.js';
-const ADMINISTERED_OP_20_ABI = [
+import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes';
+import { OP_20_ABI } from '../opnet/OP_20_ABI';
+export const MOTO_ABI = [
     {
         name: 'admin',
         type: BitcoinAbiTypes.Function,
-        constant: true,
         inputs: [],
         outputs: [
             {
-                name: 'ADDRESS',
+                name: 'adminAddress',
                 type: ABIDataTypes.ADDRESS,
             },
         ],
@@ -17,11 +16,9 @@ const ADMINISTERED_OP_20_ABI = [
     {
         name: 'changeAdmin',
         type: BitcoinAbiTypes.Function,
-        constant: false,
-        payable: false,
         inputs: [
             {
-                name: 'newAdmin',
+                name: 'to',
                 type: ABIDataTypes.ADDRESS,
             },
         ],
@@ -35,8 +32,6 @@ const ADMINISTERED_OP_20_ABI = [
     {
         name: 'adminMint',
         type: BitcoinAbiTypes.Function,
-        constant: false,
-        payable: false,
         inputs: [
             {
                 name: 'to',
@@ -57,8 +52,6 @@ const ADMINISTERED_OP_20_ABI = [
     {
         name: 'adminBurn',
         type: BitcoinAbiTypes.Function,
-        constant: false,
-        payable: false,
         inputs: [
             {
                 name: 'from',
@@ -78,4 +71,3 @@ const ADMINISTERED_OP_20_ABI = [
     },
     ...OP_20_ABI,
 ];
-export default ADMINISTERED_OP_20_ABI;

package/build/abi/shared/json/motoswap/NATIVE_SWAP_ABI.d.ts

@@ -1,3 +1,2 @@
 import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi.js';
-export declare const NativeSwapEvents: BitcoinInterfaceAbi;
 export declare const NativeSwapAbi: BitcoinInterfaceAbi;

package/build/abi/shared/json/motoswap/NATIVE_SWAP_ABI.js

@@ -1,7 +1,7 @@
 import { ABIDataTypes } from '@btc-vision/transaction';
 import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
 import { OP_NET_ABI } from '../opnet/OP_NET_ABI.js';
-export const NativeSwapEvents = [
+const NativeSwapEvents = [
     {
         name: 'LiquidityAdded',
         values: [
@@ -59,9 +59,23 @@ export const NativeSwapEvents = [
         values: [
             { name: 'depositAddress', type: ABIDataTypes.STRING },
             { name: 'amount', type: ABIDataTypes.UINT128 },
+            { name: 'providerId', type: ABIDataTypes.UINT256 },
+        ],
+        type: BitcoinAbiTypes.Event,
+    },
+    {
+        name: 'ActivateProvider',
+        values: [
+            { name: 'providerId', type: ABIDataTypes.UINT256 },
+            { name: 'listingAmount', type: ABIDataTypes.UINT128 },
         ],
         type: BitcoinAbiTypes.Event,
     },
+    {
+        name: 'FulfilledProvider',
+        values: [{ name: 'providerId', type: ABIDataTypes.UINT256 }],
+        type: BitcoinAbiTypes.Event,
+    },
 ];
 export const NativeSwapAbi = [
     {

package/build/abi/shared/json/opnet/OP_NET_ABI.js

@@ -2,36 +2,25 @@ import { ABIDataTypes } from '@btc-vision/transaction';
 import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
 export const OP_NET_ABI = [
     {
-        name: 'owner',
-        constant: true,
-        outputs: [
-            {
-                name: 'owner',
-                type: ABIDataTypes.ADDRESS,
-            },
-        ],
+        name: 'address',
         type: BitcoinAbiTypes.Function,
-    },
-    {
-        name: 'deployer',
-        constant: true,
+        inputs: [],
         outputs: [
             {
-                name: 'deployer',
+                name: 'address',
                 type: ABIDataTypes.ADDRESS,
             },
         ],
-        type: BitcoinAbiTypes.Function,
     },
     {
-        name: 'address',
-        constant: true,
+        name: 'contractDeployer',
+        type: BitcoinAbiTypes.Function,
+        inputs: [],
         outputs: [
             {
-                name: 'address',
+                name: 'contractDeployer',
                 type: ABIDataTypes.ADDRESS,
             },
         ],
-        type: BitcoinAbiTypes.Function,
     },
 ];

package/build/contracts/CallResult.d.ts

@@ -37,7 +37,7 @@ export declare class CallResult<T extends ContractDecodedObjectResult = {}, U ex
     constructor(callResult: ICallResultData, provider: AbstractRpcProvider);
     get rawEvents(): EventList;
     setTo(to: string): void;
-    sendTransaction(interactionParams: TransactionParameters): Promise<InteractionTransactionReceipt>;
+    sendTransaction(interactionParams: TransactionParameters, amountAddition?: bigint): Promise<InteractionTransactionReceipt>;
     setGasEstimation(estimatedGas: bigint): void;
     setDecoded(decoded: DecodedOutput): void;
     setEvents(events: U): void;

package/build/contracts/CallResult.js

@@ -31,7 +31,7 @@ export class CallResult {
     setTo(to) {
         this.to = to;
     }
-    async sendTransaction(interactionParams) {
+    async sendTransaction(interactionParams, amountAddition = 0n) {
         if (!this.calldata) {
             throw new Error('Calldata not set');
         }
@@ -47,7 +47,10 @@ export class CallResult {
         const totalFee = this.estimatedSatGas + priorityFee;
         try {
             const UTXOs = interactionParams.utxos ||
-                (await this.#fetchUTXOs(totalFee + interactionParams.maximumAllowedSatToSpend + totalAmount, interactionParams));
+                (await this.#fetchUTXOs(totalFee +
+                    interactionParams.maximumAllowedSatToSpend +
+                    totalAmount +
+                    amountAddition, interactionParams));
             if (!UTXOs || UTXOs.length === 0) {
                 throw new Error('No UTXOs found');
             }
@@ -87,6 +90,10 @@ export class CallResult {
             };
         }
         catch (e) {
+            const msgStr = e.message;
+            if (msgStr.includes('Insufficient funds to pay the fees') && amountAddition === 0n) {
+                return await this.sendTransaction(interactionParams, 200000n);
+            }
             this.#provider.utxoManager.clean();
             throw e;
         }
@@ -109,7 +116,7 @@ export class CallResult {
         }
         const utxoSetting = {
             address: interactionParams.refundTo,
-            amount: 10000n + amount,
+            amount: 50000n + amount,
             throwErrors: true,
         };
         const utxos = await this.#provider.utxoManager.getUTXOsForAmount(utxoSetting);

package/build/contracts/Contract.js

@@ -421,8 +421,8 @@ export class IBaseContract {
         const gasParameters = await this.currentGasParameters();
         const gasPerSat = gasParameters.gasPerSat;
         const exactGas = ((gas / 1000000n) * gasPerSat) / 1000000n;
-        const extraGas = (exactGas * 15n) / 100n;
-        return this.max(exactGas + extraGas, 330n);
+        const extraGas = (exactGas * 25n) / 100n;
+        return this.max(exactGas + extraGas, 330n) + 1n;
     }
     max(a, b) {
         return a > b ? a : b;

package/build/fetch/fetch.d.ts

@@ -0,0 +1,2 @@
+import { fetch } from 'undici';
+export default fetch;

package/build/fetch/fetch.js

@@ -0,0 +1,2 @@
+import { fetch } from 'undici';
+export default fetch;

package/build/opnet.d.ts

@@ -6,10 +6,10 @@ export * from './transactions/decoders/InteractionTransaction.js';
 export * from './transactions/metadata/TransactionInput.js';
 export * from './transactions/metadata/TransactionOutput.js';
 export * from './transactions/Transaction.js';
+export * from './transactions/interfaces/ProofOfWorkChallenge.js';
 export * from './transactions/interfaces/transactions/ICommonTransaction.js';
 export * from './transactions/interfaces/transactions/IDeploymentTransaction.js';
 export * from './transactions/interfaces/transactions/IInteractionTransaction.js';
-export * from './transactions/interfaces/ProofOfWorkChallenge.js';
 export * from './providers/AbstractRpcProvider.js';
 export * from './providers/JSONRpcProvider.js';
 export * from './providers/WebsocketRpcProvider.js';
@@ -27,8 +27,8 @@ export * from './contracts/ContractData.js';
 export * from './contracts/interfaces/IAccessList.js';
 export * from './contracts/interfaces/ICallResult.js';
 export * from './contracts/interfaces/IContract.js';
-export * from './contracts/OPNetEvent.js';
 export * from './contracts/interfaces/SimulatedTransaction.js';
+export * from './contracts/OPNetEvent.js';
 export * from './contracts/TypeToStr.js';
 export * from './abi/BitcoinAbiTypes.js';
 export * from './abi/BitcoinInterface.js';
@@ -51,23 +51,21 @@ export * from './common/CommonTypes.js';
 export * from './bitcoin/interfaces/IUTXO.js';
 export * from './bitcoin/UTXOs.js';
 export { ABIDataTypes } from '@btc-vision/transaction';
+export * from './abi/shared/json/generic/STAKING_ABI.js';
+export * from './abi/shared/json/motoswap/MOTO_ABI.js';
+export * from './abi/shared/json/motoswap/MOTOCHEF_ABI.js';
 export * from './abi/shared/json/motoswap/MOTOSWAP_FACTORY_ABI.js';
 export * from './abi/shared/json/motoswap/MOTOSWAP_POOL_ABI.js';
 export * from './abi/shared/json/motoswap/MOTOSWAP_ROUTER_ABI.js';
-export * from './abi/shared/json/motoswap/MOTOSWAP_MOTOCHEF_ABI.js';
-export * from './abi/shared/json/motoswap/ADMINISTERD_OP_20_ABI.js';
+export * from './abi/shared/json/motoswap/NATIVE_SWAP_ABI.js';
 export * from './abi/shared/json/opnet/OP_20_ABI.js';
 export * from './abi/shared/json/opnet/OP_NET_ABI.js';
-export * from './abi/shared/json/generic/STAKING_ABI.js';
-export * from './abi/shared/json/tests/WBTC_ABI.js';
-export * from './abi/shared/json/motoswap/NATIVE_SWAP_ABI.js';
+export * from './abi/shared/interfaces/generic/IStackingContract.js';
+export * from './abi/shared/interfaces/motoswap/IMoto.js';
+export * from './abi/shared/interfaces/motoswap/IMotoChef.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapFactoryContract.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapPoolContract.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapRouterContract.js';
-export * from './abi/shared/interfaces/motoswap/IMotoChefContract.js';
-export * from './abi/shared/interfaces/motoswap/IAdministeredOP20.js';
+export * from './abi/shared/interfaces/motoswap/INativeSwapContract.js';
 export * from './abi/shared/interfaces/opnet/IOP_20Contract.js';
 export * from './abi/shared/interfaces/opnet/IOP_NETContract.js';
-export * from './abi/shared/interfaces/generic/IStackingContract.js';
-export * from './abi/shared/interfaces/tests/IWBTCContract.js';
-export * from './abi/shared/interfaces/motoswap/INativeSwapContract.js';

package/build/opnet.js

@@ -6,10 +6,10 @@ export * from './transactions/decoders/InteractionTransaction.js';
 export * from './transactions/metadata/TransactionInput.js';
 export * from './transactions/metadata/TransactionOutput.js';
 export * from './transactions/Transaction.js';
+export * from './transactions/interfaces/ProofOfWorkChallenge.js';
 export * from './transactions/interfaces/transactions/ICommonTransaction.js';
 export * from './transactions/interfaces/transactions/IDeploymentTransaction.js';
 export * from './transactions/interfaces/transactions/IInteractionTransaction.js';
-export * from './transactions/interfaces/ProofOfWorkChallenge.js';
 export * from './providers/AbstractRpcProvider.js';
 export * from './providers/JSONRpcProvider.js';
 export * from './providers/WebsocketRpcProvider.js';
@@ -27,8 +27,8 @@ export * from './contracts/ContractData.js';
 export * from './contracts/interfaces/IAccessList.js';
 export * from './contracts/interfaces/ICallResult.js';
 export * from './contracts/interfaces/IContract.js';
-export * from './contracts/OPNetEvent.js';
 export * from './contracts/interfaces/SimulatedTransaction.js';
+export * from './contracts/OPNetEvent.js';
 export * from './contracts/TypeToStr.js';
 export * from './abi/BitcoinAbiTypes.js';
 export * from './abi/BitcoinInterface.js';
@@ -51,23 +51,21 @@ export * from './common/CommonTypes.js';
 export * from './bitcoin/interfaces/IUTXO.js';
 export * from './bitcoin/UTXOs.js';
 export { ABIDataTypes } from '@btc-vision/transaction';
+export * from './abi/shared/json/generic/STAKING_ABI.js';
+export * from './abi/shared/json/motoswap/MOTO_ABI.js';
+export * from './abi/shared/json/motoswap/MOTOCHEF_ABI.js';
 export * from './abi/shared/json/motoswap/MOTOSWAP_FACTORY_ABI.js';
 export * from './abi/shared/json/motoswap/MOTOSWAP_POOL_ABI.js';
 export * from './abi/shared/json/motoswap/MOTOSWAP_ROUTER_ABI.js';
-export * from './abi/shared/json/motoswap/MOTOSWAP_MOTOCHEF_ABI.js';
-export * from './abi/shared/json/motoswap/ADMINISTERD_OP_20_ABI.js';
+export * from './abi/shared/json/motoswap/NATIVE_SWAP_ABI.js';
 export * from './abi/shared/json/opnet/OP_20_ABI.js';
 export * from './abi/shared/json/opnet/OP_NET_ABI.js';
-export * from './abi/shared/json/generic/STAKING_ABI.js';
-export * from './abi/shared/json/tests/WBTC_ABI.js';
-export * from './abi/shared/json/motoswap/NATIVE_SWAP_ABI.js';
+export * from './abi/shared/interfaces/generic/IStackingContract.js';
+export * from './abi/shared/interfaces/motoswap/IMoto.js';
+export * from './abi/shared/interfaces/motoswap/IMotoChef.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapFactoryContract.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapPoolContract.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapRouterContract.js';
-export * from './abi/shared/interfaces/motoswap/IMotoChefContract.js';
-export * from './abi/shared/interfaces/motoswap/IAdministeredOP20.js';
+export * from './abi/shared/interfaces/motoswap/INativeSwapContract.js';
 export * from './abi/shared/interfaces/opnet/IOP_20Contract.js';
 export * from './abi/shared/interfaces/opnet/IOP_NETContract.js';
-export * from './abi/shared/interfaces/generic/IStackingContract.js';
-export * from './abi/shared/interfaces/tests/IWBTCContract.js';
-export * from './abi/shared/interfaces/motoswap/INativeSwapContract.js';

package/build/providers/JSONRpcProvider.js

@@ -1,4 +1,5 @@
 import { AbstractRpcProvider } from './AbstractRpcProvider.js';
+import fetch from '../fetch/fetch.js';
 export class JSONRpcProvider extends AbstractRpcProvider {
     timeout;
     url;
@@ -15,6 +16,12 @@ export class JSONRpcProvider extends AbstractRpcProvider {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
+                'User-Agent': 'OPNET/1.0',
+                'Accept-Encoding': 'gzip, deflate, br',
+                Accept: 'application/json',
+                'Accept-Charset': 'utf-8',
+                'Accept-Language': 'en-US',
+                Connection: 'Keep-Alive',
             },
             body: JSON.stringify(payload),
             timeout: this.timeout,
@@ -33,6 +40,7 @@ export class JSONRpcProvider extends AbstractRpcProvider {
             return [fetchedData];
         }
         catch (e) {
+            console.log(e);
             const error = e;
             if (error.name === 'AbortError') {
                 throw new Error(`Request timed out after ${this.timeout}ms`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opnet",
   "type": "module",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "author": "OP_NET",
   "description": "The perfect library for building Bitcoin-based applications.",
   "engines": {
@@ -25,7 +25,8 @@
     "./build/index.js": "./browser/index.js",
     "Buffer": "buffer",
     "crypto": "./src/crypto/crypto-browser.js",
-    "stream": "stream-browserify"
+    "stream": "stream-browserify",
+    "undici": "./src/fetch/fetch-browser.js"
   },
   "homepage": "https://opnet.org",
   "keywords": [
@@ -102,11 +103,12 @@
     "@bitcoinerlab/secp256k1": "^1.2.0",
     "@btc-vision/bitcoin": "^6.3.6",
     "@btc-vision/bitcoin-rpc": "^1.0.1",
-    "@btc-vision/transaction": "^1.3.1",
+    "@btc-vision/transaction": "^1.3.2",
     "@noble/hashes": "^1.7.1",
     "bignumber.js": "^9.1.2",
     "buffer": "^6.0.3",
     "ecpair": "^2.1.0",
-    "tiny-secp256k1": "^2.2.3"
+    "tiny-secp256k1": "^2.2.3",
+    "undici": "^7.5.0"
   }
 }

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.3.1';
+export const version = '1.3.3';

package/src/abi/shared/interfaces/motoswap/{IAdministeredOP20.ts → IMoto.ts}

@@ -1,6 +1,6 @@
 import { Address } from '@btc-vision/transaction';
-import { IOP_20Contract } from '../opnet/IOP_20Contract';
 import { CallResult } from '../../../../opnet';
+import { IOP_20Contract } from '../opnet/IOP_20Contract';
 
 export type Admin = CallResult<{
     ADDRESS: Address;
@@ -19,12 +19,12 @@ export type AdminBurn = CallResult<{
 }>;
 
 /**
- * @description This interface represents the IAdministeredOP20Contract contract. It extends the IOP_20Contract and adds the ability to have an admin address that can mint and burn tokens.
- * @interface IMotoChefContract
+ * @description This interface represents the IMoto contract. It extends the IOP_20Contract and adds the ability to have an admin address that can mint and burn tokens.
+ * @interface IMoto
  * @extends {IOwnableReentrancyGuardContract}
  * @cathegory Contracts
  */
-export interface IAdministeredOP20Contract extends IOP_20Contract {
+export interface IMoto extends IOP_20Contract {
     /**
      * @description Gets the current admin address.
      * @returns {Admin}