Merge e4d1e48 into 124eba8

Author: JuArce

Makefile

@@ -267,7 +267,11 @@ operator_set_eigen_sdk_go_version_error:
 	@echo "Error setting Eigen SDK version, missing ENVIRONMENT. Possible values for ENVIRONMENT=<devnet|testnet|mainnet>"
 	exit 1
 
-operator_full_registration: operator_get_eth operator_register_with_eigen_layer operator_mint_mock_tokens operator_deposit_into_mock_strategy operator_whitelist_devnet operator_register_with_aligned_layer
+operator_full_registration_base: operator_get_eth operator_register_with_eigen_layer operator_whitelist_devnet operator_mint_mock_tokens
+operator_full_registration_weth: operator_full_registration_base  operator_deposit_into_weth_strategy operator_register_with_aligned_layer_weth
+operator_full_registration_ali: operator_full_registration_base operator_deposit_into_ali_strategy operator_register_with_aligned_layer_ali
+
+operator_full_registration: operator_full_registration_base operator_deposit_into_weth_strategy operator_deposit_into_ali_strategy operator_register_with_aligned_layer_weth operator_register_with_aligned_layer_ali
 
 operator_register_and_start: $(GET_SDK_VERSION) operator_full_registration operator_start
 
@@ -356,30 +360,40 @@ operator_remove_from_whitelist:
 	@echo "Removing operator $(OPERATOR_ADDRESS)"
 	@. contracts/scripts/.env && . contracts/scripts/operator_remove_from_whitelist.sh $(OPERATOR_ADDRESS)
 
-operator_deposit_into_mock_strategy:
-	@echo "Depositing into mock strategy"
+operator_deposit_into_weth_strategy:
+	@echo "Depositing into WETH strategy"
 	$(eval STRATEGY_ADDRESS = $(shell jq -r '.addresses.strategies.WETH' contracts/script/output/devnet/eigenlayer_deployment_output.json))
 	@go run operator/cmd/main.go deposit-into-strategy \
 		--config $(CONFIG_FILE) \
 		--strategy-address $(STRATEGY_ADDRESS) \
 		--amount 100000000000000000
 
+operator_deposit_into_ali_strategy:
+	@echo "Depositing into ALI strategy"
+	$(eval STRATEGY_ADDRESS = $(shell jq -r '.addresses.strategies.ALI' contracts/script/output/devnet/eigenlayer_deployment_output.json))
+	@go run operator/cmd/main.go deposit-into-strategy \
+		--config $(CONFIG_FILE) \
+		--strategy-address $(STRATEGY_ADDRESS) \
+		--amount 100000000000000000
+
 
 AMOUNT ?= 1000
 
-operator_deposit_into_strategy:
-	@echo "Depositing into strategy"
-	@go run operator/cmd/main.go deposit-into-strategy \
+operator_register_with_aligned_layer_weth:
+	@echo "Registering operator with AlignedLayer in quorum 0"
+	@go run operator/cmd/main.go register \
 		--config $(CONFIG_FILE) \
-		--strategy-address $(STRATEGY_ADDRESS) \
-		--amount $(AMOUNT)
+		--quorum-number 0
 
-operator_register_with_aligned_layer:
-	@echo "Registering operator with AlignedLayer"
+operator_register_with_aligned_layer_ali:
+	@echo "Registering operator with AlignedLayer in quorum 1"
 	@go run operator/cmd/main.go register \
-		--config $(CONFIG_FILE)
+		--config $(CONFIG_FILE) \
+		--quorum-number 1
+
+operator_deposit_and_register_weth: operator_deposit_into_weth_strategy operator_register_with_aligned_layer_weth
 
-operator_deposit_and_register: operator_deposit_into_strategy operator_register_with_aligned_layer
+operator_deposit_and_register_ali: operator_deposit_into_ali_strategy operator_register_with_aligned_layer_ali
 
 
 # The verifier ID to enable or disable corresponds to the index of the verifier in the `ProvingSystemID` enum.

aggregation_mode/README.md

@@ -61,11 +61,11 @@ make start_proof_aggregator_gpu AGGREGATOR="sp1|risc0"
 1. Get latest aggregated proof:
 
 ```shell
-cast call 0xc351628EB244ec633d5f21fBD6621e1a683B1181 "currentAggregatedProofNumber()" --rpc-url http://localhost:8545
+cast call 0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f "currentAggregatedProofNumber()" --rpc-url http://localhost:8545
 ```
 
 2. Get aggregated proof info:
 
 ```shell
-cast call 0xc351628EB244ec633d5f21fBD6621e1a683B1181 "getAggregatedProof(uint64)(uint8,bytes32,bytes32)" <AGG_PROOF_NUMBER>  --rpc-url http://localhost:8545
+cast call 0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f "getAggregatedProof(uint64)(uint8,bytes32,bytes32)" <AGG_PROOF_NUMBER>  --rpc-url http://localhost:8545
 ```

aggregator/pkg/aggregator.go

@@ -28,8 +28,10 @@ import (
 )
 
 // FIXME(marian): Read this from Aligned contract directly
-const QUORUM_NUMBER = byte(0)
-const QUORUM_THRESHOLD = byte(67)
+const QuorumThreshold = byte(67)
+
+var QuorumNums = eigentypes.QuorumNums{eigentypes.QuorumNum(0), eigentypes.QuorumNum(1)}
+var QuorumThresholdPercentages = eigentypes.QuorumThresholdPercentages{eigentypes.QuorumThresholdPercentage(QuorumThreshold), eigentypes.QuorumThresholdPercentage(QuorumThreshold)}
 
 // Aggregator stores TaskResponse for a task here
 type TaskResponses = []types.SignedTaskResponse
