@myx-trade/sdk 0.1.239-beta.1 → 0.1.239-beta.2

package/dist/index.d.mts

@@ -1360,7 +1360,7 @@ declare class Utils {
     constructor(configManager: ConfigManager, logger: Logger);
     getOrderIdFromTransaction(receipt: any): string | null;
     private getApproveQuoteAmount;
-    needsApproval(address: string, chainId: number, quoteAddress: string, requiredAmount: string, spenderAddress?: string): Promise<boolean>;
+    needsApproval(account: string, chainId: number, tokenAddress: string, requiredAmount: string, spenderAddress?: string): Promise<boolean>;
     approveAuthorization({ chainId, quoteAddress, amount, spenderAddress, signer, }: {
         chainId: number;
         quoteAddress: string;
@@ -1393,13 +1393,14 @@ declare class Utils {
         publishTime: number;
         oracleType: OracleType;
         vaa: string;
-    } | {
-        price: string;
-        vaa: string;
-        publishTime: number;
-        poolId: string;
-        value: number;
     }>;
+    buildUpdatePriceParams(poolId: string, chainId: number): Promise<{
+        poolId: string;
+        referencePrice: bigint;
+        oracleUpdateData: string;
+        publishTime: number;
+        oracleType: OracleType;
+    }[]>;
     transferKlineResolutionToInterval(resolution: KlineResolution): HttpKlineIntervalEnum;
     getErrorMessage(error: any, fallbackErrorMessage?: string): Promise<any>;
     checkSeamlessGas(userAddress: string, chainId: number): Promise<boolean>;
@@ -3373,7 +3374,7 @@ declare class Appeal extends BaseMyxClient {
      * @param poolToken - the pool token
      * @returns the transaction receipt
      */
-    submitAppeal(poolId: string, poolToken: string): Promise<ethers.ContractTransactionReceipt | null>;
+    submitAppeal(poolId: string, lpToken: Address$2, lpAmount: string): Promise<ethers.ContractTransactionReceipt | null>;
     /**
      * vote for appeal
      * @param caseId - the case id

package/dist/index.d.ts

@@ -1360,7 +1360,7 @@ declare class Utils {
     constructor(configManager: ConfigManager, logger: Logger);
     getOrderIdFromTransaction(receipt: any): string | null;
     private getApproveQuoteAmount;
-    needsApproval(address: string, chainId: number, quoteAddress: string, requiredAmount: string, spenderAddress?: string): Promise<boolean>;
+    needsApproval(account: string, chainId: number, tokenAddress: string, requiredAmount: string, spenderAddress?: string): Promise<boolean>;
     approveAuthorization({ chainId, quoteAddress, amount, spenderAddress, signer, }: {
         chainId: number;
         quoteAddress: string;
@@ -1393,13 +1393,14 @@ declare class Utils {
         publishTime: number;
         oracleType: OracleType;
         vaa: string;
-    } | {
-        price: string;
-        vaa: string;
-        publishTime: number;
-        poolId: string;
-        value: number;
     }>;
+    buildUpdatePriceParams(poolId: string, chainId: number): Promise<{
+        poolId: string;
+        referencePrice: bigint;
+        oracleUpdateData: string;
+        publishTime: number;
+        oracleType: OracleType;
+    }[]>;
     transferKlineResolutionToInterval(resolution: KlineResolution): HttpKlineIntervalEnum;
     getErrorMessage(error: any, fallbackErrorMessage?: string): Promise<any>;
     checkSeamlessGas(userAddress: string, chainId: number): Promise<boolean>;
@@ -3373,7 +3374,7 @@ declare class Appeal extends BaseMyxClient {
      * @param poolToken - the pool token
      * @returns the transaction receipt
      */
-    submitAppeal(poolId: string, poolToken: string): Promise<ethers.ContractTransactionReceipt | null>;
+    submitAppeal(poolId: string, lpToken: Address$2, lpAmount: string): Promise<ethers.ContractTransactionReceipt | null>;
     /**
      * vote for appeal
      * @param caseId - the case id

package/dist/index.js

@@ -1834,7 +1834,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.239-beta.1",
+  version: "0.1.239-beta.2",
   private: false,
   publishConfig: {
     access: "public"
@@ -12898,8 +12898,35 @@ var DisputeCourt_default = [
     type: "function",
     name: "fileDispute",
     constant: false,
-    payable: false,
+    stateMutability: "payable",
+    payable: true,
     inputs: [
+      {
+        type: "tuple[]",
+        name: "prices",
+        components: [
+          {
+            type: "bytes32",
+            name: "poolId"
+          },
+          {
+            type: "uint8",
+            name: "oracleType"
+          },
+          {
+            type: "uint256",
+            name: "referencePrice"
+          },
+          {
+            type: "bytes",
+            name: "oracleUpdateData"
+          },
+          {
+            type: "uint64",
+            name: "publishTime"
+          }
+        ]
+      },
       {
         type: "bytes32",
         name: "poolId"
@@ -13127,6 +13154,10 @@ var DisputeCourt_default = [
             name: "expireTime"
           }
         ]
+      },
+      {
+        type: "bytes32[]",
+        name: "zeroMerkleProof"
       }
     ],
     outputs: []
@@ -22019,7 +22050,7 @@ var Utils = class {
     }
     return null;
   }
-  async getApproveQuoteAmount(address, chainId, quoteAddress, spenderAddress) {
+  async getApproveQuoteAmount(account, chainId, tokenAddress, spenderAddress) {
     try {
       const erc20Abi = [
         "function allowance(address owner, address spender) external view returns (uint256)"
@@ -22027,11 +22058,11 @@ var Utils = class {
       const spender = spenderAddress ?? getContractAddressByChainId(chainId).Account;
       const provider = await getJSONProvider(chainId);
       const tokenContract = new import_ethers25.ethers.Contract(
-        quoteAddress,
+        tokenAddress,
         erc20Abi,
         provider
       );
-      const allowance = await tokenContract.allowance(address, spender);
+      const allowance = await tokenContract.allowance(account, spender);
       return {
         code: 0,
         data: allowance.toString()
@@ -22041,12 +22072,12 @@ var Utils = class {
       throw typeof error === "string" ? error : await getErrorTextFormError(error);
     }
   }
-  async needsApproval(address, chainId, quoteAddress, requiredAmount, spenderAddress) {
+  async needsApproval(account, chainId, tokenAddress, requiredAmount, spenderAddress) {
     try {
       const currentAllowanceRes = await this.getApproveQuoteAmount(
-        address,
+        account,
         chainId,
-        quoteAddress,
+        tokenAddress,
         spenderAddress
       );
       const currentAllowance = currentAllowanceRes.data;
@@ -22080,7 +22111,16 @@ var Utils = class {
       console.log("approveAuthorization: usdcContract-->", usdcContract);
       const approveAmount = amount ?? import_ethers25.ethers.MaxUint256;
       const spender = spenderAddress ?? getContractAddressByChainId(chainId).Account;
-      const tx = await usdcContract.approve(spender, approveAmount);
+      const gasPrice = await this.getGasPriceByRatio();
+      const _gasLimit = await usdcContract.approve.estimateGas(
+        spender,
+        approveAmount
+      );
+      const gasLimit = await this.getGasLimitByRatio(_gasLimit);
+      const tx = await usdcContract.approve(spender, approveAmount, {
+        gasLimit,
+        gasPrice
+      });
       await tx.wait();
       return {
         code: 0,
@@ -22154,15 +22194,22 @@ var Utils = class {
       return priceData;
     } catch (error) {
       this.logger.error("Error getting oracle price:", error);
-      return {
-        price: "0",
-        vaa: "",
-        publishTime: 0,
-        poolId: "",
-        value: 0
-      };
+      throw error;
     }
   }
+  async buildUpdatePriceParams(poolId, chainId) {
+    const priceData = await this.getOraclePrice(poolId, chainId);
+    if (!priceData) throw new Error("Failed to get price data");
+    return [
+      {
+        poolId,
+        referencePrice: import_ethers25.ethers.parseUnits(priceData.price, 30),
+        oracleUpdateData: priceData.vaa,
+        publishTime: priceData.publishTime,
+        oracleType: priceData.oracleType
+      }
+    ];
+  }
   transferKlineResolutionToInterval(resolution) {
     switch (resolution) {
       case "1m":
@@ -24165,11 +24212,11 @@ var Appeal = class extends BaseMyxClient {
     super(client2);
   }
   async getDisputeCourtContract() {
-    const contract = await getDisputeCourtContract(this.getConfig()?.chainId);
+    const contract = await getDisputeCourtContract(this.config.chainId);
     return this.connectContract(contract);
   }
   async getReimbursementContract() {
-    const contract = await getReimbursementContract(this.getConfig()?.chainId);
+    const contract = await getReimbursementContract(this.config.chainId);
     return this.connectContract(contract);
   }
   /**
@@ -24178,12 +24225,35 @@ var Appeal = class extends BaseMyxClient {
    * @param poolToken - the pool token
    * @returns the transaction receipt
    */
-  async submitAppeal(poolId, poolToken) {
+  async submitAppeal(poolId, lpToken, lpAmount) {
+    const account = await this.config.signer?.getAddress() ?? "";
+    const needApprove = await this.client.utils.needsApproval(
+      account,
+      this.config.chainId,
+      lpToken,
+      lpAmount,
+      this.getAddressConfig().DISPUTE_COURT
+    );
+    if (needApprove) {
+      await this.client.utils.approveAuthorization({
+        chainId: this.config.chainId,
+        quoteAddress: lpToken,
+        spenderAddress: this.getAddressConfig().DISPUTE_COURT
+      });
+    }
     const contract = await this.getDisputeCourtContract();
-    const _gasLimit = await contract.fileDispute.estimateGas(poolId, poolToken);
+    const prices = await this.client.utils.buildUpdatePriceParams(
+      poolId,
+      this.config.chainId
+    );
+    const _gasLimit = await contract.fileDispute.estimateGas(
+      prices,
+      poolId,
+      lpToken
+    );
     const gasLimit = await this.client.utils.getGasLimitByRatio(_gasLimit);
     const gasPrice = await this.client.utils.getGasPriceByRatio();
-    const tx = await contract.fileDispute(poolId, poolToken, {
+    const tx = await contract.fileDispute(prices, poolId, lpToken, {
       gasLimit,
       gasPrice
     });

package/dist/index.mjs

@@ -1758,7 +1758,7 @@ var RotationProvider = class extends BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.239-beta.1",
+  version: "0.1.239-beta.2",
   private: false,
   publishConfig: {
     access: "public"
@@ -12822,8 +12822,35 @@ var DisputeCourt_default = [
     type: "function",
     name: "fileDispute",
     constant: false,
-    payable: false,
+    stateMutability: "payable",
+    payable: true,
     inputs: [
+      {
+        type: "tuple[]",
+        name: "prices",
+        components: [
+          {
+            type: "bytes32",
+            name: "poolId"
+          },
+          {
+            type: "uint8",
+            name: "oracleType"
+          },
+          {
+            type: "uint256",
+            name: "referencePrice"
+          },
+          {
+            type: "bytes",
+            name: "oracleUpdateData"
+          },
+          {
+            type: "uint64",
+            name: "publishTime"
+          }
+        ]
+      },
       {
         type: "bytes32",
         name: "poolId"
@@ -13051,6 +13078,10 @@ var DisputeCourt_default = [
             name: "expireTime"
           }
         ]
+      },
+      {
+        type: "bytes32[]",
+        name: "zeroMerkleProof"
       }
     ],
     outputs: []
@@ -21943,7 +21974,7 @@ var Utils = class {
     }
     return null;
   }
-  async getApproveQuoteAmount(address, chainId, quoteAddress, spenderAddress) {
+  async getApproveQuoteAmount(account, chainId, tokenAddress, spenderAddress) {
     try {
       const erc20Abi = [
         "function allowance(address owner, address spender) external view returns (uint256)"
@@ -21951,11 +21982,11 @@ var Utils = class {
       const spender = spenderAddress ?? getContractAddressByChainId(chainId).Account;
       const provider = await getJSONProvider(chainId);
       const tokenContract = new ethers7.Contract(
-        quoteAddress,
+        tokenAddress,
         erc20Abi,
         provider
       );
-      const allowance = await tokenContract.allowance(address, spender);
+      const allowance = await tokenContract.allowance(account, spender);
       return {
         code: 0,
         data: allowance.toString()
@@ -21965,12 +21996,12 @@ var Utils = class {
       throw typeof error === "string" ? error : await getErrorTextFormError(error);
     }
   }
-  async needsApproval(address, chainId, quoteAddress, requiredAmount, spenderAddress) {
+  async needsApproval(account, chainId, tokenAddress, requiredAmount, spenderAddress) {
     try {
       const currentAllowanceRes = await this.getApproveQuoteAmount(
-        address,
+        account,
         chainId,
-        quoteAddress,
+        tokenAddress,
         spenderAddress
       );
       const currentAllowance = currentAllowanceRes.data;
@@ -22004,7 +22035,16 @@ var Utils = class {
       console.log("approveAuthorization: usdcContract-->", usdcContract);
       const approveAmount = amount ?? ethers7.MaxUint256;
       const spender = spenderAddress ?? getContractAddressByChainId(chainId).Account;
-      const tx = await usdcContract.approve(spender, approveAmount);
+      const gasPrice = await this.getGasPriceByRatio();
+      const _gasLimit = await usdcContract.approve.estimateGas(
+        spender,
+        approveAmount
+      );
+      const gasLimit = await this.getGasLimitByRatio(_gasLimit);
+      const tx = await usdcContract.approve(spender, approveAmount, {
+        gasLimit,
+        gasPrice
+      });
       await tx.wait();
       return {
         code: 0,
@@ -22078,15 +22118,22 @@ var Utils = class {
       return priceData;
     } catch (error) {
       this.logger.error("Error getting oracle price:", error);
-      return {
-        price: "0",
-        vaa: "",
-        publishTime: 0,
-        poolId: "",
-        value: 0
-      };
+      throw error;
     }
   }
+  async buildUpdatePriceParams(poolId, chainId) {
+    const priceData = await this.getOraclePrice(poolId, chainId);
+    if (!priceData) throw new Error("Failed to get price data");
+    return [
+      {
+        poolId,
+        referencePrice: ethers7.parseUnits(priceData.price, 30),
+        oracleUpdateData: priceData.vaa,
+        publishTime: priceData.publishTime,
+        oracleType: priceData.oracleType
+      }
+    ];
+  }
   transferKlineResolutionToInterval(resolution) {
     switch (resolution) {
       case "1m":
@@ -24089,11 +24136,11 @@ var Appeal = class extends BaseMyxClient {
     super(client2);
   }
   async getDisputeCourtContract() {
-    const contract = await getDisputeCourtContract(this.getConfig()?.chainId);
+    const contract = await getDisputeCourtContract(this.config.chainId);
     return this.connectContract(contract);
   }
   async getReimbursementContract() {
-    const contract = await getReimbursementContract(this.getConfig()?.chainId);
+    const contract = await getReimbursementContract(this.config.chainId);
     return this.connectContract(contract);
   }
   /**
@@ -24102,12 +24149,35 @@ var Appeal = class extends BaseMyxClient {
    * @param poolToken - the pool token
    * @returns the transaction receipt
    */
-  async submitAppeal(poolId, poolToken) {
+  async submitAppeal(poolId, lpToken, lpAmount) {
+    const account = await this.config.signer?.getAddress() ?? "";
+    const needApprove = await this.client.utils.needsApproval(
+      account,
+      this.config.chainId,
+      lpToken,
+      lpAmount,
+      this.getAddressConfig().DISPUTE_COURT
+    );
+    if (needApprove) {
+      await this.client.utils.approveAuthorization({
+        chainId: this.config.chainId,
+        quoteAddress: lpToken,
+        spenderAddress: this.getAddressConfig().DISPUTE_COURT
+      });
+    }
     const contract = await this.getDisputeCourtContract();
-    const _gasLimit = await contract.fileDispute.estimateGas(poolId, poolToken);
+    const prices = await this.client.utils.buildUpdatePriceParams(
+      poolId,
+      this.config.chainId
+    );
+    const _gasLimit = await contract.fileDispute.estimateGas(
+      prices,
+      poolId,
+      lpToken
+    );
     const gasLimit = await this.client.utils.getGasLimitByRatio(_gasLimit);
     const gasPrice = await this.client.utils.getGasPriceByRatio();
-    const tx = await contract.fileDispute(poolId, poolToken, {
+    const tx = await contract.fileDispute(prices, poolId, lpToken, {
       gasLimit,
       gasPrice
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myx-trade/sdk",
-  "version": "0.1.239-beta.1",
+  "version": "0.1.239-beta.2",
   "private": false,
   "publishConfig": {
     "access": "public"