Skip to content

Commit 1812295

Browse files
JuArceJuArce
committed
fix: register operator
fix: mint mock tokens and deposit into strategy fix: whitelist weth strategy in devnet chore: update sdk
1 parent a1477b5 commit 1812295

19 files changed

+2434
-2099
lines changed

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export OPERATOR_ADDRESS ?= $(shell yq -r '.operator.address' $(CONFIG_FILE))
88
AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
99

1010
OPERATOR_VERSION=v0.15.2
11-
EIGEN_SDK_GO_VERSION_DEVNET=v0.1.13
11+
EIGEN_SDK_GO_VERSION_DEVNET=v0.2.0-beta.1
1212
EIGEN_SDK_GO_VERSION_TESTNET=v0.2.0-beta.1
1313
EIGEN_SDK_GO_VERSION_MAINNET=v0.2.0-beta.1
1414

@@ -73,7 +73,7 @@ install_foundry:
7373
curl -L https://foundry.paradigm.xyz | bash
7474

7575
install_eigenlayer_cli_devnet: ## Install Eigenlayer CLI v0.11.3 (Devnet compatible)
76-
curl -sSfL https://raw.githubusercontent.com/layr-labs/eigenlayer-cli/master/scripts/install.sh | sh -s -- v0.11.3
76+
curl -sSfL https://raw.githubusercontent.com/layr-labs/eigenlayer-cli/master/scripts/install.sh | sh -s -- v0.13.0
7777

7878
anvil_deploy_all_contracts: anvil_deploy_eigen_contracts anvil_deploy_risc0_contracts anvil_deploy_sp1_contracts anvil_deploy_aligned_contracts
7979

@@ -348,7 +348,7 @@ operator_remove_from_whitelist:
348348

349349
operator_deposit_into_mock_strategy:
350350
@echo "Depositing into mock strategy"
351-
$(eval STRATEGY_ADDRESS = $(shell jq -r '.addresses.strategies.MOCK' contracts/script/output/devnet/eigenlayer_deployment_output.json))
351+
$(eval STRATEGY_ADDRESS = $(shell jq -r '.addresses.strategies.WETH' contracts/script/output/devnet/eigenlayer_deployment_output.json))
352352
@go run operator/cmd/main.go deposit-into-strategy \
353353
--config $(CONFIG_FILE) \
354354
--strategy-address $(STRATEGY_ADDRESS) \

‎batcher/aligned-sdk/src/core/constants.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ pub const BUMP_MAX_RETRY_DELAY: u64 = 3600; // seconds
5252
/// NETWORK ADDRESSES ///
5353
/// BatcherPaymentService
5454
pub const BATCHER_PAYMENT_SERVICE_ADDRESS_DEVNET: &str =
55-
"0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3";
55+
"0x7969c5eD335650692Bc04293B07F5BF2e7A673C0";
5656
pub const BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY: &str =
5757
"0x815aeCA64a974297942D2Bbf034ABEe22a38A003";
5858
pub const BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY_STAGE: &str =
@@ -63,7 +63,7 @@ pub const BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET_STAGE: &str =
6363
"0x88ad27EfBeF16b6fC5b2E40c5155d61876f847c5";
6464

6565
/// AlignedServiceManager
66-
pub const ALIGNED_SERVICE_MANAGER_DEVNET: &str = "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9";
66+
pub const ALIGNED_SERVICE_MANAGER_DEVNET: &str = "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8";
6767
pub const ALIGNED_SERVICE_MANAGER_HOLESKY: &str = "0x58F280BeBE9B34c9939C3C39e0890C81f163B623";
6868
pub const ALIGNED_SERVICE_MANAGER_HOLESKY_STAGE: &str =
6969
"0x9C5231FC88059C086Ea95712d105A2026048c39B";
@@ -79,7 +79,7 @@ pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_HOLESKY_STAGE: &str =
7979
pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_HOLESKY: &str =
8080
"0xe84CD4084d8131841CE6DC265361f81F4C59a1d4";
8181
pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_DEVNET: &str =
82-
"0xc351628EB244ec633d5f21fBD6621e1a683B1181";
82+
"0xFD471836031dc5108809D173A067e8486B9047A3";
8383

