@aztec/bot 0.0.1-commit.cb6bed7c2 → 0.0.1-commit.cbf2c2d5d

package/dest/factory.d.ts

@@ -61,4 +61,4 @@ export declare class BotFactory {
     private bridgeL1FeeJuice;
     private withNoMinTxsPerBlock;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBbUJ6RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSXRFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBR2xFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU1qRCxxQkFBYSxVQUFVO0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQVBsQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxZQUNtQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsY0FBYyxFQUN0QixLQUFLLEVBQUUsUUFBUSxFQUNmLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGNBQWMsQ0FBQyw0QkFBZ0IsRUFLakQ7SUFFRDs7O09BR0c7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDO1FBQzVCLE1BQU0sRUFBRSxjQUFjLENBQUM7UUFDdkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLEtBQUssRUFBRSxhQUFhLEdBQUcsb0JBQW9CLENBQUM7UUFDNUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUNoQixTQUFTLEVBQUUsWUFBWSxDQUFDO0tBQ3pCLENBQUMsQ0FNRDtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUM7UUFDL0IsTUFBTSxFQUFFLGNBQWMsQ0FBQztRQUN2QixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsR0FBRyxFQUFFLFdBQVcsQ0FBQztRQUNqQixNQUFNLEVBQUUsYUFBYSxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxhQUFhLENBQUM7UUFDdEIsSUFBSSxFQUFFLFNBQVMsQ0FBQztLQUNqQixDQUFDLENBc0JEO0lBRUQ7OztPQUdHO0lBQ1UsZUFBZSxJQUFJLE9BQU8sQ0FBQztRQUN0QyxNQUFNLEVBQUUsY0FBYyxDQUFDO1FBQ3ZCLHFCQUFxQixFQUFFLFlBQVksQ0FBQztRQUNwQyxRQUFRLEVBQUUsWUFBWSxDQUFDO1FBQ3ZCLElBQUksRUFBRSxTQUFTLENBQUM7UUFDaEIsUUFBUSxFQUFFLHdCQUF3QixDQUFDO1FBQ25DLGFBQWEsRUFBRSxNQUFNLENBQUM7S0FDdkIsQ0FBQyxDQTJERDtZQUVhLGlCQUFpQjtZQWVqQixZQUFZO1lBV1osMEJBQTBCO1lBeUMxQixnQkFBZ0I7WUFlaEIsVUFBVTtZQXNEVixrQkFBa0I7WUFhbEIsZ0JBQWdCO1lBc0JoQixPQUFPO1lBc0ZQLHdCQUF3QjtZQTBCeEIsVUFBVTtZQWdEVixzQkFBc0I7WUEyQnRCLGdCQUFnQjtZQStCaEIsb0JBQW9CO0NBZW5DIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBbUJ6RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSXRFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBR2xFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFekQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUEyQixNQUFNLGFBQWEsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU1qRCxxQkFBYSxVQUFVO0lBSW5CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU07SUFDdkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBQ3RCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQVBsQyxPQUFPLENBQUMsR0FBRyxDQUF1QjtJQUVsQyxZQUNtQixNQUFNLEVBQUUsU0FBUyxFQUNqQixNQUFNLEVBQUUsY0FBYyxFQUN0QixLQUFLLEVBQUUsUUFBUSxFQUNmLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGNBQWMsQ0FBQyw0QkFBZ0IsRUFLakQ7SUFFRDs7O09BR0c7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDO1FBQzVCLE1BQU0sRUFBRSxjQUFjLENBQUM7UUFDdkIscUJBQXFCLEVBQUUsWUFBWSxDQUFDO1FBQ3BDLEtBQUssRUFBRSxhQUFhLEdBQUcsb0JBQW9CLENBQUM7UUFDNUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUNoQixTQUFTLEVBQUUsWUFBWSxDQUFDO0tBQ3pCLENBQUMsQ0FNRDtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUM7UUFDL0IsTUFBTSxFQUFFLGNBQWMsQ0FBQztRQUN2QixxQkFBcUIsRUFBRSxZQUFZLENBQUM7UUFDcEMsR0FBRyxFQUFFLFdBQVcsQ0FBQztRQUNqQixNQUFNLEVBQUUsYUFBYSxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxhQUFhLENBQUM7UUFDdEIsSUFBSSxFQUFFLFNBQVMsQ0FBQztLQUNqQixDQUFDLENBc0JEO0lBRUQ7OztPQUdHO0lBQ1UsZUFBZSxJQUFJLE9BQU8sQ0FBQztRQUN0QyxNQUFNLEVBQUUsY0FBYyxDQUFDO1FBQ3ZCLHFCQUFxQixFQUFFLFlBQVksQ0FBQztRQUNwQyxRQUFRLEVBQUUsWUFBWSxDQUFDO1FBQ3ZCLElBQUksRUFBRSxTQUFTLENBQUM7UUFDaEIsUUFBUSxFQUFFLHdCQUF3QixDQUFDO1FBQ25DLGFBQWEsRUFBRSxNQUFNLENBQUM7S0FDdkIsQ0FBQyxDQTJERDtZQUVhLGlCQUFpQjtZQWVqQixZQUFZO1lBV1osMEJBQTBCO1lBOEMxQixnQkFBZ0I7WUFlaEIsVUFBVTtZQXVEVixrQkFBa0I7WUFhbEIsZ0JBQWdCO1lBK0JoQixPQUFPO1lBNEdQLHdCQUF3QjtZQTJCeEIsVUFBVTtZQW1EVixzQkFBc0I7WUEyQnRCLGdCQUFnQjtZQStCaEIsb0JBQW9CO0NBZW5DIn0=

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAmBzD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAItE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMjD,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAPlC,OAAO,CAAC,GAAG,CAAuB;IAElC,YACmB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,4BAAgB,EAKjD;IAED;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC;QAC5B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC,CAMD;IAEY,QAAQ,IAAI,OAAO,CAAC;QAC/B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,GAAG,EAAE,WAAW,CAAC;QACjB,MAAM,EAAE,aAAa,CAAC;QACtB,MAAM,EAAE,aAAa,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC,CAsBD;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC;QACtC,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,QAAQ,EAAE,YAAY,CAAC;QACvB,IAAI,EAAE,SAAS,CAAC;QAChB,QAAQ,EAAE,wBAAwB,CAAC;QACnC,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC,CA2DD;YAEa,iBAAiB;YAejB,YAAY;YAWZ,0BAA0B;YAyC1B,gBAAgB;YAehB,UAAU;YAsDV,kBAAkB;YAalB,gBAAgB;YAsBhB,OAAO;YAsFP,wBAAwB;YA0BxB,UAAU;YAgDV,sBAAsB;YA2BtB,gBAAgB;YA+BhB,oBAAoB;CAenC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAmBzD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAItE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAGlE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,aAAa,CAAC;AAEtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMjD,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAPlC,OAAO,CAAC,GAAG,CAAuB;IAElC,YACmB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,4BAAgB,EAKjD;IAED;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC;QAC5B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC,CAMD;IAEY,QAAQ,IAAI,OAAO,CAAC;QAC/B,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,GAAG,EAAE,WAAW,CAAC;QACjB,MAAM,EAAE,aAAa,CAAC;QACtB,MAAM,EAAE,aAAa,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC,CAsBD;IAED;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC;QACtC,MAAM,EAAE,cAAc,CAAC;QACvB,qBAAqB,EAAE,YAAY,CAAC;QACpC,QAAQ,EAAE,YAAY,CAAC;QACvB,IAAI,EAAE,SAAS,CAAC;QAChB,QAAQ,EAAE,wBAAwB,CAAC;QACnC,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC,CA2DD;YAEa,iBAAiB;YAejB,YAAY;YAWZ,0BAA0B;YA8C1B,gBAAgB;YAehB,UAAU;YAuDV,kBAAkB;YAalB,gBAAgB;YA+BhB,OAAO;YA4GP,wBAAwB;YA2BxB,UAAU;YAmDV,sBAAsB;YA2BtB,gBAAgB;YA+BhB,oBAAoB;CAenC"}

package/dest/factory.js

@@ -17,7 +17,7 @@ import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TestContract } from '@aztec/noir-test-contracts.js/Test';
-import { GasSettings } from '@aztec/stdlib/gas';
+import { GasFees, GasSettings } from '@aztec/stdlib/gas';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { SupportedTokenContracts } from './config.js';
 import { seedL1ToL2Message } from './l1_to_l2_seeding.js';
