Skip to content

Commit b35e978

Browse files
authored
Pull fixes from tesnet (#1581)
2 parents f0d9115 + 399c50c commit b35e978

File tree

22 files changed

+170
-19
lines changed

22 files changed

+170
-19
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,11 +838,11 @@ explorer_recover_db: explorer_run_db
838838

839839
explorer_fetch_old_batches:
840840
@cd explorer && \
841-
./scripts/fetch_old_batches.sh 1728056 1729806
841+
./scripts/fetch_old_batches.sh $(FROM_BLOCK) $(TO_BLOCK)
842842

843-
explorer_fetch_old_operators_strategies_restakes:
843+
explorer_fetch_old_operators_strategies_restakes: # recommended for prod: 19000000
844844
@cd explorer && \
845-
./scripts/fetch_old_operators_strategies_restakes.sh 0
845+
./scripts/fetch_old_operators_strategies_restakes.sh $(FROM_BLOCK)
846846

847847
explorer_create_env:
848848
@cd explorer && \

aligned.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "Aligned",
33
"website": "https://alignedlayer.com",
44
"description": "Aligned Layer is a verification layer for zero-knowledge proofs using Eigen Layer. Our mission is to accelerate the adoption of zero-knowledge and validity proofs on Ethereum",
5-
"logo": "https://raw.githubusercontent.com/yetanotherco/aligned_layer/main/logo.png",
5+
"logo": "https://raw.githubusercontent.com/yetanotherco/aligned_layer/testnet/logo.png",
66
"twitter": "https://twitter.com/alignedlayer"
77
}

batcher/aligned-sdk/src/core/types.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ pub enum Network {
401401
Devnet,
402402
Holesky,
403403
HoleskyStage,
404+
Mainnet,
404405
}
405406

406407
impl FromStr for Network {
@@ -411,8 +412,9 @@ impl FromStr for Network {
411412
"holesky" => Ok(Network::Holesky),
412413
"holesky-stage" => Ok(Network::HoleskyStage),
413414
"devnet" => Ok(Network::Devnet),
415+
"mainnet" => Ok(Network::Mainnet),
414416
_ => Err(
415-
"Invalid network, possible values are: \"holesky\", \"holesky-stage\", \"devnet\""
417+
"Invalid network, possible values are: \"holesky\", \"holesky-stage\", \"devnet\", \"mainnet\""
416418
.to_string(),
417419
),
418420
}

batcher/aligned-sdk/src/sdk.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ pub fn get_payment_service_address(network: Network) -> ethers::types::H160 {
278278
Network::HoleskyStage => {
279279
H160::from_str("0x7577Ec4ccC1E6C529162ec8019A49C13F6DAd98b").unwrap()
280280
}
281+
Network::Mainnet => H160::from_str("0xb0567184A52cB40956df6333510d6eF35B89C8de").unwrap(),
281282
}
282283
}
283284

@@ -288,6 +289,7 @@ pub fn get_aligned_service_manager_address(network: Network) -> ethers::types::H
288289
Network::HoleskyStage => {
289290
H160::from_str("0x9C5231FC88059C086Ea95712d105A2026048c39B").unwrap()
290291
}
292+
Network::Mainnet => H160::from_str("0xeF2A435e5EE44B2041100EF8cbC8ae035166606c").unwrap(),
291293
}
292294
}
293295

batcher/aligned-task-sender/src/structs.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ pub enum NetworkArg {
155155
Devnet,
156156
Holesky,
157157
HoleskyStage,
158+
Mainnet,
158159
}
159160

160161
impl From<NetworkArg> for Network {
@@ -163,6 +164,7 @@ impl From<NetworkArg> for Network {
163164
NetworkArg::Devnet => Network::Devnet,
164165
NetworkArg::Holesky => Network::Holesky,
165166
NetworkArg::HoleskyStage => Network::HoleskyStage,
167+
NetworkArg::Mainnet => Network::Mainnet,
166168
}
167169
}
168170
}

batcher/aligned/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ enum NetworkArg {
223223
Devnet,
224224
Holesky,
225225
HoleskyStage,
226+
Mainnet,
226227
}
227228

228229
impl From<NetworkArg> for Network {
@@ -231,6 +232,7 @@ impl From<NetworkArg> for Network {
231232
NetworkArg::Devnet => Network::Devnet,
232233
NetworkArg::Holesky => Network::Holesky,
233234
NetworkArg::HoleskyStage => Network::HoleskyStage,
235+
NetworkArg::Mainnet => Network::Mainnet,
234236
}
235237
}
236238
}

