replace GetRecentBlockhash with GetLatestBlockhash; add check on Vsiz…

…e; misc

e2e/runner/solana.go

@@ -65,7 +65,7 @@ func (r *E2ERunner) CreateSignedTransaction(
 	privateKey solana.PrivateKey,
 ) *solana.Transaction {
 	// get a recent blockhash
-	recent, err := r.SolanaClient.GetRecentBlockhash(r.Ctx, rpc.CommitmentFinalized)
+	recent, err := r.SolanaClient.GetLatestBlockhash(r.Ctx, rpc.CommitmentFinalized)
 	require.NoError(r, err)
 
 	// create the initialize transaction

zetaclient/chains/bitcoin/fee.go

@@ -49,6 +49,7 @@ const (
 	DynamicDepositorFeeHeight = 834500
 
 	// DynamicDepositorFeeHeightV2 is the mainnet height from which dynamic depositor fee V2 is applied
+	// Height 863400 is approximately a month away (2024-09-28) from the time of writing, allowing enough time for the upgrade
 	DynamicDepositorFeeHeightV2 = 863400
 )
 
@@ -281,6 +282,12 @@ func CalcDepositorFeeV2(
 // GetRecentFeeRate gets the highest fee rate from recent blocks
 // Note: this method should be used for testnet ONLY
 func GetRecentFeeRate(rpcClient interfaces.BTCRPCClient, netParams *chaincfg.Params) (uint64, error) {
+	// should avoid using this method for mainnet
+	if netParams.Name == chaincfg.MainNetParams.Name {
+		return 0, errors.New("GetRecentFeeRate should not be used for mainnet")
+	}
+
+	// get the current block number
 	blockNumber, err := rpcClient.GetBlockCount()
 	if err != nil {
 		return 0, err

zetaclient/chains/bitcoin/rpc/rpc.go

@@ -130,6 +130,11 @@ func GetTransactionFeeAndRate(rpcClient interfaces.BTCRPCClient, rawResult *btcj
 		totalOutputValue int64
 	)
 
+	// make sure the tx Vsize is not zero (should not happen)
+	if rawResult.Vsize <= 0 {
+		return 0, 0, fmt.Errorf("tx %s has non-positive Vsize: %d", rawResult.Txid, rawResult.Vsize)
+	}
+
 	// sum up total input value
 	for _, vin := range rawResult.Vin {
 		prevTx, err := GetRawTxByHash(rpcClient, vin.Txid)

zetaclient/chains/interfaces/interfaces.go

@@ -200,7 +200,7 @@ type SolanaRPCClient interface {
 		account solana.PublicKey,
 		commitment solrpc.CommitmentType,
 	) (*solrpc.GetBalanceResult, error)
-	GetRecentBlockhash(ctx context.Context, commitment solrpc.CommitmentType) (*solrpc.GetRecentBlockhashResult, error)
+	GetLatestBlockhash(ctx context.Context, commitment solrpc.CommitmentType) (*solrpc.GetLatestBlockhashResult, error)
 	GetRecentPrioritizationFees(
 		ctx context.Context,
 		accounts solana.PublicKeySlice,

zetaclient/chains/solana/signer/withdraw.go

@@ -69,9 +69,9 @@ func (signer *Signer) SignWithdrawTx(ctx context.Context, msg contracts.MsgWithd
 	attachWithdrawAccounts(&inst, privkey.PublicKey(), signer.pda, msg.To(), signer.gatewayID)
 
 	// get a recent blockhash
-	recent, err := signer.client.GetRecentBlockhash(ctx, rpc.CommitmentFinalized)
+	recent, err := signer.client.GetLatestBlockhash(ctx, rpc.CommitmentFinalized)
 	if err != nil {
-		return nil, errors.Wrap(err, "GetRecentBlockhash error")
+		return nil, errors.Wrap(err, "GetLatestBlockhash error")
 	}
 
 	// create a transaction that wraps the instruction