@d8x/perpetuals-sdk 2.5.6 → 2.5.7

package/src/orderExecutorTool.ts

@@ -193,18 +193,6 @@ export default class OrderExecutorTool extends WriteAccessHandler {
       overrides.nonce = overrides.nonce + nonceInc;
     }
 
-    if (overrides?.gasLimit !== undefined) {
-      overrides.gasLimit = await overrides.gasLimit;
-    }
-
-    if (overrides?.gasPrice !== undefined) {
-      overrides.gasPrice = await overrides.gasPrice;
-    }
-
-    if (value !== undefined) {
-      value = await value;
-    }
-
     const unsignedTx: TransactionRequest = {
       to: this.getOrderBookContract(symbol).target,
       from: this.traderAddr,
@@ -212,9 +200,9 @@ export default class OrderExecutorTool extends WriteAccessHandler {
       data: txData,
       value: value,
       gasLimit: overrides?.gasLimit,
-      // gas price is populated by the provider if undefined
-      gasPrice: overrides?.gasPrice,
       chainId: this.chainId,
+      // fee data, is given
+      ...this._getFeeData(overrides),
     };
     // no gas limit was specified, explicitly estimate
     if (!overrides?.gasLimit) {

package/src/version.ts

@@ -1 +1 @@
-export const D8X_SDK_VERSION = "2.5.6";
+export const D8X_SDK_VERSION = "2.5.7";

package/src/writeAccessHandler.ts

@@ -133,6 +133,18 @@ export default class WriteAccessHandler extends PerpetualDataHandler {
     return this.traderAddr;
   }
 
+  protected _getFeeData(overrides?: PayableOverrides) {
+    // handle legacy and eip-1552 (ensure at most one is specified)
+    if (overrides?.maxFeePerGas) {
+      return {
+        maxFeePerGas: overrides.maxFeePerGas,
+        maxPriorityFeePerGas: overrides.maxPriorityFeePerGas ?? overrides.maxFeePerGas,
+      };
+    } else {
+      return { gasPrice: overrides?.gasPrice };
+    }
+  }
+
   /**
    * Converts a given amount of chain native currency (test MATIC)
    * into a mock token used for trading on testnet, with a rate of 1:100_000