Skip to content

Commit a88dd3d

Browse files
MarcosNicolauMarcosNicolau
committed
fix: anvil deployment point to new program_ids path
1 parent d9847df commit a88dd3d

8 files changed

+2131
-2129
lines changed

‎contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
77
},
88
"programs_id": {
9-
"sp1AggregationProgramVKHash": "0x00ba19eed0aaeb0151f07b8d3ee7c659bcd29f3021e48fb42766882f55b84509",
10-
"risc0AggregationProgramImageId": "0xd8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf"
9+
"sp1AggregationProgramVKHash": "0x00d6e32a34f68ea643362b96615591c94ee0bf99ee871740ab2337966a4f77af",
10+
"risc0AggregationProgramImageId": "0x8908f01022827e80a5de71908c16ee44f4a467236df20f62e7c994491629d74c"
1111
},
1212
"permissions": {
1313
"owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",

‎contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.mock.config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
77
},
88
"programs_id": {
9-
"sp1AggregationProgramVKHash": "0x00ba19eed0aaeb0151f07b8d3ee7c659bcd29f3021e48fb42766882f55b84509",
10-
"risc0AggregationProgramImageId": "0xd8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf"
9+
"sp1AggregationProgramVKHash": "0x00d6e32a34f68ea643362b96615591c94ee0bf99ee871740ab2337966a4f77af",
10+
"risc0AggregationProgramImageId": "0x8908f01022827e80a5de71908c16ee44f4a467236df20f62e7c994491629d74c"
1111
},
1212
"permissions": {
1313
"owner": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955"

‎contracts/scripts/anvil/deploy_aligned_contracts.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ make proof_aggregator_write_program_ids
6969

7070
# Copy new values to config file
7171
jq '.programs_id.risc0AggregationProgramImageId = $input[0].risc0_chunk_aggregator_image_id | .programs_id.sp1AggregationProgramVKHash = $input[0].sp1_chunk_aggregator_vk_hash' \
72-
--slurpfile input aggregation_mode/programs_ids.json \
72+
--slurpfile input aggregation_mode/proof_aggregator/programs_ids.json \
7373
contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.config.json \
7474
> temp.json && mv temp.json contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.config.json
7575

7676
jq '.programs_id.risc0AggregationProgramImageId = $input[0].risc0_chunk_aggregator_image_id | .programs_id.sp1AggregationProgramVKHash = $input[0].sp1_chunk_aggregator_vk_hash' \
77-
--slurpfile input aggregation_mode/programs_ids.json \
77+
--slurpfile input aggregation_mode/proof_aggregator/programs_ids.json \
7878
contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.mock.config.json \
7979
> temp.json && mv temp.json contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.mock.config.json
8080

‎contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎contracts/scripts/anvil/state/eigenlayer-deployed-anvil-state.json‎

Lines changed: 2115 additions & 2113 deletions
Large diffs are not rendered by default.

‎contracts/scripts/anvil/state/risc0-deployed-anvil-state.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎contracts/scripts/anvil/state/sp1-deployed-anvil-state.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎network_params.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ network_params:
277277
"code": "0x60806040526004361015610019575b36610374575b610374565b5f3560e01c80633659cfe6146100685780634f1ef286146100635780635c60da1b1461005e5780638f283970146100595763f851a4400361000e576102c5565b6101c7565b610173565b6100d4565b346100ba5760203660031901126100ba576100816100be565b5f5160206106ca5f395f51905f5254336001600160a01b0390911603610014576100b8906100af602061032d565b905f825261043e565b005b5f80fd5b600435906001600160a01b03821682036100ba57565b60403660031901126100ba576100e86100be565b60243567ffffffffffffffff81116100ba57366023820112156100ba5780600401359167ffffffffffffffff83116100ba5736602484840101116100ba575f5160206106ca5f395f51905f5254336001600160a01b0390911603610014575f60208480602461016161015c6100b899610358565b61032d565b9682885201838701378401015261051d565b346100ba575f3660031901126100ba575f5160206106ca5f395f51905f5254336001600160a01b0390911603610014575f5160206106ea5f395f51905f52546040516001600160a01b039091168152602090f35b346100ba5760203660031901126100ba576101e06100be565b5f5160206106ca5f395f51905f5254336001600160a01b0390911603610014575f5160206106ca5f395f51905f5254604080516001600160a01b03808416825290931660208401819052927f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f9190a18115610271576001600160a01b031916175f5160206106ca5f395f51905f5255005b60405162461bcd60e51b815260206004820152602660248201527f455243313936373a206e65772061646d696e20697320746865207a65726f206160448201526564647265737360d01b6064820152608490fd5b346100ba575f3660031901126100ba575f5160206106ca5f395f51905f5254336001600160a01b0390911603610014575f5160206106ca5f395f51905f52546040516001600160a01b039091168152602090f35b634e487b7160e01b5f52604160045260245ffd5b6040519190601f01601f1916820167ffffffffffffffff81118382101761035357604052565b610319565b67ffffffffffffffff811161035357601f01601f191660200190565b5f5160206106ca5f395f51905f52546001600160a01b031633146103c8575f5160206106ea5f395f51905f52545f9081906001600160a01b0316368280378136915af43d5f803e156103c4573d5ff35b3d5ffd5b60405162461bcd60e51b815260206004820152604260248201527f5472616e73706172656e745570677261646561626c6550726f78793a2061646d60448201527f696e2063616e6e6f742066616c6c6261636b20746f2070726f78792074617267606482015261195d60f21b608482015260a490fd5b803b156104c2575f5160206106ea5f395f51905f5280546001600160a01b0319166001600160a01b0383169081179091557fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b5f80a28151158015906104bb575b6104a6575050565b6104b8916104b261058c565b916105d3565b50565b505f61049e565b60405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608490fd5b803b156104c2575f5160206106ea5f395f51905f5280546001600160a01b0319166001600160a01b0383169081179091557fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b5f80a2815115801590610584576104a6575050565b50600161049e565b610596606061032d565b9060278252660819985a5b195960ca1b6040837f416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c60208201520152565b9190823b1561061a575f8161060f9460208394519201905af43d15610612573d9061060061015c83610358565b9182523d5f602084013e61066e565b90565b60609061066e565b60405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608490fd5b9091901561067a575090565b81511561068a5750805190602001fd5b604460209160405192839162461bcd60e51b83528160048401528051918291826024860152018484015e5f828201840152601f01601f19168101030190fdfeb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca2646970667358221220a0851ba576664d27dde363b300db02b006e60152f1efd7b34267485776e1b2f464736f6c634300081b0033",
278278
"storage": {
279279
"0x17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ec": "0x0000000000000000000000000000000000000000000000000000000000000001",
280-
"0x295841a49a1089f4b560f91cfbb0133326654dcbb1041861fc5dde96c724a22f": "0x0000000000000010000000000000000000000000000000000000000000000000",
280+
"0x295841a49a1089f4b560f91cfbb0133326654dcbb1041861fc5dde96c724a22f": "0x0000000000000011000000000000000000000000000000000000000000000000",
281281
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x0000000000000000000000009d4454b023096f34b160d6b654540c56a1f81688",
282282
"0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x0000000000000000000000009e545e3c0baab3e08cdfd552c960a1050f373042"
283283
}
@@ -360,7 +360,7 @@ network_params:
360360
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x0000000000000000000000004826533b4897376654bb4d4ad88b7fafd0c98528",
361361
"0x3617319a054d772f909f7c479a2cebe5066e836a939412e32403c99029b92eff": "0x0000000000000000000000000000000000000000000000000000000000000001",
362362
"0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x0000000000000000000000009e545e3c0baab3e08cdfd552c960a1050f373042",
363-
"0xcfb339bd1c51c488f6134f4ac63d1594afad827b3401c3fc51ed1da74a8ca14e": "0x0000000000000000000000000000000000000000000000000000000000000010"
363+
"0xcfb339bd1c51c488f6134f4ac63d1594afad827b3401c3fc51ed1da74a8ca14e": "0x0000000000000000000000000000000000000000000000000000000000000011"
364364
}
365365
},
366366
"0x959922be3caee4b8cd9a407cc3ac1c251c2007b1": {
@@ -376,7 +376,7 @@ network_params:
376376
"balance": "0x0",
377377
"code": "0x60806040526004361015610019575b36610374575b610374565b5f3560e01c80633659cfe6146100685780634f1ef286146100635780635c60da1b1461005e5780638f283970146100595763f851a4400361000e576102c5565b6101c7565b610173565b6100d4565b346100ba5760203660031901126100ba576100816100be565b5f5160206106ca5f395f51905f5254336001600160a01b0390911603610014576100b8906100af602061032d565b905f825261043e565b005b5f80fd5b600435906001600160a01b03821682036100ba57565b60403660031901126100ba576100e86100be565b60243567ffffffffffffffff81116100ba57366023820112156100ba5780600401359167ffffffffffffffff83116100ba5736602484840101116100ba575f5160206106ca5f395f51905f5254336001600160a01b0390911603610014575f60208480602461016161015c6100b899610358565b61032d565b9682885201838701378401015261051d565b346100ba575f3660031901126100ba575f5160206106ca5f395f51905f5254336001600160a01b0390911603610014575f5160206106ea5f395f51905f52546040516001600160a01b039091168152602090f35b346100ba5760203660031901126100ba576101e06100be565b5f5160206106ca5f395f51905f5254336001600160a01b0390911603610014575f5160206106ca5f395f51905f5254604080516001600160a01b03808416825290931660208401819052927f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f9190a18115610271576001600160a01b031916175f5160206106ca5f395f51905f5255005b60405162461bcd60e51b815260206004820152602660248201527f455243313936373a206e65772061646d696e20697320746865207a65726f206160448201526564647265737360d01b6064820152608490fd5b346100ba575f3660031901126100ba575f5160206106ca5f395f51905f5254336001600160a01b0390911603610014575f5160206106ca5f395f51905f52546040516001600160a01b039091168152602090f35b634e487b7160e01b5f52604160045260245ffd5b6040519190601f01601f1916820167ffffffffffffffff81118382101761035357604052565b610319565b67ffffffffffffffff811161035357601f01601f191660200190565b5f5160206106ca5f395f51905f52546001600160a01b031633146103c8575f5160206106ea5f395f51905f52545f9081906001600160a01b0316368280378136915af43d5f803e156103c4573d5ff35b3d5ffd5b60405162461bcd60e51b815260206004820152604260248201527f5472616e73706172656e745570677261646561626c6550726f78793a2061646d60448201527f696e2063616e6e6f742066616c6c6261636b20746f2070726f78792074617267606482015261195d60f21b608482015260a490fd5b803b156104c2575f5160206106ea5f395f51905f5280546001600160a01b0319166001600160a01b0383169081179091557fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b5f80a28151158015906104bb575b6104a6575050565b6104b8916104b261058c565b916105d3565b50565b505f61049e565b60405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608490fd5b803b156104c2575f5160206106ea5f395f51905f5280546001600160a01b0319166001600160a01b0383169081179091557fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b5f80a2815115801590610584576104a6575050565b50600161049e565b610596606061032d565b9060278252660819985a5b195960ca1b6040837f416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c60208201520152565b9190823b1561061a575f8161060f9460208394519201905af43d15610612573d9061060061015c83610358565b9182523d5f602084013e61066e565b90565b60609061066e565b60405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608490fd5b9091901561067a575090565b81511561068a5750805190602001fd5b604460209160405192839162461bcd60e51b83528160048401528051918291826024860152018484015e5f828201840152601f01601f19168101030190fdfeb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca2646970667358221220a0851ba576664d27dde363b300db02b006e60152f1efd7b34267485776e1b2f464736f6c634300081b0033",
378378
"storage": {
379-
"0x0eb5be412f275a18f6e4d622aee4ff40b21467c926224771b782d4c095d1444b": "0x0000000000000000000000000000000000000000000000000000000000000010",
379+
"0x0eb5be412f275a18f6e4d622aee4ff40b21467c926224771b782d4c095d1444b": "0x0000000000000000000000000000000000000000000000000000000000000011",
380380
"0x17ef568e3e12ab5b9c7254a8d58478811de00f9e6eb34345acd53bf8fd09d3ec": "0x0000000000000000000000000000000000000000000000000000000000000001",
381381
"0x295841a49a1089f4b560f91cfbb0133326654dcbb1041861fc5dde96c724a22f": "0x000000000000000000000000c5a5c42992decbae36851359345fe25997f5c42d",
382382
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x0000000000000000000000000e801d84fa97b50751dbf25036d067dcf18858bf",
@@ -465,8 +465,8 @@ network_params:
465465
"0x00000000000000000000000000000000000000000000000000000000000000ca": "0x00000000000000000000000000000000000000000000000000000000000000ff",
466466
"0x00000000000000000000000000000000000000000000000000000000000000cb": "0x000000000000000000000000a0ee7a142d267c1f36714e4a8f75612f20a79720",
467467
"0x00000000000000000000000000000000000000000000000000000000000000cc": "0x00000000000000000000000000000000000000000000000000000000000000ff",
468-
"0x00000000000000000000000000000000000000000000000000000000000000cd": "0xd8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf",
469-
"0x00000000000000000000000000000000000000000000000000000000000000ce": "0x00ba19eed0aaeb0151f07b8d3ee7c659bcd29f3021e48fb42766882f55b84509",
468+
"0x00000000000000000000000000000000000000000000000000000000000000cd": "0x8908f01022827e80a5de71908c16ee44f4a467236df20f62e7c994491629d74c",
469+
"0x00000000000000000000000000000000000000000000000000000000000000ce": "0x00d6e32a34f68ea643362b96615591c94ee0bf99ee871740ab2337966a4f77af",
470470
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x0000000000000000000000001429859428c0abc9c2c47c8ee9fbaf82cfa0f20f"
471471
}
472472
},
@@ -503,8 +503,8 @@ network_params:
503503
"0x00000000000000000000000000000000000000000000000000000000000000ca": "0x00000000000000000000000006530dd13afb697b81e2d602a279ebaec8ca2e31",
504504
"0x00000000000000000000000000000000000000000000000000000000000000cb": "0x000000000000000000000000a0ee7a142d267c1f36714e4a8f75612f20a79720",
505505
"0x00000000000000000000000000000000000000000000000000000000000000cc": "0x000000000000000000000000663f3ad617193148711d28f5334ee4ed07016602",
506-
"0x00000000000000000000000000000000000000000000000000000000000000cd": "0xd8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf",
507-
"0x00000000000000000000000000000000000000000000000000000000000000ce": "0x00ba19eed0aaeb0151f07b8d3ee7c659bcd29f3021e48fb42766882f55b84509",
506+
"0x00000000000000000000000000000000000000000000000000000000000000cd": "0x8908f01022827e80a5de71908c16ee44f4a467236df20f62e7c994491629d74c",
507+
"0x00000000000000000000000000000000000000000000000000000000000000ce": "0x00d6e32a34f68ea643362b96615591c94ee0bf99ee871740ab2337966a4f77af",
508508
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x000000000000000000000000fd471836031dc5108809d173a067e8486b9047a3"
509509
}
510510
},

0 commit comments

Comments
 (0)