Skip to content

Commit d5e740c

Browse files
grezlegrezle
authored
Merge branch 'main' into feat/upgrade-template
2 parents 3b76074 + 3a62a56 commit d5e740c

File tree

16 files changed

+693
-47
lines changed

16 files changed

+693
-47
lines changed

‎config/contexts/migrations/v0.0.7-v0.0.8.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func migrateKeystoreFiles() error {
176176
// Migrate each operator's keystores
177177
for i := 1; i <= 5; i++ {
178178
operatorNum := fmt.Sprintf("operator%d", i)
179-
179+
180180
// Old and new BLS keystore names
181181
oldBLSName := fmt.Sprintf("%s.keystore.json", operatorNum)
182182
newBLSName := fmt.Sprintf("%s.bls.keystore.json", operatorNum)
@@ -194,7 +194,7 @@ func migrateKeystoreFiles() error {
194194
// Add ECDSA keystore from embedded files
195195
ecdsaName := fmt.Sprintf("%s.ecdsa.keystore.json", operatorNum)
196196
ecdsaPath := filepath.Join(keystoreDir, ecdsaName)
197-
197+
198198
// Only create ECDSA keystore if it doesn't already exist
199199
if _, err := os.Stat(ecdsaPath); os.IsNotExist(err) {
200200
// Get ECDSA keystore content from embedded files
@@ -213,4 +213,4 @@ func migrateKeystoreFiles() error {
213213
}
214214

215215
return nil
216-
}
216+
}

‎config/contexts/migrations/v0.0.9-v0.1.0.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,36 @@ func Migration_0_0_9_to_0_1_0(user, old, new *yaml.Node) (*yaml.Node, error) {
179179
return &yaml.Node{Kind: yaml.ScalarNode, Value: "0x44632dfBdCb6D3E21EF613B0ca8A6A0c618F5a37"}
180180
},
181181
},
182+
// Update L1 fork block
183+
{
184+
Path: []string{"context", "chains", "l1", "fork", "block"},
185+
Condition: migration.Always{},
186+
Base: migration.BaseUser,
187+
Transform: func(_ *yaml.Node) *yaml.Node {
188+
return &yaml.Node{Kind: yaml.ScalarNode, Value: "9085290"}
189+
},
190+
},
191+
// Update L2 fork block
192+
{
193+
Path: []string{"context", "chains", "l2", "fork", "block"},
194+
Condition: migration.Always{},
195+
Base: migration.BaseUser,
196+
Transform: func(_ *yaml.Node) *yaml.Node {
197+
return &yaml.Node{Kind: yaml.ScalarNode, Value: "30327360"}
198+
},
199+
},
182200
},
183201
}
184202

185203
if err := engine.Apply(); err != nil {
186204
return nil, err
187205
}
188206

207+
// Update BLS keystore files
208+
if err := updateKeystoreFiles(); err != nil {
209+
return nil, fmt.Errorf("failed to migrate keystore files: %w", err)
210+
}
211+
189212
// Upgrade the version
190213
if v := migration.ResolveNode(user, []string{"version"}); v != nil {
191214
v.Value = "0.1.0"

‎config/contexts/v0.1.0.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ context:
99
chain_id: 31337
1010
rpc_url: "http://localhost:8545"
1111
fork:
12-
block: 8836193
12+
block: 9085290
1313
url: ""
1414
block_time: 3
1515
l2:
1616
chain_id: 31338
1717
rpc_url: "http://localhost:9545"
1818
fork:
19-
block: 28820370
19+
block: 30327360
2020
url: ""
2121
block_time: 3
2222
# Stake Root Transporter configuration

‎config/keystores/operator1.bls.keystore.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
"n": 262144,
88
"p": 1,
99
"r": 8,
10-
"salt": "9fae9b1bbd819da8145fc9ac0fd96994e0a437592ee586e750300f83b4526693"
10+
"salt": "d6f87d41f3e579f5c01842c97bd06a8d3ed2bbb927f1af0b0b84597ba8973462"
1111
},
1212
"message": ""
1313
},
1414
"checksum": {
1515
"function": "sha256",
1616
"params": {},
17-
"message": "c10506cb8e40da4a869047440e33b91950769e4f49b82474eeef622dbfd92698"
17+
"message": "edf33551b6dfcbcb9c1fd284b3df211121992694c896d07a6aa270f08bfad691"
1818
},
1919
"cipher": {
2020
"function": "aes-128-ctr",
2121
"params": {
22-
"iv": "fe7f0fe16096245665808ab3e637e768"
22+
"iv": "f78c4113516550a1166f631bd17f17a5"
2323
},
24-
"message": "34c36a0c9ffe18021d6b646d6c983138f95a79bb3406f4630dcb0a7b70f9d8ee2d2de335203d42bb7a6047622e499e2acc2bc21413e264931251a9e53836ae4ca93c344a0fd111f08f339d5663"
24+
"message": "bc833e7f5d91f70fc1f452b19648b6c49976fe93d394789047ecc6ece6006fa6df0a4e63c885f26d514af5171d8c6c32ad5286be3ac6867df42921eca2ddd97a"
2525
}
2626
},
27-
"pubkey": "15de6881d859600f953e1b00fa58a950c65eac7c86860412b269c2a33bac09e51d37f7f962df4041a82808c85140c6186878b4695673ecd3c6fd1b7953d9f77000161e1c998df8e36d9cd89717ec47a5e385220ea4c9fa4bf419a3563fb5c3541425a016e78736ea3568613ff6338ffcec5a40e597b31ed959bb630d22502a70",
27+
"pubkey": "19fb7a235dbb9d09a549bde919fd738ad9eea8829462f90b0cb1d305497509fb2b1cb5c63fc2225c4e014ae056be73c568c34bbeadf37eaf019aec13e11f7e93136694c1eefb9b8853185ad57abb356edd4a0e8187dc35297a1adc26d05c6d062d64523c7380de3a4b9607035e5789544b453c408564b6ae57ee4ebb20c5f38e",
2828
"path": "m/1/0/0",
29-
"uuid": "8a46d49d-14c3-4532-82e3-0476bee37390",
29+
"uuid": "64e38071-7634-496e-b10a-89cdf59ac3ab",
3030
"version": 4,
3131
"curveType": "bn254"
3232
}

‎config/keystores/operator2.bls.keystore.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
"n": 262144,
88
"p": 1,
99
"r": 8,
10-
"salt": "ef47268ea1e2e103052eaa40a166a93f96674b04a2ee759cc67c8981dfadde7f"
10+
"salt": "943edb5c49e538b9e7707e87abda46ad5960c0568f465c9eb289b6d56eee50cf"
1111
},
1212
"message": ""
1313
},
1414
"checksum": {
1515
"function": "sha256",
1616
"params": {},
17-
"message": "64cc2b4ed00f6cdf230122af4a17df2481d3d928773b416b38d54368df3398b2"
17+
"message": "a2d841d2182ed96d7d5f3fc663109c77b692229ea12cacfa9a1f569191360f39"
1818
},
1919
"cipher": {
2020
"function": "aes-128-ctr",
2121
"params": {
22-
"iv": "d8821947d50b01545907516437fdaa9c"
22+
"iv": "f113dda8133c9640ec7a08d21d5f8629"
2323
},
24-
"message": "5f104f844ab8020f3d12d59c1532428d9425d3df0edf6bbd95d697e6b304c4ff690983765f0a07289fb38b50cc663db31c9cf2b7102b9153d9b342b9071929817d5aff8dcfb65abc774fcf"
24+
"message": "6b7ec13bbe3091326f37b2a801a5d8b5c61c5d4214d1d75d944781ed68bc214f257e3cf9fc7daa9752d68c92e30cc106c35ff385af0c0b88a2fd1c84e9750957"
2525
}
2626
},
27-
"pubkey": "0ade1cdf142c7dbf27aa9173a6dc34515607a444bd8c178180689a0f80cf38352a547c0d1a5763c18b4af4107c51a1633fb70fc975fe7a8e98b5e224d9dba90c0832c8878dac72b88643c1c9313d0d20eac8b8bbb1347aa9a3d83ee61b7b2a4c237dcae2f9ba22b3a4b6b09e426fa805eb5338c1f4af3ac199ae1259a3a6ae1d",
27+
"pubkey": "22585e9dde848ba29e014c9a2c8ab2e398bd9a0d136c2090d0c397f5175f489d0585466f0a0c2a5085879675dd345ad8602041c5b1aa14bf532060e62d595c610e82952b99729adb02023985f89973c29f115b4648d4d0a21c1c32a76027d6151407aaed9a860d41e610db40bfe89f47e022716f663a50c1a0b131eab581495e",
2828
"path": "m/1/0/0",
29-
"uuid": "7be99975-d7e3-42d0-a814-b5a80309e2a9",
29+
"uuid": "d9bee745-5bb4-4946-a1c0-b6183a17138c",
3030
"version": 4,
3131
"curveType": "bn254"
3232
}

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ toolchain go1.24.2
77
replace github.com/Layr-Labs/devkit-cli => ./
88

