Add gas padding everywhere

src/knockout.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from "ethers";
+import { BigNumber, BigNumberish } from "ethers";
 import { TransactionResponse } from '@ethersproject/providers';
 import { CrocContext } from './context';
 import { CrocEthView, CrocTokenView, sortBaseQuoteViews, TokenQty } from './tokens';
@@ -7,6 +7,7 @@ import { KnockoutEncoder } from "./encoding/knockout";
 import { ChainSpec } from "./constants";
 import { CrocSurplusFlags, decodeSurplusFlag, encodeSurplusArg } from "./encoding/flags";
 import { baseTokenForQuoteConc, bigNumToFloat, floatToBigNum, quoteTokenForBaseConc, roundForConcLiq } from "./utils";
+import { GAS_PADDING } from "./utils";
 
 
 export class CrocKnockoutHandle {
@@ -36,7 +37,7 @@ export class CrocKnockoutHandle {
 
     const cmd = encoder.encodeKnockoutMint(await this.qty, lowerTick, upperTick, 
       this.sellBase, surplus);
-    return (await this.context).dex.userCmd(KNOCKOUT_PATH, cmd, { value: this.msgVal(surplus) })
+    return this.sendCmd(cmd, { value: await this.msgVal(surplus) })
   }
 
   async burn (opts?: CrocKnockoutOpts): Promise<TransactionResponse> {
@@ -48,7 +49,7 @@ export class CrocKnockoutHandle {
 
     const cmd = encoder.encodeKnockoutBurnQty(await this.qty, lowerTick, upperTick, 
       this.sellBase, surplus);
-    return (await this.context).dex.userCmd(KNOCKOUT_PATH, cmd)
+    return this.sendCmd(cmd)
   }
 
   async burnLiq (liq: BigNumber, opts?: CrocKnockoutOpts): Promise<TransactionResponse> {
@@ -60,7 +61,7 @@ export class CrocKnockoutHandle {
 
     const cmd = encoder.encodeKnockoutBurnLiq(roundForConcLiq(liq), lowerTick, upperTick, 
       this.sellBase, surplus);
-    return (await this.context).dex.userCmd(KNOCKOUT_PATH, cmd)
+    return this.sendCmd(cmd)
   }
 
   async recoverPost (pivotTime: number, opts?: CrocKnockoutOpts): Promise<TransactionResponse> {
@@ -72,7 +73,7 @@ export class CrocKnockoutHandle {
 
     const cmd = encoder.encodeKnockoutRecover(pivotTime, lowerTick, upperTick, 
       this.sellBase, surplus);
-    return (await this.context).dex.userCmd(KNOCKOUT_PATH, cmd)
+    return this.sendCmd(cmd)
   }
 
   async willMintFail(): Promise<boolean> {
@@ -84,6 +85,14 @@ export class CrocKnockoutHandle {
       (this.knockoutTick - await gridSize <= await marketTick)
   }
 
+  private async sendCmd (calldata: string, txArgs?: { value?: BigNumberish }):
+      Promise<TransactionResponse> {
+      let cntx = await this.context
+      if (txArgs === undefined) { txArgs = {} }
+      const gasEst = await cntx.dex.estimateGas.userCmd(KNOCKOUT_PATH, calldata, txArgs)
+      Object.assign(txArgs, { gasLimit: gasEst.add(GAS_PADDING)})
+      return cntx.dex.userCmd(KNOCKOUT_PATH, calldata, txArgs);
+  }
 
   private maskSurplusFlags (opts?: CrocKnockoutOpts): number {
     if (!opts || !opts.surplus) { return encodeSurplusArg(false) }

src/pool.ts

@@ -8,6 +8,7 @@ import { BigNumber, BigNumberish } from 'ethers';
 import { AddressZero } from '@ethersproject/constants';
 import { PoolInitEncoder } from "./encoding/init";
 import { CrocSurplusFlags, decodeSurplusFlag, encodeSurplusArg } from "./encoding/flags";
+import { GAS_PADDING } from "./utils";
 
 type PriceRange = [number, number]
 type TickRange = [number, number]
@@ -134,6 +135,8 @@ export class CrocPoolView {
         let calldata = encoder.encodeInitialize(await spotPrice)        
 
         let cntx = await this.context
+        const gasEst = await cntx.dex.estimateGas.userCmd(cntx.chain.proxyPaths.cold, calldata, txArgs)
+        Object.assign(txArgs, { gasLimit: gasEst.add(GAS_PADDING)})
         return cntx.dex.userCmd(cntx.chain.proxyPaths.cold, calldata, txArgs)
     }
 
@@ -189,12 +192,13 @@ export class CrocPoolView {
         return this.sendCmd(calldata)
     }
 
-    private async sendCmd (calldata: string, txArgs?: { value?: BigNumberish}): 
+    private async sendCmd (calldata: string, txArgs?: { value?: BigNumberish }):
         Promise<TransactionResponse> {
         let cntx = await this.context
-        return txArgs ?
-            cntx.dex.userCmd(cntx.chain.proxyPaths.liq, calldata, txArgs) :
-            cntx.dex.userCmd(cntx.chain.proxyPaths.liq, calldata)
+        if (txArgs === undefined) { txArgs = {} }
+        const gasEst = await cntx.dex.estimateGas.userCmd(cntx.chain.proxyPaths.liq, calldata, txArgs)
+        Object.assign(txArgs, { gasLimit: gasEst.add(GAS_PADDING)})
+        return cntx.dex.userCmd(cntx.chain.proxyPaths.liq, calldata, txArgs);
     }
 
     private async mintAmbient (qty: TokenQty, isQtyBase: boolean, 

src/recipes/reposition.ts

@@ -6,6 +6,7 @@ import { CrocSwapPlan } from "../swap";
 import { CrocTokenView } from "../tokens";
 import { encodeCrocPrice, tickToPrice } from "../utils";
 import { baseTokenForConcLiq, concDepositBalance, quoteTokenForConcLiq } from "../utils/liquidity";
+import { GAS_PADDING } from "../utils";
 
 
 interface RepositionTarget {
@@ -34,8 +35,10 @@ export class CrocReposition {
 
     async rebal(): Promise<TransactionResponse> {        
         const directive = await this.formatDirective()
-        const path = (await this.pool.context).chain.proxyPaths.long
-        return (await this.pool.context).dex.userCmd(path, directive.encodeBytes())
+        let cntx = await this.pool.context
+        const path = cntx.chain.proxyPaths.long
+        const gasEst = await cntx.dex.estimateGas.userCmd(path, directive.encodeBytes())
+        return cntx.dex.userCmd(path, directive.encodeBytes(), { gasLimit: gasEst.add(GAS_PADDING)})
     }
 
     async simStatic() {

src/swap.ts

@@ -10,6 +10,7 @@ import { CrocSurplusFlags, decodeSurplusFlag, encodeSurplusArg } from "./encodin
 import { MAX_SQRT_PRICE, MIN_SQRT_PRICE } from "./constants";
 import { AbiCoder } from "ethers/lib/utils";
 import { CrocSlotReader } from "./slots";
+import { GAS_PADDING } from "./utils";
 
 /* Describes the predicted impact of a given swap. 
  * @property sellQty The total quantity of tokens predicted to be sold by the swapper to the dex.
@@ -202,7 +203,6 @@ export class CrocSwapPlan {
     let txArgs = await this.attachEthMsg(surplusArg)
 
     if (gasEst) {
-      const GAS_PADDING = 30000
       Object.assign(txArgs, { gasLimit: gasEst.add(GAS_PADDING)})
     }
 

src/tokens.ts

@@ -5,6 +5,7 @@ import { AddressZero, MaxUint256 } from "@ethersproject/constants";
 import { MAX_LIQ } from "./constants";
 import { toDisplayQty, fromDisplayQty } from "./utils/token";
 import { BlockTag } from "./position";
+import { GAS_PADDING } from "./utils";
 
 /* Type representing specified token quantities. This type can either represent the raw non-decimalized
  * on-chain value in wei, if passed as a BigNuber. Or it can represent the decimalized value if passed
@@ -173,8 +174,9 @@ export class CrocTokenView {
 
       const txArgs = useMsgVal ? { value: await weiQty } : { }
       let cntx = await this.context
+      const gasEst = await cntx.dex.estimateGas.userCmd(cntx.chain.proxyPaths.cold, cmd, txArgs)
+      Object.assign(txArgs, { gasLimit: gasEst.add(GAS_PADDING)})
       return cntx.dex.userCmd(cntx.chain.proxyPaths.cold, cmd, txArgs)
-
   }
 
   readonly tokenAddr: string;

src/utils/gas.ts

@@ -2,6 +2,9 @@ import { BigNumber, Contract, PopulatedTransaction, Transaction, utils } from "e
 import { CrocEnv } from "../croc";
 import { L1_GAS_PRICE_ORACLE_ABI } from "../abis/external/L1GasPriceOracle";
 
+// Applied to all gas estimates.
+export const GAS_PADDING = 30000;
+
 /**
  * Compute the raw transaction data for a given transaction.
  *