@aztec/end-to-end 2.0.0-rc.34 → 2.0.0-rc.35

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.
Files changed (4) hide show
  1. package/dest/e2e_fees/fees_test.d.ts.map +1 -1
  2. package/dest/e2e_fees/fees_test.js +3 -2
  3. package/package.json +36 -36
  4. package/src/e2e_fees/fees_test.ts +3 -2
package/dest/e2e_fees/fees_test.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fees_test.d.ts","sourceRoot":"","sources":["../../src/e2e_fees/fees_test.ts"],"names":[],"mappings":"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"}
package/dest/e2e_fees/fees_test.js CHANGED
@@ -105,9 +105,10 @@ const { E2E_DATA_PATH: dataPath } = process.env;
105
105
  }
106
106
  async getBlockRewards() {
107
107
  const blockReward = await this.rollupContract.getBlockReward();
108
- const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress);
108
+ const rewardConfig = await this.rollupContract.getRewardConfig();
109
+ const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(EthAddress.fromString(rewardConfig.rewardDistributor));
109
110
  const toDistribute = balance > blockReward ? blockReward : balance;
110
- const sequencerBlockRewards = toDistribute / 2n;
111
+ const sequencerBlockRewards = toDistribute * BigInt(rewardConfig.sequencerBps) / 10000n;
111
112
  const proverBlockRewards = toDistribute - sequencerBlockRewards;