8484
/// Batcher URL's
8585
pub const BATCHER_URL_DEVNET: &str = "ws://localhost:8080";

‎config-files/config-proof-aggregator-mock.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
eth_rpc_url: http://localhost:8545
22
eth_ws_url: ws://localhost:8545
33
max_proofs_in_queue: 1000
4-
proof_aggregation_service_address: 0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc
5-
aligned_service_manager_address: 0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9
4+
proof_aggregation_service_address: 0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f
5+
aligned_service_manager_address: 0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8
66
last_aggregated_block_filepath: config-files/proof-aggregator.last_aggregated_block.json
77
ecdsa:
88
private_key_store_path: config-files/anvil.proof-aggregator.ecdsa.key.json

‎config-files/config-proof-aggregator.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
aligned_service_manager_address: "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9"
2-
proof_aggregation_service_address: "0xc351628EB244ec633d5f21fBD6621e1a683B1181"
1+
aligned_service_manager_address: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
2+
proof_aggregation_service_address: "0xFD471836031dc5108809D173A067e8486B9047A3"
33
eth_rpc_url: "http://localhost:8545"
44
eth_ws_url: "ws://localhost:8545"
55
max_proofs_in_queue: 1000

‎contracts/script/deploy/config/devnet/batcher-payment-service.devnet.config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"address": {
33
"batcherWallet": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
44
"batcherPrivateKey": "0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba",
5-
"alignedLayerServiceManager": "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9"
5+
"alignedLayerServiceManager": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
66
},
77
"amounts": {
88
"gasForAggregator": "300000",

‎contracts/script/output/devnet/alignedlayer_deployment_output.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"addresses": {
3-
"alignedLayerProxyAdmin": "0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690",
4-
"alignedLayerServiceManager": "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9",
5-
"alignedLayerServiceManagerImplementation": "0x36C02dA8a0983159322a80FFE9F24b1acfF8B570",
6-
"blsApkRegistry": "0x95401dc811bb5740090279Ba06cfA8fcF6113778",
7-
"blsApkRegistryImplementation": "0x0E801D84Fa97b50751Dbf25036d067dCf18858bF",
8-
"indexRegistry": "0x851356ae760d987E095750cCeb3bC6014560891C",
9-
"indexRegistryImplementation": "0x998abeb3E57409262aE5b751f60747921B33613E",
10-
"operatorStateRetriever": "0x5f3f1dBD7B74C6B46e8c44f98792A1dAf8d69154",
11-
"pauserRegistry": "0x84eA74d481Ee0A5332c457a4d796187F6Ba67fEB",
12-
"registryCoordinator": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8",
13-
"registryCoordinatorImplementation": "0x9d4454B023096f34B160D6B654540c56A1F81688",
14-
"serviceManagerRouter": "0x9E545E3C0baAB3E08CdfD552C960A1050f373042",
15-
"stakeRegistry": "0xf5059a5D33d5853360D16C683c16e67980206f36",
16-
"stakeRegistryImplementation": "0x4826533B4897376654Bb4d4AD88B7faFD0C98528",
17-
"batcherPaymentService": "0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3",
18-
"batcherPaymentServiceImplementation": "0x82e01223d51Eb87e16A03E24687EDF0F294da6f1"
3+
"alignedLayerProxyAdmin": "0x84eA74d481Ee0A5332c457a4d796187F6Ba67fEB",
4+
"alignedLayerServiceManager": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8",
5+
"alignedLayerServiceManagerImplementation": "0x809d550fca64d94Bd9F66E60752A544199cfAC3D",
6+
"blsApkRegistry": "0x998abeb3E57409262aE5b751f60747921B33613E",
7+
"blsApkRegistryImplementation": "0x8f86403A4DE0BB5791fa46B8e795C547942fE4Cf",
8+
"indexRegistry": "0xf5059a5D33d5853360D16C683c16e67980206f36",
9+
"indexRegistryImplementation": "0x70e0bA845a1A0F2DA3359C97E0285013525FFC49",
10+
"operatorStateRetriever": "0xb7278A61aa25c888815aFC32Ad3cC52fF24fE575",
11+
"pauserRegistry": "0x9E545E3C0baAB3E08CdfD552C960A1050f373042",
12+
"registryCoordinator": "0x851356ae760d987E095750cCeb3bC6014560891C",
13+
"registryCoordinatorImplementation": "0x5eb3Bc0a489C5A8288765d2336659EbCA68FCd00",
14+
"serviceManagerRouter": "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9",
15+
"stakeRegistry": "0x95401dc811bb5740090279Ba06cfA8fcF6113778",
16+
"stakeRegistryImplementation": "0x99bbA657f2BbC93c02D617f8bA121cB8Fc104Acf",
17+
"batcherPaymentService": "0x7969c5eD335650692Bc04293B07F5BF2e7A673C0",
18+
"batcherPaymentServiceImplementation": "0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3"
1919
},
2020
"chainInfo": {
2121
"chainId": 31337,

‎contracts/script/output/devnet/batcher_deployment_output.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"addresses": {
3-
"batcherPaymentService": "0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3",
4-
"batcherPaymentServiceImplementation": "0x82e01223d51Eb87e16A03E24687EDF0F294da6f1"
3+
"batcherPaymentService": "0x7969c5eD335650692Bc04293B07F5BF2e7A673C0",
4+
"batcherPaymentServiceImplementation": "0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3"
55
}
66
}

‎contracts/script/output/devnet/proof_aggregation_service_deployment_output.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"addresses": {
3-
"alignedProofAggregationService": "0xc351628EB244ec633d5f21fBD6621e1a683B1181",
4-
"alignedProofAggregationServiceImplementation": "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650"
3+
"alignedProofAggregationService": "0xFD471836031dc5108809D173A067e8486B9047A3",
4+
"alignedProofAggregationServiceImplementation": "0xc351628EB244ec633d5f21fBD6621e1a683B1181"
55
}
66
}

