@aztec/end-to-end 1.0.0-nightly.20250727 → 1.0.0-nightly.20250729
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/e2e_fees/fees_test.d.ts +2 -1
- package/dest/e2e_fees/fees_test.d.ts.map +1 -1
- package/dest/e2e_fees/fees_test.js +10 -21
- package/dest/e2e_p2p/p2p_network.d.ts.map +1 -1
- package/dest/e2e_p2p/p2p_network.js +6 -5
- package/dest/fixtures/snapshot_manager.d.ts.map +1 -1
- package/dest/fixtures/snapshot_manager.js +5 -9
- package/dest/fixtures/utils.d.ts.map +1 -1
- package/dest/fixtures/utils.js +5 -9
- package/dest/spartan/utils.d.ts +6 -8
- package/dest/spartan/utils.d.ts.map +1 -1
- package/package.json +35 -35
- package/src/e2e_fees/fees_test.ts +13 -31
- package/src/e2e_p2p/p2p_network.ts +7 -6
- package/src/fixtures/snapshot_manager.ts +12 -9
- package/src/fixtures/utils.ts +12 -9
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type AccountWallet, type AztecAddress, type AztecNode, type Logger, type PXE } from '@aztec/aztec.js';
|
|
2
2
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
3
|
-
import { type DeployL1ContractsArgs } from '@aztec/ethereum';
|
|
3
|
+
import { type DeployL1ContractsArgs, RollupContract } from '@aztec/ethereum';
|
|
4
4
|
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
5
5
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
6
|
import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
|
|
@@ -39,6 +39,7 @@ export declare class FeesTest {
|
|
|
39
39
|
coinbase: EthAddress;
|
|
40
40
|
fpcAdmin: AztecAddress;
|
|
41
41
|
gasSettings: GasSettings;
|
|
42
|
+
rollupContract: RollupContract;
|
|
42
43
|
feeJuiceContract: FeeJuiceContract;
|
|
43
44
|
bananaCoin: BananaCoin;
|
|
44
45
|
bananaFPC: FPCContract;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,GAAG,EAGT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,
|
|
1
|
+
{"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { getSchnorrWallet } from '@aztec/accounts/schnorr';
|
|
|
2
2
|
import { createLogger, sleep } from '@aztec/aztec.js';
|
|
3
3
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
4
4
|
import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
|
|
5
|
-
import { RollupContract, createExtendedL1Client
|
|
5
|
+
import { RollupContract, createExtendedL1Client } from '@aztec/ethereum';
|
|
6
6
|
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
7
7
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
8
8
|
import { TestERC20Abi } from '@aztec/l1-artifacts';
|
|
@@ -47,6 +47,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
47
47
|
coinbase;
|
|
48
48
|
fpcAdmin;
|
|
49
49
|
gasSettings;
|
|
50
|
+
rollupContract;
|
|
50
51
|
feeJuiceContract;
|
|
51
52
|
bananaCoin;
|
|
52
53
|
bananaFPC;
|
|
@@ -88,8 +89,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
88
89
|
feeRecipient: this.sequencerAddress,
|
|
89
90
|
coinbase: this.coinbase
|
|
90
91
|
});
|
|
91
|
-
|
|
92
|
-
this.chainMonitor = new ChainMonitor(rollupContract, context.dateProvider, this.logger, 200).start();
|
|
92
|
+
this.rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
|
|
93
|
+
this.chainMonitor = new ChainMonitor(this.rollupContract, context.dateProvider, this.logger, 200).start();
|
|
93
94
|
return this;
|
|
94
95
|
}
|
|
95
96
|
async teardown() {
|
|
@@ -106,13 +107,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
106
107
|
}
|
|
107
108
|
}
|
|
108
109
|
async getBlockRewards() {
|
|
109
|
-
const
|
|
110
|
-
|
|
111
|
-
abi: l1Artifacts.rewardDistributor.contractAbi,
|
|
112
|
-
client: this.context.deployL1ContractsValues.l1Client
|
|
113
|
-
});
|
|
114
|
-
const blockReward = await rewardDistributor.read.BLOCK_REWARD();
|
|
115
|
-
const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(EthAddress.fromString(rewardDistributor.address));
|
|
110
|
+
const blockReward = await this.rollupContract.getBlockReward();
|
|
111
|
+
const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress);
|
|
116
112
|
const toDistribute = balance > blockReward ? blockReward : balance;
|
|
117
113
|
const sequencerBlockRewards = toDistribute / 2n;
|
|
118
114
|
const proverBlockRewards = toDistribute - sequencerBlockRewards;
|
|
@@ -218,25 +214,18 @@ const { E2E_DATA_PATH: dataPath } = process.env;
|
|
|
218
214
|
]);
|
|
219
215
|
};
|
|
220
216
|
this.getCoinbaseSequencerRewards = async ()=>{
|
|
221
|
-
|
|
222
|
-
const rollup = new RollupContract(l1Client, data.rollupAddress);
|
|
223
|
-
return await rollup.getSequencerRewards(this.coinbase);
|
|
217
|
+
return await this.rollupContract.getSequencerRewards(this.coinbase);
|
|
224
218
|
};
|
|
225
219
|
this.getProverFee = async (blockNumber)=>{
|
|
226
220
|
const block = await this.pxe.getBlock(blockNumber);
|
|
227
|
-
const publicClient = getPublicClient({
|
|
228
|
-
l1RpcUrls: context.aztecNodeConfig.l1RpcUrls,
|
|
229
|
-
l1ChainId: context.aztecNodeConfig.l1ChainId
|
|
230
|
-
});
|
|
231
|
-
const rollup = new RollupContract(publicClient, data.rollupAddress);
|
|
232
221
|
// @todo @lherskind As we deal with #13601
|
|
233
222
|
// Right now the value is from `FeeLib.sol`
|
|
234
223
|
const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
|
|
235
224
|
// We round up
|
|
236
225
|
const mulDiv = (a, b, c)=>a * b / c + (a * b % c > 0n ? 1n : 0n);
|
|
237
|
-
const { baseFee } = await
|
|
238
|
-
const proverCost = mulDiv(mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await
|
|
239
|
-
const price = await
|
|
226
|
+
const { baseFee } = await this.rollupContract.getL1FeesAt(block.header.globalVariables.timestamp);
|
|
227
|
+
const proverCost = mulDiv(mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await this.rollupContract.getEpochDuration()), 1n, await this.rollupContract.getManaTarget()) + await this.rollupContract.getProvingCostPerMana();
|
|
228
|
+
const price = await this.rollupContract.getFeeAssetPerEth();
|
|
240
229
|
const mana = block.header.totalManaUsed.toBigInt();
|
|
241
230
|
return mulDiv(mana * proverCost, price, 10n ** 9n);
|
|
242
231
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,KAAK,0BAA0B,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,
|
|
1
|
+
{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
|
|
2
2
|
import { EthAddress } from '@aztec/aztec.js';
|
|
3
|
-
import { L1TxUtils, RollupContract, deployL1Contract, getL1ContractsConfigEnvVars
|
|
3
|
+
import { L1TxUtils, MultiAdderArtifact, RollupContract, deployL1Contract, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
|
|
4
4
|
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
5
5
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
6
|
import { RollupAbi, SlashFactoryAbi, SlasherAbi, SlashingProposerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
|
|
7
7
|
import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
|
|
8
|
+
import { privateKeyFromHex } from '@aztec/p2p';
|
|
8
9
|
import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
|
|
9
10
|
import { tryStop } from '@aztec/stdlib/interfaces/server';
|
|
10
11
|
import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
|
|
@@ -95,7 +96,7 @@ export class P2PNetworkTest {
|
|
|
95
96
|
}
|
|
96
97
|
static async create({ testName, numberOfNodes, numberOfValidators, basePort, metricsPort, initialConfig, startProverNode, mockZkPassportVerifier }) {
|
|
97
98
|
const port = basePort || await getPort();
|
|
98
|
-
const bootstrapNodeENR =
|
|
99
|
+
const bootstrapNodeENR = getBootstrapNodeEnr(privateKeyFromHex(BOOTSTRAP_NODE_PRIVATE_KEY), port);
|
|
99
100
|
const bootstrapNodeEnr = bootstrapNodeENR.encodeTxt();
|
|
100
101
|
const initialValidatorConfig = await createValidatorConfig(initialConfig ?? {}, bootstrapNodeEnr);
|
|
101
102
|
return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfValidators, initialValidatorConfig, numberOfNodes, metricsPort, startProverNode, mockZkPassportVerifier);
|
|
@@ -109,7 +110,7 @@ export class P2PNetworkTest {
|
|
|
109
110
|
async addBootstrapNode() {
|
|
110
111
|
await this.snapshotManager.snapshot('add-bootstrap-node', async ({ aztecNodeConfig })=>{
|
|
111
112
|
const telemetry = getEndToEndTestTelemetryClient(this.metricsPort);
|
|
112
|
-
this.bootstrapNode = await createBootstrapNodeFromPrivateKey(BOOTSTRAP_NODE_PRIVATE_KEY, this.bootNodePort, telemetry, aztecNodeConfig);
|
|
113
|
+
this.bootstrapNode = await createBootstrapNodeFromPrivateKey(privateKeyFromHex(BOOTSTRAP_NODE_PRIVATE_KEY), this.bootNodePort, telemetry, aztecNodeConfig);
|
|
113
114
|
// Overwrite enr with updated info
|
|
114
115
|
this.bootstrapNodeEnr = this.bootstrapNode.getENR().encodeTxt();
|
|
115
116
|
});
|
|
@@ -143,13 +144,13 @@ export class P2PNetworkTest {
|
|
|
143
144
|
abi: TestERC20Abi,
|
|
144
145
|
client: deployL1ContractsValues.l1Client
|
|
145
146
|
});
|
|
146
|
-
const { address: multiAdderAddress } = await deployL1Contract(deployL1ContractsValues.l1Client,
|
|
147
|
+
const { address: multiAdderAddress } = await deployL1Contract(deployL1ContractsValues.l1Client, MultiAdderArtifact.contractAbi, MultiAdderArtifact.contractBytecode, [
|
|
147
148
|
rollup.address,
|
|
148
149
|
deployL1ContractsValues.l1Client.account.address
|
|
149
150
|
]);
|
|
150
151
|
const multiAdder = getContract({
|
|
151
152
|
address: multiAdderAddress.toString(),
|
|
152
|
-
abi:
|
|
153
|
+
abi: MultiAdderArtifact.contractAbi,
|
|
153
154
|
client: deployL1ContractsValues.l1Client
|
|
154
155
|
});
|
|
155
156
|
const stakeNeeded = l1ContractsConfig.depositAmount * BigInt(this.numberOfValidators);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot_manager.d.ts","sourceRoot":"","sources":["../../src/fixtures/snapshot_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,kBAAkB,EAAwD,MAAM,yBAAyB,CAAC;AACxH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,eAAe,EAGpB,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,yBAAyB,CAAC;AACpF,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,
|
|
1
|
+
{"version":3,"file":"snapshot_manager.d.ts","sourceRoot":"","sources":["../../src/fixtures/snapshot_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { BatchCall, DefaultWaitForProvenOpts, getContractClassFromArtifact, wait
|
|
|
5
5
|
import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
|
|
6
6
|
import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
|
|
7
7
|
import { createBlobSinkServer } from '@aztec/blob-sink/server';
|
|
8
|
-
import { createExtendedL1Client, deployMulticall3, getL1ContractsConfigEnvVars
|
|
8
|
+
import { FeeAssetArtifact, RollupContract, createExtendedL1Client, deployMulticall3, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
|
|
9
9
|
import { EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
|
|
10
10
|
import { asyncMap } from '@aztec/foundation/async-map';
|
|
11
11
|
import { SecretValue } from '@aztec/foundation/config';
|
|
@@ -280,20 +280,16 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
|
|
|
280
280
|
aztecNodeConfig.l1PublishRetryIntervalMS = 100;
|
|
281
281
|
if (opts.fundRewardDistributor) {
|
|
282
282
|
// Mints block rewards for 10000 blocks to the rewardDistributor contract
|
|
283
|
-
const
|
|
284
|
-
|
|
285
|
-
abi: l1Artifacts.rewardDistributor.contractAbi,
|
|
286
|
-
client: deployL1ContractsValues.l1Client
|
|
287
|
-
});
|
|
288
|
-
const blockReward = await rewardDistributor.read.BLOCK_REWARD();
|
|
283
|
+
const rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
|
|
284
|
+
const blockReward = await rollup.getBlockReward();
|
|
289
285
|
const mintAmount = 10_000n * blockReward;
|
|
290
286
|
const feeJuice = getContract({
|
|
291
287
|
address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
|
|
292
|
-
abi:
|
|
288
|
+
abi: FeeAssetArtifact.contractAbi,
|
|
293
289
|
client: deployL1ContractsValues.l1Client
|
|
294
290
|
});
|
|
295
291
|
const rewardDistributorMintTxHash = await feeJuice.write.mint([
|
|
296
|
-
|
|
292
|
+
deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
|
|
297
293
|
mintAmount
|
|
298
294
|
], {});
|
|
299
295
|
await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,eAAe,EAAsC,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAEL,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,cAAc,EACnB,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAOZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,yBAAyB,CAAC;AAEpF,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"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"}
|
package/dest/fixtures/utils.js
CHANGED
|
@@ -8,7 +8,7 @@ import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
|
|
|
8
8
|
import { createBlobSinkClient } from '@aztec/blob-sink/client';
|
|
9
9
|
import { createBlobSinkServer } from '@aztec/blob-sink/server';
|
|
10
10
|
import { GENESIS_ARCHIVE_ROOT, SPONSORED_FPC_SALT } from '@aztec/constants';
|
|
11
|
-
import { NULL_KEY, createExtendedL1Client, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, isAnvilTestChain
|
|
11
|
+
import { FeeAssetArtifact, NULL_KEY, RollupContract, createExtendedL1Client, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, isAnvilTestChain } from '@aztec/ethereum';
|
|
12
12
|
import { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
|
|
13
13
|
import { SecretValue } from '@aztec/foundation/config';
|
|
14
14
|
import { randomBytes } from '@aztec/foundation/crypto';
|
|
@@ -273,20 +273,16 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
|
|
|
273
273
|
config.rollupVersion = deployL1ContractsValues.rollupVersion;
|
|
274
274
|
if (opts.fundRewardDistributor) {
|
|
275
275
|
// Mints block rewards for 10000 blocks to the rewardDistributor contract
|
|
276
|
-
const
|
|
277
|
-
|
|
278
|
-
abi: l1Artifacts.rewardDistributor.contractAbi,
|
|
279
|
-
client: deployL1ContractsValues.l1Client
|
|
280
|
-
});
|
|
281
|
-
const blockReward = await rewardDistributor.read.BLOCK_REWARD();
|
|
276
|
+
const rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
|
|
277
|
+
const blockReward = await rollup.getBlockReward();
|
|
282
278
|
const mintAmount = 10_000n * blockReward;
|
|
283
279
|
const feeJuice = getContract({
|
|
284
280
|
address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
|
|
285
|
-
abi:
|
|
281
|
+
abi: FeeAssetArtifact.contractAbi,
|
|
286
282
|
client: deployL1ContractsValues.l1Client
|
|
287
283
|
});
|
|
288
284
|
const rewardDistributorMintTxHash = await feeJuice.write.mint([
|
|
289
|
-
|
|
285
|
+
deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
|
|
290
286
|
mintAmount
|
|
291
287
|
], {});
|
|
292
288
|
await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
|
package/dest/spartan/utils.d.ts
CHANGED
|
@@ -71,7 +71,7 @@ declare const k8sLocalConfigSchema: z.ZodObject<{
|
|
|
71
71
|
L1_ACCOUNT_MNEMONIC?: string | undefined;
|
|
72
72
|
SEPOLIA_RUN?: string | undefined;
|
|
73
73
|
}>;
|
|
74
|
-
declare const k8sGCloudConfigSchema: z.ZodObject<
|
|
74
|
+
declare const k8sGCloudConfigSchema: z.ZodObject<{
|
|
75
75
|
ETHEREUM_SLOT_DURATION: z.ZodNumber;
|
|
76
76
|
AZTEC_SLOT_DURATION: z.ZodNumber;
|
|
77
77
|
AZTEC_EPOCH_DURATION: z.ZodNumber;
|
|
@@ -92,13 +92,12 @@ declare const k8sGCloudConfigSchema: z.ZodObject<z.objectUtil.extendShape<{
|
|
|
92
92
|
ETHEREUM_HOSTS: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
|
|
93
93
|
L1_ACCOUNT_MNEMONIC: z.ZodDefault<z.ZodString>;
|
|
94
94
|
SEPOLIA_RUN: z.ZodDefault<z.ZodString>;
|
|
95
|
-
|
|
96
|
-
}, {
|
|
95
|
+
} & {
|
|
97
96
|
K8S: z.ZodLiteral<"gcloud">;
|
|
98
97
|
CLUSTER_NAME: z.ZodString;
|
|
99
98
|
REGION: z.ZodString;
|
|
100
99
|
PROJECT_ID: z.ZodString;
|
|
101
|
-
}
|
|
100
|
+
}, "strip", z.ZodTypeAny, {
|
|
102
101
|
ETHEREUM_SLOT_DURATION: number;
|
|
103
102
|
AZTEC_SLOT_DURATION: number;
|
|
104
103
|
AZTEC_EPOCH_DURATION: number;
|
|
@@ -234,7 +233,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
|
|
|
234
233
|
METRICS_API_PATH?: string | undefined;
|
|
235
234
|
L1_ACCOUNT_MNEMONIC?: string | undefined;
|
|
236
235
|
SEPOLIA_RUN?: string | undefined;
|
|
237
|
-
}>, z.ZodObject<
|
|
236
|
+
}>, z.ZodObject<{
|
|
238
237
|
ETHEREUM_SLOT_DURATION: z.ZodNumber;
|
|
239
238
|
AZTEC_SLOT_DURATION: z.ZodNumber;
|
|
240
239
|
AZTEC_EPOCH_DURATION: z.ZodNumber;
|
|
@@ -255,13 +254,12 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
|
|
|
255
254
|
ETHEREUM_HOSTS: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
|
|
256
255
|
L1_ACCOUNT_MNEMONIC: z.ZodDefault<z.ZodString>;
|
|
257
256
|
SEPOLIA_RUN: z.ZodDefault<z.ZodString>;
|
|
258
|
-
|
|
259
|
-
}, {
|
|
257
|
+
} & {
|
|
260
258
|
K8S: z.ZodLiteral<"gcloud">;
|
|
261
259
|
CLUSTER_NAME: z.ZodString;
|
|
262
260
|
REGION: z.ZodString;
|
|
263
261
|
PROJECT_ID: z.ZodString;
|
|
264
|
-
}
|
|
262
|
+
}, "strip", z.ZodTypeAny, {
|
|
265
263
|
ETHEREUM_SLOT_DURATION: number;
|
|
266
264
|
AZTEC_SLOT_DURATION: number;
|
|
267
265
|
AZTEC_EPOCH_DURATION: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,YAAY,EAAyB,MAAM,eAAe,CAAC;AAGpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAgB,KAAK,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAmBxF,QAAA,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsBxB,CAAC;AAEH,QAAA,MAAM,qBAAqB
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/end-to-end",
|
|
3
|
-
"version": "1.0.0-nightly.
|
|
3
|
+
"version": "1.0.0-nightly.20250729",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"inherits": [
|
|
@@ -25,40 +25,40 @@
|
|
|
25
25
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@aztec/accounts": "1.0.0-nightly.
|
|
29
|
-
"@aztec/archiver": "1.0.0-nightly.
|
|
30
|
-
"@aztec/aztec": "1.0.0-nightly.
|
|
31
|
-
"@aztec/aztec-node": "1.0.0-nightly.
|
|
32
|
-
"@aztec/aztec.js": "1.0.0-nightly.
|
|
33
|
-
"@aztec/bb-prover": "1.0.0-nightly.
|
|
34
|
-
"@aztec/blob-lib": "1.0.0-nightly.
|
|
35
|
-
"@aztec/blob-sink": "1.0.0-nightly.
|
|
36
|
-
"@aztec/bot": "1.0.0-nightly.
|
|
37
|
-
"@aztec/cli": "1.0.0-nightly.
|
|
38
|
-
"@aztec/constants": "1.0.0-nightly.
|
|
39
|
-
"@aztec/entrypoints": "1.0.0-nightly.
|
|
40
|
-
"@aztec/epoch-cache": "1.0.0-nightly.
|
|
41
|
-
"@aztec/ethereum": "1.0.0-nightly.
|
|
42
|
-
"@aztec/foundation": "1.0.0-nightly.
|
|
43
|
-
"@aztec/kv-store": "1.0.0-nightly.
|
|
44
|
-
"@aztec/l1-artifacts": "1.0.0-nightly.
|
|
45
|
-
"@aztec/merkle-tree": "1.0.0-nightly.
|
|
46
|
-
"@aztec/noir-contracts.js": "1.0.0-nightly.
|
|
47
|
-
"@aztec/noir-noirc_abi": "1.0.0-nightly.
|
|
48
|
-
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.
|
|
49
|
-
"@aztec/noir-test-contracts.js": "1.0.0-nightly.
|
|
50
|
-
"@aztec/p2p": "1.0.0-nightly.
|
|
51
|
-
"@aztec/protocol-contracts": "1.0.0-nightly.
|
|
52
|
-
"@aztec/prover-client": "1.0.0-nightly.
|
|
53
|
-
"@aztec/prover-node": "1.0.0-nightly.
|
|
54
|
-
"@aztec/pxe": "1.0.0-nightly.
|
|
55
|
-
"@aztec/sequencer-client": "1.0.0-nightly.
|
|
56
|
-
"@aztec/simulator": "1.0.0-nightly.
|
|
57
|
-
"@aztec/slasher": "1.0.0-nightly.
|
|
58
|
-
"@aztec/stdlib": "1.0.0-nightly.
|
|
59
|
-
"@aztec/telemetry-client": "1.0.0-nightly.
|
|
60
|
-
"@aztec/validator-client": "1.0.0-nightly.
|
|
61
|
-
"@aztec/world-state": "1.0.0-nightly.
|
|
28
|
+
"@aztec/accounts": "1.0.0-nightly.20250729",
|
|
29
|
+
"@aztec/archiver": "1.0.0-nightly.20250729",
|
|
30
|
+
"@aztec/aztec": "1.0.0-nightly.20250729",
|
|
31
|
+
"@aztec/aztec-node": "1.0.0-nightly.20250729",
|
|
32
|
+
"@aztec/aztec.js": "1.0.0-nightly.20250729",
|
|
33
|
+
"@aztec/bb-prover": "1.0.0-nightly.20250729",
|
|
34
|
+
"@aztec/blob-lib": "1.0.0-nightly.20250729",
|
|
35
|
+
"@aztec/blob-sink": "1.0.0-nightly.20250729",
|
|
36
|
+
"@aztec/bot": "1.0.0-nightly.20250729",
|
|
37
|
+
"@aztec/cli": "1.0.0-nightly.20250729",
|
|
38
|
+
"@aztec/constants": "1.0.0-nightly.20250729",
|
|
39
|
+
"@aztec/entrypoints": "1.0.0-nightly.20250729",
|
|
40
|
+
"@aztec/epoch-cache": "1.0.0-nightly.20250729",
|
|
41
|
+
"@aztec/ethereum": "1.0.0-nightly.20250729",
|
|
42
|
+
"@aztec/foundation": "1.0.0-nightly.20250729",
|
|
43
|
+
"@aztec/kv-store": "1.0.0-nightly.20250729",
|
|
44
|
+
"@aztec/l1-artifacts": "1.0.0-nightly.20250729",
|
|
45
|
+
"@aztec/merkle-tree": "1.0.0-nightly.20250729",
|
|
46
|
+
"@aztec/noir-contracts.js": "1.0.0-nightly.20250729",
|
|
47
|
+
"@aztec/noir-noirc_abi": "1.0.0-nightly.20250729",
|
|
48
|
+
"@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250729",
|
|
49
|
+
"@aztec/noir-test-contracts.js": "1.0.0-nightly.20250729",
|
|
50
|
+
"@aztec/p2p": "1.0.0-nightly.20250729",
|
|
51
|
+
"@aztec/protocol-contracts": "1.0.0-nightly.20250729",
|
|
52
|
+
"@aztec/prover-client": "1.0.0-nightly.20250729",
|
|
53
|
+
"@aztec/prover-node": "1.0.0-nightly.20250729",
|
|
54
|
+
"@aztec/pxe": "1.0.0-nightly.20250729",
|
|
55
|
+
"@aztec/sequencer-client": "1.0.0-nightly.20250729",
|
|
56
|
+
"@aztec/simulator": "1.0.0-nightly.20250729",
|
|
57
|
+
"@aztec/slasher": "1.0.0-nightly.20250729",
|
|
58
|
+
"@aztec/stdlib": "1.0.0-nightly.20250729",
|
|
59
|
+
"@aztec/telemetry-client": "1.0.0-nightly.20250729",
|
|
60
|
+
"@aztec/validator-client": "1.0.0-nightly.20250729",
|
|
61
|
+
"@aztec/world-state": "1.0.0-nightly.20250729",
|
|
62
62
|
"@iarna/toml": "^2.2.5",
|
|
63
63
|
"@jest/globals": "^30.0.0",
|
|
64
64
|
"@noble/curves": "^1.0.0",
|
|
@@ -10,13 +10,7 @@ import {
|
|
|
10
10
|
} from '@aztec/aztec.js';
|
|
11
11
|
import { CheatCodes } from '@aztec/aztec/testing';
|
|
12
12
|
import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
|
|
13
|
-
import {
|
|
14
|
-
type DeployL1ContractsArgs,
|
|
15
|
-
RollupContract,
|
|
16
|
-
createExtendedL1Client,
|
|
17
|
-
getPublicClient,
|
|
18
|
-
l1Artifacts,
|
|
19
|
-
} from '@aztec/ethereum';
|
|
13
|
+
import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client } from '@aztec/ethereum';
|
|
20
14
|
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
21
15
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
22
16
|
import { TestERC20Abi } from '@aztec/l1-artifacts';
|
|
@@ -81,6 +75,8 @@ export class FeesTest {
|
|
|
81
75
|
|
|
82
76
|
public gasSettings!: GasSettings;
|
|
83
77
|
|
|
78
|
+
public rollupContract!: RollupContract;
|
|
79
|
+
|
|
84
80
|
public feeJuiceContract!: FeeJuiceContract;
|
|
85
81
|
public bananaCoin!: BananaCoin;
|
|
86
82
|
public bananaFPC!: FPCContract;
|
|
@@ -124,8 +120,8 @@ export class FeesTest {
|
|
|
124
120
|
const context = await this.snapshotManager.setup();
|
|
125
121
|
await context.aztecNode.setConfig({ feeRecipient: this.sequencerAddress, coinbase: this.coinbase });
|
|
126
122
|
|
|
127
|
-
|
|
128
|
-
this.chainMonitor = new ChainMonitor(rollupContract, context.dateProvider, this.logger, 200).start();
|
|
123
|
+
this.rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
|
|
124
|
+
this.chainMonitor = new ChainMonitor(this.rollupContract, context.dateProvider, this.logger, 200).start();
|
|
129
125
|
|
|
130
126
|
return this;
|
|
131
127
|
}
|
|
@@ -147,16 +143,10 @@ export class FeesTest {
|
|
|
147
143
|
}
|
|
148
144
|
|
|
149
145
|
async getBlockRewards() {
|
|
150
|
-
const
|
|
151
|
-
address: this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
|
|
152
|
-
abi: l1Artifacts.rewardDistributor.contractAbi,
|
|
153
|
-
client: this.context.deployL1ContractsValues.l1Client,
|
|
154
|
-
});
|
|
155
|
-
|
|
156
|
-
const blockReward = await rewardDistributor.read.BLOCK_REWARD();
|
|
146
|
+
const blockReward = await this.rollupContract.getBlockReward();
|
|
157
147
|
|
|
158
148
|
const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(
|
|
159
|
-
|
|
149
|
+
this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress,
|
|
160
150
|
);
|
|
161
151
|
|
|
162
152
|
const toDistribute = balance > blockReward ? blockReward : balance;
|
|
@@ -304,20 +294,12 @@ export class FeesTest {
|
|
|
304
294
|
};
|
|
305
295
|
|
|
306
296
|
this.getCoinbaseSequencerRewards = async () => {
|
|
307
|
-
|
|
308
|
-
const rollup = new RollupContract(l1Client, data.rollupAddress);
|
|
309
|
-
return await rollup.getSequencerRewards(this.coinbase);
|
|
297
|
+
return await this.rollupContract.getSequencerRewards(this.coinbase);
|
|
310
298
|
};
|
|
311
299
|
|
|
312
300
|
this.getProverFee = async (blockNumber: number) => {
|
|
313
301
|
const block = await this.pxe.getBlock(blockNumber);
|
|
314
302
|
|
|
315
|
-
const publicClient = getPublicClient({
|
|
316
|
-
l1RpcUrls: context.aztecNodeConfig.l1RpcUrls,
|
|
317
|
-
l1ChainId: context.aztecNodeConfig.l1ChainId,
|
|
318
|
-
});
|
|
319
|
-
const rollup = new RollupContract(publicClient, data.rollupAddress);
|
|
320
|
-
|
|
321
303
|
// @todo @lherskind As we deal with #13601
|
|
322
304
|
// Right now the value is from `FeeLib.sol`
|
|
323
305
|
const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
|
|
@@ -325,15 +307,15 @@ export class FeesTest {
|
|
|
325
307
|
// We round up
|
|
326
308
|
const mulDiv = (a: bigint, b: bigint, c: bigint) => (a * b) / c + ((a * b) % c > 0n ? 1n : 0n);
|
|
327
309
|
|
|
328
|
-
const { baseFee } = await
|
|
310
|
+
const { baseFee } = await this.rollupContract.getL1FeesAt(block!.header.globalVariables.timestamp);
|
|
329
311
|
const proverCost =
|
|
330
312
|
mulDiv(
|
|
331
|
-
mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await
|
|
313
|
+
mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await this.rollupContract.getEpochDuration()),
|
|
332
314
|
1n,
|
|
333
|
-
await
|
|
334
|
-
) + (await
|
|
315
|
+
await this.rollupContract.getManaTarget(),
|
|
316
|
+
) + (await this.rollupContract.getProvingCostPerMana());
|
|
335
317
|
|
|
336
|
-
const price = await
|
|
318
|
+
const price = await this.rollupContract.getFeeAssetPerEth();
|
|
337
319
|
|
|
338
320
|
const mana = block!.header.totalManaUsed.toBigInt();
|
|
339
321
|
return mulDiv(mana * proverCost, price, 10n ** 9n);
|
|
@@ -5,17 +5,18 @@ import { type AccountWalletWithSecretKey, EthAddress } from '@aztec/aztec.js';
|
|
|
5
5
|
import {
|
|
6
6
|
type ExtendedViemWalletClient,
|
|
7
7
|
L1TxUtils,
|
|
8
|
+
MultiAdderArtifact,
|
|
8
9
|
type Operator,
|
|
9
10
|
RollupContract,
|
|
10
11
|
type ViemClient,
|
|
11
12
|
deployL1Contract,
|
|
12
13
|
getL1ContractsConfigEnvVars,
|
|
13
|
-
l1Artifacts,
|
|
14
14
|
} from '@aztec/ethereum';
|
|
15
15
|
import { ChainMonitor } from '@aztec/ethereum/test';
|
|
16
16
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
17
17
|
import { RollupAbi, SlashFactoryAbi, SlasherAbi, SlashingProposerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
|
|
18
18
|
import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
|
|
19
|
+
import { privateKeyFromHex } from '@aztec/p2p';
|
|
19
20
|
import type { BootstrapNode } from '@aztec/p2p/bootstrap';
|
|
20
21
|
import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
|
|
21
22
|
import { tryStop } from '@aztec/stdlib/interfaces/server';
|
|
@@ -154,7 +155,7 @@ export class P2PNetworkTest {
|
|
|
154
155
|
}) {
|
|
155
156
|
const port = basePort || (await getPort());
|
|
156
157
|
|
|
157
|
-
const bootstrapNodeENR =
|
|
158
|
+
const bootstrapNodeENR = getBootstrapNodeEnr(privateKeyFromHex(BOOTSTRAP_NODE_PRIVATE_KEY), port);
|
|
158
159
|
const bootstrapNodeEnr = bootstrapNodeENR.encodeTxt();
|
|
159
160
|
|
|
160
161
|
const initialValidatorConfig = await createValidatorConfig(
|
|
@@ -186,7 +187,7 @@ export class P2PNetworkTest {
|
|
|
186
187
|
await this.snapshotManager.snapshot('add-bootstrap-node', async ({ aztecNodeConfig }) => {
|
|
187
188
|
const telemetry = getEndToEndTestTelemetryClient(this.metricsPort);
|
|
188
189
|
this.bootstrapNode = await createBootstrapNodeFromPrivateKey(
|
|
189
|
-
BOOTSTRAP_NODE_PRIVATE_KEY,
|
|
190
|
+
privateKeyFromHex(BOOTSTRAP_NODE_PRIVATE_KEY),
|
|
190
191
|
this.bootNodePort,
|
|
191
192
|
telemetry,
|
|
192
193
|
aztecNodeConfig,
|
|
@@ -234,14 +235,14 @@ export class P2PNetworkTest {
|
|
|
234
235
|
|
|
235
236
|
const { address: multiAdderAddress } = await deployL1Contract(
|
|
236
237
|
deployL1ContractsValues.l1Client,
|
|
237
|
-
|
|
238
|
-
|
|
238
|
+
MultiAdderArtifact.contractAbi,
|
|
239
|
+
MultiAdderArtifact.contractBytecode,
|
|
239
240
|
[rollup.address, deployL1ContractsValues.l1Client.account.address],
|
|
240
241
|
);
|
|
241
242
|
|
|
242
243
|
const multiAdder = getContract({
|
|
243
244
|
address: multiAdderAddress.toString(),
|
|
244
|
-
abi:
|
|
245
|
+
abi: MultiAdderArtifact.contractAbi,
|
|
245
246
|
client: deployL1ContractsValues.l1Client,
|
|
246
247
|
});
|
|
247
248
|
|
|
@@ -20,10 +20,11 @@ import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/serv
|
|
|
20
20
|
import {
|
|
21
21
|
type DeployL1ContractsArgs,
|
|
22
22
|
type DeployL1ContractsReturnType,
|
|
23
|
+
FeeAssetArtifact,
|
|
24
|
+
RollupContract,
|
|
23
25
|
createExtendedL1Client,
|
|
24
26
|
deployMulticall3,
|
|
25
27
|
getL1ContractsConfigEnvVars,
|
|
26
|
-
l1Artifacts,
|
|
27
28
|
} from '@aztec/ethereum';
|
|
28
29
|
import { EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
|
|
29
30
|
import { asyncMap } from '@aztec/foundation/async-map';
|
|
@@ -378,22 +379,24 @@ async function setupFromFresh(
|
|
|
378
379
|
if (opts.fundRewardDistributor) {
|
|
379
380
|
// Mints block rewards for 10000 blocks to the rewardDistributor contract
|
|
380
381
|
|
|
381
|
-
const
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
});
|
|
382
|
+
const rollup = new RollupContract(
|
|
383
|
+
deployL1ContractsValues.l1Client,
|
|
384
|
+
deployL1ContractsValues.l1ContractAddresses.rollupAddress,
|
|
385
|
+
);
|
|
386
386
|
|
|
387
|
-
const blockReward = await
|
|
387
|
+
const blockReward = await rollup.getBlockReward();
|
|
388
388
|
const mintAmount = 10_000n * (blockReward as bigint);
|
|
389
389
|
|
|
390
390
|
const feeJuice = getContract({
|
|
391
391
|
address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
|
|
392
|
-
abi:
|
|
392
|
+
abi: FeeAssetArtifact.contractAbi,
|
|
393
393
|
client: deployL1ContractsValues.l1Client,
|
|
394
394
|
});
|
|
395
395
|
|
|
396
|
-
const rewardDistributorMintTxHash = await feeJuice.write.mint(
|
|
396
|
+
const rewardDistributorMintTxHash = await feeJuice.write.mint(
|
|
397
|
+
[deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(), mintAmount],
|
|
398
|
+
{} as any,
|
|
399
|
+
);
|
|
397
400
|
await deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: rewardDistributorMintTxHash });
|
|
398
401
|
logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
|
|
399
402
|
}
|
package/src/fixtures/utils.ts
CHANGED
|
@@ -33,14 +33,15 @@ import { GENESIS_ARCHIVE_ROOT, SPONSORED_FPC_SALT } from '@aztec/constants';
|
|
|
33
33
|
import {
|
|
34
34
|
type DeployL1ContractsArgs,
|
|
35
35
|
type DeployL1ContractsReturnType,
|
|
36
|
+
FeeAssetArtifact,
|
|
36
37
|
NULL_KEY,
|
|
37
38
|
type Operator,
|
|
39
|
+
RollupContract,
|
|
38
40
|
createExtendedL1Client,
|
|
39
41
|
deployL1Contracts,
|
|
40
42
|
deployMulticall3,
|
|
41
43
|
getL1ContractsConfigEnvVars,
|
|
42
44
|
isAnvilTestChain,
|
|
43
|
-
l1Artifacts,
|
|
44
45
|
} from '@aztec/ethereum';
|
|
45
46
|
import { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
|
|
46
47
|
import { SecretValue } from '@aztec/foundation/config';
|
|
@@ -483,22 +484,24 @@ export async function setup(
|
|
|
483
484
|
if (opts.fundRewardDistributor) {
|
|
484
485
|
// Mints block rewards for 10000 blocks to the rewardDistributor contract
|
|
485
486
|
|
|
486
|
-
const
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
});
|
|
487
|
+
const rollup = new RollupContract(
|
|
488
|
+
deployL1ContractsValues.l1Client,
|
|
489
|
+
deployL1ContractsValues.l1ContractAddresses.rollupAddress,
|
|
490
|
+
);
|
|
491
491
|
|
|
492
|
-
const blockReward = await
|
|
492
|
+
const blockReward = await rollup.getBlockReward();
|
|
493
493
|
const mintAmount = 10_000n * (blockReward as bigint);
|
|
494
494
|
|
|
495
495
|
const feeJuice = getContract({
|
|
496
496
|
address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
|
|
497
|
-
abi:
|
|
497
|
+
abi: FeeAssetArtifact.contractAbi,
|
|
498
498
|
client: deployL1ContractsValues.l1Client,
|
|
499
499
|
});
|
|
500
500
|
|
|
501
|
-
const rewardDistributorMintTxHash = await feeJuice.write.mint(
|
|
501
|
+
const rewardDistributorMintTxHash = await feeJuice.write.mint(
|
|
502
|
+
[deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(), mintAmount],
|
|
503
|
+
{} as any,
|
|
504
|
+
);
|
|
502
505
|
await deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: rewardDistributorMintTxHash });
|
|
503
506
|
logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
|
|
504
507
|
}
|