Skip to content

Commit eabda9c

Browse files
authored
hotfix(CI): update devnet aligned_service_manager in sdk and update docker config files (#1752)
1 parent 422f6d4 commit eabda9c

File tree

7 files changed

+21
-25
lines changed

7 files changed

+21
-25
lines changed

Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,11 +1046,18 @@ docker_verify_proof_submission_success:
10461046
verification=$$(aligned verify-proof-onchain \
10471047
--aligned-verification-data $${proof} \
10481048
--rpc_url $$(echo $(DOCKER_RPC_URL)) 2>&1); \
1049+
cat $${proof%.cbor}.json; \
1050+
echo "$$verification"; \
10491051
if echo "$$verification" | grep -q not; then \
10501052
echo "ERROR: Proof verification failed for $${proof}"; \
10511053
exit 1; \
10521054
elif echo "$$verification" | grep -q verified; then \
10531055
echo "Proof verification succeeded for $${proof}"; \
1056+
else \
1057+
echo "WARNING: Unexpected verification result for $${proof}"; \
1058+
echo "Output:"; \
1059+
echo "$$verification"; \
1060+
exit 1; \
10541061
fi; \
10551062
echo "---------------------------------------------------------------------------------------------------"; \
10561063
done; \

batcher/aligned-sdk/src/sdk.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ pub fn get_payment_service_address(network: Network) -> ethers::types::H160 {
284284

285285
pub fn get_aligned_service_manager_address(network: Network) -> ethers::types::H160 {
286286
match network {
287-
Network::Devnet => H160::from_str("0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8").unwrap(),
287+
Network::Devnet => H160::from_str("0x851356ae760d987E095750cCeb3bC6014560891C").unwrap(),
288288
Network::Holesky => H160::from_str("0x58F280BeBE9B34c9939C3C39e0890C81f163B623").unwrap(),
289289
Network::HoleskyStage => {
290290
H160::from_str("0x9C5231FC88059C086Ea95712d105A2026048c39B").unwrap()

config-files/config-aggregator-docker.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,10 @@ aggregator:
3131
garbage_collector_tasks_age: 20 #The age of tasks that will be removed by the GC, in blocks. Suggested value for prod: '216000' (30 days)
3232
garbage_collector_tasks_interval: 10 #The interval of queried blocks to get an old batch. Suggested value for prod: '900' (3 hours)
3333
bls_service_task_timeout: 168h # The timeout of bls aggregation service tasks. Suggested value for prod '168h' (7 days)
34+
gas_base_bump_percentage: 25 # Percentage to overestimate gas price when sending a task
35+
gas_bump_incremental_percentage: 20 # An extra percentage to overestimate in each bump of respond to task. This is additive between tries
36+
# Gas used formula = est_gas_by_node * (gas_base_bump_percentage + gas_bum_incremental_percentage * i) / 100, where i is the iteration number.
37+
gas_bump_percentage_limit: 150 # The max percentage to bump the gas price.
38+
# The Gas formula is percentage (gas_base_bump_percentage + gas_bump_incremental_percentage * i) / 100) is checked against this value
39+
# If it is higher, it will default to `gas_bump_percentage_limit`
40+
time_to_wait_before_bump: 72s # The time to wait for the receipt when responding to task. Suggested value 72 seconds (6 blocks)

config-files/config-batcher-docker.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ batcher:
2424
max_proof_size: 67108864 # 64 MiB
2525
max_batch_byte_size: 268435456 # 256 MiB
2626
max_batch_proof_qty: 3000 # 3000 proofs in a batch
27-
eth_ws_reconnects: 99999999999999
2827
pre_verification_is_enabled: true
2928
metrics_port: 9093
3029
telemetry_ip_port_address: localhost:4001
Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,6 @@ bls:
1919
private_key_store_path: "config-files/anvil.bls.key.json"
2020
private_key_store_password: ""
2121

22-
## Batcher configurations
23-
batcher:
24-
block_interval: 3
25-
batch_size_interval: 10
26-
max_proof_size: 67108864 # 64 MiB
27-
max_batch_byte_size: 268435456 # 256 MiB
28-
eth_ws_reconnects: 99999999999999
29-
pre_verification_is_enabled: true
30-
31-
## Aggregator Configurations
32-
aggregator:
33-
server_ip_port_address: localhost:8090
34-
bls_public_key_compendium_address: 0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
35-
avs_service_manager_address: 0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
36-
enable_metrics: true
37-
metrics_ip_port_address: localhost:9091
38-
3922
## Operator Configurations
4023
operator:
4124
aggregator_rpc_server_ip_port_address: aggregator:8090
@@ -47,7 +30,7 @@ operator:
4730
metadata_url: "https://yetanotherco.github.io/operator_metadata/metadata.json"
4831
enable_metrics: true
4932
metrics_ip_port_address: localhost:9092
50-
max_batch_byte_size: 268435456 # 256 MiB
33+
max_batch_size: 268435456 # 256 MiB
5134
last_processed_batch_filepath: config-files/operator.last_processed_batch.json
5235
# Operators variables needed for register it in EigenLayer
5336
el_delegation_manager_address: "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"

docker-compose.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040

4141
register-operator-eigenlayer:
4242
image: ghcr.io/yetanotherco/aligned_layer/eigenlayer-cli:latest
43-
command: ["sh", "-c", "echo '' | eigenlayer operator register config-files/config-docker.yaml"]
43+
command: ["sh", "-c", "echo '' | eigenlayer operator register config-files/config-operator-docker.yaml"]
4444
build:
4545
context: .
4646
dockerfile: docker/eigenlayer-cli.Dockerfile
@@ -58,7 +58,7 @@ services:
5858

5959
operator-deposit-into-mock-strategy:
6060
image: ghcr.io/yetanotherco/aligned_layer/operator:latest
61-
command: ["aligned-layer-operator", "deposit-into-strategy", "--config", "./config-files/config-docker.yaml", "--strategy-address", "0xc5a5C42992dECbae36851359345FE25997F5C42d", "--amount", "100000000000000000"]
61+
command: ["aligned-layer-operator", "deposit-into-strategy", "--config", "./config-files/config-operator-docker.yaml", "--strategy-address", "0xc5a5C42992dECbae36851359345FE25997F5C42d", "--amount", "100000000000000000"]
6262
build:
6363
context: .
6464
dockerfile: docker/operator.Dockerfile
@@ -76,7 +76,7 @@ services:
7676

7777
operator-register-with-aligned-layer:
7878
image: ghcr.io/yetanotherco/aligned_layer/operator:latest
79-
command: ["aligned-layer-operator", "register", "--config", "./config-files/config-docker.yaml"]
79+
command: ["aligned-layer-operator", "register", "--config", "./config-files/config-operator-docker.yaml"]
8080
build:
8181
context: .
8282
dockerfile: docker/operator.Dockerfile
@@ -85,7 +85,7 @@ services:
8585

8686
operator:
8787
image: ghcr.io/yetanotherco/aligned_layer/operator:latest
88-
command: ["aligned-layer-operator", "start", "--config", "./config-files/config-docker.yaml"]
88+
command: ["aligned-layer-operator", "start", "--config", "./config-files/config-operator-docker.yaml"]
8989
build:
9090
context: .
9191
dockerfile: docker/operator.Dockerfile

docker/operator.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ COPY contracts ./contracts
2929

3030
ENV LD_LIBRARY_PATH=/aligned_layer/operator/risc_zero/lib/
3131

32-
CMD ["aligned-layer-operator", "start", "--config", "./config-files/config-docker.yaml"]
32+
CMD ["aligned-layer-operator", "start", "--config", "./config-files/config-operator-docker.yaml"]

0 commit comments

Comments
 (0)