Merge branch 'develop' into refactor/chain-params

# Conflicts:
#	zetaclient/chains/evm/observer/outbound_test.go
#	zetaclient/chains/evm/signer/outbound_data.go
#	zetaclient/chains/evm/signer/signer.go
#	zetaclient/config/types.go
#	zetaclient/orchestrator/bootstrap.go
#	zetaclient/orchestrator/orchestrator.go
#	zetaclient/orchestrator/orchestrator_test.go

Author: swift1337

.github/workflows/build.yml

@@ -7,12 +7,6 @@ on:
       - release/*
   merge_group:
   pull_request:
-    branches:
-      - "*"
-    types:
-      - synchronize
-      - opened
-      - reopened
 
 concurrency: 
   group: pr-testing-${{ github.head_ref || github.run_id }}
@@ -28,8 +22,6 @@ jobs:
   build-and-test:
     runs-on: ubuntu-20.04
     timeout-minutes: 15
-    concurrency:
-      group: "build-and-test"
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/e2e.yml

@@ -6,8 +6,6 @@ on:
       - develop
       - release/*
   pull_request:
-    branches:
-      - "*"
   merge_group:
   schedule:
     # run at 6AM UTC Daily

.github/workflows/sast-linters.yml

@@ -8,9 +8,6 @@ on:
       - "*"
   merge_group:
   pull_request:
-    types:
-      - opened
-      - synchronize
 
 concurrency:
   group: linters-${{ github.head_ref || github.run_id }}

Dockerfile-localnet

@@ -1,5 +1,5 @@
-# syntax=docker/dockerfile:1.7-labs
-FROM golang:1.22.5-bookworm AS base-build
+# syntax=ghcr.io/zeta-chain/docker-dockerfile:1.7-labs
+FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS base-build
 
 ENV GOPATH /go
 ENV GOOS=linux
@@ -22,10 +22,10 @@ COPY --exclude=*.sh --exclude=*.md --exclude=*.yml . .
 RUN --mount=type=cache,target="/root/.cache/go-build" make install
 RUN --mount=type=cache,target="/root/.cache/go-build" make install-zetae2e
 
-FROM golang:1.22.5-bookworm AS cosmovisor-build
+FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS cosmovisor-build
 RUN go install cosmossdk.io/tools/cosmovisor/cmd/[email protected]
 
-FROM golang:1.22.5-bookworm AS base-runtime
+FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS base-runtime
 
 RUN apt update && \
     apt install -yq jq yq curl tmux python3 openssh-server iputils-ping iproute2 bind9-host && \

Makefile

@@ -249,7 +249,7 @@ start-e2e-admin-test: zetanode
 start-e2e-performance-test: zetanode
 	@echo "--> Starting e2e performance test"
 	export E2E_ARGS="--test-performance" && \
-	cd contrib/localnet/ && $(DOCKER_COMPOSE) -f docker-compose.yml up -d
+	cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile stress -f docker-compose.yml up -d
 
 start-e2e-import-mainnet-test: zetanode
 	@echo "--> Starting e2e import-data test"

changelog.md

@@ -11,6 +11,7 @@
 ### Breaking Changes
 
 * [2460](https://github.com/zeta-chain/node/pull/2460) - Upgrade to go 1.22. This required us to temporarily remove the QUIC backend from [go-libp2p](https://github.com/libp2p/go-libp2p). If you are a zetaclient operator and have configured quic peers, you need to switch to tcp peers.
+* [List of the other breaking changes can be found in this document](docs/releases/v19_breaking_changes.md)
 
 ### Features
 
@@ -42,6 +43,9 @@
 * [2518](https://github.com/zeta-chain/node/pull/2518) - add support for Solana address in zetacore
 * [2483](https://github.com/zeta-chain/node/pull/2483) - add priorityFee (gasTipCap) gas to the state
 * [2567](https://github.com/zeta-chain/node/pull/2567) - add sign latency metric to zetaclient (zetaclient_sign_latency)
+* [2524](https://github.com/zeta-chain/node/pull/2524) - add inscription envelop parsing 
+* [2560](https://github.com/zeta-chain/node/pull/2560) - add support for Solana SOL token withdraw
+* [2533](https://github.com/zeta-chain/node/pull/2533) - parse memo from both OP_RETURN and inscription
 
 ### Refactor
 
@@ -589,4 +593,4 @@ Getting the correct TSS address for Bitcoin now requires proviidng the Bitcoin c
 ### CI
 
 * [1218](https://github.com/zeta-chain/node/pull/1218) - cross-compile release binaries and simplify PR testings
-* [1302](https://github.com/zeta-chain/node/pull/1302) - add mainnet builds to goreleaser
+* [1302](https://github.com/zeta-chain/node/pull/1302) - add mainnet builds to goreleaser

cmd/zetaclientd/init.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"path"
+
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
 
@@ -36,6 +38,7 @@ type initArguments struct {
 	KeyringBackend      string
 	HsmMode             bool
 	HsmHotKey           string
+	SolanaKey           string
 }
 
 func init() {
@@ -69,6 +72,7 @@ func init() {
 	InitCmd.Flags().BoolVar(&initArgs.HsmMode, "hsm-mode", false, "enable hsm signer, default disabled")
 	InitCmd.Flags().
 		StringVar(&initArgs.HsmHotKey, "hsm-hotkey", "hsm-hotkey", "name of hotkey associated with hardware security module")
+	InitCmd.Flags().StringVar(&initArgs.SolanaKey, "solana-key", "solana-key.json", "solana key file name")
 }
 
 func Initialize(_ *cobra.Command, _ []string) error {
@@ -106,8 +110,16 @@ func Initialize(_ *cobra.Command, _ []string) error {
 	configData.KeyringBackend = config.KeyringBackend(initArgs.KeyringBackend)
 	configData.HsmMode = initArgs.HsmMode
 	configData.HsmHotKey = initArgs.HsmHotKey
+	configData.SolanaKeyFile = initArgs.SolanaKey
 	configData.ComplianceConfig = testutils.ComplianceConfigTest()
 
-	//Save config file
+	// Save solana test fee payer key file
+	keyFile := path.Join(rootArgs.zetaCoreHome, initArgs.SolanaKey)
+	err = createSolanaTestKeyFile(keyFile)
+	if err != nil {
+		return err
+	}
+
+	// Save config file
 	return config.Save(&configData, rootArgs.zetaCoreHome)
 }

cmd/zetaclientd/solana_test_key.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"encoding/json"
+	"os"
+)
+
+// solanaTestKey is a local test private key for Solana
+// TODO: use separate keys for each zetaclient in Solana E2E tests
+// https://github.com/zeta-chain/node/issues/2614
+var solanaTestKey = []uint8{
+	199, 16, 63, 28, 125, 103, 131, 13, 6, 94, 68, 109, 13, 68, 132, 17,
+	71, 33, 216, 51, 49, 103, 146, 241, 245, 162, 90, 228, 71, 177, 32, 199,
+	31, 128, 124, 2, 23, 207, 48, 93, 141, 113, 91, 29, 196, 95, 24, 137,
+	170, 194, 90, 4, 124, 113, 12, 222, 166, 209, 119, 19, 78, 20, 99, 5,
+}
+
+// createSolanaTestKeyFile creates a solana test key json file
+func createSolanaTestKeyFile(keyFile string) error {
+	// marshal the byte array to JSON
+	keyBytes, err := json.Marshal(solanaTestKey)
+	if err != nil {
+		return err
+	}
+
+	// create file (or overwrite if it already exists)
+	// #nosec G304 -- for E2E testing purposes only
+	file, err := os.Create(keyFile)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	// write the key bytes to the file
+	_, err = file.Write(keyBytes)
+	return err
+}

cmd/zetaclientd/utils.go

@@ -41,5 +41,3 @@ func CreateZetacoreClient(cfg config.Config, hotkeyPassword string, logger zerol
 
 	return client, nil
 }
-
-// TODO

cmd/zetae2e/local/local.go

@@ -318,7 +318,11 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 			logger.Print("❌ solana client is nil, maybe solana rpc is not set")
 			os.Exit(1)
 		}
-		eg.Go(solanaTestRoutine(conf, deployerRunner, verbose, e2etests.TestSolanaDepositName))
+		solanaTests := []string{
+			e2etests.TestSolanaDepositName,
+			e2etests.TestSolanaWithdrawName,
+		}
+		eg.Go(solanaTestRoutine(conf, deployerRunner, verbose, solanaTests...))
 	}
 
 	// while tests are executed, monitor blocks in parallel to check if system txs are on top and they have biggest priority

cmd/zetae2e/local/performance.go

@@ -75,6 +75,13 @@ func ethereumWithdrawPerformanceRoutine(
 			return err
 		}
 
+		if r.ReceiptTimeout == 0 {
+			r.ReceiptTimeout = 15 * time.Minute
+		}
+		if r.CctxTimeout == 0 {
+			r.CctxTimeout = 15 * time.Minute
+		}
+
 		r.Logger.Print("🏃 starting Ethereum withdraw performance tests")
 		startTime := time.Now()
 

cmd/zetae2e/local/test_runner.go

@@ -30,6 +30,10 @@ func initTestRunner(
 		return nil, err
 	}
 
+	// copy timeouts from deployer runner
+	testRunner.CctxTimeout = deployerRunner.ReceiptTimeout
+	testRunner.ReceiptTimeout = deployerRunner.ReceiptTimeout
+
 	// copy contracts from deployer runner
 	if err := testRunner.CopyAddressesFrom(deployerRunner); err != nil {
 		return nil, err

contrib/localnet/docker-compose.yml

@@ -9,6 +9,8 @@
 # - An orchestrator to manage interaction with the localnet (orchestrator)
 # - An upgrade host to serve binaries for the upgrade tests (upgrade-host). Only enabled when profile is set to upgrade.
 # - An upgrade orchestrator to send the upgrade governance proposal (upgrade-orchestrator). Only enabled when profile is set to upgrade.
+#
+# If you are using third party images in CI, you should copy them into ghcr via https://github.com/zeta-chain/copy-docker-images
 
 networks:
   mynetwork:
@@ -181,7 +183,7 @@ services:
       - preparams:/root/preparams
 
   eth:
-    image: ethereum/client-go:v1.10.26
+    image: ghcr.io/zeta-chain/ethereum-client-go:v1.10.26
     container_name: eth
     hostname: eth
     ports:
@@ -207,7 +209,7 @@ services:
         ipv4_address: 172.20.0.102
 
   bitcoin:
-    image: ruimarinho/bitcoin-core:22 # version 23 is not working with btcd 0.22.0 due to change in createwallet rpc
+    image: ghcr.io/zeta-chain/ruimarinho-bitcoin-core:22 # version 23 is not working with btcd 0.22.0 due to change in createwallet rpc
     container_name: bitcoin
     hostname: bitcoin
     networks:

contrib/localnet/orchestrator/Dockerfile.fastbuild

@@ -1,6 +1,6 @@
 FROM zetanode:latest as zeta
-FROM ethereum/client-go:v1.10.26 as geth
-FROM  golang:1.20.14-bookworm as orchestrator
+FROM ghcr.io/zeta-chain/ethereum-client-go:v1.10.26 as geth
+FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm as orchestrator
 
 RUN apt update && \
     apt install -yq jq yq curl tmux python3 openssh-server iputils-ping iproute2 && \

contrib/localnet/orchestrator/start-zetae2e.sh

@@ -66,6 +66,11 @@ address=$(yq -r '.additional_accounts.user_bitcoin.evm_address' config.yml)
 echo "funding bitcoin tester address ${address} with 10000 Ether"
 geth --exec "eth.sendTransaction({from: eth.coinbase, to: '${address}', value: web3.toWei(10000,'ether')})" attach http://eth:8545
 
+# unlock solana tester accounts
+address=$(yq -r '.additional_accounts.user_solana.evm_address' config.yml)
+echo "funding solana tester address ${address} with 10000 Ether"
+geth --exec "eth.sendTransaction({from: eth.coinbase, to: '${address}', value: web3.toWei(10000,'ether')})" attach http://eth:8545
+
 # unlock ethers tester accounts
 address=$(yq -r '.additional_accounts.user_ether.evm_address' config.yml)
 echo "funding ether tester address ${address} with 10000 Ether"

contrib/localnet/scripts/start-zetacored.sh

@@ -247,6 +247,9 @@ then
 # bitcoin tester
   address=$(yq -r '.additional_accounts.user_bitcoin.bech32_address' /root/config.yml)
   zetacored add-genesis-account "$address" 100000000000000000000000000azeta
+# solana tester
+  address=$(yq -r '.additional_accounts.user_solana.bech32_address' /root/config.yml)
+  zetacored add-genesis-account "$address" 100000000000000000000000000azeta
 # ethers tester
   address=$(yq -r '.additional_accounts.user_ether.bech32_address' /root/config.yml)
   zetacored add-genesis-account "$address" 100000000000000000000000000azeta

docs/cli/zetacored/zetacored_tx_fungible_update-gateway-contract.md

@@ -3,7 +3,7 @@
 Broadcast message UpdateGatewayContract to update the gateway contract address
 
 ```
-zetacored tx fungible update-gateway-contract [contract-address]  [flags]
+zetacored tx fungible update-gateway-contract [contract-address] [flags]
 ```
 
 ### Options

e2e/e2etests/e2etests.go

@@ -54,7 +54,8 @@ const (
 	/*
 	 Solana tests
 	*/
