opnet 1.2.26 → 1.3.0

package/src/abi/shared/interfaces/motoswap/INativeSwapContract.ts

@@ -4,6 +4,10 @@ import { OPNetEvent } from '../../../../contracts/OPNetEvent.js';
 import { TransferEvent } from '../opnet/IOP_20Contract.js';
 import { IOP_NETContract } from '../opnet/IOP_NETContract.js';
 
+/** ------------------------------------------------------------------
+ * Event Definitions
+ * ------------------------------------------------------------------ */
+
 export type LiquidityAddedEvent = {
     readonly totalTokensContributed: bigint;
     readonly virtualTokenExchanged: bigint;
@@ -43,6 +47,10 @@ export type LiquidityReservedEvent = {
     readonly amount: bigint;
 };
 
+/** ------------------------------------------------------------------
+ * Call Results
+ * ------------------------------------------------------------------ */
+
 /**
  * @description Represents the result of the reserve function call.
  */
@@ -120,7 +128,6 @@ export type GetFees = CallResult<
     {
         reservationBaseFee: bigint;
         priorityQueueBaseFee: bigint;
-        pricePerUserInPriorityQueueBTC: bigint;
     },
     []
 >;
@@ -151,7 +158,6 @@ export type GetReserve = CallResult<
 
 /**
  * @description Represents the result of the getQuote function call.
- * Renamed currentPrice -> price.
  */
 export type GetQuote = CallResult<
     {
@@ -185,6 +191,10 @@ export type GetPriorityQueueCost = CallResult<
     []
 >;
 
+/** ------------------------------------------------------------------
+ * NativeSwap Interface
+ * ------------------------------------------------------------------ */
+
 /**
  * @description This interface represents the NativeSwap contract,
  * including all new/updated methods and type definitions.
@@ -200,6 +210,7 @@ export interface INativeSwapContract extends IOP_NETContract {
      * @param maximumAmountIn - The maximum amount of tokens to reserve.
      * @param minimumAmountOut - The minimum amount of tokens expected out.
      * @param forLP - Whether this reservation is for LP or not.
+     * @param activationDelay - Number of blocks before activation (if used).
      * @returns {Promise<ReserveNativeSwap>}
      */
     reserve(
@@ -207,6 +218,7 @@ export interface INativeSwapContract extends IOP_NETContract {
         maximumAmountIn: bigint,
         minimumAmountOut: bigint,
         forLP: boolean,
+        activationDelay: number,
     ): Promise<ReserveNativeSwap>;
 
     /**
@@ -252,6 +264,20 @@ export interface INativeSwapContract extends IOP_NETContract {
         maxReservesIn5BlocksPercent: number,
     ): Promise<CreatePool>;
 
+    /**
+     * @description Creates a new liquidity pool with an approval signature (new).
+     * @param signature - Buffer for the signature.
+     * @param approveAmount - Amount to approve.
+     * @param nonce - Approval nonce.
+     * @param token - The token address.
+     * @param floorPrice - The floor price to set.
+     * @param initialLiquidity - The amount of liquidity to seed.
+     * @param receiver - The Bitcoin address for receiving payments.
+     * @param antiBotEnabledFor - Number of blocks for anti-bot protection.
+     * @param antiBotMaximumTokensPerReservation - Anti-bot max tokens per user.
+     * @param maxReservesIn5BlocksPercent - Cap on reserves in a short window.
+     * @returns {Promise<CreatePool>}
+     */
     createPoolWithSignature(
         signature: Buffer,
         approveAmount: bigint,
@@ -269,14 +295,9 @@ export interface INativeSwapContract extends IOP_NETContract {
      * @description Sets the global fee parameters (new).
      * @param reservationBaseFee - Base fee for a reservation.
      * @param priorityQueueBaseFee - Base fee for priority queue usage.
-     * @param pricePerUserInPriorityQueueBTC - Additional cost per user in queue.
      * @returns {Promise<SetFees>}
      */
-    setFees(
-        reservationBaseFee: bigint,
-        priorityQueueBaseFee: bigint,
-        pricePerUserInPriorityQueueBTC: bigint,
-    ): Promise<SetFees>;
+    setFees(reservationBaseFee: bigint, priorityQueueBaseFee: bigint): Promise<SetFees>;
 
     /**
      * @description Retrieves the current fee parameters (new).
@@ -293,12 +314,11 @@ export interface INativeSwapContract extends IOP_NETContract {
     addLiquidity(token: Address, receiver: string): Promise<AddLiquidity>;
 
     /**
-     * @description Removes liquidity from the contract.
+     * @description Removes all liquidity from the contract for the given token.
      * @param token - The address of the token to remove liquidity for.
-     * @param amount
      * @returns {Promise<RemoveLiquidity>}
      */
-    removeLiquidity(token: Address, amount: bigint): Promise<RemoveLiquidity>;
+    removeLiquidity(token: Address): Promise<RemoveLiquidity>;
 
     /**
      * @description Executes a swap operation.

package/src/abi/shared/interfaces/opnet/IOP_20Contract.ts

@@ -106,7 +106,7 @@ export interface IOP_20Contract extends IOP_NETContract {
 
     mint(address: Address, value: bigint): Promise<Mint>;
 
-    airdrop(tuple: AddressMap<bigint>): Promise<Airdrop>;
+    airdrop(map: AddressMap<bigint>): Promise<Airdrop>;
 
     airdropWithAmount(amount: bigint, addresses: Address[]): Promise<AirdropWithAmount>;
 }

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

@@ -75,6 +75,33 @@ export const MotoSwapFactoryAbi: BitcoinInterfaceAbi = [
         ],
         type: BitcoinAbiTypes.Function,
     },
+    {
+        name: 'setStakingContractAddress',
+        inputs: [
+            {
+                name: 'stakingContractAddress',
+                type: ABIDataTypes.ADDRESS,
+            },
+        ],
+        outputs: [
+            {
+                name: 'success',
+                type: ABIDataTypes.BOOL,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
+    {
+        name: 'getStakingContractAddress',
+        inputs: [],
+        outputs: [
+            {
+                name: 'stakingContractAddress',
+                type: ABIDataTypes.ADDRESS,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
 
     ...MotoSwapFactoryEvents,
 

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

@@ -17,7 +17,7 @@ export const MotoChefEvents: BitcoinInterfaceAbi = [
         values: [
             {
                 name: 'pid',
-                type: ABIDataTypes.UINT32,
+                type: ABIDataTypes.UINT64,
             },
             {
                 name: 'allocPoint',
@@ -27,10 +27,6 @@ export const MotoChefEvents: BitcoinInterfaceAbi = [
                 name: 'lpToken',
                 type: ABIDataTypes.ADDRESS,
             },
-            {
-                name: 'rewarder',
-                type: ABIDataTypes.ADDRESS,
-            },
         ],
     },
     {
@@ -39,20 +35,12 @@ export const MotoChefEvents: BitcoinInterfaceAbi = [
         values: [
             {
                 name: 'pid',
-                type: ABIDataTypes.UINT32,
+                type: ABIDataTypes.UINT64,
             },
             {
                 name: 'allocPoint',
                 type: ABIDataTypes.UINT256,
             },
-            {
-                name: 'rewarder',
-                type: ABIDataTypes.ADDRESS,
-            },
-            {
-                name: 'overwrite',
-                type: ABIDataTypes.BOOL,
-            },
         ],
     },
     {
@@ -61,7 +49,7 @@ export const MotoChefEvents: BitcoinInterfaceAbi = [
         values: [
             {
                 name: 'pid',
-                type: ABIDataTypes.UINT32,
+                type: ABIDataTypes.UINT64,
             },
             {
                 name: 'lastRewardBlock',
@@ -87,7 +75,7 @@ export const MotoChefEvents: BitcoinInterfaceAbi = [
             },
             {
                 name: 'pid',
-                type: ABIDataTypes.UINT32,
+                type: ABIDataTypes.UINT64,
             },
             {
                 name: 'amount',
@@ -109,7 +97,7 @@ export const MotoChefEvents: BitcoinInterfaceAbi = [
             },
             {
                 name: 'pid',
-                type: ABIDataTypes.UINT32,
+                type: ABIDataTypes.UINT64,
             },
             {
                 name: 'amount',
@@ -131,7 +119,7 @@ export const MotoChefEvents: BitcoinInterfaceAbi = [
             },
             {
                 name: 'pid',
-                type: ABIDataTypes.UINT32,
+                type: ABIDataTypes.UINT64,
             },
             {
                 name: 'amount',
@@ -149,7 +137,7 @@ export const MotoChefEvents: BitcoinInterfaceAbi = [
             },
             {
                 name: 'pid',
-                type: ABIDataTypes.UINT32,
+                type: ABIDataTypes.UINT64,
             },
             {
                 name: 'amount',
@@ -161,6 +149,50 @@ export const MotoChefEvents: BitcoinInterfaceAbi = [
             },
         ],
     },
+    {
+        name: 'StakeBTC',
+        type: BitcoinAbiTypes.Event,
+        values: [
+            {
+                name: 'user',
+                type: ABIDataTypes.ADDRESS,
+            },
+            {
+                name: 'amount',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'stakingTxId',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'stakingIndex',
+                type: ABIDataTypes.UINT256,
+            },
+        ],
+    },
+    {
+        name: 'UnstakeBTC',
+        type: BitcoinAbiTypes.Event,
+        values: [
+            {
+                name: 'user',
+                type: ABIDataTypes.ADDRESS,
+            },
+            {
+                name: 'amount',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'stakingTxId',
+                type: ABIDataTypes.UINT256,
+            },
+            {
+                name: 'stakingIndex',
+                type: ABIDataTypes.UINT256,
+            },
+        ],
+    },
 ];
 
 const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
@@ -176,6 +208,8 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
             { name: 'motoPerBlock', type: ABIDataTypes.UINT256 },
             { name: 'bonusEndBlock', type: ABIDataTypes.UINT256 },
             { name: 'bonusMultiplier', type: ABIDataTypes.UINT256 },
+            { name: 'treasuryAddress', type: ABIDataTypes.STRING },
+            { name: 'btcAllocPoint', type: ABIDataTypes.UINT256 },
         ],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
     },
@@ -183,49 +217,45 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         name: 'getLpToken',
         type: BitcoinAbiTypes.Function,
         constant: true,
-        inputs: [{ name: 'pid', type: ABIDataTypes.UINT32 }],
+        inputs: [{ name: 'pid', type: ABIDataTypes.UINT64 }],
         outputs: [{ name: 'lpTokenAddress', type: ABIDataTypes.ADDRESS }],
     },
     {
-        name: 'getRewarder',
+        name: 'getLpTokens',
         type: BitcoinAbiTypes.Function,
         constant: true,
-        inputs: [{ name: 'pid', type: ABIDataTypes.UINT32 }],
-        outputs: [{ name: 'rewarderAddress', type: ABIDataTypes.ADDRESS }],
+        inputs: [],
+        outputs: [{ name: 'lpTokens', type: ABIDataTypes.ARRAY_OF_ADDRESSES }],
     },
     {
         name: 'getPoolInfo',
         type: BitcoinAbiTypes.Function,
         constant: true,
-        inputs: [{ name: 'pid', type: ABIDataTypes.UINT32 }],
+        inputs: [{ name: 'pid', type: ABIDataTypes.UINT64 }],
         outputs: [
-            { name: 'allocPoint', type: ABIDataTypes.UINT64 },
-            { name: 'lastRewardBlock', type: ABIDataTypes.UINT64 },
             { name: 'accMotoPerShare', type: ABIDataTypes.UINT256 },
+            { name: 'lastRewardBlock', type: ABIDataTypes.UINT64 },
+            { name: 'allocPoint', type: ABIDataTypes.UINT64 },
         ],
     },
     {
-        name: 'pools',
+        name: 'getPoolsLength',
         type: BitcoinAbiTypes.Function,
         constant: true,
         inputs: [],
-        outputs: [
-            { name: 'poolLength', type: ABIDataTypes.UINT32 },
-            { name: 'poolsData', type: ABIDataTypes.BYTES },
-        ],
+        outputs: [{ name: 'poolLength', type: ABIDataTypes.UINT64 }],
     },
     {
         name: 'getUserInfo',
         type: BitcoinAbiTypes.Function,
         constant: true,
         inputs: [
-            { name: 'pid', type: ABIDataTypes.UINT32 },
+            { name: 'pid', type: ABIDataTypes.UINT64 },
             { name: 'user', type: ABIDataTypes.ADDRESS },
         ],
         outputs: [
             { name: 'amount', type: ABIDataTypes.UINT256 },
-            // FIXME: NEEDS TO BE INT256
-            { name: 'rewardDebt', type: ABIDataTypes.UINT256 },
+            { name: 'rewardDebt', type: ABIDataTypes.INT128 },
         ],
     },
     {
@@ -257,11 +287,32 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         outputs: [{ name: 'bonusEndBlock', type: ABIDataTypes.UINT256 }],
     },
     {
-        name: 'getBonusMultiplier',
+        name: 'totalBtcStaked',
+        type: BitcoinAbiTypes.Function,
+        constant: true,
+        inputs: [],
+        outputs: [{ name: 'totalBtcStaked', type: ABIDataTypes.UINT256 }],
+    },
+    {
+        name: 'treasuryAddress',
+        type: BitcoinAbiTypes.Function,
+        constant: true,
+        inputs: [],
+        outputs: [{ name: 'treasuryAddress', type: ABIDataTypes.STRING }],
+    },
+    {
+        name: 'getStakingTxId',
         type: BitcoinAbiTypes.Function,
         constant: true,
         inputs: [],
-        outputs: [{ name: 'bonusMultiplier', type: ABIDataTypes.UINT256 }],
+        outputs: [{ name: 'stakingTxId', type: ABIDataTypes.UINT256 }],
+    },
+    {
+        name: 'getStakingIndex',
+        type: BitcoinAbiTypes.Function,
+        constant: true,
+        inputs: [],
+        outputs: [{ name: 'stakingIndex', type: ABIDataTypes.UINT256 }],
     },
     {
         name: 'setMotoPerBlock',
@@ -295,7 +346,6 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         inputs: [
             { name: 'allocPoint', type: ABIDataTypes.UINT256 },
             { name: 'lpToken', type: ABIDataTypes.ADDRESS },
-            { name: 'rewarder', type: ABIDataTypes.ADDRESS },
         ],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
     },
@@ -305,10 +355,8 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         constant: false,
         payable: false,
         inputs: [
-            { name: 'pid', type: ABIDataTypes.UINT32 },
+            { name: 'pid', type: ABIDataTypes.UINT64 },
             { name: 'allocPoint', type: ABIDataTypes.UINT256 },
-            { name: 'rewarder', type: ABIDataTypes.ADDRESS },
-            { name: 'overwrite', type: ABIDataTypes.BOOL },
         ],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
     },
@@ -325,7 +373,7 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         type: BitcoinAbiTypes.Function,
         constant: false,
         payable: false,
-        inputs: [{ name: 'pid', type: ABIDataTypes.UINT32 }],
+        inputs: [{ name: 'pid', type: ABIDataTypes.UINT64 }],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
     },
     {
@@ -345,7 +393,7 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         constant: false,
         payable: false,
         inputs: [
-            { name: 'pid', type: ABIDataTypes.UINT32 },
+            { name: 'pid', type: ABIDataTypes.UINT64 },
             { name: 'user', type: ABIDataTypes.ADDRESS },
         ],
         outputs: [{ name: 'pendingMoto', type: ABIDataTypes.UINT256 }],
@@ -357,7 +405,7 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         payable: false,
         inputs: [
             { name: 'length', type: ABIDataTypes.UINT32 },
-            { name: 'pids', type: ABIDataTypes.ARRAY_OF_UINT32 },
+            { name: 'pids', type: ABIDataTypes.ARRAY_OF_UINT64 },
         ],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
     },
@@ -366,11 +414,11 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         type: BitcoinAbiTypes.Function,
         constant: false,
         payable: false,
-        inputs: [{ name: 'pid', type: ABIDataTypes.UINT32 }],
+        inputs: [{ name: 'pid', type: ABIDataTypes.UINT64 }],
         outputs: [
-            { name: 'allocPoint', type: ABIDataTypes.UINT64 },
-            { name: 'lastRewardBlock', type: ABIDataTypes.UINT64 },
             { name: 'accMotoPerShare', type: ABIDataTypes.UINT256 },
+            { name: 'lastRewardBlock', type: ABIDataTypes.UINT64 },
+            { name: 'allocPoint', type: ABIDataTypes.UINT64 },
         ],
     },
     {
@@ -379,7 +427,7 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         constant: false,
         payable: false,
         inputs: [
-            { name: 'pid', type: ABIDataTypes.UINT32 },
+            { name: 'pid', type: ABIDataTypes.UINT64 },
             { name: 'amount', type: ABIDataTypes.UINT256 },
             { name: 'to', type: ABIDataTypes.ADDRESS },
         ],
@@ -391,7 +439,7 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         constant: false,
         payable: false,
         inputs: [
-            { name: 'pid', type: ABIDataTypes.UINT32 },
+            { name: 'pid', type: ABIDataTypes.UINT64 },
             { name: 'amount', type: ABIDataTypes.UINT256 },
             { name: 'to', type: ABIDataTypes.ADDRESS },
         ],
@@ -403,7 +451,7 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         constant: false,
         payable: false,
         inputs: [
-            { name: 'pid', type: ABIDataTypes.UINT32 },
+            { name: 'pid', type: ABIDataTypes.UINT64 },
             { name: 'to', type: ABIDataTypes.ADDRESS },
         ],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
@@ -414,7 +462,7 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         constant: false,
         payable: false,
         inputs: [
-            { name: 'pid', type: ABIDataTypes.UINT32 },
+            { name: 'pid', type: ABIDataTypes.UINT64 },
             { name: 'amount', type: ABIDataTypes.UINT256 },
             { name: 'to', type: ABIDataTypes.ADDRESS },
         ],
@@ -426,7 +474,7 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         constant: false,
         payable: false,
         inputs: [
-            { name: 'pid', type: ABIDataTypes.UINT32 },
+            { name: 'pid', type: ABIDataTypes.UINT64 },
             { name: 'to', type: ABIDataTypes.ADDRESS },
         ],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
@@ -439,6 +487,23 @@ const MOTOCHEF_ABI: BitcoinInterfaceAbi = [
         inputs: [{ name: 'devaddr', type: ABIDataTypes.ADDRESS }],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
     },
+    {
+        name: 'stakeBtc',
+        type: BitcoinAbiTypes.Function,
+        constant: false,
+        payable: false,
+        inputs: [{ name: 'stakeAmount', type: ABIDataTypes.UINT256 }],
+        outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
+    },
+    {
+        name: 'unstakeBtc',
+        type: BitcoinAbiTypes.Function,
+        constant: false,
+        payable: false,
+        inputs: [],
+        outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
+    },
+
     // Events
     ...MotoChefEvents,
 

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

@@ -241,7 +241,7 @@ export const MotoswapPoolAbi: BitcoinInterfaceAbi = [
         outputs: [
             {
                 name: 'blockTimestampLast',
-                type: ABIDataTypes.UINT64,
+                type: ABIDataTypes.UINT256,
             },
         ],
         type: BitcoinAbiTypes.Function,
@@ -257,6 +257,17 @@ export const MotoswapPoolAbi: BitcoinInterfaceAbi = [
         ],
         type: BitcoinAbiTypes.Function,
     },
+    {
+        name: 'MINIMUM_LIQUIDITY',
+        inputs: [],
+        outputs: [
+            {
+                name: 'MINIMUM_LIQUIDITY',
+                type: ABIDataTypes.UINT256,
+            },
+        ],
+        type: BitcoinAbiTypes.Function,
+    },
 
     // Overwrites
     {

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

@@ -197,7 +197,7 @@ export const MOTOSWAP_ROUTER_ABI: BitcoinInterfaceAbi = [
         outputs: [
             {
                 name: 'amountsOut',
-                type: ABIDataTypes.TUPLE,
+                type: ABIDataTypes.ARRAY_OF_UINT256,
             },
         ],
         type: BitcoinAbiTypes.Function,
@@ -217,7 +217,7 @@ export const MOTOSWAP_ROUTER_ABI: BitcoinInterfaceAbi = [
         outputs: [
             {
                 name: 'amountsIn',
-                type: ABIDataTypes.TUPLE,
+                type: ABIDataTypes.ARRAY_OF_UINT256,
             },
         ],
         type: BitcoinAbiTypes.Function,

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

@@ -30,18 +30,18 @@ export const MotoswapStakingEvents: BitcoinInterfaceAbi = [
 
 export const MOTOSWAP_STAKING_ABI: BitcoinInterfaceAbi = [
     {
-        name: 'getMotoAddress',
+        name: 'balanceOf',
         type: BitcoinAbiTypes.Function,
         constant: true,
-        inputs: [],
-        outputs: [{ name: 'motoAddress', type: ABIDataTypes.ADDRESS }],
+        inputs: [{ name: 'address', type: ABIDataTypes.ADDRESS }],
+        outputs: [{ name: 'balance', type: ABIDataTypes.UINT256 }],
     },
     {
-        name: 'balanceOf',
+        name: 'motoAddress',
         type: BitcoinAbiTypes.Function,
         constant: true,
-        inputs: [{ name: 'address', type: ABIDataTypes.ADDRESS }],
-        outputs: [{ name: 'balance', type: ABIDataTypes.UINT256 }],
+        inputs: [],
+        outputs: [{ name: 'motoAddress', type: ABIDataTypes.ADDRESS }],
     },
     {
         name: 'totalSupply',
@@ -154,6 +154,15 @@ export const MOTOSWAP_STAKING_ABI: BitcoinInterfaceAbi = [
         ],
         outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
     },
+    {
+        name: 'adminEnableEmergencyWithdrawals',
+        type: BitcoinAbiTypes.Function,
+        constant: false,
+        payable: false,
+        inputs: [],
+        outputs: [{ name: 'success', type: ABIDataTypes.BOOL }],
+    },
+
     // Events
     ...MotoswapStakingEvents,