Skip to content

fix: init fee juice contract in sandbox #11379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexghr merged 1 commit into from
Jan 21, 2025
Merged

fix: init fee juice contract in sandbox #11379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion yarn-project/aztec/src/cli/aztec_start_action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
6 changes: 0 additions & 6 deletions yarn-project/aztec/src/cli/aztec_start_options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
16 changes: 6 additions & 10 deletions yarn-project/aztec/src/sandbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

/**
Expand Down Expand Up @@ -150,14 +148,12 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}) {
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,
Copy link
Contributor Author

@alexghr alexghr Jan 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undefined is passed for WaitOpts (ie. use default settings)

logger.info,
);

const stop = async () => {
await node.stop();
Expand Down
1 change: 0 additions & 1 deletion yarn-project/end-to-end/scripts/docker-compose-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 0 additions & 1 deletion yarn-project/end-to-end/scripts/docker-compose-wallet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion yarn-project/end-to-end/scripts/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion yarn-project/end-to-end/scripts/e2e_compose_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion yarn-project/foundation/src/config/env_var.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading