Merge branch 'develop' into refactor-MsgUpdateZRC20

changelog.md

@@ -15,6 +15,7 @@
 * [2152](https://github.com/zeta-chain/node/pull/2152) - custom priority nonce mempool
 * [2113](https://github.com/zeta-chain/node/pull/2113) - add zetaclientd-supervisor process
 * [2154](https://github.com/zeta-chain/node/pull/2154) - add `ibccrosschain` module
+* [2258](https://github.com/zeta-chain/node/pull/2258) - add Optimism and Base in static chain information
 
 ### Refactor
 

cmd/zetaclientd/keygen_tss.go

@@ -37,7 +37,7 @@ func GenerateTss(
 	// Bitcoin chain ID is currently used for using the correct signature format
 	// TODO: remove this once we have a better way to determine the signature format
 	// https://github.com/zeta-chain/node/issues/1397
-	bitcoinChainID := chains.BtcRegtestChain.ChainId
+	bitcoinChainID := chains.BitcoinRegtest.ChainId
 	btcChain, _, btcEnabled := appContext.GetBTCChainAndConfig()
 	if btcEnabled {
 		bitcoinChainID = btcChain.ChainId

cmd/zetae2e/local/local.go

@@ -195,8 +195,8 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 
 	if !skipHeaderProof {
 		if err := deployerRunner.EnableHeaderVerification([]int64{
-			chains.GoerliLocalnetChain.ChainId,
-			chains.BtcRegtestChain.ChainId}); err != nil {
+			chains.GoerliLocalnet.ChainId,
+			chains.BitcoinRegtest.ChainId}); err != nil {
 			panic(err)
 		}
 	}

docs/openapi/openapi.swagger.yaml

@@ -56747,21 +56747,31 @@ definitions:
   chainsChain:
     type: object
     properties:
-      chain_name:
-        $ref: '#/definitions/chainsChainName'
       chain_id:
         type: string
         format: int64
+        title: ChainId is the unique identifier of the chain
+      chain_name:
+        $ref: '#/definitions/chainsChainName'
+        title: ChainName is the name of the chain
       network:
         $ref: '#/definitions/chainsNetwork'
+        title: Network is the network of the chain
       network_type:
         $ref: '#/definitions/chainsNetworkType'
+        description: 'NetworkType is the network type of the chain: mainnet, testnet, etc..'
       vm:
         $ref: '#/definitions/chainsVm'
+        title: Vm is the virtual machine used in the chain
       consensus:
         $ref: '#/definitions/chainsConsensus'
+        title: Consensus is the underlying consensus algorithm used by the chain
       is_external:
         type: boolean
+        title: IsExternal describe if the chain is ZetaChain or external
+    title: |-
+      Chain represents static data about a blockchain network
+      it is identified by a unique chain ID
   chainsChainName:
     type: string
     enum:
@@ -56773,15 +56783,17 @@ definitions:
       - bsc_mainnet
       - goerli_testnet
       - mumbai_testnet
-      - ganache_testnet
-      - baobab_testnet
       - bsc_testnet
       - zeta_testnet
       - btc_testnet
       - sepolia_testnet
       - goerli_localnet
       - btc_regtest
       - amoy_testnet
+      - optimism_mainnet
+      - optimism_sepolia
+      - base_mainnet
+      - base_sepolia
     default: empty
     title: ChainName represents the name of the chain
   chainsConsensus:
@@ -56790,8 +56802,12 @@ definitions:
       - ethereum
       - tendermint
       - bitcoin
+      - op_stack
     default: ethereum
-    title: Consensus represents the consensus algorithm used by the chain
+    title: |-
+      Consensus represents the consensus algorithm used by the chain
+      this can represent the consensus of a L1
+      this can also represent the solution of a L2
   chainsNetwork:
     type: string
     enum:
@@ -56800,8 +56816,13 @@ definitions:
       - btc
       - polygon
       - bsc
+      - optimism
+      - base
     default: eth
-    title: Network represents the network type of the chain
+    title: |-
+      Network represents the network of the chain
+      there is a single instance of the network on mainnet
+      then the network can have eventual testnets or devnets
   chainsNetworkType:
     type: string
     enum:
@@ -56810,15 +56831,21 @@ definitions:
       - privnet
       - devnet
     default: mainnet
-    title: NetworkType represents the network type of the chain
+    title: |-
+      NetworkType represents the network type of the chain
+      Mainnet, Testnet, Privnet, Devnet
   chainsReceiveStatus:
     type: string
     enum:
       - created
       - success
       - failed
     default: created
-    title: '- created: some observer sees inbound tx'
+    description: '- created: Created is used for inbounds'
+    title: |-
+      ReceiveStatus represents the status of an outbound
+      TODO: Rename and move
+      https://github.com/zeta-chain/node/issues/2257
   chainsVm:
     type: string
     enum:

e2e/e2etests/test_bitcoin_withdraw_restricted_address.go

@@ -37,7 +37,7 @@ func withdrawBitcoinRestricted(r *runner.E2ERunner, amount *big.Int) {
 	// use restricted BTC P2WPKH address
 	addressRestricted, err := chains.DecodeBtcAddress(
 		testutils.RestrictedBtcAddressTest,
-		chains.BtcRegtestChain.ChainId,
+		chains.BitcoinRegtest.ChainId,
 	)
 	if err != nil {
 		panic(err)

e2e/e2etests/test_migrate_chain_support.go

@@ -29,9 +29,9 @@ import (
 // Therefore, we hardcode RPC urls and addresses for simplicity
 const EVM2RPCURL = "http://eth2:8545"
 
-// EVM2ChainID is the chain ID for the additional EVM localnet
+// EVMSepoliaChainID is the chain ID for the additional EVM localnet
 // We set Sepolia testnet although the value is not important, only used to differentiate
-var EVM2ChainID = chains.SepoliaChain.ChainId
+var EVMSepoliaChainID = chains.Sepolia.ChainId
 
 func TestMigrateChainSupport(r *runner.E2ERunner, _ []string) {
 	// deposit most of the ZETA supply on ZetaChain
@@ -187,7 +187,7 @@ func TestMigrateChainSupport(r *runner.E2ERunner, _ []string) {
 	res, err := newRunner.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, crosschaintypes.NewMsgWhitelistERC20(
 		adminAddr,
 		newRunner.ERC20Addr.Hex(),
-		chains.SepoliaChain.ChainId,
+		chains.Sepolia.ChainId,
 		"USDT",
 		"USDT",
 		18,
@@ -309,7 +309,7 @@ func getNewEVMChainParams(r *runner.E2ERunner) *observertypes.ChainParams {
 	chainParams := observertypes.GetDefaultGoerliLocalnetChainParams()
 
 	// set the chain id to the new chain id
-	chainParams.ChainId = EVM2ChainID
+	chainParams.ChainId = EVMSepoliaChainID
 
 	// set contracts
 	chainParams.ConnectorContractAddress = r.ConnectorEthAddr.Hex()

e2e/e2etests/test_zeta_withdraw_bitcoin_revert.go

@@ -48,7 +48,7 @@ func TestZetaWithdrawBTCRevert(r *runner.E2ERunner, args []string) {
 
 	lessThanAmount := amount.Div(amount, big.NewInt(10)) // 1/10 of amount
 	tx, err = r.ConnectorZEVM.Send(r.ZEVMAuth, connectorzevm.ZetaInterfacesSendInput{
-		DestinationChainId:  big.NewInt(chains.BtcRegtestChain.ChainId),
+		DestinationChainId:  big.NewInt(chains.BitcoinRegtest.ChainId),
 		DestinationAddress:  r.DeployerAddress.Bytes(),
 		DestinationGasLimit: big.NewInt(400_000),
 		Message:             nil,

e2e/runner/bitcoin.go

@@ -443,7 +443,7 @@ func (runner *E2ERunner) ProveBTCTransaction(txHash *chainhash.Hash) {
 
 	// verify merkle proof through RPC
 	res, err := runner.LightclientClient.Prove(runner.Ctx, &lightclienttypes.QueryProveRequest{
-		ChainId:   chains.BtcRegtestChain.ChainId,
+		ChainId:   chains.BitcoinRegtest.ChainId,
 		TxHash:    txHash.String(),
 		BlockHash: blockHash.String(),
 		Proof:     proofs.NewBitcoinProof(txBytes, path, index),

e2e/runner/evm.go

@@ -254,7 +254,7 @@ func (runner *E2ERunner) ProveEthTransaction(receipt *ethtypes.Receipt) {
 		TxIndex:   int64(txIndex),
 		TxHash:    txHash.Hex(),
 		Proof:     proofs.NewEthereumProof(txProof),
-		ChainId:   chains.GoerliLocalnetChain.ChainId,
+		ChainId:   chains.GoerliLocalnet.ChainId,
 	})
 	if err != nil {
 		panic(err)

e2e/runner/setup_zeta.go

@@ -204,7 +204,7 @@ func (runner *E2ERunner) SetZEVMContracts() {
 func (runner *E2ERunner) SetupETHZRC20() {
 	ethZRC20Addr, err := runner.SystemContract.GasCoinZRC20ByChainId(
 		&bind.CallOpts{},
-		big.NewInt(chains.GoerliLocalnetChain.ChainId),
+		big.NewInt(chains.GoerliLocalnet.ChainId),
 	)
 	if err != nil {
 		panic(err)
@@ -224,7 +224,7 @@ func (runner *E2ERunner) SetupETHZRC20() {
 func (runner *E2ERunner) SetupBTCZRC20() {
 	BTCZRC20Addr, err := runner.SystemContract.GasCoinZRC20ByChainId(
 		&bind.CallOpts{},
-		big.NewInt(chains.BtcRegtestChain.ChainId),
+		big.NewInt(chains.BitcoinRegtest.ChainId),
 	)
 	if err != nil {
 		panic(err)

e2e/txserver/zeta_tx_server.go

@@ -341,7 +341,7 @@ func (zts ZetaTxServer) DeploySystemContractsAndZRC20(
 	_, err = zts.BroadcastTx(account, fungibletypes.NewMsgDeployFungibleCoinZRC20(
 		addr.String(),
 		"",
-		chains.GoerliLocalnetChain.ChainId,
+		chains.GoerliLocalnet.ChainId,
 		18,
 		"ETH",
 		"gETH",
@@ -356,7 +356,7 @@ func (zts ZetaTxServer) DeploySystemContractsAndZRC20(
 	_, err = zts.BroadcastTx(account, fungibletypes.NewMsgDeployFungibleCoinZRC20(
 		addr.String(),
 		"",
-		chains.BtcRegtestChain.ChainId,
+		chains.BitcoinRegtest.ChainId,
 		8,
 		"BTC",
 		"tBTC",
@@ -371,7 +371,7 @@ func (zts ZetaTxServer) DeploySystemContractsAndZRC20(
 	res, err = zts.BroadcastTx(account, fungibletypes.NewMsgDeployFungibleCoinZRC20(
 		addr.String(),
 		erc20Addr,
-		chains.GoerliLocalnetChain.ChainId,
+		chains.GoerliLocalnet.ChainId,
 		6,
 		"USDT",
 		"USDT",