‎contracts/script/output/devnet/proof_aggregation_service_deployment_output.mock.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"addresses": {
3-
"alignedProofAggregationService": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc",
4-
"alignedProofAggregationServiceImplementation": "0xFD471836031dc5108809D173A067e8486B9047A3"
3+
"alignedProofAggregationService": "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f",
4+
"alignedProofAggregationServiceImplementation": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc"
55
}
66
}

‎contracts/scripts/anvil/deploy_eigen_contracts.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ forge script script/deploy/local/deploy_from_scratch.slashing.s.sol \
2525
--broadcast \
2626
--sig "run(string memory configFile)" -- local/deploy_from_scratch.slashing.anvil.config.json
2727

28+
# Whitelist strategy into strategyManager
29+
strategy_manager=$(jq -r '.addresses.strategyManager' script/output/devnet/SLASHING_deploy_from_scratch_deployment_data.json)
30+
strategy=$(jq -r '.addresses.strategy' script/output/devnet/SLASHING_deploy_from_scratch_deployment_data.json)
31+
echo "Whitelisting strategy ($strategy) into strategy manager ($strategy_manager)"
32+
cast send "$strategy_manager" \
33+
"addStrategiesToDepositWhitelist(address[])" "[$strategy]" \
34+
--rpc-url $RPC_URL \
35+
--private-key $PRIVATE_KEY \
36+
2837
# Copy the deployment data to Aligned output directory
2938
cp script/output/devnet/SLASHING_deploy_from_scratch_deployment_data.json ../../script/output/devnet/eigenlayer_deployment_output.json
3039

0 commit comments

Comments
 (0)