Skip to content

Commit 82a4b8c

Browse files
damiannolandamiannolan
authored
chore: update hyperlane deployment configs (#344)
* chore: update hyperlane deployment configs * chore: update defaults for merkle tree address and docker compose * chore: address docker compose comments
1 parent 3659f39 commit 82a4b8c

File tree

9 files changed

+91
-40
lines changed

9 files changed

+91
-40
lines changed

‎.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ MAILBOX_ADDRESS="0xb1c938f5ba4b3593377f399e12175e8db0c787ff"
2222
CELESTIA_MAILBOX_ADDRESS="0x68797065726c616e650000000000000000000000000000000000000000000000"
2323

2424
# The Hyperlane Merkle Tree Address on EV
25-
MERKLE_TREE_ADDRESS="0xfcb1d485ef46344029d9e8a7925925e146b3430e"
25+
MERKLE_TREE_ADDRESS="0x1D957dA7A6988f5a9d2D2454637B4B7fea0Aeea5"
2626

2727
# Default Namespace used for Celestia data submission.
2828
# NOTE: The DA_HEADER_NAMESPACE and DA_DATA_NAMESPACE env vars in docker-compose.yml are namespace encoded by ev-node.

‎crates/ev-prover/src/config/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl Default for EvmHyperlaneConfig {
229229
fn default() -> Self {
230230
Self {
231231
mailbox_address: "0xb1c938f5ba4b3593377f399e12175e8db0c787ff".into(),
232-
merkle_tree_address: "0xfcb1d485ef46344029d9e8a7925925e146b3430e".into(),
232+
merkle_tree_address: "0x1D957dA7A6988f5a9d2D2454637B4B7fea0Aeea5".into(),
233233
}
234234
}
235235
}

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ services:
152152
- celestia-zkevm-net
153153

154154
relayer:
155-
image: gcr.io/abacus-labs-dev/hyperlane-agent:main
155+
image: gcr.io/abacus-labs-dev/hyperlane-agent:agents-v1.7.0
156156
platform: linux/amd64
157157
container_name: relayer
158158
environment:

‎hyperlane/cmd/hyp/cmd/cmd.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ import (
1919
)
2020

2121
type HyperlaneConfig struct {
22-
IsmID util.HexAddress `json:"ism_id"`
23-
MailboxID util.HexAddress `json:"mailbox_id"`
24-
HooksID util.HexAddress `json:"hooks_id"`
25-
TokenID util.HexAddress `json:"collateral_token_id"`
22+
IsmID util.HexAddress `json:"ism_id"`
23+
MailboxID util.HexAddress `json:"mailbox_id"`
24+
DefaultHookID util.HexAddress `json:"default_hook_id"`
25+
RequiredHookID util.HexAddress `json:"required_hook_id"`
26+
TokenID util.HexAddress `json:"collateral_token_id"`
2627
}
2728

2829
func NewRootCmd() *cobra.Command {

‎hyperlane/cmd/hyp/cmd/events.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,25 @@ func parseHooksIDFromEvents(events []abci.Event) util.HexAddress {
7272
return hookID
7373
}
7474

75+
func parseMerkleTreeHookIDFromEvents(events []abci.Event) util.HexAddress {
76+
var merkleTreeHookID util.HexAddress
77+
for _, evt := range events {
78+
if evt.GetType() == proto.MessageName(&hooktypes.EventCreateMerkleTreeHook{}) {
79+
event, err := sdk.ParseTypedEvent(evt)
80+
if err != nil {
81+
log.Fatalf("failed to parse typed event: %v", err)
82+
}
83+
84+
if hookEvent, ok := event.(*hooktypes.EventCreateMerkleTreeHook); ok {
85+
log.Printf("successfully created NoopHook: %s\n", hookEvent)
86+
merkleTreeHookID = hookEvent.MerkleTreeHookId
87+
}
88+
}
89+
}
90+
91+
return merkleTreeHookID
92+
}
93+
7594
func parseMailboxIDFromEvents(events []abci.Event) util.HexAddress {
7695
var mailboxID util.HexAddress
7796
for _, evt := range events {

‎hyperlane/cmd/hyp/cmd/hyperlane.go‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,25 @@ func SetupWithIsm(ctx context.Context, broadcaster *Broadcaster, ismID util.HexA
9696
res = broadcaster.BroadcastTx(ctx, &msgCreateMailBox)
9797
mailboxID := parseMailboxIDFromEvents(res.Events)
9898

99+
msgCreateMerkleTreeHook := hooktypes.MsgCreateMerkleTreeHook{
100+
MailboxId: mailboxID,
101+
Owner: broadcaster.address.String(),
102+
}
103+
104+
res = broadcaster.BroadcastTx(ctx, &msgCreateMerkleTreeHook)
105+
merkleTreeHookID := parseMerkleTreeHookIDFromEvents(res.Events)
106+
107+
msgSetMailbox := coretypes.MsgSetMailbox{
108+
Owner: broadcaster.address.String(),
109+
MailboxId: mailboxID,
110+
DefaultIsm: &ismID,
111+
DefaultHook: &hooksID,
112+
RequiredHook: &merkleTreeHookID,
113+
RenounceOwnership: false,
114+
}
115+
116+
res = broadcaster.BroadcastTx(ctx, &msgSetMailbox)
117+
99118
msgCreateCollateralToken := warptypes.MsgCreateCollateralToken{
100119
Owner: broadcaster.address.String(),
101120
OriginMailbox: mailboxID,
@@ -116,10 +135,11 @@ func SetupWithIsm(ctx context.Context, broadcaster *Broadcaster, ismID util.HexA
116135
broadcaster.BroadcastTx(ctx, &msgSetToken)
117136

118137
cfg := &HyperlaneConfig{
119-
IsmID: ismID,
120-
HooksID: hooksID,
121-
MailboxID: mailboxID,
122-
TokenID: tokenID,
138+
IsmID: ismID,
139+
DefaultHookID: hooksID,
140+
RequiredHookID: merkleTreeHookID,
141+
MailboxID: mailboxID,
142+
TokenID: tokenID,
123143
}
124144

125145
writeConfig(cfg)
@@ -149,10 +169,11 @@ func OverwriteIsm(ctx context.Context, broadcaster *Broadcaster, ismID util.HexA
149169
broadcaster.BroadcastTx(ctx, &msgSetMailbox, &msgSetToken)
150170

151171
cfg := &HyperlaneConfig{
152-
IsmID: ismID,
153-
HooksID: *mailbox.RequiredHook,
154-
MailboxID: mailbox.Id,
155-
TokenID: tokenID,
172+
IsmID: ismID,
173+
DefaultHookID: *mailbox.DefaultHook,
174+
RequiredHookID: *mailbox.RequiredHook,
175+
MailboxID: mailbox.Id,
176+
TokenID: tokenID,
156177
}
157178

158179
writeConfig(cfg)

‎hyperlane/configs/core-config.yaml‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,34 @@
11
defaultHook:
22
address: "0xFCb1d485ef46344029D9E8A7925925e146B3430E"
3-
type: merkleTreeHook
3+
beneficiary: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
4+
maxProtocolFee: "0"
5+
owner: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
6+
protocolFee: "0"
7+
type: protocolFee
48
defaultIsm:
59
address: "0xa05915fD6E32A1AA7E67d800164CaCB12487142d"
610
type: testIsm
711
interchainAccountRouter:
8-
address: "0x4dc4E8bf5D0390C95Af9AFEb1e9c9927c4dB83e7"
12+
address: "0x9F098AE0AC3B7F75F0B3126f471E5F592b47F300"
13+
commitmentIsm:
14+
address: "0xc5891D3385DFC2f430494bd8B773Ac43D737244d"
15+
owner: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
16+
type: offchainLookupIsm
17+
urls:
18+
- https://commitment-read-ism.hyperlane.xyz
19+
hook: "0x0000000000000000000000000000000000000000"
20+
interchainSecurityModule:
21+
address: "0x9F098AE0AC3B7F75F0B3126f471E5F592b47F300"
22+
isms: {}
23+
owner: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
24+
type: interchainAccountRouting
925
mailbox: "0xb1c938F5BA4B3593377F399e12175e8db0C787Ff"
1026
owner: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
11-
proxyAdmin:
12-
address: "0x67cff9B0F9F25c00C71bd8300c3f38553088e234"
13-
owner: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
14-
remoteIcaRouters: {}
27+
remoteRouters: {}
1528
owner: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
1629
proxyAdmin:
1730
address: "0x7e7aD18Adc99b94d4c728fDf13D4dE97B926A0D8"
1831
owner: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
1932
requiredHook:
2033
address: "0x1D957dA7A6988f5a9d2D2454637B4B7fea0Aeea5"
21-
beneficiary: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
22-
maxProtocolFee: "10000000000000000000000000000"
23-
owner: "0xaF9053bB6c4346381C77C2FeD279B17ABAfCDf4d"
24-
protocolFee: "0"
25-
type: protocolFee
26-
34+
type: merkleTreeHook

‎hyperlane/registry/chains/rethlocal/addresses.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
domainRoutingIsmFactory: "0xE2c1756b8825C54638f98425c113b51730cc47f6"
2-
interchainAccountIsm: "0x9F098AE0AC3B7F75F0B3126f471E5F592b47F300"
3-
interchainAccountRouter: "0x4dc4E8bf5D0390C95Af9AFEb1e9c9927c4dB83e7"
2+
interchainAccountRouter: "0x9F098AE0AC3B7F75F0B3126f471E5F592b47F300"
43
mailbox: "0xb1c938F5BA4B3593377F399e12175e8db0C787Ff"
5-
merkleTreeHook: "0xFCb1d485ef46344029D9E8A7925925e146B3430E"
4+
merkleTreeHook: "0x1D957dA7A6988f5a9d2D2454637B4B7fea0Aeea5"
65
proxyAdmin: "0x7e7aD18Adc99b94d4c728fDf13D4dE97B926A0D8"
76
staticAggregationHookFactory: "0xe53275A1FcA119e1c5eeB32E7a72e54835A63936"
87
staticAggregationIsmFactory: "0x25CdBD2bf399341F8FEe22eCdB06682AC81fDC37"
98
staticMerkleRootMultisigIsmFactory: "0x2854CFaC53FCaB6C95E28de8C91B96a31f0af8DD"
109
staticMerkleRootWeightedMultisigIsmFactory: "0x94B9B5bD518109dB400ADC62ab2022D2F0008ff7"
1110
staticMessageIdMultisigIsmFactory: "0xCb1DC4aF63CFdaa4b9BFF307A8Dd4dC11B197E8f"
1211
staticMessageIdWeightedMultisigIsmFactory: "0x70Ac5980099d71F4cb561bbc0fcfEf08AA6279ec"
13-
testRecipient: "0xd7958B336f0019081Ad2279B2B7B7c3f744Bce0a"
14-
validatorAnnounce: "0x79ec7bF05AF122D3782934d4Fb94eE32f0C01c97"
12+
testRecipient: "0x6253964a75a5ae755a05C8460E690AF5914f93b2"
13+
validatorAnnounce: "0x67cff9B0F9F25c00C71bd8300c3f38553088e234"

‎hyperlane/relayer-config.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
"interchainGasPaymaster": "0x1D957dA7A6988f5a9d2D2454637B4B7fea0Aeea5",
3333
"interchainSecurityModule": "0xa05915fD6E32A1AA7E67d800164CaCB12487142d",
3434
"mailbox": "0xb1c938F5BA4B3593377F399e12175e8db0C787Ff",
35-
"merkleTreeHook": "0xFCb1d485ef46344029D9E8A7925925e146B3430E",
36-
"protocolFee": "0x8A93d247134d91e0de6f96547cB0204e5BE8e5D8",
35+
"merkleTreeHook": "0x1D957dA7A6988f5a9d2D2454637B4B7fea0Aeea5",
36+
"protocolFee": "0xFCb1d485ef46344029D9E8A7925925e146B3430E",
3737
"proxyAdmin": "0x7e7aD18Adc99b94d4c728fDf13D4dE97B926A0D8",
3838
"storageGasOracle": "0x457cCf29090fe5A24c19c1bc95F492168C0EaFdb",
39-
"testRecipient": "0xd7958B336f0019081Ad2279B2B7B7c3f744Bce0a",
40-
"validatorAnnounce": "0x79ec7bF05AF122D3782934d4Fb94eE32f0C01c97"
39+
"testRecipient": "0x6253964a75a5ae755a05C8460E690AF5914f93b2",
40+
"validatorAnnounce": "0x67cff9B0F9F25c00C71bd8300c3f38553088e234"
4141
},
42-
"celestia": {
42+
"celestiadev": {
4343
"bech32Prefix": "celestia",
4444
"blocks": {
4545
"confirmations": 1,
@@ -57,14 +57,14 @@
5757
"domainId": 69420,
5858
"gasPrice": {
5959
"denom": "utia",
60-
"amount": "0.002"
60+
"amount": "0.1"
6161
},
6262
"index": {
6363
"from": 1150,
6464
"chunk": 10
6565
},
6666
"isTestnet": true,
67-
"name": "celestia",
67+
"name": "celestiadev",
6868
"nativeToken": {
6969
"decimals": 6,
7070
"denom": "utia",
@@ -89,6 +89,9 @@
8989
},
9090
"slip44": 118,
9191
"technicalStack": "other",
92+
"transactionOverrides": {
93+
"gasPrice": "0.0"
94+
},
9295
"interchainSecurityModule": "0x726f757465725f69736d00000000000000000000000000000000000000000000",
9396
"mailbox": "0x68797065726c616e650000000000000000000000000000000000000000000000",
9497
"interchainGasPaymaster": "0x726f757465725f706f73745f6469737061746368000000000000000000000000",
@@ -102,5 +105,5 @@
102105
}
103106
},
104107
"defaultRpcConsensusType": "fallback",
105-
"relayChains": "rethlocal,celestia"
108+
"relayChains": "rethlocal,celestiadev"
106109
}

0 commit comments

Comments
 (0)