contracts/script/deploy/config/mainnet/aligned.mainnet.config.json

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"chainInfo": {
3-
"chainId": 17000
3+
"chainId": 1
44
},
55
"permissions" : {
66
"aggregator": "<aggregator_address>",
@@ -18,8 +18,56 @@
1818
"strategyWeights": [
1919
[
2020
{
21-
"0_strategy": "TBD",
22-
"1_multiplier": 1e+18
21+
"0_strategy": "0xbeaC0eeEeeeeEEeEeEEEEeeEEeEeeeEeeEEBEaC0",
22+
"1_multiplier": 1000000000000000000
23+
},
24+
{
25+
"0_strategy": "0x93c4b944D05dfe6df7645A86cd2206016c51564D",
26+
"1_multiplier": 1030077629425962827
27+
},
28+
{
29+
"0_strategy": "0x1BeE69b7dFFfA4E2d53C2a2Df135C388AD25dCD2",
30+
"1_multiplier": 1102456657360376283
31+
},
32+
{
33+
"0_strategy": "0x54945180dB7943c0ed0FEE7EdaB2Bd24620256bc",
34+
"1_multiplier": 1067949170243902475
35+
},
36+
{
37+
"0_strategy": "0x9d7eD45EE2E8FC5482fa2428f15C971e6369011d",
38+
"1_multiplier": 1026158078493781538
39+
},
40+
{
41+
"0_strategy": "0x13760F50a9d7377e4F20CB8CF9e4c26586c658ff",
42+
"1_multiplier": 1152393415227598758
43+
},
44+
{
45+
"0_strategy": "0xa4C637e0F704745D182e4D38cAb7E7485321d059",
46+
"1_multiplier": 1011855761455017859
47+
},
48+
{
49+
"0_strategy": "0x57ba429517c3473B6d34CA9aCd56c0e735b94c02",
50+
"1_multiplier": 1012495275290785447
51+
},
52+
{
53+
"0_strategy": "0x0Fe4F44beE93503346A3Ac9EE5A26b130a5796d6",
54+
"1_multiplier": 1055446649335815388
55+
},
56+
{
57+
"0_strategy": "0x7CA911E83dabf90C90dD3De5411a10F1A6112184",
58+
"1_multiplier": 1035345726488000000
59+
},
60+
{
61+
"0_strategy": "0x8CA7A5d6f3acd3A7A8bC468a8CD0FB14B6BD28b6",
62+
"1_multiplier": 1081259809521793439
63+
},
64+
{
65+
"0_strategy": "0xAe60d8180437b5C34bB956822ac2710972584473",
66+
"1_multiplier": 1044315639811926396
67+
},
68+
{
69+
"0_strategy": "0x298aFB19A105D59E74658C4C334Ff360BadE6dd2",
70+
"1_multiplier": 1028802524926876401
2371
}
2472
]
2573
],

core/chainio/avs_writer.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMe
100100
// Set the nonce, as we might have to replace the transaction with a higher gas price
101101
txNonce := big.NewInt(int64(simTx.Nonce()))
102102
txOpts.Nonce = txNonce
103-
txOpts.GasPrice = simTx.GasPrice()
103+
txOpts.GasPrice = nil
104104
txOpts.NoSend = false
105105
i := 0
106106

@@ -113,7 +113,16 @@ func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMe
113113
if err != nil {
114114
return nil, err
115115
}
116-
previousTxGasPrice := txOpts.GasPrice
116+
117+
// if txOpts.GasPrice wasn't previously set use the fetched gasPrice
118+
// this should happen on the first iteration only
119+
var previousTxGasPrice *big.Int
120+
if txOpts.GasPrice == nil {
121+
previousTxGasPrice = gasPrice
122+
} else {
123+
previousTxGasPrice = txOpts.GasPrice
124+
}
125+
117126
// in order to avoid replacement transaction underpriced
118127
// the bumped gas price has to be at least 10% higher than the previous one.
119128
minimumGasPriceBump := utils.CalculateGasPriceBumpBasedOnRetry(previousTxGasPrice, 10, 0, gasBumpPercentageLimit, 0)

docs/3_guides/7_contract_addresses.md

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,41 @@
11
# Aligned contract addresses
22

3-
## Holesky deployments
3+
## Mainnet Deployments
4+
5+
| Contract | Address |
6+
|----------------------------|-----------------------------------------------------------------------------------------------------------------------|
7+
| AlignedLayerServiceManager | [0xeF2A435e5EE44B2041100EF8cbC8ae035166606c](https://etherscan.io/address/0xeF2A435e5EE44B2041100EF8cbC8ae035166606c) |
8+
| BlsApkRegistry | [0x3CcfB7e6e8fe2A8d941a8Ce4C69A944a770E8228](https://etherscan.io/address/0x3CcfB7e6e8fe2A8d941a8Ce4C69A944a770E8228) |
9+
| IndexRegistry | [0x9Bf1275e18eC8FA3cA7f9bffF1b0DF3e14C6E134](https://etherscan.io/address/0x9Bf1275e18eC8FA3cA7f9bffF1b0DF3e14C6E134) |
10+
| OperatorStateRetriever | [0x6e0046205cAfA503F6b7465195A6C63C47d214f1](https://etherscan.io/address/0x6e0046205cAfA503F6b7465195A6C63C47d214f1) |
11+
| RegistryCoordinator | [0xA8CC0749b4409c3c47012323E625aEcBA92f64b9](https://etherscan.io/address/0xA8CC0749b4409c3c47012323E625aEcBA92f64b9) |
12+
| StakeRegistry | [0x45F5290a3630Cd6dc277B6f92227526121ca7c22](https://etherscan.io/address/0x45F5290a3630Cd6dc277B6f92227526121ca7c22) |
13+
| BatcherPaymentService | [0xb0567184A52cB40956df6333510d6eF35B89C8de](https://etherscan.io/address/0xb0567184A52cB40956df6333510d6eF35B89C8de) |
14+
15+
### Strategies
16+
17+
Below is the list of supported strategies available on Aligned Mainnet:
18+
19+
| Name | Address |
20+
|------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|
21+
| [Beacon Chain ETH](https://app.eigenlayer.xyz/restake/ETH) | [0xbeaC0eeEeeeeEEeEeEEEEeeEEeEeeeEeeEEBEaC0](https://etherscan.io/address/0xbeaC0eeEeeeeEEeEeEEEEeeEEeEeeeEeeEEBEaC0) |
22+
| [stETH](https://app.eigenlayer.xyz/restake/stETH) | [0x93c4b944D05dfe6df7645A86cd2206016c51564D](https://etherscan.io/address/0x93c4b944D05dfe6df7645A86cd2206016c51564D) |
23+
| [rETH](https://app.eigenlayer.xyz/restake/rETH) | [0x1BeE69b7dFFfA4E2d53C2a2Df135C388AD25dCD2](https://etherscan.io/address/0x1BeE69b7dFFfA4E2d53C2a2Df135C388AD25dCD2) |
24+
| [cbETH](https://app.eigenlayer.xyz/restake/cbETH) | [0x54945180dB7943c0ed0FEE7EdaB2Bd24620256bc](https://etherscan.io/address/0x54945180dB7943c0ed0FEE7EdaB2Bd24620256bc) |
25+
| [ETHx](https://app.eigenlayer.xyz/restake/ETHx) | [0x9d7eD45EE2E8FC5482fa2428f15C971e6369011d](https://etherscan.io/address/0x9d7eD45EE2E8FC5482fa2428f15C971e6369011d) |
26+
| [ankrETH](https://app.eigenlayer.xyz/restake/ankrETH) | [0x13760F50a9d7377e4F20CB8CF9e4c26586c658ff](https://etherscan.io/address/0x13760F50a9d7377e4F20CB8CF9e4c26586c658ff) |
27+
| [oETH](https://app.eigenlayer.xyz/restake/oETH) | [0xa4C637e0F704745D182e4D38cAb7E7485321d059](https://etherscan.io/address/0xa4C637e0F704745D182e4D38cAb7E7485321d059) |
28+
| [osETH](https://app.eigenlayer.xyz/restake/osETH) | [0x57ba429517c3473B6d34CA9aCd56c0e735b94c02](https://etherscan.io/address/0x57ba429517c3473B6d34CA9aCd56c0e735b94c02) |
29+
| [swETH](https://app.eigenlayer.xyz/restake/swETH) | [0x0Fe4F44beE93503346A3Ac9EE5A26b130a5796d6](https://etherscan.io/address/0x0Fe4F44beE93503346A3Ac9EE5A26b130a5796d6) |
30+
| [wBETH](https://app.eigenlayer.xyz/restake/wBETH) | [0x7CA911E83dabf90C90dD3De5411a10F1A6112184](https://etherscan.io/address/0x7CA911E83dabf90C90dD3De5411a10F1A6112184) |
31+
| [sfrxETH](https://app.eigenlayer.xyz/restake/sfrxETH) | [0x8CA7A5d6f3acd3A7A8bC468a8CD0FB14B6BD28b6](https://etherscan.io/address/0x8CA7A5d6f3acd3A7A8bC468a8CD0FB14B6BD28b6) |
32+
| [lsETH](https://app.eigenlayer.xyz/restake/lsETH) | [0xAe60d8180437b5C34bB956822ac2710972584473](https://etherscan.io/address/0xAe60d8180437b5C34bB956822ac2710972584473) |
33+
| [mETH](https://app.eigenlayer.xyz/restake/mETH) | [0x298aFB19A105D59E74658C4C334Ff360BadE6dd2](https://etherscan.io/address/0x298aFB19A105D59E74658C4C334Ff360BadE6dd2) |
34+
35+
For additional details, refer to the [official EigenLayer documentation](https://github.com/Layr-Labs/eigenlayer-contracts/tree/mainnet?tab=readme-ov-file#strategies).
36+
37+
38+
## Holesky Deployments
439

540
| Contract | Address |
641
|----------------------------|-------------------------------------------------------------------------------------------------------------------------------|

docs/operator_guides/0_running_an_operator.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ Minimum hardware requirements:
2121
| **Bandwidth** | 1 Gbps |
2222
| **Storage** | 256 GB disk space |
2323

24+
## Supported Strategies
25+
26+
The list of supported strategies can be found [here](../3_guides/7_contract_addresses.md).
27+
2428
## Step 1 - Clone the repo
2529

2630
To start with, clone the Aligned repository and move inside it

0 commit comments

Comments
 (0)