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

fix: add attester to attestation data #1227

Open
wants to merge 4 commits into
base: release-v26
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import {IAvailBridge} from "./IAvailBridge.sol";

abstract contract AvailAttestationLib {
struct AttestationData {
/// @dev Address of the chain's diamond
address attester;
/// @dev Block number on Avail
uint32 blockNumber;
/// @dev Index of the leaf in the data root
uint128 leafIndex;
}

Expand All @@ -27,6 +31,7 @@ abstract contract AvailAttestationLib {
function _attest(IAvailBridge.MerkleProofInput memory input) internal virtual {
if (!bridge.verifyBlobLeaf(input)) revert InvalidAttestationProof();
attestations[input.leaf] = AttestationData(
msg.sender,
vectorx.rangeStartBlocks(input.rangeHash) + uint32(input.dataRootIndex) + 1,
uint128(input.leafIndex)
);
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

3,078 changes: 1,553 additions & 1,525 deletions l1-contracts/upgrade-envs/outputs/stage/run-latest.json

Large diffs are not rendered by default.

62 changes: 31 additions & 31 deletions l1-contracts/upgrade-envs/outputs/stage/verification-logs
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
forge verify-contract 0xeFdfEB1b9C6f8b7cbb6A001759ddd271547F9330 BytecodesSupplier --chain sepolia --watch
forge verify-contract 0x9BA11E5Ee2540b6DDAc450d3bC9309623Ac4d486 TestnetVerifier --chain sepolia --watch
forge verify-contract 0x267cc44E5B7905781fdf9A447D5FAFfa971D3388 DefaultUpgrade --chain sepolia --watch
forge verify-contract 0xC3Bea86875C7367e3fEE5772d18614cf34Fa9b4f L1GenesisUpgrade --chain sepolia --watch
forge verify-contract 0xdaba748E6A0F35EB08F6679434dE1d91C6B8576f GatewayUpgrade --chain sepolia --watch
forge verify-contract 0x79c9b9a7E817ABA476FAFCbC4991ad26F9701f06 RollupDAManager --chain sepolia --watch
forge verify-contract 0x6351Df4EA6cD2b57227dd8342C5C3c4c1332a716 RollupL1DAValidator --chain sepolia --watch
forge verify-contract 0xEc91AF106d70e90fB38b9474a443f37FeeF49361 ValidiumL1DAValidator --chain sepolia --watch
forge verify-contract 0x7aec98A68CdFF415B08303d0A4f9b1f3a131De22 ValidatorTimelock --constructor-args 0x0000000000000000000000007921f9f70b754a014922aca94947e23f1a4241640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010e --chain sepolia --watch
forge verify-contract 0xdC4F9423B6dbd85f18303f1652B3a56f53bD8237 Bridgehub --constructor-args 0x0000000000000000000000000000000000000000000000000000000000aa36a7000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e0000000000000000000000000000000000000000000000000000000000000064 --chain sepolia --watch
forge verify-contract 0x153A8e2A42D88a9c88Bd45eA583dc8cBB25Afae6 MessageRoot --constructor-args 0x000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce --chain sepolia --watch
forge verify-contract 0xdBB1cFFfCE359f626bC23fe7fe6fC43492325Cfc TransparentUpgradeableProxy --constructor-args 0x000000000000000000000000153a8e2a42d88a9c88bd45ea583dc8cbb25afae6000000000000000000000000cb7f8e556ef02771ea32f54e767d6f9742ed31c2000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000048129fc1c00000000000000000000000000000000000000000000000000000000 --chain sepolia --watch
forge verify-contract 0x384F52b074BD233D644aA76C66FeB9b1E2B9603e L1Nullifier --constructor-args 0x000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce000000000000000000000000000000000000000000000000000000000000010e0000000000000000000000006d6e010a2680e2e5a3b097ce411528b36d880ef6 --chain sepolia --watch
forge verify-contract 0x8104665Db866397c98E1089CF116a3f6E0587d83 L1AssetRouter --constructor-args 0x0000000000000000000000007b79995e5f793a07bc00c21412e50ecae098e7f9000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce0000000000000000000000006f03861d12e6401623854e494beacd66bc46e6f0000000000000000000000000000000000000000000000000000000000000010e0000000000000000000000006d6e010a2680e2e5a3b097ce411528b36d880ef6 --chain sepolia --watch
forge verify-contract 0x254829dC4030c280dC1267FdB7d183D2236736a1 TransparentUpgradeableProxy --constructor-args 0x0000000000000000000000008104665db866397c98e1089cf116a3f6e0587d83000000000000000000000000cb7f8e556ef02771ea32f54e767d6f9742ed31c200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024c4d66de80000000000000000000000007921f9f70b754a014922aca94947e23f1a42416400000000000000000000000000000000000000000000000000000000 --chain sepolia --watch
forge verify-contract 0xD70e240b86Ca2e32088E1571f3d8dE2d369fB600 BridgedStandardERC20 --chain sepolia --watch
forge verify-contract 0x9f6deDe200B68e66362233956C958e15592bA5ad UpgradeableBeacon --constructor-args 0x000000000000000000000000d70e240b86ca2e32088e1571f3d8de2d369fb600 --chain sepolia --watch
forge verify-contract 0xc534F72A9d1Ab19383B42B312D0675Ac04153Df3 L1NativeTokenVault --constructor-args 0x0000000000000000000000007b79995e5f793a07bc00c21412e50ecae098e7f9000000000000000000000000254829dc4030c280dc1267fdb7d183d2236736a10000000000000000000000006f03861d12e6401623854e494beacd66bc46e6f0 --chain sepolia --watch
forge verify-contract 0x615B8fD3d830Df15eE3A85c14E39Cf2355b693Db TransparentUpgradeableProxy --constructor-args 0x000000000000000000000000c534f72a9d1ab19383b42b312d0675ac04153df3000000000000000000000000cb7f8e556ef02771ea32f54e767d6f9742ed31c200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e0000000000000000000000009f6dede200b68e66362233956c958e15592ba5ad00000000000000000000000000000000000000000000000000000000 --chain sepolia --watch
forge verify-contract 0x0E786313De2E580bAcabb52b7472Da84DAdABf0b L1ERC20Bridge --constructor-args 0x0000000000000000000000006f03861d12e6401623854e494beacd66bc46e6f0000000000000000000000000254829dc4030c280dc1267fdb7d183d2236736a1000000000000000000000000615b8fd3d830df15ee3a85c14e39cf2355b693db000000000000000000000000000000000000000000000000000000000000010e --chain sepolia --watch
forge verify-contract 0xd155b587015086E91a97AE1fdd990890e36Ab876 CTMDeploymentTracker --constructor-args 0x000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce000000000000000000000000254829dc4030c280dc1267fdb7d183d2236736a1 --chain sepolia --watch
forge verify-contract 0x358231eB34F2d05aef85fd37f73e582b7295D2A5 TransparentUpgradeableProxy --constructor-args 0x000000000000000000000000d155b587015086e91a97ae1fdd990890e36ab876000000000000000000000000cb7f8e556ef02771ea32f54e767d6f9742ed31c200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024c4d66de80000000000000000000000007921f9f70b754a014922aca94947e23f1a42416400000000000000000000000000000000000000000000000000000000 --chain sepolia --watch
forge verify-contract 0xcde2b50b26bA6a77f68A5CE93f17331D1A379Ec3 ExecutorFacet --constructor-args 0x0000000000000000000000000000000000000000000000000000000000aa36a7 --chain sepolia --watch
forge verify-contract 0xBc4B3DceDBe93Cd816b885e6AB41CB01f9100182 AdminFacet --constructor-args 0x0000000000000000000000000000000000000000000000000000000000aa36a700000000000000000000000079c9b9a7e817aba476fafcbc4991ad26f9701f06 --chain sepolia --watch
forge verify-contract 0xD7c903b713d379136531e72cD4217B9d0304AaCA MailboxFacet --constructor-args 0x000000000000000000000000000000000000000000000000000000000000010e0000000000000000000000000000000000000000000000000000000000aa36a7 --chain sepolia --watch
forge verify-contract 0x6996643b640B8792B440298106854b3Eead50bC5 GettersFacet --chain sepolia --watch
forge verify-contract 0xf283b328937081f49d709008CD68818204f1e6F4 DiamondInit --chain sepolia --watch
forge verify-contract 0x9d9D3B57F211Bfb211E9c9D777c4C7236C6e7CBc ChainTypeManager --constructor-args 0x000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce --chain sepolia --watch
forge verify-contract 0xF82b42a4FCcbAbA450e0C9FF431010c1ee8992A3 TransitionaryOwner --constructor-args 0x000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e --chain sepolia --watch
forge verify-contract 0x701C5a6e17776Dd8D06a366B9258F206c301Ca5A L2WrappedBaseTokenStore --constructor-args 0x000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e000000000000000000000000a6ed12b87d2e6ea039d27e1ffbdc24915ffd3042 --chain sepolia --watch
forge verify-contract 0x4644f8097F63dcd84908831311011307A4e15B79 GovernanceUpgradeTimer --constructor-args 0x00000000000000000000000000000000000000000000000000000000000151800000000000000000000000000000000000000000000000000000000000127500000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e000000000000000000000000a6ed12b87d2e6ea039d27e1ffbdc24915ffd3042 --chain sepolia --watch
forge verify-contract 0x662B8fE285BB3aab483e75Ec46136e01aaa154f9 BytecodesSupplier --chain sepolia --watch
forge verify-contract 0xC2B2Adec31752DbBC7000b7A611c3eDac5518a2D TestnetVerifier --chain sepolia --watch
forge verify-contract 0xfED91a1CE7e334EbeE5b39722a5f859801CaAf50 DefaultUpgrade --chain sepolia --watch
forge verify-contract 0x10f0d9bbF331B8a64E59d80F5E112EB6DDe3ced6 L1GenesisUpgrade --chain sepolia --watch
forge verify-contract 0xbD979DBfA434D995b4564e07282862F1cf201845 GatewayUpgrade --chain sepolia --watch
forge verify-contract 0xeb7c0DAAdDFb52AFa05400b489e7497b271d6122 RollupDAManager --chain sepolia --watch
forge verify-contract 0xF9a241A3821BEBE1324FBBC79A3aD60efdfF6ACe RollupL1DAValidator --chain sepolia --watch
forge verify-contract 0xBBfaF792b9ae54baC1167b6C2923166FD0FC9873 ValidiumL1DAValidator --chain sepolia --watch
forge verify-contract 0xa8A8a8bB25C9E9AbE44Eb7b3e00502a1d8F5AAC4 ValidatorTimelock --constructor-args 0x000000000000000000000000de0a67fe0db5474e44e7add5a56cce3360fa30bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010e --chain sepolia --watch
forge verify-contract 0x598bB37804852208C6364280f92D076F5f3EB0Ba Bridgehub --constructor-args 0x0000000000000000000000000000000000000000000000000000000000aa36a7000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e0000000000000000000000000000000000000000000000000000000000000064 --chain sepolia --watch
forge verify-contract 0x7CE90e7c8912246438c28aBCF9a143f5E4Ab2Cba MessageRoot --constructor-args 0x000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce --chain sepolia --watch
forge verify-contract 0x280D3AD9fbDE5daAaA8A5Df0EB7bA6E2bd5bc39f TransparentUpgradeableProxy --constructor-args 0x0000000000000000000000007ce90e7c8912246438c28abcf9a143f5e4ab2cba000000000000000000000000cb7f8e556ef02771ea32f54e767d6f9742ed31c2000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000048129fc1c00000000000000000000000000000000000000000000000000000000 --chain sepolia --watch
forge verify-contract 0xDc0DE8a0efA34516906a03b6E4564fCB09D7D49C L1Nullifier --constructor-args 0x000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce000000000000000000000000000000000000000000000000000000000000010e0000000000000000000000006d6e010a2680e2e5a3b097ce411528b36d880ef6 --chain sepolia --watch
forge verify-contract 0xFc98039CAAE63165C6C7305Bc58c9213e4a757F3 L1AssetRouter --constructor-args 0x0000000000000000000000007b79995e5f793a07bc00c21412e50ecae098e7f9000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce0000000000000000000000006f03861d12e6401623854e494beacd66bc46e6f0000000000000000000000000000000000000000000000000000000000000010e0000000000000000000000006d6e010a2680e2e5a3b097ce411528b36d880ef6 --chain sepolia --watch
forge verify-contract 0xfD3130Ea0e8B7Dd61Ac3663328a66d97eb02f84b TransparentUpgradeableProxy --constructor-args 0x000000000000000000000000fc98039caae63165c6c7305bc58c9213e4a757f3000000000000000000000000cb7f8e556ef02771ea32f54e767d6f9742ed31c200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024c4d66de8000000000000000000000000de0a67fe0db5474e44e7add5a56cce3360fa30bb00000000000000000000000000000000000000000000000000000000 --chain sepolia --watch
forge verify-contract 0x570600157acD222ba6F666c7a8193080355a6435 BridgedStandardERC20 --chain sepolia --watch
forge verify-contract 0xD8b3C9Dde71e13470B59e1e6DA97Bf21142A1A75 UpgradeableBeacon --constructor-args 0x000000000000000000000000570600157acd222ba6f666c7a8193080355a6435 --chain sepolia --watch
forge verify-contract 0x2Ff1f2559721b3084405740B588B7c6aae2A59d8 L1NativeTokenVault --constructor-args 0x0000000000000000000000007b79995e5f793a07bc00c21412e50ecae098e7f9000000000000000000000000fd3130ea0e8b7dd61ac3663328a66d97eb02f84b0000000000000000000000006f03861d12e6401623854e494beacd66bc46e6f0 --chain sepolia --watch
forge verify-contract 0x257CE1e946c9C6531E2C9deBF7fcf821F9467f73 TransparentUpgradeableProxy --constructor-args 0x0000000000000000000000002ff1f2559721b3084405740b588b7c6aae2a59d8000000000000000000000000cb7f8e556ef02771ea32f54e767d6f9742ed31c200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044485cc955000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e000000000000000000000000d8b3c9dde71e13470b59e1e6da97bf21142a1a7500000000000000000000000000000000000000000000000000000000 --chain sepolia --watch
forge verify-contract 0x0512E63bd0eBd52294d54B09611b2501e71a226C L1ERC20Bridge --constructor-args 0x0000000000000000000000006f03861d12e6401623854e494beacd66bc46e6f0000000000000000000000000fd3130ea0e8b7dd61ac3663328a66d97eb02f84b000000000000000000000000257ce1e946c9c6531e2c9debf7fcf821f9467f73000000000000000000000000000000000000000000000000000000000000010e --chain sepolia --watch
forge verify-contract 0x731eb5627aFb49bb98087cbbF57E5820E5893D0f CTMDeploymentTracker --constructor-args 0x000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce000000000000000000000000fd3130ea0e8b7dd61ac3663328a66d97eb02f84b --chain sepolia --watch
forge verify-contract 0x25E04b7d1fC963aB8e5fEB0797f7a943E260e8b6 TransparentUpgradeableProxy --constructor-args 0x000000000000000000000000731eb5627afb49bb98087cbbf57e5820e5893d0f000000000000000000000000cb7f8e556ef02771ea32f54e767d6f9742ed31c200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024c4d66de8000000000000000000000000de0a67fe0db5474e44e7add5a56cce3360fa30bb00000000000000000000000000000000000000000000000000000000 --chain sepolia --watch
forge verify-contract 0xADa3b6059c50b7e366197387Fae223c456374237 ExecutorFacet --constructor-args 0x0000000000000000000000000000000000000000000000000000000000aa36a7 --chain sepolia --watch
forge verify-contract 0x1A1c48880b7C33DBb9D7184086C90DA788B55C3c AdminFacet --constructor-args 0x0000000000000000000000000000000000000000000000000000000000aa36a7000000000000000000000000eb7c0daaddfb52afa05400b489e7497b271d6122 --chain sepolia --watch
forge verify-contract 0x121385DCE88da3855Dd86fCc8C431D54E23400A3 MailboxFacet --constructor-args 0x000000000000000000000000000000000000000000000000000000000000010e0000000000000000000000000000000000000000000000000000000000aa36a7 --chain sepolia --watch
forge verify-contract 0x2433e433f51434A9176De9e38EBBe2A1e08A4007 GettersFacet --chain sepolia --watch
forge verify-contract 0x480e3FcfEDeD9D688532d459F70Ff24fE033C435 DiamondInit --chain sepolia --watch
forge verify-contract 0xE565E68aD7F7b89f2D680AA3B54cE654B2b8FBC0 ChainTypeManager --constructor-args 0x000000000000000000000000236d1c3ff32bd0ca26b72af287e895627c0478ce --chain sepolia --watch
forge verify-contract 0xb28E56339f07F9577B2fb6904e491FC42D973e54 TransitionaryOwner --constructor-args 0x000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e --chain sepolia --watch
forge verify-contract 0x44881d92F801F475d974eDa3516B0f47D7e4cF04 L2WrappedBaseTokenStore --constructor-args 0x000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e000000000000000000000000de0a67fe0db5474e44e7add5a56cce3360fa30bb --chain sepolia --watch
forge verify-contract 0x3eB320C09B33CdD371b2010b77aD8F8798f2017C GovernanceUpgradeTimer --constructor-args 0x00000000000000000000000000000000000000000000000000000000000151800000000000000000000000000000000000000000000000000000000000127500000000000000000000000000699a1cd1fcd3213e20de15d2236a67d9084bf89e000000000000000000000000a6ed12b87d2e6ea039d27e1ffbdc24915ffd3042 --chain sepolia --watch
10 changes: 5 additions & 5 deletions l1-contracts/upgrade-envs/stage.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ governance_upgrade_timer_initial_delay = 86400

[contracts]
max_number_of_chains = 100
create2_factory_salt = "0x1000000000000000000000000000000000000000000000000000000000000000"
create2_factory_salt = "0x1000000000000000000000000000000000000000000000000000000000000001"
validator_timelock_execution_delay = 0
genesis_root = "0x7cc160319ad566c71679b0391d3ebd736a2757f9c1fe40f34ac42c82d79ffe6e"
genesis_root = "0xd8c9be7efb705e7dcf529c14fce7048ea99dea9eab6a6b4e5f8de1ebf4f2ebf2"
genesis_rollup_leaf_index = 68
genesis_batch_commitment = "0x248eeb165b8e69d8c5e1b8441e9c6f7a98804115cd2e1c365df1723c495e4853"
genesis_batch_commitment = "0xf6e873e8894b90f157511a133d941fb6f0892f83147e3d0d2cafa71af8c838e5"
recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
recursion_leaf_level_vk_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
recursion_circuits_set_vks_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
Expand All @@ -19,8 +19,8 @@ diamond_init_max_pubdata_per_batch = 120000
diamond_init_max_l2_gas_per_batch = 80000000
diamond_init_priority_tx_max_pubdata = 99000
diamond_init_minimal_l2_gas_price = 250000000
bootloader_hash = "0x010008e5b883de8897598e83d383e332b87d09164363816c15f22353c3cd910d"
default_aa_hash = "0x0100052307b3b66ef67935255483d39b3c8dcdb47fdf94dddca11ebe8271afe6"
bootloader_hash = "0x0100088580465d88420e6369230ee94a32ff356dbcdd407a4be49fc8009b2a81"
default_aa_hash = "0x010004dbf8be36c421254d005352f8245146906919be0099e8a50d0e78df85e0"
bridgehub_proxy_address = "0x236D1c3Ff32Bd0Ca26b72Af287E895627c0478cE"
transparent_proxy_admin = "0xcb7f8e556ef02771ea32f54e767d6f9742ed31c2"

Expand Down
Loading