112
113
  return {
113
114
  sequencerBlockRewards,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/end-to-end",
3
- "version": "2.0.0-rc.34",
3
+ "version": "2.0.0-rc.35",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "inherits": [
@@ -25,41 +25,41 @@
25
25
  "formatting": "run -T prettier --check ./src && run -T eslint ./src"
26
26
  },
27
27
  "dependencies": {
28
- "@aztec/accounts": "2.0.0-rc.34",
29
- "@aztec/archiver": "2.0.0-rc.34",
30
- "@aztec/aztec": "2.0.0-rc.34",
31
- "@aztec/aztec-node": "2.0.0-rc.34",
32
- "@aztec/aztec.js": "2.0.0-rc.34",
33
- "@aztec/bb-prover": "2.0.0-rc.34",
34
- "@aztec/blob-lib": "2.0.0-rc.34",
35
- "@aztec/blob-sink": "2.0.0-rc.34",
36
- "@aztec/bot": "2.0.0-rc.34",
37
- "@aztec/cli": "2.0.0-rc.34",
38
- "@aztec/constants": "2.0.0-rc.34",
39
- "@aztec/entrypoints": "2.0.0-rc.34",
40
- "@aztec/epoch-cache": "2.0.0-rc.34",
41
- "@aztec/ethereum": "2.0.0-rc.34",
42
- "@aztec/foundation": "2.0.0-rc.34",
43
- "@aztec/kv-store": "2.0.0-rc.34",
44
- "@aztec/l1-artifacts": "2.0.0-rc.34",
45
- "@aztec/merkle-tree": "2.0.0-rc.34",
46
- "@aztec/node-keystore": "2.0.0-rc.34",
47
- "@aztec/noir-contracts.js": "2.0.0-rc.34",
48
- "@aztec/noir-noirc_abi": "2.0.0-rc.34",
49
- "@aztec/noir-protocol-circuits-types": "2.0.0-rc.34",
50
- "@aztec/noir-test-contracts.js": "2.0.0-rc.34",
51
- "@aztec/p2p": "2.0.0-rc.34",
52
- "@aztec/protocol-contracts": "2.0.0-rc.34",
53
- "@aztec/prover-client": "2.0.0-rc.34",
54
- "@aztec/prover-node": "2.0.0-rc.34",
55
- "@aztec/pxe": "2.0.0-rc.34",
56
- "@aztec/sequencer-client": "2.0.0-rc.34",
57
- "@aztec/simulator": "2.0.0-rc.34",
58
- "@aztec/slasher": "2.0.0-rc.34",
59
- "@aztec/stdlib": "2.0.0-rc.34",
60
- "@aztec/telemetry-client": "2.0.0-rc.34",
61
- "@aztec/validator-client": "2.0.0-rc.34",
62
- "@aztec/world-state": "2.0.0-rc.34",
28
+ "@aztec/accounts": "2.0.0-rc.35",
29
+ "@aztec/archiver": "2.0.0-rc.35",
30
+ "@aztec/aztec": "2.0.0-rc.35",
31
+ "@aztec/aztec-node": "2.0.0-rc.35",
32
+ "@aztec/aztec.js": "2.0.0-rc.35",
33
+ "@aztec/bb-prover": "2.0.0-rc.35",
34
+ "@aztec/blob-lib": "2.0.0-rc.35",
35
+ "@aztec/blob-sink": "2.0.0-rc.35",
36
+ "@aztec/bot": "2.0.0-rc.35",
37
+ "@aztec/cli": "2.0.0-rc.35",
38
+ "@aztec/constants": "2.0.0-rc.35",
39
+ "@aztec/entrypoints": "2.0.0-rc.35",
40
+ "@aztec/epoch-cache": "2.0.0-rc.35",
41
+ "@aztec/ethereum": "2.0.0-rc.35",
42
+ "@aztec/foundation": "2.0.0-rc.35",
43
+ "@aztec/kv-store": "2.0.0-rc.35",
44
+ "@aztec/l1-artifacts": "2.0.0-rc.35",
45
+ "@aztec/merkle-tree": "2.0.0-rc.35",
46
+ "@aztec/node-keystore": "2.0.0-rc.35",
47
+ "@aztec/noir-contracts.js": "2.0.0-rc.35",
48
+ "@aztec/noir-noirc_abi": "2.0.0-rc.35",
49
+ "@aztec/noir-protocol-circuits-types": "2.0.0-rc.35",
50
+ "@aztec/noir-test-contracts.js": "2.0.0-rc.35",
51
+ "@aztec/p2p": "2.0.0-rc.35",
52
+ "@aztec/protocol-contracts": "2.0.0-rc.35",
53
+ "@aztec/prover-client": "2.0.0-rc.35",
54
+ "@aztec/prover-node": "2.0.0-rc.35",
55
+ "@aztec/pxe": "2.0.0-rc.35",
56
+ "@aztec/sequencer-client": "2.0.0-rc.35",
57
+ "@aztec/simulator": "2.0.0-rc.35",
58
+ "@aztec/slasher": "2.0.0-rc.35",
59
+ "@aztec/stdlib": "2.0.0-rc.35",
60
+ "@aztec/telemetry-client": "2.0.0-rc.35",
61
+ "@aztec/validator-client": "2.0.0-rc.35",
62
+ "@aztec/world-state": "2.0.0-rc.35",
63
63
  "@iarna/toml": "^2.2.5",
64
64
  "@jest/globals": "^30.0.0",
65
65
  "@noble/curves": "=1.0.0",
package/src/e2e_fees/fees_test.ts CHANGED
@@ -145,13 +145,14 @@ export class FeesTest {
145
145
 
146
146
  async getBlockRewards() {
147
147
  const blockReward = await this.rollupContract.getBlockReward();
148
+ const rewardConfig = await this.rollupContract.getRewardConfig();
148
149
 
149
150
  const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(
150
- this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress,
151
+ EthAddress.fromString(rewardConfig.rewardDistributor),
151
152
  );
152
153
 
153
154
  const toDistribute = balance > blockReward ? blockReward : balance;
154
- const sequencerBlockRewards = toDistribute / 2n;
155
+ const sequencerBlockRewards = (toDistribute * BigInt(rewardConfig.sequencerBps)) / 10000n;
155
156
  const proverBlockRewards = toDistribute - sequencerBlockRewards;
156
157
 
157
158
  return { sequencerBlockRewards, proverBlockRewards };