diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol index c0a8b47b4dd..0e095c7335c 100644 --- a/l1-contracts/src/core/libraries/ConstantsGen.sol +++ b/l1-contracts/src/core/libraries/ConstantsGen.sol @@ -98,7 +98,6 @@ library Constants { uint256 internal constant GENESIS_ARCHIVE_ROOT = 1002640778211850180189505934749257244705296832326768971348723156503780793518; uint256 internal constant FEE_JUICE_INITIAL_MINT = 200000000000000000000; - uint256 internal constant FEE_FUNDING_FOR_TESTER_ACCOUNT = 100000000000000000000; uint256 internal constant PUBLIC_DISPATCH_SELECTOR = 3578010381; uint256 internal constant MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 3000; uint256 internal constant MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS = 3000; diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr index c08b8e8b2ce..ed9b45dd0a3 100644 --- a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr +++ b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr @@ -139,7 +139,6 @@ pub global GENESIS_ARCHIVE_ROOT: Field = // The following and the value in `deploy_l1_contracts` must match. We should not have the code both places, but // we are running into circular dependency issues. #3342 global FEE_JUICE_INITIAL_MINT: Field = 200000000000000000000; -global FEE_FUNDING_FOR_TESTER_ACCOUNT: Field = 100000000000000000000; // 100e18 // Last 4 bytes of the Poseidon2 hash of 'public_dispatch(Field)'. pub global PUBLIC_DISPATCH_SELECTOR: Field = 0xd5441b0d; diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json index 0c4730d4357..34f19cb3e6d 100644 --- a/yarn-project/circuits.js/package.json +++ b/yarn-project/circuits.js/package.json @@ -16,7 +16,7 @@ "./interfaces": "./dest/interfaces/index.js", "./utils": "./dest/utils/index.js", "./types": "./dest/types/index.js", - "./constants": "./dest/constants.gen.js", + "./constants": "./dest/constants.js", "./contract": "./dest/contract/index.js", "./merkle": "./dest/merkle/index.js", "./simulation": "./dest/simulator/index.js" @@ -101,4 +101,4 @@ ] ] } -} +} \ No newline at end of file diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts index 8ef7a67d4af..183e21073d2 100644 --- a/yarn-project/circuits.js/src/constants.gen.ts +++ b/yarn-project/circuits.js/src/constants.gen.ts @@ -84,7 +84,6 @@ export const BLOB_SIZE_IN_BYTES = 126976; export const AZTEC_MAX_EPOCH_DURATION = 32; export const GENESIS_ARCHIVE_ROOT = 1002640778211850180189505934749257244705296832326768971348723156503780793518n; export const FEE_JUICE_INITIAL_MINT = 200000000000000000000n; -export const FEE_FUNDING_FOR_TESTER_ACCOUNT = 100000000000000000000n; export const PUBLIC_DISPATCH_SELECTOR = 3578010381; export const MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 3000; export const MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS = 3000; diff --git a/yarn-project/circuits.js/src/constants.ts b/yarn-project/circuits.js/src/constants.ts new file mode 100644 index 00000000000..8e2f8f06caf --- /dev/null +++ b/yarn-project/circuits.js/src/constants.ts @@ -0,0 +1,5 @@ +// Typescript-land-only constants +export const FEE_FUNDING_FOR_TESTER_ACCOUNT = BigInt(1_000e18); + +// Autogenerated constants loaded from noir-land +export * from './constants.gen.js'; diff --git a/yarn-project/circuits.js/src/index.ts b/yarn-project/circuits.js/src/index.ts index 3b7dba0dfef..9ed5971c96f 100644 --- a/yarn-project/circuits.js/src/index.ts +++ b/yarn-project/circuits.js/src/index.ts @@ -1,4 +1,4 @@ -export * from './constants.gen.js'; +export * from './constants.js'; export * from './contract/index.js'; export * from './hints/index.js'; export * from './interfaces/index.js'; diff --git a/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts b/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts index e7a47a7eced..58d92c7ce1a 100644 --- a/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts +++ b/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts @@ -72,7 +72,11 @@ export class GasTxValidator implements TxValidator { const balance = claimFunctionCall ? initialBalance.add(claimFunctionCall.args[2]) : initialBalance; if (balance.lt(feeLimit)) { - this.#log.info(`Rejecting transaction due to not enough fee payer balance`, { feePayer, balance, feeLimit }); + this.#log.info(`Rejecting transaction due to not enough fee payer balance`, { + feePayer, + balance: balance.toBigInt(), + feeLimit: feeLimit.toBigInt(), + }); return false; } return true;