Skip to content
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.

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

feat: Testnet Deploy Branch #9788

Closed
wants to merge 56 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
86762a1
feat: sequencer is aware of slot progression (#9767)
just-mitch Nov 6, 2024
5bae479
fix: don't crash sequencer when it is too slow (#9790)
just-mitch Nov 6, 2024
7bc5e56
chore: more descriptive slack alert take 2 (#9791)
ludamad Nov 6, 2024
c95e5fd
feat: constify eccvm and translator (#9661)
lucasxia01 Nov 7, 2024
01f7c01
git subrepo push --branch=master barretenberg
AztecBot Nov 7, 2024
28d469b
chore: replace relative paths to noir-protocol-circuits
AztecBot Nov 7, 2024
91bfe6c
git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
AztecBot Nov 7, 2024
7a7e75c
git subrepo push --branch=master noir-projects/aztec-nr
AztecBot Nov 7, 2024
2fcf94e
feat: process tagged logs (#9623)
Thunkar Nov 7, 2024
d5e9a98
chore: range error flake (#9784)
LHerskind Nov 7, 2024
2509e2f
chore: Boring names (#9725)
LHerskind Nov 7, 2024
f1cdc2d
feat: prove openings of masking polynomials in ECCVM and Translator (…
iakovenkos Nov 7, 2024
f6f0be8
chore: update boundary in test (#9728)
LHerskind Nov 7, 2024
65b1cd2
refactor: Improve input validation in bootstrap.sh and refactor bit_t…
cypherpepe Nov 7, 2024
0cb0343
feat: add canPruneAtTime (#9751)
LHerskind Nov 7, 2024
1b41d38
chore: reverts "cleanup and address comments after refactor" (#9801)
dbanks12 Nov 7, 2024
f4c6f0e
fix: re-enable p2p tests (#9777)
Maddiaa0 Nov 7, 2024
ae7cfe7
feat: Constrain App function VKs (#9756)
sirasistant Nov 7, 2024
d77e473
feat: Origin Tags part 3 (Memory) (#9758)
Rumata888 Nov 7, 2024
58e75cd
feat: extract gossipsub / discv5 dependency gauge prometheus metrics …
Maddiaa0 Nov 7, 2024
48969ce
feat(telemetry): configurable collection time (#9741)
Maddiaa0 Nov 7, 2024
4660381
feat: introduce avm circuit public inputs (#9759)
LeilaWang Nov 7, 2024
9de9e4d
feat(docs): add Sandbox PXE proving doc (#9815)
critesjosh Nov 7, 2024
2a98ebb
Chore: Fix for boot node pod dns in Google Kubernetes Engine (#9818)
stevenplatt Nov 7, 2024
ddba505
chore: remove some more warnings (#9819)
nventuro Nov 8, 2024
bd2a4f7
git subrepo push --branch=master barretenberg
AztecBot Nov 8, 2024
1c6cca5
chore: replace relative paths to noir-protocol-circuits
AztecBot Nov 8, 2024
2f42b47
git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
AztecBot Nov 8, 2024
f96ce2f
git subrepo push --branch=master noir-projects/aztec-nr
AztecBot Nov 8, 2024
0ebd52e
chore: rename aggregation object to pairing point accumulator (#9817)
lucasxia01 Nov 8, 2024
3a49cfb
fix: ci.yml, use correct runner (#9824)
ludamad Nov 8, 2024
2096dc2
feat: mega zk features (#9774)
iakovenkos Nov 8, 2024
f6875ee
test: deflaker CI for testnet branch (#9820)
ludamad Nov 8, 2024
e06b192
fix(docs): Add missing dependency in token tutorial (#9845)
critesjosh Nov 8, 2024
2e13938
refactor: nuking `pay_refund_with_shielded_rebate` flow (#9639)
benesjan Nov 8, 2024
9bc5a2f
feat: send G_0 in proof to reduce tube size (#9766)
lucasxia01 Nov 8, 2024
3a8e8bf
chore: disable rediscovery test (#9844)
Maddiaa0 Nov 8, 2024
90696cd
feat: bb.js tests of ClientIVC (#9412)
codygunton Nov 8, 2024
61c33a0
chore: bump runner cache disk size (#9849)
ludamad Nov 8, 2024
82fd125
feat: domain separate block proposals and attestations (#9842)
Maddiaa0 Nov 8, 2024
23ff518
feat: zk shplemini (#9830)
iakovenkos Nov 8, 2024
9978c97
fix: Fix mac build by calling `count` on durations (#9855)
codygunton Nov 8, 2024
6f10be3
fix: bench prover test (#9856)
benesjan Nov 8, 2024
fccbb36
fix(build): l1-contracts .rebuild_patterns did not cover test files (…
ludamad Nov 8, 2024
23c122d
fix: tree heights that last past 3 days (#9760)
ludamad Nov 8, 2024
059c895
git subrepo push --branch=master barretenberg
AztecBot Nov 9, 2024
e044c67
chore: replace relative paths to noir-protocol-circuits
AztecBot Nov 9, 2024
7b7fc2a
git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
AztecBot Nov 9, 2024
402cfc3
git subrepo push --branch=master noir-projects/aztec-nr
AztecBot Nov 9, 2024
bfd4f2c
chore: Move epoch and slot durations to config (#9861)
spalladino Nov 9, 2024
5299f5f
fix: Revert changes to ci.yml (#9863)
codygunton Nov 9, 2024
5246251
fix: fixing devcontainers to use the sandbox docker-compose file (#9782)
signorecello Nov 9, 2024
6554122
chore: Validate RPC inputs (#9672)
spalladino Nov 10, 2024
5be770f
fix: deploy l2 contracts fails on 48 validator (#9860)
just-mitch Nov 11, 2024
7d1c797
Revert "fix: deploy l2 contracts fails on 48 validator" (#9871)
ludamad Nov 11, 2024
dd83d52
chore: Revert "chore: Validate RPC inputs" (#9875)
ludamad Nov 11, 2024
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
Prev Previous commit
Next Next commit
chore: Boring names (#9725)
Fixes #8328 by using boring names. 

Ends up with a lot of tiny changes in the form of paths and variable
names etc. Some of the environment variable names are changed.



![The Big Lebowski Goodnight Sweet Prince
GIF](https://media1.giphy.com/media/jtUiNaYnqZZlu/giphy.gif)

---------

Co-authored-by: just-mitch <[email protected]>
LHerskind and just-mitch authored Nov 7, 2024

Verified

This commit was signed with the committer’s verified signature.
commit 2509e2f132d30efa5085e9740279529ce551215a
9 changes: 2 additions & 7 deletions cspell.json
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
"acvm",
"addrs",
"alphanet",
"Apella",
"Governance",
"archiver",
"assignement",
"asyncify",
@@ -102,7 +102,6 @@
"fullpath",
"fuzzer",
"fuzzers",
"Gerousia",
"gitmodules",
"gitrepo",
"Gossipable",
@@ -169,7 +168,6 @@
"nodebuffer",
"noirc",
"noirup",
"Nomismatokopio",
"nullifer",
"offchain",
"onchain",
@@ -250,7 +248,6 @@
"subrepo",
"subroot",
"suyash",
"Sysstia",
"templating",
"tldr",
"toplevel",
@@ -316,7 +313,5 @@
"lib",
"*.cmake"
],
"flagWords": [
"anonymous"
]
"flagWords": ["anonymous"]
}
2 changes: 1 addition & 1 deletion l1-contracts/.rebuild_patterns
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
^l1-contracts/src/.*\.sol$
^l1-contracts/test/governance/scenario/NewGerousiaPayload.sol$
^l1-contracts/test/governance/scenario/NewGovernanceProposerPayload.sol$
22 changes: 11 additions & 11 deletions l1-contracts/src/core/Rollup.sol
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ import {TxsDecoder} from "@aztec/core/libraries/TxsDecoder.sol";
import {Inbox} from "@aztec/core/messagebridge/Inbox.sol";
import {Outbox} from "@aztec/core/messagebridge/Outbox.sol";
import {ProofCommitmentEscrow} from "@aztec/core/ProofCommitmentEscrow.sol";
import {ISysstia} from "@aztec/governance/interfaces/ISysstia.sol";
import {IRewardDistributor} from "@aztec/governance/interfaces/IRewardDistributor.sol";
import {MockVerifier} from "@aztec/mock/MockVerifier.sol";
import {IERC20} from "@oz/token/ERC20/IERC20.sol";
import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
@@ -64,7 +64,7 @@ contract Rollup is EIP712("Aztec Rollup", "1"), Leonidas, IRollup, ITestRollup {
IProofCommitmentEscrow public immutable PROOF_COMMITMENT_ESCROW;
uint256 public immutable VERSION;
IFeeJuicePortal public immutable FEE_JUICE_PORTAL;
ISysstia public immutable SYSSTIA;
IRewardDistributor public immutable REWARD_DISTRIBUTOR;
IERC20 public immutable ASSET;
IVerifier public epochProofVerifier;

@@ -87,15 +87,15 @@ contract Rollup is EIP712("Aztec Rollup", "1"), Leonidas, IRollup, ITestRollup {

constructor(
IFeeJuicePortal _fpcJuicePortal,
ISysstia _sysstia,
IRewardDistributor _rewardDistributor,
bytes32 _vkTreeRoot,
bytes32 _protocolContractTreeRoot,
address _ares,
address[] memory _validators
) Leonidas(_ares) {
epochProofVerifier = new MockVerifier();
FEE_JUICE_PORTAL = _fpcJuicePortal;
SYSSTIA = _sysstia;
REWARD_DISTRIBUTOR = _rewardDistributor;
ASSET = _fpcJuicePortal.UNDERLYING();
PROOF_COMMITMENT_ESCROW = new ProofCommitmentEscrow(ASSET, address(this));
INBOX = IInbox(address(new Inbox(address(this), Constants.L1_TO_L2_MSG_SUBTREE_HEIGHT)));
@@ -240,11 +240,11 @@ contract Rollup is EIP712("Aztec Rollup", "1"), Leonidas, IRollup, ITestRollup {
// @note Only if the rollup is the canonical will it be able to meaningfully claim fees
// Otherwise, the fees are unbacked #7938.
bool isFeeCanonical = address(this) == FEE_JUICE_PORTAL.canonicalRollup();
bool isSysstiaCanonical = address(this) == SYSSTIA.canonicalRollup();
bool isRewardDistributorCanonical = address(this) == REWARD_DISTRIBUTOR.canonicalRollup();

uint256 totalProverReward = 0;

if (isFeeCanonical || isSysstiaCanonical) {
if (isFeeCanonical || isRewardDistributorCanonical) {
for (uint256 i = 0; i < _epochSize; i++) {
address coinbase = address(uint160(uint256(publicInputs[9 + i * 2])));
uint256 reward = 0;
@@ -258,8 +258,8 @@ contract Rollup is EIP712("Aztec Rollup", "1"), Leonidas, IRollup, ITestRollup {
}
}

if (isSysstiaCanonical) {
reward += SYSSTIA.claim(address(this));
if (isRewardDistributorCanonical) {
reward += REWARD_DISTRIBUTOR.claim(address(this));
}

if (coinbase == address(0)) {
@@ -498,16 +498,16 @@ contract Rollup is EIP712("Aztec Rollup", "1"), Leonidas, IRollup, ITestRollup {
_fakeBlockNumberAsProven(blockNumber);

bool isFeeCanonical = address(this) == FEE_JUICE_PORTAL.canonicalRollup();
bool isSysstiaCanonical = address(this) == SYSSTIA.canonicalRollup();
bool isRewardDistributorCanonical = address(this) == REWARD_DISTRIBUTOR.canonicalRollup();

if (isFeeCanonical && header.globalVariables.coinbase != address(0) && header.totalFees > 0) {
// @note This will currently fail if there are insufficient funds in the bridge
// which WILL happen for the old version after an upgrade where the bridge follow.
// Consider allowing a failure. See #7938.
FEE_JUICE_PORTAL.distributeFees(header.globalVariables.coinbase, header.totalFees);
}
if (isSysstiaCanonical && header.globalVariables.coinbase != address(0)) {
SYSSTIA.claim(header.globalVariables.coinbase);
if (isRewardDistributorCanonical && header.globalVariables.coinbase != address(0)) {
REWARD_DISTRIBUTOR.claim(header.globalVariables.coinbase);
}

emit L2ProofVerified(blockNumber, "CHEAT");
2 changes: 1 addition & 1 deletion l1-contracts/src/core/interfaces/IRollup.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {IInbox} from "@aztec/core/interfaces/messagebridge/IInbox.sol";
2 changes: 1 addition & 1 deletion l1-contracts/src/core/interfaces/IVerifier.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

interface IVerifier {
2 changes: 1 addition & 1 deletion l1-contracts/src/core/interfaces/messagebridge/IInbox.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {DataStructures} from "../../libraries/DataStructures.sol";
2 changes: 1 addition & 1 deletion l1-contracts/src/core/libraries/ConstantsGen.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// GENERATED FILE - DO NOT EDIT, RUN yarn remake-constants in circuits.js
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

/**
2 changes: 1 addition & 1 deletion l1-contracts/src/core/libraries/Errors.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {Timestamp, Slot, Epoch} from "@aztec/core/libraries/TimeMath.sol";
2 changes: 1 addition & 1 deletion l1-contracts/src/core/libraries/HeaderLib.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
2 changes: 1 addition & 1 deletion l1-contracts/src/core/libraries/TxsDecoder.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
2 changes: 1 addition & 1 deletion l1-contracts/src/core/libraries/crypto/FrontierLib.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
2 changes: 1 addition & 1 deletion l1-contracts/src/core/libraries/crypto/Hash.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {DataStructures} from "@aztec/core/libraries/DataStructures.sol";
2 changes: 1 addition & 1 deletion l1-contracts/src/core/messagebridge/Inbox.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {IInbox} from "@aztec/core/interfaces/messagebridge/IInbox.sol";
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2023 Aztec Labs.
// Copyright 2024 Aztec Labs.
pragma solidity >=0.8.27;

import {ICoinIssuer} from "@aztec/governance/interfaces/ICoinIssuer.sol";
import {IMintableERC20} from "@aztec/governance/interfaces/IMintableERC20.sol";
import {INomismatokopio} from "@aztec/governance/interfaces/INomismatokopio.sol";
import {Errors} from "@aztec/governance/libraries/Errors.sol";
import {Ownable} from "@oz/access/Ownable.sol";

contract Nomismatokopio is INomismatokopio, Ownable {
/**
* @title CoinIssuer
* @author Aztec Labs
* @notice A contract that allows minting of coins at a maximum fixed rate
*/
contract CoinIssuer is ICoinIssuer, Ownable {
IMintableERC20 public immutable ASSET;
uint256 public immutable RATE;
uint256 public timeOfLastMint;
@@ -26,9 +31,9 @@ contract Nomismatokopio is INomismatokopio, Ownable {
* @param _to - The address to receive the funds
* @param _amount - The amount to mint
*/
function mint(address _to, uint256 _amount) external override(INomismatokopio) onlyOwner {
function mint(address _to, uint256 _amount) external override(ICoinIssuer) onlyOwner {
uint256 maxMint = mintAvailable();
require(_amount <= maxMint, Errors.Nomismatokopio__InssuficientMintAvailable(maxMint, _amount));
require(_amount <= maxMint, Errors.CoinIssuer__InssuficientMintAvailable(maxMint, _amount));
timeOfLastMint = block.timestamp;
ASSET.mint(_to, _amount);
}
@@ -38,7 +43,7 @@ contract Nomismatokopio is INomismatokopio, Ownable {
*
* @return The amount mintable
*/
function mintAvailable() public view override(INomismatokopio) returns (uint256) {
function mintAvailable() public view override(ICoinIssuer) returns (uint256) {
return RATE * (block.timestamp - timeOfLastMint);
}
}
Loading

Unchanged files with check annotations Beta

# install SRS needed for proving
COPY --dir ./srs_db/+build/. srs_db
RUN echo "Warning: If ./bin/client_ivc_tests is not found, there may be build failures above."
RUN cd build && ./bin/client_ivc_tests --gtest_filter="*BasicStructured"

Check failure on line 110 in barretenberg/cpp/Earthfile

GitHub Actions / bb-msan-check

Error

The command RUN cd build && ./bin/client_ivc_tests --gtest_filter="*BasicStructured" did not complete successfully. Exit code 1
preset-check:
ARG preset
RUN cmake --preset $preset -Bbuild && cmake --build build --target client_ivc_tests
# install SRS needed for proving
COPY --dir ./srs_db/+build/. srs_db
RUN cd build && ./bin/client_ivc_tests --gtest_filter="*BasicStructured"

Check failure on line 118 in barretenberg/cpp/Earthfile

GitHub Actions / bb-tsan-check

Error

The command RUN cd build && ./bin/client_ivc_tests --gtest_filter="*BasicStructured" did not complete successfully. Exit code 66
preset-wasm:
ARG TARGETARCH