Merge branch 'main' into joel/add-slashing-params-vaa

.github/workflows/wormchain-icts.yml

@@ -64,6 +64,7 @@ jobs:
           - "ictest-wormchain"
           # Disabled due to flakiness in CI.
           # - "ictest-ibc-receiver"
+          - "ictest-validator-hotswap"
           - "ictest-cw-wormhole"
       fail-fast: false
 

node/cmd/guardiand/adminnodes.go

@@ -140,7 +140,6 @@ func runListNodes(cmd *cobra.Command, args []string) {
 		{"OptimismSepolia", vaa.ChainIDOptimismSepolia},
 		{"Holesky", vaa.ChainIDHolesky},
 		{"PolygonSepolia", vaa.ChainIDPolygonSepolia},
-		{"MonadDevnet", vaa.ChainIDMonadDevnet},
 	}
 
 	if len(only) > 0 {

node/cmd/guardiand/node.go

@@ -203,9 +203,6 @@ var (
 	monadRPC      *string
 	monadContract *string
 
-	monadDevnetRPC      *string
-	monadDevnetContract *string
-
 	inkRPC      *string
 	inkContract *string
 
@@ -462,9 +459,6 @@ func init() {
 	polygonSepoliaRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "polygonSepoliaRPC", "Polygon on Sepolia RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
 	polygonSepoliaContract = NodeCmd.Flags().String("polygonSepoliaContract", "", "Polygon on Sepolia contract address")
 
-	monadDevnetRPC = node.RegisterFlagWithValidationOrFail(NodeCmd, "monadDevnetRPC", "Monad Devnet RPC URL", "ws://eth-devnet:8545", []string{"ws", "wss"})
-	monadDevnetContract = NodeCmd.Flags().String("monadDevnetContract", "", "Monad Devnet contract address")
-
 	logLevel = NodeCmd.Flags().String("logLevel", "info", "Logging level (debug, info, warn, error, dpanic, panic, fatal)")
 	publicRpcLogDetailStr = NodeCmd.Flags().String("publicRpcLogDetail", "full", "The detail with which public RPC requests shall be logged (none=no logging, minimal=only log gRPC methods, full=log gRPC method, payload (up to 200 bytes) and user agent (up to 200 bytes))")
 	publicRpcLogToTelemetry = NodeCmd.Flags().Bool("logPublicRpcToTelemetry", true, "whether or not to include publicRpc request logs in telemetry")
@@ -855,7 +849,6 @@ func runNode(cmd *cobra.Command, args []string) {
 	*optimismSepoliaContract = checkEvmArgs(logger, *optimismSepoliaRPC, *optimismSepoliaContract, "optimismSepolia", false)
 	*holeskyContract = checkEvmArgs(logger, *holeskyRPC, *holeskyContract, "holesky", false)
 	*polygonSepoliaContract = checkEvmArgs(logger, *polygonSepoliaRPC, *polygonSepoliaContract, "polygonSepolia", false)
-	*monadDevnetContract = checkEvmArgs(logger, *monadDevnetRPC, *monadDevnetContract, "monadDevnet", false)
 
 	if !argsConsistent([]string{*solanaContract, *solanaRPC}) {
 		logger.Fatal("Both --solanaContract and --solanaRPC must be set or both unset")
@@ -1029,7 +1022,6 @@ func runNode(cmd *cobra.Command, args []string) {
 		rpcMap["optimismSepoliaRPC"] = *optimismSepoliaRPC
 		rpcMap["holeskyRPC"] = *holeskyRPC
 		rpcMap["polygonSepoliaRPC"] = *polygonSepoliaRPC
-		rpcMap["monadDevnetRPC"] = *monadDevnetRPC
 	}
 
 	// Other, non-chain specific parameters go here.
@@ -1760,18 +1752,6 @@ func runNode(cmd *cobra.Command, args []string) {
 
 			watcherConfigs = append(watcherConfigs, wc)
 		}
-
-		if shouldStart(monadDevnetRPC) {
-			wc := &evm.WatcherConfig{
-				NetworkID:        "monad_devnet",
-				ChainID:          vaa.ChainIDMonadDevnet,
-				Rpc:              *monadDevnetRPC,
-				Contract:         *monadDevnetContract,
-				CcqBackfillCache: *ccqBackfillCache,
-			}
-
-			watcherConfigs = append(watcherConfigs, wc)
-		}
 	}
 
 	var ibcWatcherConfig *node.IbcWatcherConfig = nil

node/pkg/query/query.go

@@ -140,7 +140,6 @@ var perChainConfig = map[vaa.ChainID]PerChainConfig{
 	vaa.ChainIDBaseSepolia:     {NumWorkers: 1, TimestampCacheSupported: true},
 	vaa.ChainIDOptimismSepolia: {NumWorkers: 1, TimestampCacheSupported: true},
 	vaa.ChainIDPolygonSepolia:  {NumWorkers: 1, TimestampCacheSupported: true},
-	vaa.ChainIDMonadDevnet:     {NumWorkers: 1, TimestampCacheSupported: true},
 	vaa.ChainIDHyperEVM:        {NumWorkers: 1, TimestampCacheSupported: true},
 	vaa.ChainIDMonad:           {NumWorkers: 1, TimestampCacheSupported: true},
 	vaa.ChainIDSeiEVM:          {NumWorkers: 1, TimestampCacheSupported: true},

node/pkg/watchers/evm/watcher.go

@@ -716,7 +716,6 @@ func (w *Watcher) getFinality(ctx context.Context) (bool, bool, error) {
 		w.chainID == vaa.ChainIDKarura ||
 		w.chainID == vaa.ChainIDMantle ||
 		w.chainID == vaa.ChainIDMonad ||
-		w.chainID == vaa.ChainIDMonadDevnet ||
 		w.chainID == vaa.ChainIDMoonbeam ||
 		w.chainID == vaa.ChainIDOptimism ||
 		w.chainID == vaa.ChainIDOptimismSepolia ||

node/pkg/watchers/solana/shim.go

@@ -341,7 +341,7 @@ func (s *SolanaWatcher) shimProcessRest(
 			zap.Uint64("sequence", observation.Sequence),
 			zap.Stringer("emitter_chain", observation.EmitterChain),
 			zap.Stringer("emitter_address", observation.EmitterAddress),
-			zap.Bool("isReobservation", false),
+			zap.Bool("isReobservation", observation.IsReobservation),
 			zap.Binary("payload", observation.Payload),
 			zap.Uint8("consistency_level", observation.ConsistencyLevel),
 		)

proto/publicrpc/v1/publicrpc.proto

@@ -75,7 +75,7 @@ enum ChainID {
   CHAIN_ID_OPTIMISM_SEPOLIA = 10005;
   CHAIN_ID_HOLESKY = 10006;
   CHAIN_ID_POLYGON_SEPOLIA = 10007;
-  CHAIN_ID_MONAD_DEVNET = 10008;
+  // OBSOLETE: CHAIN_ID_MONAD_DEVNET = 10008;
 }
 
 // MessageID is a VAA's globally unique identifier (see data availability design document).

sdk/vaa/structs.go

@@ -261,8 +261,6 @@ func (c ChainID) String() string {
 		return "holesky"
 	case ChainIDPolygonSepolia:
 		return "polygon_sepolia"
-	case ChainIDMonadDevnet:
-		return "monad_devnet"
 	default:
 		return fmt.Sprintf("unknown chain ID: %d", c)
 	}
@@ -400,8 +398,6 @@ func ChainIDFromString(s string) (ChainID, error) {
 		return ChainIDHolesky, nil
 	case "polygon_sepolia":
 		return ChainIDPolygonSepolia, nil
-	case "monad_devnet":
-		return ChainIDMonadDevnet, nil
 	default:
 		return ChainIDUnset, fmt.Errorf("unknown chain ID: %s", s)
 	}
@@ -473,7 +469,6 @@ func GetAllNetworkIDs() []ChainID {
 		ChainIDOptimismSepolia,
 		ChainIDHolesky,
 		ChainIDPolygonSepolia,
-		ChainIDMonadDevnet,
 	}
 }
 
@@ -616,8 +611,7 @@ const (
 	ChainIDHolesky ChainID = 10006
 	// ChainIDPolygonSepolia is the ChainID of Polygon on Sepolia
 	ChainIDPolygonSepolia ChainID = 10007
-	// ChainIDMonadDevnet is the ChainID of Monad Devnet
-	ChainIDMonadDevnet ChainID = 10008
+	// OBSOLETE: ChainIDMonadDevnet ChainID = 10008
 
 	// Minimum VAA size is derrived from the following assumptions:
 	//  HEADER

sdk/vaa/structs_test.go

@@ -93,7 +93,6 @@ func TestChainIDFromString(t *testing.T) {
 		{input: "optimism_sepolia", output: ChainIDOptimismSepolia},
 		{input: "holesky", output: ChainIDHolesky},
 		{input: "polygon_sepolia", output: ChainIDPolygonSepolia},
-		{input: "monad_devnet", output: ChainIDMonadDevnet},
 
 		{input: "Solana", output: ChainIDSolana},
 		{input: "Ethereum", output: ChainIDEthereum},
@@ -159,7 +158,6 @@ func TestChainIDFromString(t *testing.T) {
 		{input: "Optimism_Sepolia", output: ChainIDOptimismSepolia},
 		{input: "Holesky", output: ChainIDHolesky},
 		{input: "Polygon_Sepolia", output: ChainIDPolygonSepolia},
-		{input: "Monad_Devnet", output: ChainIDMonadDevnet},
 	}
 
 	// Negative Test Cases
@@ -367,7 +365,6 @@ func TestChainId_String(t *testing.T) {
 		{input: 10005, output: "optimism_sepolia"},
 		{input: 10006, output: "holesky"},
 		{input: 10007, output: "polygon_sepolia"},
-		{input: 10008, output: "monad_devnet"},
 		{input: 10000, output: "unknown chain ID: 10000"},
 	}
 

wormchain/Makefile

@@ -90,29 +90,40 @@ local-image: build/wormchaind
 # Individual Tests ($$ is interpreted as $)
 rm-testcache:
 	go clean -testcache
+.PHONY: rm-testcache
 
 ictest-cancel-upgrade: rm-testcache
 	cd interchaintest && go test -race -v -run ^TestCancelUpgrade$$ ./...
+.PHONY: ictest-cancel-upgrade
 
 ictest-malformed-payload: rm-testcache
 	cd interchaintest && go test -race -v -run ^TestMalformedPayload$$ ./...
+.PHONY: ictest-malformed-payload
 
 ictest-slashing-params-update-vaa: rm-testcache
 	cd interchaintest && go test -race -v -run ^TestSlashingParamsUpdateVaa$$ ./...
+.PHONY: ictest-slashing-params-update-vaa
 
 ictest-upgrade-failure: rm-testcache
 	cd interchaintest && go test -race -v -run ^TestUpgradeFailure$$ ./...
+.PHONY: ictest-upgrade-failure
 
 ictest-upgrade: rm-testcache
 	cd interchaintest && go test -race -v -run ^TestUpgrade$$ ./...
+.PHONY: ictest-upgrade
 
 ictest-wormchain: rm-testcache
 	cd interchaintest && go test -race -v -run ^TestWormchain$$ ./...
+.PHONY: ictest-wormchain
 
 ictest-ibc-receiver: rm-testcache
 	cd interchaintest && go test -race -v -run ^TestIbcReceiver ./...
+.PHONY: ictest-ibc-receiver
 
 ictest-cw-wormhole: rm-testcache
 	cd interchaintest && go test -race -v -run ^TestCWWormhole ./...
+.PHONY: ictest-cw-wormhole
 
-.PHONY: ictest-cancel-upgrade ictest-malformed-payload ictest-slashing-params-update-vaa ictest-upgrade-failure ictest-upgrade ictest-wormchain ictest-ibc-receiver ictest-cw-wormhole
+ictest-validator-hotswap: rm-testcache
+	cd interchaintest && go test -race -v -run ^TestValidatorHotswap$$ ./...
+.PHONY: ictest-validator-hotswap

wormchain/interchaintest/cw_wormhole_test.go

@@ -28,7 +28,7 @@ func createSingleNodeCluster(t *testing.T, wormchainVersion string, guardians gu
 	numFullNodes := 0
 
 	wormchainConfig.Images[0].Version = wormchainVersion
-	wormchainConfig.ModifyGenesis = ModifyGenesis(votingPeriod, maxDepositPeriod, guardians, true)
+	wormchainConfig.ModifyGenesis = ModifyGenesis(votingPeriod, maxDepositPeriod, guardians, numWormchainVals, true)
 
 	cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{
 		{