Skip to content

Commit

Permalink
Node: Rename Hyperliquid to HyperEVM (wormhole-foundation#4199)
Browse files Browse the repository at this point in the history 
* Node: Rename Hyperliquid to HyperEVM

* Add registration VAA
  • Loading branch information
@bruce-riley
bruce-riley authored Dec 19, 2024
1 parent 608715a commit 79657d4
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 25 deletions.
1 change: 1 addition & 0 deletions deployments/testnet/tokenBridgeVAAs.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Berachain (39) Testnet Token Bridge,01000000000100c19d35faa10139fef5b3244f120efb
Snaxchain (43) Testnet Token Bridge,010000000001008ed60dec76f13f6da695fc5f134c8cf3527f264712e7bb98d2e54a5f457759e0491e3f1cb42eed9b84edc60a96836df98a3752c8a4e10977801e6c35a39f211b000000000100000001000100000000000000000000000000000000000000000000000000000000000000040000000005ba971e00000000000000000000000000000000000000000000546f6b656e427269646765010000002b000000000000000000000000a10f2ef61de1f19f586ab8b6f2eba89bace63f7a
Unichain (44) Testnet Token Bridge,010000000001004f9c7be0694bcabbf1fec2300004b9d82f6a122c459fababcfdc897e894769290c9a9655015909b5c17667d63f8edcec9ad9ee2d05e7cdb24a7a64136a4312c70100000001000000010001000000000000000000000000000000000000000000000000000000000000000400000000008006e100000000000000000000000000000000000000000000546f6b656e427269646765010000002c000000000000000000000000a10f2ef61de1f19f586ab8b6f2eba89bace63f7a
Worldchain (45) Testnet Token Bridge,01000000000100f1ae141e77e67110aecade87c6a5f9b34545638aba1a3a7dbf6a311fe58c99fd351650c8593a8161a03cc7f94b76cdc0a5978fa3e0ffbfb3738085a070172cc5010000000100000001000100000000000000000000000000000000000000000000000000000000000000040000000004f3500a00000000000000000000000000000000000000000000546f6b656e427269646765010000002d000000000000000000000000430855b4d43b8aeb9d2b9869b74d58dda79c0db2
HyperEVM (47) Testnet Token Bridge,010000000001003f9a225a8b004c871374f69c29e8a3335614270886719a9ce30b1e5afb1df04d144208fb42b74fbfb140977a13e4fb4fa6107e625745ede6d6ddca0e4eafcb3c01000000010000000100010000000000000000000000000000000000000000000000000000000000000004000000000456642800000000000000000000000000000000000000000000546f6b656e427269646765010000002f0000000000000000000000004a8bc80ed5a4067f1ccf107057b8270e0cc11a78
Gateway (3104) Testnet Token Bridge,01000000000100117d1c7a124a9e2e29d82b3803b825be7c8a1dc7f19013669f7d11d42d448aa72339fe3657e4bd156c5c28dd10e78aab3e06e9e76c4bbd38c81e057533d577c40000000000d09296c5000100000000000000000000000000000000000000000000000000000000000000049ea4b9942b23298c20000000000000000000000000000000000000000000546f6b656e4272696467650100000c20ef5251ea1e99ae48732800ccc7b83b57881232a73eb796b63b1d86ed2ea44e27
Sepolia (10002) (Ethereum) Testnet Token Bridge,01000000000100a03841125d40e9df3cd80d027bc660191755587980e49f6a46e9baa1b5c3f6b46e51256c225bd242139ae11d3c84439acdc204a5f39a2e1acb750ae98bb759f1000000000100000001000100000000000000000000000000000000000000000000000000000000000000040000000005491ea100000000000000000000000000000000000000000000546f6b656e4272696467650100002712000000000000000000000000db5492265f6038831e89f495670ff909ade94bd9
Arbitrum Sepolia (10003) Testnet Token Bridge,010000000001001b0fbbcc7a3e8c491dc25f0a611075513032fe444d8e6585153e6ae2cf8c7514152b050e95a3e0af11e5b2705b2efb717bec3cfaa3b1617ff623c14e61a69224000000000100000001000100000000000000000000000000000000000000000000000000000000000000040000000001b8de3c00000000000000000000000000000000000000000000546f6b656e4272696467650100002713000000000000000000000000c7a204bdbfe983fcd8d8e61d02b475d4073ff97e
Expand Down
2 changes: 1 addition & 1 deletion ethereum/env/.env.hyperliquid.testnet → ethereum/env/.env.hyperevm.testnet
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Hyperliquid testnet env
# HyperEVM testnet env
# Rename to .env

# Common config for forge deployment
Expand Down
22 changes: 11 additions & 11 deletions node/cmd/guardiand/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ var (
inkRPC *string
inkContract *string

hyperliquidRPC *string
hyperliquidContract *string
hyperEvmRPC *string
hyperEvmContract *string

sepoliaRPC *string
sepoliaContract *string
Expand Down Expand Up @@ -425,8 +425,8 @@ func init() {
inkRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "inkRPC", "Ink RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
inkContract = NodeCmd.Flags().String("inkContract", "", "Ink contract address")

hyperliquidRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "hyperliquidRPC", "Hyperliquid RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
hyperliquidContract = NodeCmd.Flags().String("hyperliquidContract", "", "Hyperliquid contract address")
hyperEvmRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "hyperEvmRPC", "HyperEVM RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
hyperEvmContract = NodeCmd.Flags().String("hyperEvmContract", "", "HyperEVM contract address")

arbitrumSepoliaRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "arbitrumSepoliaRPC", "Arbitrum on Sepolia RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
arbitrumSepoliaContract = NodeCmd.Flags().String("arbitrumSepoliaContract", "", "Arbitrum on Sepolia contract address")
Expand Down Expand Up @@ -818,7 +818,7 @@ func runNode(cmd *cobra.Command, args []string) {
*unichainContract = checkEvmArgs(logger, *unichainRPC, *unichainContract, "unichain", false)
*worldchainContract = checkEvmArgs(logger, *worldchainRPC, *worldchainContract, "worldchain", true)
*inkContract = checkEvmArgs(logger, *inkRPC, *inkContract, "ink", false)
*hyperliquidContract = checkEvmArgs(logger, *hyperliquidRPC, *hyperliquidContract, "hyperliquid", false)
*hyperEvmContract = checkEvmArgs(logger, *hyperEvmRPC, *hyperEvmContract, "hyperEvm", false)

// These chains will only ever be testnet / devnet.
*sepoliaContract = checkEvmArgs(logger, *sepoliaRPC, *sepoliaContract, "sepolia", false)
Expand Down Expand Up @@ -935,7 +935,7 @@ func runNode(cmd *cobra.Command, args []string) {
rpcMap["celoRPC"] = *celoRPC
rpcMap["ethRPC"] = *ethRPC
rpcMap["fantomRPC"] = *fantomRPC
rpcMap["hyperliquidRPC"] = *hyperliquidRPC
rpcMap["hyperEvmRPC"] = *hyperEvmRPC
rpcMap["ibcBlockHeightURL"] = *ibcBlockHeightURL
rpcMap["ibcLCD"] = *ibcLCD
rpcMap["ibcWS"] = *ibcWS
Expand Down Expand Up @@ -1437,12 +1437,12 @@ func runNode(cmd *cobra.Command, args []string) {
watcherConfigs = append(watcherConfigs, wc)
}

if shouldStart(hyperliquidRPC) {
if shouldStart(hyperEvmRPC) {
wc := &evm.WatcherConfig{
NetworkID: "hyperliquid",
ChainID: vaa.ChainIDHyperliquid,
Rpc: *hyperliquidRPC,
Contract: *hyperliquidContract,
NetworkID: "hyperevm",
ChainID: vaa.ChainIDHyperEVM,
Rpc: *hyperEvmRPC,
Contract: *hyperEvmContract,
CcqBackfillCache: *ccqBackfillCache,
}

Expand Down
2 changes: 1 addition & 1 deletion node/pkg/query/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ var perChainConfig = map[vaa.ChainID]PerChainConfig{
vaa.ChainIDOptimismSepolia: {NumWorkers: 1, TimestampCacheSupported: true},
vaa.ChainIDPolygonSepolia: {NumWorkers: 1, TimestampCacheSupported: true},
vaa.ChainIDMonadDevnet: {NumWorkers: 1, TimestampCacheSupported: true},
vaa.ChainIDHyperliquid: {NumWorkers: 1, TimestampCacheSupported: true},
vaa.ChainIDHyperEVM: {NumWorkers: 1, TimestampCacheSupported: true},
}

// GetPerChainConfig returns the config for the specified chain. If the chain is not configured it returns an empty struct,
Expand Down
2 changes: 1 addition & 1 deletion node/pkg/watchers/evm/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ func (w *Watcher) getFinality(ctx context.Context) (bool, bool, error) {
w.chainID == vaa.ChainIDBSC ||
w.chainID == vaa.ChainIDEthereum ||
w.chainID == vaa.ChainIDHolesky ||
w.chainID == vaa.ChainIDHyperliquid ||
w.chainID == vaa.ChainIDHyperEVM ||
w.chainID == vaa.ChainIDInk ||
w.chainID == vaa.ChainIDKarura ||
w.chainID == vaa.ChainIDMantle ||
Expand Down
2 changes: 1 addition & 1 deletion sdk/testnet_consts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var knownTestnetTokenbridgeEmitters = map[vaa.ChainID]string{
vaa.ChainIDUnichain: "000000000000000000000000a10f2eF61dE1f19f586ab8B6F2EbA89bACE63F7a",
vaa.ChainIDWorldchain: "000000000000000000000000430855B4D43b8AEB9D2B9869B74d58dda79C0dB2",
vaa.ChainIDInk: "000000000000000000000000376428e7f26D5867e69201b275553C45B09EE090",
vaa.ChainIDHyperliquid: "0000000000000000000000004a8bc80Ed5a4067f1CCf107057b8270E0cC11A78",
vaa.ChainIDHyperEVM: "0000000000000000000000004a8bc80Ed5a4067f1CCf107057b8270E0cC11A78",
vaa.ChainIDSepolia: "000000000000000000000000DB5492265f6038831E89f495670FF909aDe94bd9",
vaa.ChainIDHolesky: "00000000000000000000000076d093BbaE4529a342080546cAFEec4AcbA59EC6",
vaa.ChainIDArbitrumSepolia: "000000000000000000000000C7A204bDBFe983FCD8d8E61D02b475D4073fF97e",
Expand Down
14 changes: 7 additions & 7 deletions sdk/vaa/structs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ func (c ChainID) String() string {
return "worldchain"
case ChainIDInk:
return "ink"
case ChainIDHyperliquid:
return "hyperliquid"
case ChainIDHyperEVM:
return "hyperevm"
case ChainIDCosmoshub:
return "cosmoshub"
case ChainIDEvmos:
Expand Down Expand Up @@ -344,8 +344,8 @@ func ChainIDFromString(s string) (ChainID, error) {
return ChainIDWorldchain, nil
case "ink":
return ChainIDInk, nil
case "hyperliquid":
return ChainIDHyperliquid, nil
case "hyperevm":
return ChainIDHyperEVM, nil
case "cosmoshub":
return ChainIDCosmoshub, nil
case "seievm":
Expand Down Expand Up @@ -429,7 +429,7 @@ func GetAllNetworkIDs() []ChainID {
ChainIDUnichain,
ChainIDWorldchain,
ChainIDInk,
ChainIDHyperliquid,
ChainIDHyperEVM,
ChainIDWormchain,
ChainIDCosmoshub,
ChainIDEvmos,
Expand Down Expand Up @@ -536,8 +536,8 @@ const (
ChainIDWorldchain ChainID = 45
// ChainIDInk is the ChainID of Ink
ChainIDInk ChainID = 46
// ChainIDHyperliquid is the ChainID of Hyperliquid
ChainIDHyperliquid ChainID = 47
// ChainIDHyperEVM is the ChainID of HyperEVM
ChainIDHyperEVM ChainID = 47
//ChainIDWormchain is the ChainID of Wormchain
ChainIDWormchain ChainID = 3104
// ChainIDCosmoshub is the ChainID of Cosmoshub
Expand Down
6 changes: 3 additions & 3 deletions sdk/vaa/structs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func TestChainIDFromString(t *testing.T) {
{input: "unichain", output: ChainIDUnichain},
{input: "worldchain", output: ChainIDWorldchain},
{input: "ink", output: ChainIDInk},
{input: "hyperliquid", output: ChainIDHyperliquid},
{input: "hyperevm", output: ChainIDHyperEVM},
{input: "seievm", output: ChainIDSeiEVM},
{input: "wormchain", output: ChainIDWormchain},
{input: "cosmoshub", output: ChainIDCosmoshub},
Expand Down Expand Up @@ -130,7 +130,7 @@ func TestChainIDFromString(t *testing.T) {
{input: "Unichain", output: ChainIDUnichain},
{input: "Worldchain", output: ChainIDWorldchain},
{input: "Ink", output: ChainIDInk},
{input: "Hyperliquid", output: ChainIDHyperliquid},
{input: "HyperEVM", output: ChainIDHyperEVM},
{input: "SeiEVM", output: ChainIDSeiEVM},
{input: "Wormchain", output: ChainIDWormchain},
{input: "Cosmoshub", output: ChainIDCosmoshub},
Expand Down Expand Up @@ -332,7 +332,7 @@ func TestChainId_String(t *testing.T) {
{input: 44, output: "unichain"},
{input: 45, output: "worldchain"},
{input: 46, output: "ink"},
{input: 47, output: "hyperliquid"},
{input: 47, output: "hyperevm"},
{input: 3104, output: "wormchain"},
{input: 4000, output: "cosmoshub"},
{input: 4001, output: "evmos"},
Expand Down

0 comments on commit 79657d4

Please sign in to comment.