opnet 1.2.1 → 1.2.3

package/src/abi/shared/json/motoswap/{EWMA_ABI.ts → NATIVE_SWAP_ABI.ts}

@@ -6,9 +6,27 @@ import { OP_NET_ABI } from '../opnet/OP_NET_ABI.js';
 /**
  * @category Events
  */
-export const EwmaEvents: BitcoinInterfaceAbi = [
+export const NativeSwapEvents: BitcoinInterfaceAbi = [
     {
         name: 'LiquidityAdded',
+        values: [
+            {
+                name: 'totalTokensContributed',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'virtualTokenExchanged',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'totalSatoshisSpent',
+                type: ABIDataTypes.UINT256,
+            },
+        ],
+        type: BitcoinAbiTypes.Event,
+    },
+    {
+        name: 'LiquidityListed',
         values: [
             {
                 name: 'totalLiquidity',
@@ -21,6 +39,24 @@ export const EwmaEvents: BitcoinInterfaceAbi = [
         ],
         type: BitcoinAbiTypes.Event,
     },
+    {
+        name: 'LiquidityRemoved',
+        values: [
+            {
+                name: 'providerId',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'btcOwed',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'tokenAmount',
+                type: ABIDataTypes.UINT256,
+            },
+        ],
+        type: BitcoinAbiTypes.Event,
+    },
     {
         name: 'ReservationCreated',
         values: [
@@ -36,36 +72,36 @@ export const EwmaEvents: BitcoinInterfaceAbi = [
         type: BitcoinAbiTypes.Event,
     },
     {
-        name: 'LiquidityRemoved',
+        name: 'SwapExecuted',
         values: [
             {
-                name: 'token',
+                name: 'buyer',
                 type: ABIDataTypes.ADDRESS,
             },
             {
-                name: 'amount',
+                name: 'amountIn',
                 type: ABIDataTypes.UINT256,
             },
             {
-                name: 'remainingLiquidity',
+                name: 'amountOut',
                 type: ABIDataTypes.UINT256,
             },
         ],
         type: BitcoinAbiTypes.Event,
     },
     {
-        name: 'SwapExecuted',
+        name: 'Unlist',
         values: [
             {
-                name: 'buyer',
+                name: 'token',
                 type: ABIDataTypes.ADDRESS,
             },
             {
-                name: 'amountIn',
+                name: 'amount',
                 type: ABIDataTypes.UINT256,
             },
             {
-                name: 'amountOut',
+                name: 'remainingLiquidity',
                 type: ABIDataTypes.UINT256,
             },
         ],
@@ -90,7 +126,10 @@ export const EwmaEvents: BitcoinInterfaceAbi = [
 /**
  * @category ABI
  */
-export const EwmaAbi: BitcoinInterfaceAbi = [
+export const NativeSwapAbi: BitcoinInterfaceAbi = [
+    //=================================================
+    // RESERVE
+    //=================================================
     {
         name: 'reserve',
         inputs: [
@@ -106,6 +145,10 @@ export const EwmaAbi: BitcoinInterfaceAbi = [
                 name: 'minimumAmountOut',
                 type: ABIDataTypes.UINT256,
             },
+            {
+                name: 'forLP',
+                type: ABIDataTypes.BOOL,
+            },
         ],
         outputs: [
             {
@@ -116,8 +159,11 @@ export const EwmaAbi: BitcoinInterfaceAbi = [
         type: BitcoinAbiTypes.Function,
     },
 
+    //=================================================
+    // LIST LIQUIDITY
+    //=================================================
     {
-        name: 'addLiquidity',
+        name: 'listLiquidity',
         inputs: [
             {
                 name: 'token',
@@ -145,8 +191,11 @@ export const EwmaAbi: BitcoinInterfaceAbi = [
         type: BitcoinAbiTypes.Function,
     },
 
+    //=================================================
+    // CANCEL LISTING
+    //=================================================
     {
-        name: 'removeLiquidity',
+        name: 'cancelListing',
         inputs: [
             {
                 name: 'token',
@@ -162,18 +211,69 @@ export const EwmaAbi: BitcoinInterfaceAbi = [
         type: BitcoinAbiTypes.Function,
     },
 
+    //=================================================
+    // CREATE POOL
+    //=================================================
     {
-        name: 'swap',
+        name: 'createPool',
         inputs: [
             {
                 name: 'token',
                 type: ABIDataTypes.ADDRESS,
             },
             {
-                name: 'isSimulation',
+                name: 'floorPrice',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'initialLiquidity',
+                type: ABIDataTypes.UINT128,
+            },
+            {
+                name: 'receiver',
+                type: ABIDataTypes.STRING,
+            },
+            {
+                name: 'antiBotEnabledFor',
+                type: ABIDataTypes.UINT16,
+            },
+            {
+                name: 'antiBotMaximumTokensPerReservation',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'maxReservesIn5BlocksPercent',
+                type: ABIDataTypes.UINT16,
+            },
+        ],
+        outputs: [
+            {
+                name: 'ok',
                 type: ABIDataTypes.BOOL,
             },
         ],
+        type: BitcoinAbiTypes.Function,
+    },
+
+    //=================================================
+    // SET FEES
+    //=================================================
+    {
+        name: 'setFees',
+        inputs: [
+            {
+                name: 'reservationBaseFee',
+                type: ABIDataTypes.UINT64,
+            },
+            {
+                name: 'priorityQueueBaseFee',
+                type: ABIDataTypes.UINT64,
+            },
+            {
+                name: 'pricePerUserInPriorityQueueBTC',
+                type: ABIDataTypes.UINT64,
+            },
+        ],
         outputs: [
             {
                 name: 'ok',
@@ -183,6 +283,104 @@ export const EwmaAbi: BitcoinInterfaceAbi = [
         type: BitcoinAbiTypes.Function,
     },
 
+    //=================================================
+    // GET FEES
+    //=================================================
+    {
+        name: 'getFees',
+        inputs: [],
+        outputs: [
+            {
+                name: 'reservationBaseFee',
+                type: ABIDataTypes.UINT64,
+            },
+            {
+                name: 'priorityQueueBaseFee',
+                type: ABIDataTypes.UINT64,
+            },
+            {
+                name: 'pricePerUserInPriorityQueueBTC',
+                type: ABIDataTypes.UINT64,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
+
+    //=================================================
+    // ADD LIQUIDITY
+    //=================================================
+    {
+        name: 'addLiquidity',
+        inputs: [
+            {
+                name: 'token',
+                type: ABIDataTypes.ADDRESS,
+            },
+            {
+                name: 'receiver',
+                type: ABIDataTypes.STRING,
+            },
+            {
+                name: 'amountIn',
+                type: ABIDataTypes.UINT128,
+            },
+            {
+                name: 'priority',
+                type: ABIDataTypes.BOOL,
+            },
+        ],
+        outputs: [
+            {
+                name: 'ok',
+                type: ABIDataTypes.BOOL,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
+
+    //=================================================
+    // REMOVE LIQUIDITY (changed return type)
+    //=================================================
+    {
+        name: 'removeLiquidity',
+        inputs: [
+            {
+                name: 'token',
+                type: ABIDataTypes.ADDRESS,
+            },
+        ],
+        outputs: [
+            {
+                name: 'ok',
+                type: ABIDataTypes.BOOL,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
+
+    //=================================================
+    // SWAP
+    //=================================================
+    {
+        name: 'swap',
+        inputs: [
+            {
+                name: 'token',
+                type: ABIDataTypes.ADDRESS,
+            },
+        ],
+        outputs: [
+            {
+                name: 'ok',
+                type: ABIDataTypes.BOOL,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
+
+    //=================================================
+    // GET RESERVE
+    //=================================================
     {
         name: 'getReserve',
         inputs: [
@@ -200,10 +398,21 @@ export const EwmaAbi: BitcoinInterfaceAbi = [
                 name: 'reservedLiquidity',
                 type: ABIDataTypes.UINT256,
             },
+            {
+                name: 'virtualBTCReserve',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'virtualTokenReserve',
+                type: ABIDataTypes.UINT256,
+            },
         ],
         type: BitcoinAbiTypes.Function,
     },
 
+    //=================================================
+    // GET QUOTE
+    //=================================================
     {
         name: 'getQuote',
         inputs: [
@@ -226,36 +435,43 @@ export const EwmaAbi: BitcoinInterfaceAbi = [
                 type: ABIDataTypes.UINT256,
             },
             {
-                name: 'currentPrice',
+                name: 'price',
                 type: ABIDataTypes.UINT256,
             },
         ],
         type: BitcoinAbiTypes.Function,
     },
 
+    //=================================================
+    // GET PROVIDER DETAILS
+    //=================================================
     {
-        name: 'setQuote',
+        name: 'getProviderDetails',
         inputs: [
             {
                 name: 'token',
                 type: ABIDataTypes.ADDRESS,
             },
-            {
-                name: 'p0',
-                type: ABIDataTypes.UINT256,
-            },
         ],
         outputs: [
             {
-                name: 'ok',
-                type: ABIDataTypes.BOOL,
+                name: 'liquidity',
+                type: ABIDataTypes.UINT128,
+            },
+            {
+                name: 'reserved',
+                type: ABIDataTypes.UINT128,
+            },
+            {
+                name: 'btcReceiver',
+                type: ABIDataTypes.STRING,
             },
         ],
         type: BitcoinAbiTypes.Function,
     },
 
     {
-        name: 'priorityQueueCost',
+        name: 'getVirtualReserves',
         inputs: [
             {
                 name: 'token',
@@ -264,15 +480,22 @@ export const EwmaAbi: BitcoinInterfaceAbi = [
         ],
         outputs: [
             {
-                name: 'cost',
-                type: ABIDataTypes.UINT128,
+                name: 'virtualBTCReserve',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'virtualTokenReserve',
+                type: ABIDataTypes.UINT256,
             },
         ],
         type: BitcoinAbiTypes.Function,
     },
 
+    //=================================================
+    // GET PRIORITY QUEUE COST
+    //=================================================
     {
-        name: 'getProviderDetails',
+        name: 'getPriorityQueueCost',
         inputs: [
             {
                 name: 'token',
@@ -281,22 +504,14 @@ export const EwmaAbi: BitcoinInterfaceAbi = [
         ],
         outputs: [
             {
-                name: 'liquidity',
-                type: ABIDataTypes.UINT128,
-            },
-            {
-                name: 'reserved',
-                type: ABIDataTypes.UINT128,
-            },
-            {
-                name: 'btcReceiver',
-                type: ABIDataTypes.STRING,
+                name: 'cost',
+                type: ABIDataTypes.UINT64,
             },
         ],
         type: BitcoinAbiTypes.Function,
     },
 
-    ...EwmaEvents,
+    ...NativeSwapEvents,
 
     // OP_NET
     ...OP_NET_ABI,

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

@@ -0,0 +1,38 @@
+import { ABIDataTypes } from '@btc-vision/transaction';
+import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes';
+import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi';
+
+const OWNABLE_ABI: BitcoinInterfaceAbi = [
+    {
+        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,
+            },
+        ],
+    },
+];
+
+export default OWNABLE_ABI;

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

@@ -0,0 +1,20 @@
+import { ABIDataTypes } from '@btc-vision/transaction';
+import { BitcoinAbiTypes } from '../../../BitcoinAbiTypes';
+import { BitcoinInterfaceAbi } from '../../../interfaces/BitcoinInterfaceAbi';
+
+/**
+ * @category ABI
+ */
+export const REENTRANCY_GUARD_ABI: BitcoinInterfaceAbi = [
+    {
+        name: 'status',
+        inputs: [],
+        outputs: [
+            {
+                name: 'status',
+                type: ABIDataTypes.UINT256,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
+];

package/src/bitcoin/UTXOs.ts

@@ -1,4 +1,4 @@
-import { ScriptPubKey } from '@btc-vision/bsi-bitcoin-rpc';
+import { ScriptPubKey } from '@btc-vision/bitcoin-rpc';
 import { IUTXO } from './interfaces/IUTXO.js';
 
 /**
@@ -22,7 +22,7 @@ export class UTXO implements Omit<IUTXO, 'raw'> {
         if (!iUTXO.raw) {
             throw new Error('Missing nonWitnessUtxo field in UTXO');
         }
-        
+
         this.nonWitnessUtxo = Buffer.from(iUTXO.raw, 'base64');
     }
 }

package/src/bitcoin/interfaces/IUTXO.ts

@@ -1,4 +1,4 @@
-import { ScriptPubKey } from '@btc-vision/bsi-bitcoin-rpc';
+import { ScriptPubKey } from '@btc-vision/bitcoin-rpc';
 
 /**
  * Unspent Transaction Output

package/src/block/Block.ts

@@ -1,3 +1,4 @@
+import { Network } from '@btc-vision/bitcoin';
 import { BigNumberish } from '../common/CommonTypes.js';
 import { OPNetTransactionTypes } from '../interfaces/opnet/OPNetTransactionTypes.js';
 import { ITransaction } from '../transactions/interfaces/ITransaction.js';
@@ -42,7 +43,7 @@ export class Block implements Omit<IBlock, 'gasUsed' | 'ema' | 'baseGas'> {
 
     public readonly transactions: TransactionBase<OPNetTransactionTypes>[] = [];
 
-    constructor(block: IBlock) {
+    constructor(block: IBlock, network: Network) {
         this.height = BigInt(block.height.toString());
 
         this.hash = block.hash;
@@ -74,6 +75,7 @@ export class Block implements Omit<IBlock, 'gasUsed' | 'ema' | 'baseGas'> {
 
         this.transactions = TransactionParser.parseTransactions(
             block.transactions as ITransaction[],
+            network
         );
     }
 }

package/src/contracts/CallResult.ts

@@ -1,5 +1,6 @@
 import { Network, PsbtOutputExtended, Signer } from '@btc-vision/bitcoin';
 import {
+    Address,
     BinaryReader,
     BufferHelper,
     IInteractionParameters,
@@ -59,12 +60,10 @@ export class CallResult<T extends ContractDecodedObjectResult = {}>
     readonly #rawEvents: EventList;
     readonly #provider: AbstractRpcProvider;
 
-    //private readonly decoded: Array<DecodedCallResult> = [];
-
     constructor(callResult: ICallResultData, provider: AbstractRpcProvider) {
+        this.#provider = provider;
         this.#rawEvents = this.parseEvents(callResult.events);
         this.accessList = callResult.accessList;
-        this.#provider = provider;
 
         if (callResult.estimatedGas) {
             this.estimatedGas = BigInt(callResult.estimatedGas);
@@ -167,8 +166,6 @@ export class CallResult<T extends ContractDecodedObjectResult = {}>
 
     public setDecoded(decoded: DecodedOutput): void {
         this.properties = Object.freeze(decoded.obj) as T;
-
-        //this.decoded.push(...decoded.values);
     }
 
     public setCalldata(calldata: Buffer): void {
@@ -194,6 +191,12 @@ export class CallResult<T extends ContractDecodedObjectResult = {}>
         return utxos;
     }
 
+    private contractToString(contract: string): string {
+        const addressCa = Address.fromString(contract);
+
+        return addressCa.p2tr(this.#provider.network);
+    }
+
     private parseEvents(events: RawEventList): EventList {
         const eventsList: EventList = {};
 
@@ -206,7 +209,7 @@ export class CallResult<T extends ContractDecodedObjectResult = {}>
                 events.push(eventData);
             }
 
-            eventsList[contract] = events;
+            eventsList[this.contractToString(contract)] = events;
         }
 
         return eventsList;

package/src/opnet.ts

@@ -15,6 +15,7 @@ export * from './transactions/Transaction.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';
@@ -87,18 +88,22 @@ export { ABIDataTypes } from '@btc-vision/transaction';
 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/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/EWMA_ABI.js';
+export * from './abi/shared/json/motoswap/NATIVE_SWAP_ABI.js';
 
 /** ABI Interfaces */
 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/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/IEwmaContract.js';
+export * from './abi/shared/interfaces/motoswap/INativeSwapContract.js';

package/src/providers/AbstractRpcProvider.ts

@@ -42,7 +42,7 @@ export abstract class AbstractRpcProvider {
     private nextId: number = 0;
     private chainId: bigint | undefined;
 
-    protected constructor(private readonly network: Network) {}
+    protected constructor(public readonly network: Network) {}
 
     private _utxoManager: UTXOsManager = new UTXOsManager(this);
 
@@ -139,7 +139,7 @@ export abstract class AbstractRpcProvider {
         const block: JsonRpcResult = await this.callPayloadSingle(payload);
 
         const result: IBlock = block.result as IBlock;
-        return new Block(result);
+        return new Block(result, this.network);
     }
 
     /**
@@ -174,7 +174,7 @@ export abstract class AbstractRpcProvider {
 
             const result: IBlock = block.result as IBlock;
 
-            return new Block(result);
+            return new Block(result, this.network);
         });
     }
 
@@ -236,7 +236,7 @@ export abstract class AbstractRpcProvider {
             );
         }
 
-        return TransactionParser.parseTransaction(result);
+        return TransactionParser.parseTransaction(result, this.network);
     }
 
     /**
@@ -254,7 +254,7 @@ export abstract class AbstractRpcProvider {
         );
 
         const rawTransaction: JsonRpcResult = await this.callPayloadSingle(payload);
-        return new TransactionReceipt(rawTransaction.result);
+        return new TransactionReceipt(rawTransaction.result, this.network);
     }
 
     /**

package/src/providers/JSONRpcProvider.ts

@@ -49,7 +49,7 @@ export class JSONRpcProvider extends AbstractRpcProvider {
             if (!resp.ok) {
                 throw new Error(`Failed to fetch: ${resp.statusText}`);
             }
-
+            
             clearTimeout(timeoutId);
 
             //const str = await resp.text();