@dhedge/v2-sdk 2.0.2 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",

package/src/test/flatmoney.test.ts

@@ -118,6 +118,14 @@ const testFlatMoney = ({
       await expect(collateralAllowanceDelta.gt(0));
 
       const depositAmountStr = new BigNumber(1).times(1e18).toString();
+      const estimateData = await pool.mintUnitViaFlatMoney(
+        depositAmountStr,
+        0.5,
+        10, // set higher to tolerate high gasPrice returned by forked local chain
+        null,
+        true
+      );
+      expect(estimateData.gasEstimationError).toBe(null);
       const tx = await pool.mintUnitViaFlatMoney(
         depositAmountStr,
         0.5,
@@ -132,6 +140,12 @@ const testFlatMoney = ({
       expect(existingOrder.orderType).toBe(1);
     });
 
+    it("cancel order(estimate)", async () => {
+      await provider.send("evm_increaseTime", [60 * 2]); // more than 1 min
+      const res = await pool.cancelOrderViaFlatMoney({}, true);
+      expect(res.gasEstimationError).toBe(null);
+    });
+
     it("cancel order", async () => {
       await provider.send("evm_increaseTime", [60 * 2]); // more than 1 min
       await pool.cancelOrderViaFlatMoney();
@@ -148,6 +162,14 @@ const testFlatMoney = ({
       } else {
         withdrawAmountStr = new BigNumber(2).times(1e18).toString();
       }
+      const estimateData = await pool.redeemUnitViaFlatMoney(
+        withdrawAmountStr,
+        0.5,
+        10, //  set higher to tolerate high gasPrice returned by forked local chain
+        null,
+        true
+      );
+      expect(estimateData.gasEstimationError).toBe(null);
 
       const tx = await pool.redeemUnitViaFlatMoney(
         withdrawAmountStr,

package/src/utils/contract.ts

@@ -4,6 +4,7 @@ import set from "lodash/set";
 import { Interface } from "@ethersproject/abi";
 import { multiCallAddress } from "../config";
 import { ethers, Network, Pool, SDKOptions } from "..";
+import { Signer } from "ethers";
 
 export async function call(
   provider: ethers.Signer,
@@ -95,14 +96,29 @@ export class Multicaller {
 }
 
 const getGasEstimateData = async (
+  pool: Pool,
   estimateFunc: ethers.ContractFunction<ethers.BigNumber>,
   txInfoData: { to: string; txData: string; minAmountOut: any },
-  txOptions: any = {}
+  txOptions: any = {},
+  sdkOptions: SDKOptions
 ) => {
   let gas = null;
   let gasEstimationError = null;
   try {
-    gas = await estimateFunc(txInfoData.to, txInfoData.txData, txOptions);
+    if (
+      !pool.isDhedge ||
+      (!isSdkOptionsBoolean(sdkOptions) && sdkOptions.useTraderAddressAsFrom)
+    ) {
+      // for pool.signer.estimateGas
+      gas = await (estimateFunc as Signer["estimateGas"])({
+        to: txInfoData.to,
+        data: txInfoData.txData,
+        ...txOptions
+      });
+    } else {
+      // for pool.poolLogic.estimateGas.execTransaction
+      gas = await estimateFunc(txInfoData.to, txInfoData.txData, txOptions);
+    }
   } catch (e) {
     gasEstimationError = e;
   }
@@ -145,9 +161,11 @@ export const getPoolTxOrGasEstimate = async (
       (!isSdkOptionsBoolean(sdkOptions) && sdkOptions.estimateGas)
     ) {
       return await getGasEstimateData(
-        pool.signer.estimateGas,
+        pool,
+        pool.signer.estimateGas.bind(pool.signer),
         txInfoData,
-        txOptions
+        txOptions,
+        sdkOptions
       );
     } else {
       return await pool.signer.sendTransaction({
@@ -162,9 +180,11 @@ export const getPoolTxOrGasEstimate = async (
       (!isSdkOptionsBoolean(sdkOptions) && sdkOptions.estimateGas)
     ) {
       return await getGasEstimateData(
+        pool,
         pool.poolLogic.estimateGas.execTransaction,
         txInfoData,
-        txOptions
+        txOptions,
+        sdkOptions
       );
     } else {
       return await pool.poolLogic.execTransaction(