@@ -337,6 +339,7 @@ func (agg *Aggregator) sendAggregatedResponse(batchIdentifierHash [32]byte, batc
 		batchIdentifierHash,
 		batchMerkleRoot,
 		senderAddress,
+		QuorumNums,
 		nonSignerStakesAndSignature,
 		agg.AggregatorConfig.Aggregator.GasBaseBumpPercentage,
 		agg.AggregatorConfig.Aggregator.GasBumpIncrementalPercentage,
@@ -407,10 +410,7 @@ func (agg *Aggregator) AddNewTask(batchMerkleRoot [32]byte, senderAddress [20]by
 	)
 	agg.nextBatchIndex += 1
 
-	quorumNums := eigentypes.QuorumNums{eigentypes.QuorumNum(QUORUM_NUMBER)}
-	quorumThresholdPercentages := eigentypes.QuorumThresholdPercentages{eigentypes.QuorumThresholdPercentage(QUORUM_THRESHOLD)}
-
-	err := agg.blsAggregationService.InitializeNewTaskWithWindow(batchIndex, taskCreatedBlock, quorumNums, quorumThresholdPercentages, agg.AggregatorConfig.Aggregator.BlsServiceTaskTimeout, 15*time.Second)
+	err := agg.blsAggregationService.InitializeNewTaskWithWindow(batchIndex, taskCreatedBlock, QuorumNums, QuorumThresholdPercentages, agg.AggregatorConfig.Aggregator.BlsServiceTaskTimeout, 15*time.Second)
 	if err != nil {
 		agg.logger.Fatalf("BLS aggregation service error when initializing new task: %s", err)
 	}

batcher/aligned-sdk/src/common/constants.rs

@@ -52,7 +52,7 @@ pub const BUMP_MAX_RETRY_DELAY: u64 = 3600; // seconds
 /// NETWORK ADDRESSES ///
 /// BatcherPaymentService
 pub const BATCHER_PAYMENT_SERVICE_ADDRESS_DEVNET: &str =
-    "0x7969c5eD335650692Bc04293B07F5BF2e7A673C0";
+    "0xc351628EB244ec633d5f21fBD6621e1a683B1181";
 pub const BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY: &str =
     "0x815aeCA64a974297942D2Bbf034ABEe22a38A003";
 pub const BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY_STAGE: &str =
@@ -63,7 +63,7 @@ pub const BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET_STAGE: &str =
     "0x88ad27EfBeF16b6fC5b2E40c5155d61876f847c5";
 
 /// AlignedServiceManager
-pub const ALIGNED_SERVICE_MANAGER_DEVNET: &str = "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8";
+pub const ALIGNED_SERVICE_MANAGER_DEVNET: &str = "0xf5059a5D33d5853360D16C683c16e67980206f36";
 pub const ALIGNED_SERVICE_MANAGER_HOLESKY: &str = "0x58F280BeBE9B34c9939C3C39e0890C81f163B623";
 pub const ALIGNED_SERVICE_MANAGER_HOLESKY_STAGE: &str =
     "0x9C5231FC88059C086Ea95712d105A2026048c39B";
@@ -79,7 +79,7 @@ pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_HOLESKY_STAGE: &str =
 pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_HOLESKY: &str =
     "0xe84CD4084d8131841CE6DC265361f81F4C59a1d4";
 pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_DEVNET: &str =
-    "0xFD471836031dc5108809D173A067e8486B9047A3";
+    "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f";
 
 /// Batcher URL's
 pub const BATCHER_URL_DEVNET: &str = "ws://localhost:8080";

config-files/config-proof-aggregator-ethereum-package.yaml

@@ -1,5 +1,5 @@
-aligned_service_manager_address: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
-proof_aggregation_service_address: "0xFD471836031dc5108809D173A067e8486B9047A3"
+aligned_service_manager_address: "0xf5059a5D33d5853360D16C683c16e67980206f36"
+proof_aggregation_service_address: "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f"
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8546"
 max_proofs_in_queue: 1000

config-files/config-proof-aggregator-mock-ethereum-package.yaml

@@ -1,5 +1,5 @@
-aligned_service_manager_address: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
-proof_aggregation_service_address: "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f"
+aligned_service_manager_address: "0xf5059a5D33d5853360D16C683c16e67980206f36"
+proof_aggregation_service_address: "0x162A433068F51e18b7d13932F27e66a3f99E6890"
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8546"
 max_proofs_in_queue: 1000

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

@@ -1,5 +1,5 @@
-aligned_service_manager_address: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
-proof_aggregation_service_address: "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f"
+aligned_service_manager_address: "0xf5059a5D33d5853360D16C683c16e67980206f36"
+proof_aggregation_service_address: "0x162A433068F51e18b7d13932F27e66a3f99E6890"
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 max_proofs_in_queue: 1000

config-files/config-proof-aggregator.yaml

@@ -1,5 +1,5 @@
-aligned_service_manager_address: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
-proof_aggregation_service_address: "0xFD471836031dc5108809D173A067e8486B9047A3"
+aligned_service_manager_address: "0xf5059a5D33d5853360D16C683c16e67980206f36"
+proof_aggregation_service_address: "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f"
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 max_proofs_in_queue: 1000