opnet 1.3.1 → 1.3.3

package/src/abi/shared/json/motoswap/MOTOSWAP_FACTORY_ABI.ts

@@ -3,9 +3,6 @@ import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
 import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi.js';
 import { OP_NET_ABI } from '../opnet/OP_NET_ABI.js';
 
-/**
- * @category Events
- */
 export const MotoSwapFactoryEvents: BitcoinInterfaceAbi = [
     {
         name: 'PoolCreated',
@@ -27,9 +24,6 @@ export const MotoSwapFactoryEvents: BitcoinInterfaceAbi = [
     },
 ];
 
-/**
- * @category ABI
- */
 export const MotoSwapFactoryAbi: BitcoinInterfaceAbi = [
     {
         name: 'createPool',

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

@@ -3,9 +3,6 @@ import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
 import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi.js';
 import { OP_20_ABI } from '../opnet/OP_20_ABI.js';
 
-/**
- * @category Events
- */
 export const MotoSwapPoolEvents: BitcoinInterfaceAbi = [
     {
         name: 'PoolBurn',
@@ -89,9 +86,6 @@ export const MotoSwapPoolEvents: BitcoinInterfaceAbi = [
     },
 ];
 
-/**
- * @category ABI
- */
 export const MotoswapPoolAbi: BitcoinInterfaceAbi = [
     {
         name: 'initialize',

package/src/abi/shared/json/motoswap/MOTOSWAP_ROUTER_ABI.ts

@@ -6,9 +6,6 @@ import { OP_NET_ABI } from '../opnet/OP_NET_ABI.js';
 import { MotoSwapFactoryEvents } from './MOTOSWAP_FACTORY_ABI.js';
 import { MotoSwapPoolEvents } from './MOTOSWAP_POOL_ABI.js';
 
-/**
- * @category ABI
- */
 export const MOTOSWAP_ROUTER_ABI: BitcoinInterfaceAbi = [
     /** Liquidity functions */
     {

package/src/abi/shared/json/motoswap/MOTOSWAP_STAKING_ABI.ts

@@ -2,10 +2,55 @@ import { ABIDataTypes } from '@btc-vision/transaction';
 import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
 import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi.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: BitcoinInterfaceAbi = [
+const MOTOSWAP_OWNABLE_REENTRANCY_GUARD_ABI: BitcoinInterfaceAbi = [
+    // Ownable
+    {
+        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,
+            },
+        ],
+    },
+
+    // Reentrancy guard
+    {
+        name: 'status',
+        inputs: [],
+        outputs: [
+            {
+                name: 'status',
+                type: ABIDataTypes.UINT256,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
+];
+
+const MotoswapStakingEvents: BitcoinInterfaceAbi = [
     {
         name: 'RewardTokenAdded',
         type: BitcoinAbiTypes.Event,
@@ -163,15 +208,12 @@ export const MOTOSWAP_STAKING_ABI: BitcoinInterfaceAbi = [
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
     },
 
+    // Ownable Reentrancy Guard
+    ...MOTOSWAP_OWNABLE_REENTRANCY_GUARD_ABI,
+
     // Events
     ...MotoswapStakingEvents,
 
     // OP_NET
     ...OP_NET_ABI,
-
-    // Reentrancy contract
-    ...REENTRANCY_GUARD_ABI,
-
-    // Ownable contract
-    ...OWNABLE_ABI,
 ];

package/src/abi/shared/json/motoswap/{ADMINISTERD_OP_20_ABI.ts → MOTO_ABI.ts}

@@ -1,17 +1,16 @@
 import { ABIDataTypes } from '@btc-vision/transaction';
-import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
-import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi.js';
-import { OP_20_ABI } from '../opnet/OP_20_ABI.js';
+import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes';
+import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi';
+import { OP_20_ABI } from '../opnet/OP_20_ABI';
 
-const ADMINISTERED_OP_20_ABI: BitcoinInterfaceAbi = [
+export const MOTO_ABI: BitcoinInterfaceAbi = [
     {
         name: 'admin',
         type: BitcoinAbiTypes.Function,
-        constant: true,
         inputs: [],
         outputs: [
             {
-                name: 'ADDRESS',
+                name: 'adminAddress',
                 type: ABIDataTypes.ADDRESS,
             },
         ],
@@ -19,11 +18,9 @@ const ADMINISTERED_OP_20_ABI: BitcoinInterfaceAbi = [
     {
         name: 'changeAdmin',
         type: BitcoinAbiTypes.Function,
-        constant: false,
-        payable: false,
         inputs: [
             {
-                name: 'newAdmin',
+                name: 'to',
                 type: ABIDataTypes.ADDRESS,
             },
         ],
@@ -37,8 +34,6 @@ const ADMINISTERED_OP_20_ABI: BitcoinInterfaceAbi = [
     {
         name: 'adminMint',
         type: BitcoinAbiTypes.Function,
-        constant: false,
-        payable: false,
         inputs: [
             {
                 name: 'to',
@@ -59,8 +54,6 @@ const ADMINISTERED_OP_20_ABI: BitcoinInterfaceAbi = [
     {
         name: 'adminBurn',
         type: BitcoinAbiTypes.Function,
-        constant: false,
-        payable: false,
         inputs: [
             {
                 name: 'from',
@@ -78,8 +71,7 @@ const ADMINISTERED_OP_20_ABI: BitcoinInterfaceAbi = [
             },
         ],
     },
+
     // OP_20
     ...OP_20_ABI,
 ];
-
-export default ADMINISTERED_OP_20_ABI;

package/src/abi/shared/json/motoswap/NATIVE_SWAP_ABI.ts

@@ -3,10 +3,7 @@ import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
 import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi.js';
 import { OP_NET_ABI } from '../opnet/OP_NET_ABI.js';
 
-/**
- * @category Events
- */
-export const NativeSwapEvents: BitcoinInterfaceAbi = [
+const NativeSwapEvents: BitcoinInterfaceAbi = [
     {
         name: 'LiquidityAdded',
         values: [
@@ -64,14 +61,25 @@ export const NativeSwapEvents: BitcoinInterfaceAbi = [
         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,
+    },
 ];
 
-/**
- * @category ABI
- */
 export const NativeSwapAbi: BitcoinInterfaceAbi = [
     //=================================================
     // RESERVE

package/src/abi/shared/json/opnet/OP_NET_ABI.ts

@@ -2,44 +2,27 @@ import { ABIDataTypes } from '@btc-vision/transaction';
 import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes.js';
 import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi.js';
 
-/**
- * @category ABI
- */
 export const OP_NET_ABI: BitcoinInterfaceAbi = [
-    // OP_NET
     {
-        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/src/contracts/CallResult.ts

@@ -93,10 +93,12 @@ export class CallResult<
     /**
      * Easily create a bitcoin interaction transaction from a simulated contract call.
      * @param {TransactionParameters} interactionParams - The parameters for the transaction.
+     * @param amountAddition
      * @returns {Promise<InteractionTransactionReceipt>} The transaction hash, the transaction hex and the UTXOs used.
      */
     public async sendTransaction(
         interactionParams: TransactionParameters,
+        amountAddition: bigint = 0n,
     ): Promise<InteractionTransactionReceipt> {
         if (!this.calldata) {
             throw new Error('Calldata not set');
@@ -119,7 +121,10 @@ export class CallResult<
             const UTXOs: UTXO[] =
                 interactionParams.utxos ||
                 (await this.#fetchUTXOs(
-                    totalFee + interactionParams.maximumAllowedSatToSpend + totalAmount,
+                    totalFee +
+                        interactionParams.maximumAllowedSatToSpend +
+                        totalAmount +
+                        amountAddition,
                     interactionParams,
                 ));
 
@@ -147,6 +152,7 @@ export class CallResult<
                 transaction.fundingTransaction,
                 false,
             );
+            
             if (!tx1 || tx1.error) {
                 throw new Error(`Error sending transaction: ${tx1?.error || 'Unknown error'}`);
             }
@@ -174,6 +180,12 @@ export class CallResult<
                 preimage: transaction.preimage,
             };
         } catch (e) {
+            const msgStr = (e as Error).message;
+
+            if (msgStr.includes('Insufficient funds to pay the fees') && amountAddition === 0n) {
+                return await this.sendTransaction(interactionParams, 200_000n);
+            }
+
             // We need to clean up the UTXOs if the transaction fails
             this.#provider.utxoManager.clean();
 
@@ -204,7 +216,7 @@ export class CallResult<
 
         const utxoSetting: RequestUTXOsParamsWithAmount = {
             address: interactionParams.refundTo,
-            amount: 10000n + amount,
+            amount: 50_000n + amount,
             throwErrors: true,
         };
 

package/src/contracts/Contract.ts

@@ -629,10 +629,10 @@ export abstract class IBaseContract<T extends BaseContractProperties> implements
         const gasPerSat = gasParameters.gasPerSat;
         const exactGas = ((gas / 1000000n) * gasPerSat) / 1000000n;
 
-        // Add 15% extra gas
-        const extraGas = (exactGas * 15n) / 100n;
+        // Add 25% extra gas
+        const extraGas = (exactGas * 25n) / 100n;
 
-        return this.max(exactGas + extraGas, 330n);
+        return this.max(exactGas + extraGas, 330n) + 1n;
     }
 
     private max(a: bigint, b: bigint): bigint {

package/src/fetch/fetch-browser.js

@@ -0,0 +1,5 @@
+export default {
+    fetch(input, init) {
+        return window.fetch(input, init);
+    },
+};

package/src/fetch/fetch.ts

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

package/src/opnet.ts

@@ -12,10 +12,10 @@ 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';
 
 /** Providers */
 export * from './providers/AbstractRpcProvider.js';
@@ -45,8 +45,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';
 
 /** Abi */
@@ -86,25 +86,23 @@ export * from './bitcoin/UTXOs.js';
 export { ABIDataTypes } from '@btc-vision/transaction';
 
 /** ABI JSON */
+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';
 
 /** ABI Interfaces */
+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/src/providers/JSONRpcProvider.ts

@@ -3,6 +3,9 @@ import { AbstractRpcProvider } from './AbstractRpcProvider.js';
 import { JsonRpcPayload } from './interfaces/JSONRpc.js';
 import { JsonRpcCallResult, JsonRpcError, JsonRpcResult } from './interfaces/JSONRpcResult.js';
 
+import fetch from '../fetch/fetch.js';
+import { Response } from 'undici/types/fetch';
+
 /**
  * @description This class is used to provide a JSON RPC provider.
  * @class JSONRpcProvider
@@ -38,6 +41,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,
@@ -52,9 +61,6 @@ export class JSONRpcProvider extends AbstractRpcProvider {
 
             clearTimeout(timeoutId);
 
-            //const str = await resp.text();
-            //fs.writeFileSync('response.json', str);
-
             const fetchedData = (await resp.json()) as JsonRpcResult | JsonRpcError;
             if (!fetchedData) {
                 throw new Error('No data fetched');
@@ -62,6 +68,7 @@ export class JSONRpcProvider extends AbstractRpcProvider {
 
             return [fetchedData];
         } catch (e) {
+            console.log(e);
             const error = e as Error;
             if (error.name === 'AbortError') {
                 throw new Error(`Request timed out after ${this.timeout}ms`);

package/webpack.config.js

@@ -29,6 +29,7 @@ export default {
 
             assert: import.meta.resolve('assert/'),
             crypto: import.meta.resolve('./src/crypto/crypto-browser.js'),
+            undici: import.meta.resolve('./src/fetch/fetch-browser.js'),
             http: import.meta.resolve('stream-http/'),
             https: import.meta.resolve('https-browserify/'),
             os: import.meta.resolve('os-browserify/browser/'),