99
require (
10-
github.com/Layr-Labs/eigenlayer-contracts v1.8.0-rc.0
10+
github.com/Layr-Labs/eigenlayer-contracts v1.8.0-testnet-final
1111
github.com/Layr-Labs/hourglass-monorepo/ponos v0.0.0-20250613205316-cb10040f5737
12-
github.com/Layr-Labs/multichain-go v0.0.11
12+
github.com/Layr-Labs/multichain-go v0.0.12
1313
github.com/google/uuid v1.6.0
1414
github.com/joho/godotenv v1.5.1
1515
github.com/opencontainers/go-digest v1.0.0

‎go.sum

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
66
github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
77
github.com/Layr-Labs/crypto-libs v0.0.4 h1:FV/staDn/1CzYmmbP/o2+fPc9Z1NotPBP9dW/xisx94=
88
github.com/Layr-Labs/crypto-libs v0.0.4/go.mod h1:PWjHsuxgk5MNopPr3QLhpP/RJerbjh98qCCSivnVPHE=
9-
github.com/Layr-Labs/eigenlayer-contracts v1.8.0-rc.0 h1:Sb8qPzW2XARXkh1uzE5Zlod5Q4LK+iT4UkOhDFU74X8=
10-
github.com/Layr-Labs/eigenlayer-contracts v1.8.0-rc.0/go.mod h1:Ie8YE3EQkTHqG6/tnUS0He7/UPMkXPo/3OFXwSy0iRo=
9+
github.com/Layr-Labs/eigenlayer-contracts v1.8.0-testnet-final h1:f+dHuhY4mrgBOwXGfADkSbHy0Sex2t9TCsAdp1jJpjM=
10+
github.com/Layr-Labs/eigenlayer-contracts v1.8.0-testnet-final/go.mod h1:Ie8YE3EQkTHqG6/tnUS0He7/UPMkXPo/3OFXwSy0iRo=
1111
github.com/Layr-Labs/hourglass-monorepo/ponos v0.0.0-20250613205316-cb10040f5737 h1:UnBl34Y3xxQ4WTQ/O36dtY0CtHXZXvgyWxwEdJRCdHQ=
1212
github.com/Layr-Labs/hourglass-monorepo/ponos v0.0.0-20250613205316-cb10040f5737/go.mod h1:bNDHU6OHvYrjPaUe/0GSUrfvO6OjGFWIWPehC0U6K40=
13-
github.com/Layr-Labs/multichain-go v0.0.11 h1:WDpTzaL8EmQzGrjCMSL3Fykg54Di3GIgYQ85JyJzw2Y=
14-
github.com/Layr-Labs/multichain-go v0.0.11/go.mod h1:eQQLSZYnFyecHcsil5l1whR15ffZdbzKrXMJbequqjM=
13+
github.com/Layr-Labs/multichain-go v0.0.12 h1:fCRDOeKJg4gW7WPBc8kZfuIhtpUO+RUk0bf+Lx+AiIc=
14+
github.com/Layr-Labs/multichain-go v0.0.12/go.mod h1:BTDGFUQZwuwZPnYfTTwj0+xAsUIGbWE5zXiZi6v3W9A=
1515
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
1616
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
17+
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
1718
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
1819
github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
1920
github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI=
@@ -67,6 +68,7 @@ github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a h1:W8mUrRp6NOV
6768
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a/go.mod h1:sTwzHBvIzm2RfVCGNEBZgRyjwK40bVoun3ZnGOCafNM=
6869
github.com/crate-crypto/go-kzg-4844 v1.1.0 h1:EN/u9k2TF6OWSHrCCDBBU6GLNMq88OspHHlMnHfoyU4=
6970
github.com/crate-crypto/go-kzg-4844 v1.1.0/go.mod h1:JolLjpSff1tCCJKaJx4psrlEdlXuJEC996PL3tTAFks=
71+
github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
7072
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
7173
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7274
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -143,6 +145,7 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5uk
143145
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
144146
github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
145147
github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
148+
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
146149
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
147150
github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4=
148151
github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc=

‎pkg/commands/context/context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ var Command = &cli.Command{
6363
} else if cCtx.String("context") == "" && len(cCtx.Args().Slice()) > 0 {
6464
// Select the last arg
6565
last := len(args) - 1
66-
// Only treat as context if it’s not a key=value
66+
// Only treat as context if its not a key=value
6767
if !strings.Contains(args[last], "=") {
6868
context = args[last]
6969
args = args[:last]

‎pkg/commands/deploy_actions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ func CreateAVSOperatorSetsAction(cCtx *cli.Context, logger iface.Logger) error {
755755
}
756756
}
757757

758-
logger.Info("creating operatorSets")
758+
logger.Info("Creating operatorSets")
759759

760760
return contractCaller.CreateOperatorSets(cCtx.Context, avsAddr, createSetParams)
761761
}

0 commit comments

Comments
 (0)