diff --git a/yarn-project/aztec/src/cli/aztec_start_action.ts b/yarn-project/aztec/src/cli/aztec_start_action.ts index f97db8d053d6..fab0dee0e9c7 100644 --- a/yarn-project/aztec/src/cli/aztec_start_action.ts +++ b/yarn-project/aztec/src/cli/aztec_start_action.ts @@ -30,7 +30,6 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg userLog(`Setting up Aztec Sandbox ${cliVersion}, please stand by...`); const { aztecNodeConfig, node, pxe, stop } = await createSandbox({ - enableGas: sandboxOptions.enableGas, l1Mnemonic: options.l1Mnemonic, l1RpcUrl: options.l1RpcUrl, }); diff --git a/yarn-project/aztec/src/cli/aztec_start_options.ts b/yarn-project/aztec/src/cli/aztec_start_options.ts index b9e2c2992c0e..7758502a9a55 100644 --- a/yarn-project/aztec/src/cli/aztec_start_options.ts +++ b/yarn-project/aztec/src/cli/aztec_start_options.ts @@ -70,12 +70,6 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = { envVar: 'TEST_ACCOUNTS', ...booleanConfigHelper(true), }, - { - flag: '--sandbox.enableGas', - description: 'Enable gas on sandbox start', - envVar: 'ENABLE_GAS', - ...booleanConfigHelper(), - }, { flag: '--sandbox.noPXE', description: 'Do not expose PXE service on sandbox start', diff --git a/yarn-project/aztec/src/sandbox.ts b/yarn-project/aztec/src/sandbox.ts index 1cfb2178e071..b0c2f303e18e 100644 --- a/yarn-project/aztec/src/sandbox.ts +++ b/yarn-project/aztec/src/sandbox.ts @@ -100,8 +100,6 @@ export async function deployContractsToL1( export type SandboxConfig = AztecNodeConfig & { /** Mnemonic used to derive the L1 deployer private key.*/ l1Mnemonic: string; - /** Enable the contracts to track and pay for gas */ - enableGas: boolean; }; /** @@ -150,14 +148,12 @@ export async function createSandbox(config: Partial = {}) { const node = await createAztecNode(aztecNodeConfig, { telemetry, blobSinkClient }); const pxe = await createAztecPXE(node); - if (config.enableGas) { - await setupCanonicalL2FeeJuice( - new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(aztecNodeConfig.l1ChainId, aztecNodeConfig.version)), - aztecNodeConfig.l1Contracts.feeJuicePortalAddress, - undefined, - logger.info, - ); - } + await setupCanonicalL2FeeJuice( + new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(aztecNodeConfig.l1ChainId, aztecNodeConfig.version)), + aztecNodeConfig.l1Contracts.feeJuicePortalAddress, + undefined, + logger.info, + ); const stop = async () => { await node.stop(); diff --git a/yarn-project/end-to-end/scripts/docker-compose-images.yml b/yarn-project/end-to-end/scripts/docker-compose-images.yml index 67b3b5b0ae23..2645a856edf8 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-images.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-images.yml @@ -19,7 +19,6 @@ services: SEQ_TX_POLLING_INTERVAL_MS: 500 WS_BLOCK_CHECK_INTERVAL_MS: 500 ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500 - ENABLE_GAS: ${ENABLE_GAS:-} HARDWARE_CONCURRENCY: ${HARDWARE_CONCURRENCY:-} expose: - '8080' diff --git a/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml b/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml index a1f849d81259..f535a31518bb 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml @@ -19,7 +19,6 @@ services: SEQ_TX_POLLING_INTERVAL_MS: 50 WS_BLOCK_CHECK_INTERVAL_MS: 50 ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500 - ENABLE_GAS: ${ENABLE_GAS:-''} JOB_NAME: ${JOB_NAME:-''} HARDWARE_CONCURRENCY: ${HARDWARE_CONCURRENCY:-} command: ${TEST:-./src/e2e_deploy_contract.test.ts} diff --git a/yarn-project/end-to-end/scripts/docker-compose-wallet.yml b/yarn-project/end-to-end/scripts/docker-compose-wallet.yml index b9b3992638fa..cfa6983f6c48 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-wallet.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-wallet.yml @@ -19,7 +19,6 @@ services: SEQ_TX_POLLING_INTERVAL_MS: 50 WS_BLOCK_CHECK_INTERVAL_MS: 50 ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500 - ENABLE_GAS: ${ENABLE_GAS:-} HARDWARE_CONCURRENCY: ${HARDWARE_CONCURRENCY:-} expose: - '8080' diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml index 50e77c31515b..1996420aa9d6 100644 --- a/yarn-project/end-to-end/scripts/docker-compose.yml +++ b/yarn-project/end-to-end/scripts/docker-compose.yml @@ -21,7 +21,6 @@ services: SEQ_TX_POLLING_INTERVAL_MS: 500 WS_BLOCK_CHECK_INTERVAL_MS: 500 ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500 - ENABLE_GAS: ${ENABLE_GAS:-} HARDWARE_CONCURRENCY: ${HARDWARE_CONCURRENCY:-} end-to-end: diff --git a/yarn-project/end-to-end/scripts/e2e_compose_test.sh b/yarn-project/end-to-end/scripts/e2e_compose_test.sh index da095b079eb4..86fec03abc5e 100755 --- a/yarn-project/end-to-end/scripts/e2e_compose_test.sh +++ b/yarn-project/end-to-end/scripts/e2e_compose_test.sh @@ -5,7 +5,6 @@ # COMPOSE_FILE (default: ./scripts/docker-compose-images.yml) # LOG_LEVEL (default: "verbose") # HARDWARE_CONCURRENCY (default: "") -# ENABLE_GAS (default: "") # AZTEC_DOCKER_TAG (default: current git commit) set -eu diff --git a/yarn-project/foundation/src/config/env_var.ts b/yarn-project/foundation/src/config/env_var.ts index 2fef4f1dcace..dbab1ffb24f8 100644 --- a/yarn-project/foundation/src/config/env_var.ts +++ b/yarn-project/foundation/src/config/env_var.ts @@ -42,7 +42,6 @@ export type EnvVar = | 'DEBUG' | 'DEPLOY_AZTEC_CONTRACTS_SALT' | 'DEPLOY_AZTEC_CONTRACTS' - | 'ENABLE_GAS' | 'ENFORCE_FEES' | 'ETHEREUM_HOST' | 'FEE_JUICE_CONTRACT_ADDRESS'