@@ -166,8 +166,17 @@ export class BotFactory {
             const paymentMethod = new FeeJuicePaymentMethodWithClaim(accountManager.address, claim);
             const deployMethod = await accountManager.getDeployMethod();
             const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1 + this.config.minFeePadding);
-            const gasSettings = GasSettings.default({
-                maxFeesPerGas
+            const { estimatedGas } = await deployMethod.simulate({
+                from: AztecAddress.ZERO,
+                fee: {
+                    estimateGas: true,
+                    paymentMethod
+                }
+            });
+            const gasSettings = GasSettings.from({
+                ...estimatedGas,
+                maxFeesPerGas,
+                maxPriorityFeesPerGas: GasFees.empty()
             });
             await this.withNoMinTxsPerBlock(async ()=>{
                 const { txHash } = await deployMethod.send({
@@ -178,7 +187,9 @@ export class BotFactory {
                     },
                     wait: NO_WAIT
                 });
-                this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`);
+                this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`, {
+                    gasSettings
+                });
                 return waitForTx(this.aztecNode, txHash, {
                     timeout: this.config.txMinedWaitSeconds
                 });
@@ -237,11 +248,22 @@ export class BotFactory {
             await deploy.register();
         } else {
             this.log.info(`Deploying token contract at ${address.toString()}`);
+            const { estimatedGas } = await deploy.simulate({
+                ...deployOpts,
+                fee: {
+                    estimateGas: true
+                }
+            });
             const { txHash } = await deploy.send({
                 ...deployOpts,
+                fee: {
+                    gasSettings: estimatedGas
+                },
                 wait: NO_WAIT
             });
-            this.log.info(`Sent tx for token setup with hash ${txHash.toString()}`);
+            this.log.info(`Sent tx for token setup with hash ${txHash.toString()}`, {
+                estimatedGas
+            });
             await this.withNoMinTxsPerBlock(async ()=>{
                 await waitForTx(this.aztecNode, txHash, {
                     timeout: this.config.txMinedWaitSeconds
@@ -275,13 +297,25 @@ export class BotFactory {
         const instance = await this.registerOrDeployContract('AMM', deploy, deployOpts);
         const amm = AMMContract.at(instance.address, this.wallet);
         this.log.info(`AMM deployed at ${amm.address}`);
-        const { receipt: minterReceipt } = await lpToken.methods.set_minter(amm.address, true).send({
+        const setMinterInteraction = lpToken.methods.set_minter(amm.address, true);
+        const { estimatedGas: setMinterGas } = await setMinterInteraction.simulate({
             from: deployer,
+            fee: {
+                estimateGas: true
+            }
+        });
+        const { receipt: minterReceipt } = await setMinterInteraction.send({
+            from: deployer,
+            fee: {
+                gasSettings: setMinterGas
+            },
             wait: {
                 timeout: this.config.txMinedWaitSeconds
             }
         });
-        this.log.info(`Set LP token minter to AMM txHash=${minterReceipt.txHash.toString()}`);
+        this.log.info(`Set LP token minter to AMM txHash=${minterReceipt.txHash.toString()}`, {
+            estimatedGas: setMinterGas
+        });
         this.log.info(`Liquidity token initialized`);
         return amm;
     }
@@ -314,18 +348,44 @@ export class BotFactory {
             caller: amm.address,
             call: await token1.methods.transfer_to_public_and_prepare_private_balance_increase(liquidityProvider, amm.address, amount1Max, authwitNonce).getFunctionCall()
         });
-        const { receipt: mintReceipt } = await new BatchCall(this.wallet, [
+        const mintBatch = new BatchCall(this.wallet, [
             token0.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
             token1.methods.mint_to_private(liquidityProvider, MINT_BALANCE)
-        ]).send({
+        ]);
+        const { estimatedGas: mintGas } = await mintBatch.simulate({
+            from: liquidityProvider,
+            fee: {
+                estimateGas: true
+            }
+        });
+        const { receipt: mintReceipt } = await mintBatch.send({
             from: liquidityProvider,
+            fee: {
+                gasSettings: mintGas
+            },
             wait: {
                 timeout: this.config.txMinedWaitSeconds
             }
         });
-        this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`);
-        const { receipt: addLiquidityReceipt } = await amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce).send({
+        this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`, {
+            estimatedGas: mintGas
+        });
+        const addLiquidityInteraction = amm.methods.add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce);
+        const { estimatedGas: addLiquidityGas } = await addLiquidityInteraction.simulate({
             from: liquidityProvider,
+            fee: {
+                estimateGas: true
+            },
+            authWitnesses: [
+                token0Authwit,
+                token1Authwit
+            ]
+        });
+        const { receipt: addLiquidityReceipt } = await addLiquidityInteraction.send({
+            from: liquidityProvider,
+            fee: {
+                gasSettings: addLiquidityGas
+            },
             authWitnesses: [
                 token0Authwit,
                 token1Authwit
@@ -334,7 +394,9 @@ export class BotFactory {
                 timeout: this.config.txMinedWaitSeconds
             }
         });
-        this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`);
+        this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`, {
+            estimatedGas: addLiquidityGas
+        });
         this.log.info(`Liquidity added`);
         const [newT0Bal, newT1Bal, newLPBal] = await getPrivateBalances();
         this.log.info(`Updated private balances of ${defaultAccountAddress} after minting and funding AMM: token0=${newT0Bal}, token1=${newT1Bal}, lp=${newLPBal}`);
@@ -347,10 +409,21 @@ export class BotFactory {
             this.log.info(`Contract ${name} at ${address.toString()} already deployed`);
             await deploy.register();
         } else {
-            this.log.info(`Deploying contract ${name} at ${address.toString()}`);
+            const { estimatedGas } = await deploy.simulate({
+                ...deployOpts,
+                fee: {
+                    estimateGas: true
+                }
+            });
+            this.log.info(`Deploying contract ${name} at ${address.toString()}`, {
+                estimatedGas
+            });
             await this.withNoMinTxsPerBlock(async ()=>{
                 const { txHash } = await deploy.send({
                     ...deployOpts,
+                    fee: {
+                        gasSettings: estimatedGas
+                    },
                     wait: NO_WAIT
                 });
                 this.log.info(`Sent contract ${name} setup tx with hash ${txHash.toString()}`);
@@ -390,13 +463,26 @@ export class BotFactory {
         const additionalScopes = isStandardToken ? undefined : [
             token.address
         ];
+        const mintBatch = new BatchCall(token.wallet, calls);
+        const { estimatedGas } = await mintBatch.simulate({
+            from: minter,
+            fee: {
+                estimateGas: true
+            },
+            additionalScopes
+        });
         await this.withNoMinTxsPerBlock(async ()=>{
-            const { txHash } = await new BatchCall(token.wallet, calls).send({
+            const { txHash } = await mintBatch.send({
                 from: minter,
                 additionalScopes,
+                fee: {
+                    gasSettings: estimatedGas
+                },
                 wait: NO_WAIT
             });
-            this.log.info(`Sent token mint tx with hash ${txHash.toString()}`);
+            this.log.info(`Sent token mint tx with hash ${txHash.toString()}`, {
+                estimatedGas
+            });
             return waitForTx(this.aztecNode, txHash, {
                 timeout: this.config.txMinedWaitSeconds
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bot",
-  "version": "0.0.1-commit.cb6bed7c2",
+  "version": "0.0.1-commit.cbf2c2d5d",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -54,20 +54,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.cb6bed7c2",
-    "@aztec/aztec.js": "0.0.1-commit.cb6bed7c2",
-    "@aztec/entrypoints": "0.0.1-commit.cb6bed7c2",
-    "@aztec/ethereum": "0.0.1-commit.cb6bed7c2",
-    "@aztec/foundation": "0.0.1-commit.cb6bed7c2",
-    "@aztec/kv-store": "0.0.1-commit.cb6bed7c2",
-    "@aztec/l1-artifacts": "0.0.1-commit.cb6bed7c2",
-    "@aztec/noir-contracts.js": "0.0.1-commit.cb6bed7c2",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.cb6bed7c2",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.cb6bed7c2",
-    "@aztec/protocol-contracts": "0.0.1-commit.cb6bed7c2",
-    "@aztec/stdlib": "0.0.1-commit.cb6bed7c2",
-    "@aztec/telemetry-client": "0.0.1-commit.cb6bed7c2",
-    "@aztec/wallets": "0.0.1-commit.cb6bed7c2",
+    "@aztec/accounts": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/aztec.js": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/entrypoints": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/ethereum": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/foundation": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/kv-store": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/l1-artifacts": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/noir-contracts.js": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/protocol-contracts": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/stdlib": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/telemetry-client": "0.0.1-commit.cbf2c2d5d",
+    "@aztec/wallets": "0.0.1-commit.cbf2c2d5d",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2",

package/src/factory.ts

@@ -27,7 +27,7 @@ import { PrivateTokenContract } from '@aztec/noir-contracts.js/PrivateToken';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TestContract } from '@aztec/noir-test-contracts.js/Test';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import { GasSettings } from '@aztec/stdlib/gas';
+import { GasFees, GasSettings } from '@aztec/stdlib/gas';
 import type { AztecNode, AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { EmbeddedWallet } from '@aztec/wallets/embedded';
@@ -223,7 +223,12 @@ export class BotFactory {
       const paymentMethod = new FeeJuicePaymentMethodWithClaim(accountManager.address, claim);
       const deployMethod = await accountManager.getDeployMethod();
       const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1 + this.config.minFeePadding);
-      const gasSettings = GasSettings.default({ maxFeesPerGas });
+
+      const { estimatedGas } = await deployMethod.simulate({
+        from: AztecAddress.ZERO,
+        fee: { estimateGas: true, paymentMethod },
+      });
+      const gasSettings = GasSettings.from({ ...estimatedGas!, maxFeesPerGas, maxPriorityFeesPerGas: GasFees.empty() });
 
       await this.withNoMinTxsPerBlock(async () => {
         const { txHash } = await deployMethod.send({
@@ -231,7 +236,7 @@ export class BotFactory {
           fee: { gasSettings, paymentMethod },
           wait: NO_WAIT,
         });
-        this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`);
+        this.log.info(`Sent tx for account deployment with hash ${txHash.toString()}`, { gasSettings });
         return waitForTx(this.aztecNode, txHash, { timeout: this.config.txMinedWaitSeconds });
       });
       this.log.info(`Account deployed at ${address}`);
@@ -297,8 +302,9 @@ export class BotFactory {
       await deploy.register();
     } else {
       this.log.info(`Deploying token contract at ${address.toString()}`);
-      const { txHash } = await deploy.send({ ...deployOpts, wait: NO_WAIT });
-      this.log.info(`Sent tx for token setup with hash ${txHash.toString()}`);
+      const { estimatedGas } = await deploy.simulate({ ...deployOpts, fee: { estimateGas: true } });
+      const { txHash } = await deploy.send({ ...deployOpts, fee: { gasSettings: estimatedGas }, wait: NO_WAIT });
+      this.log.info(`Sent tx for token setup with hash ${txHash.toString()}`, { estimatedGas });
       await this.withNoMinTxsPerBlock(async () => {
         await waitForTx(this.aztecNode, txHash, { timeout: this.config.txMinedWaitSeconds });
         return token;
@@ -338,10 +344,19 @@ export class BotFactory {
     const amm = AMMContract.at(instance.address, this.wallet);
 
     this.log.info(`AMM deployed at ${amm.address}`);
-    const { receipt: minterReceipt } = await lpToken.methods
-      .set_minter(amm.address, true)
-      .send({ from: deployer, wait: { timeout: this.config.txMinedWaitSeconds } });
-    this.log.info(`Set LP token minter to AMM txHash=${minterReceipt.txHash.toString()}`);
+    const setMinterInteraction = lpToken.methods.set_minter(amm.address, true);
+    const { estimatedGas: setMinterGas } = await setMinterInteraction.simulate({
+      from: deployer,
+      fee: { estimateGas: true },
+    });
+    const { receipt: minterReceipt } = await setMinterInteraction.send({
+      from: deployer,
+      fee: { gasSettings: setMinterGas },
+      wait: { timeout: this.config.txMinedWaitSeconds },
+    });
+    this.log.info(`Set LP token minter to AMM txHash=${minterReceipt.txHash.toString()}`, {
+      estimatedGas: setMinterGas,
+    });
     this.log.info(`Liquidity token initialized`);
 
     return amm;
@@ -409,22 +424,44 @@ export class BotFactory {
         .getFunctionCall(),
     });
 
-    const { receipt: mintReceipt } = await new BatchCall(this.wallet, [
+    const mintBatch = new BatchCall(this.wallet, [
       token0.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
       token1.methods.mint_to_private(liquidityProvider, MINT_BALANCE),
-    ]).send({ from: liquidityProvider, wait: { timeout: this.config.txMinedWaitSeconds } });
+    ]);
+    const { estimatedGas: mintGas } = await mintBatch.simulate({
+      from: liquidityProvider,
+      fee: { estimateGas: true },
+    });
+    const { receipt: mintReceipt } = await mintBatch.send({
+      from: liquidityProvider,
+      fee: { gasSettings: mintGas },
+      wait: { timeout: this.config.txMinedWaitSeconds },
+    });
 
-    this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`);
+    this.log.info(`Sent mint tx: ${mintReceipt.txHash.toString()}`, { estimatedGas: mintGas });
 
-    const { receipt: addLiquidityReceipt } = await amm.methods
-      .add_liquidity(amount0Max, amount1Max, amount0Min, amount1Min, authwitNonce)
-      .send({
-        from: liquidityProvider,
-        authWitnesses: [token0Authwit, token1Authwit],
-        wait: { timeout: this.config.txMinedWaitSeconds },
-      });
+    const addLiquidityInteraction = amm.methods.add_liquidity(
+      amount0Max,
+      amount1Max,
+      amount0Min,
+      amount1Min,
+      authwitNonce,
+    );
+    const { estimatedGas: addLiquidityGas } = await addLiquidityInteraction.simulate({
+      from: liquidityProvider,
+      fee: { estimateGas: true },
+      authWitnesses: [token0Authwit, token1Authwit],
+    });
+    const { receipt: addLiquidityReceipt } = await addLiquidityInteraction.send({
+      from: liquidityProvider,
+      fee: { gasSettings: addLiquidityGas },
+      authWitnesses: [token0Authwit, token1Authwit],
+      wait: { timeout: this.config.txMinedWaitSeconds },
+    });
 
-    this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`);
+    this.log.info(`Sent tx to add liquidity to the AMM: ${addLiquidityReceipt.txHash.toString()}`, {
+      estimatedGas: addLiquidityGas,
+    });
     this.log.info(`Liquidity added`);
 
     const [newT0Bal, newT1Bal, newLPBal] = await getPrivateBalances();
@@ -445,9 +482,10 @@ export class BotFactory {
       this.log.info(`Contract ${name} at ${address.toString()} already deployed`);
       await deploy.register();
     } else {
-      this.log.info(`Deploying contract ${name} at ${address.toString()}`);
+      const { estimatedGas } = await deploy.simulate({ ...deployOpts, fee: { estimateGas: true } });
+      this.log.info(`Deploying contract ${name} at ${address.toString()}`, { estimatedGas });
       await this.withNoMinTxsPerBlock(async () => {
-        const { txHash } = await deploy.send({ ...deployOpts, wait: NO_WAIT });
+        const { txHash } = await deploy.send({ ...deployOpts, fee: { gasSettings: estimatedGas }, wait: NO_WAIT });
         this.log.info(`Sent contract ${name} setup tx with hash ${txHash.toString()}`);
         return waitForTx(this.aztecNode, txHash, { timeout: this.config.txMinedWaitSeconds });
       });
@@ -491,13 +529,16 @@ export class BotFactory {
 
     // PrivateToken's mint accesses contract-level private storage vars (admin, total_supply).
     const additionalScopes = isStandardToken ? undefined : [token.address];
+    const mintBatch = new BatchCall(token.wallet, calls);
+    const { estimatedGas } = await mintBatch.simulate({ from: minter, fee: { estimateGas: true }, additionalScopes });
     await this.withNoMinTxsPerBlock(async () => {
-      const { txHash } = await new BatchCall(token.wallet, calls).send({
+      const { txHash } = await mintBatch.send({
         from: minter,
         additionalScopes,
+        fee: { gasSettings: estimatedGas },
         wait: NO_WAIT,
       });
-      this.log.info(`Sent token mint tx with hash ${txHash.toString()}`);
+      this.log.info(`Sent token mint tx with hash ${txHash.toString()}`, { estimatedGas });
       return waitForTx(this.aztecNode, txHash, { timeout: this.config.txMinedWaitSeconds });
     });
   }