-	TestSolanaDepositName = "solana_deposit"
+	TestSolanaDepositName  = "solana_deposit"
+	TestSolanaWithdrawName = "solana_withdraw"
 
 	/*
 	 Bitcoin tests
@@ -338,10 +339,18 @@ var AllE2ETests = []runner.E2ETest{
 		TestSolanaDepositName,
 		"deposit SOL into ZEVM",
 		[]runner.ArgDefinition{
-			{Description: "amount in SOL", DefaultValue: "0.1"},
+			{Description: "amount in lamport", DefaultValue: "13370000"},
 		},
 		TestSolanaDeposit,
 	),
+	runner.NewE2ETest(
+		TestSolanaWithdrawName,
+		"withdraw SOL from ZEVM",
+		[]runner.ArgDefinition{
+			{Description: "amount in lamport", DefaultValue: "1336000"},
+		},
+		TestSolanaWithdraw,
+	),
 	/*
 	 Bitcoin tests
 	*/

e2e/e2etests/test_solana_deposit.go

@@ -1,20 +1,29 @@
 package e2etests
 
 import (
+	"math/big"
+
 	"github.com/gagliardetto/solana-go"
+	"github.com/stretchr/testify/require"
 
 	"github.com/zeta-chain/zetacore/e2e/runner"
 	"github.com/zeta-chain/zetacore/e2e/utils"
 	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
-func TestSolanaDeposit(r *runner.E2ERunner, _ []string) {
+func TestSolanaDeposit(r *runner.E2ERunner, args []string) {
+	require.Len(r, args, 1)
+
+	// parse deposit amount (in lamports)
+	// #nosec G115 e2e - always in range
+	depositAmount := big.NewInt(int64(parseInt(r, args[0])))
+
 	// load deployer private key
-	privkey := solana.MustPrivateKeyFromBase58(r.Account.SolanaPrivateKey.String())
+	privkey, err := solana.PrivateKeyFromBase58(r.Account.SolanaPrivateKey.String())
+	require.NoError(r, err)
 
 	// create 'deposit' instruction
-	amount := uint64(13370000)
-	instruction := r.CreateDepositInstruction(privkey.PublicKey(), r.EVMAddress(), amount)
+	instruction := r.CreateDepositInstruction(privkey.PublicKey(), r.EVMAddress(), depositAmount.Uint64())
 
 	// create and sign the transaction
 	signedTx := r.CreateSignedTransaction([]solana.Instruction{instruction}, privkey)

e2e/e2etests/test_solana_withdraw.go

@@ -0,0 +1,47 @@
+package e2etests
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/gagliardetto/solana-go"
+	"github.com/stretchr/testify/require"
+
+	"github.com/zeta-chain/zetacore/e2e/runner"
+)
+
+func TestSolanaWithdraw(r *runner.E2ERunner, args []string) {
+	require.Len(r, args, 1)
+
+	// print balanceAfter of from address
+	balanceBefore, err := r.SOLZRC20.BalanceOf(&bind.CallOpts{}, r.ZEVMAuth.From)
+	require.NoError(r, err)
+	r.Logger.Info("from address %s balance of SOL before: %d", r.ZEVMAuth.From, balanceBefore)
+
+	// parse withdraw amount (in lamports), approve amount is 1 SOL
+	approvedAmount := new(big.Int).SetUint64(solana.LAMPORTS_PER_SOL)
+	// #nosec G115 e2e - always in range
+	withdrawAmount := big.NewInt(int64(parseInt(r, args[0])))
+	require.Equal(
+		r,
+		-1,
+		withdrawAmount.Cmp(approvedAmount),
+		"Withdrawal amount must be less than the approved amount (1e9).",
+	)
+
+	// load deployer private key
+	privkey, err := solana.PrivateKeyFromBase58(r.Account.SolanaPrivateKey.String())
+	require.NoError(r, err)
+
+	// withdraw
+	r.WithdrawSOLZRC20(privkey.PublicKey(), withdrawAmount, approvedAmount)
+
+	// print balance of from address after withdraw
+	balanceAfter, err := r.SOLZRC20.BalanceOf(&bind.CallOpts{}, r.ZEVMAuth.From)
+	require.NoError(r, err)
+	r.Logger.Info("from address %s balance of SOL after: %d", r.ZEVMAuth.From, balanceAfter)
+
+	// check if the balance is reduced correctly
+	amountReduced := new(big.Int).Sub(balanceBefore, balanceAfter)
+	require.True(r, amountReduced.Cmp(withdrawAmount) >= 0, "balance is not reduced correctly")
+}