conflicts

changelog.md

@@ -19,7 +19,9 @@
 
 * [3206](https://github.com/zeta-chain/node/pull/3206) - skip Solana unsupported transaction version to not block inbound observation
 * [3184](https://github.com/zeta-chain/node/pull/3184) - zetaclient should not retry if inbound vote message validation fails
+* [3230](https://github.com/zeta-chain/node/pull/3230) - update pending nonces when aborting a cctx through MsgAbortStuckCCTX
 * [3225](https://github.com/zeta-chain/node/pull/3225) - use separate database file names for btc signet and testnet4
+* [3242](https://github.com/zeta-chain/node/pull/3242) - set the `Receiver` of `MsgVoteInbound` to the address pulled from solana memo
 * [3253](https://github.com/zeta-chain/node/pull/3253) - fix solana inbound version 0 queries and move tss keysign prior to relayer key checking
 
 ## v23.0.0

cmd/zetae2e/local/local.go

@@ -212,6 +212,9 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 		}))
 	}
 
+	e2eStartHeight, err := deployerRunner.Clients.Zetacore.GetBlockHeight(ctx)
+	noError(err)
+
 	// setting up the networks
 	if !skipSetup {
 		logger.Print("⚙️ setting up networks")
@@ -250,8 +253,6 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 		// Update the chain params to contains protocol contract addresses
 		deployerRunner.UpdateProtocolContractsInChainParams()
 
-		deployerRunner.MintERC20OnEVM(1e10)
-
 		logger.Print("✅ setup completed in %s", time.Since(startTime))
 	}
 
@@ -280,6 +281,9 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 		deployerRunner.UpgradeGatewaysAndERC20Custody()
 	}
 
+	// always mint ERC20 before every test execution
+	deployerRunner.MintERC20OnEVM(1e10)
+
 	// run tests
 	var eg errgroup.Group
 
@@ -317,6 +321,7 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 			e2etests.TestBitcoinWithdrawMultipleName,
 			e2etests.TestBitcoinWithdrawRestrictedName,
 		}
+
 		if !light {
 			// if light is enabled, only the most basic tests are run and advanced are skipped
 			bitcoinDepositTests = append(bitcoinDepositTests, bitcoinDepositTestsAdvanced...)
@@ -335,19 +340,28 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 	}
 
 	if !skipPrecompiles {
-		eg.Go(statefulPrecompilesTestRoutine(conf, deployerRunner, verbose,
+		precompiledContractTests := []string{
 			e2etests.TestPrecompilesPrototypeName,
 			e2etests.TestPrecompilesPrototypeThroughContractName,
-			e2etests.TestPrecompilesStakingName,
 			// Disabled until further notice, check https://github.com/zeta-chain/node/issues/3005.
 			// e2etests.TestPrecompilesStakingThroughContractName,
 			e2etests.TestPrecompilesBankName,
 			e2etests.TestPrecompilesBankFailName,
 			e2etests.TestPrecompilesBankThroughContractName,
-			e2etests.TestPrecompilesDistributeName,
-			e2etests.TestPrecompilesDistributeNonZRC20Name,
-			e2etests.TestPrecompilesDistributeThroughContractName,
-		))
+		}
+		if e2eStartHeight < 100 {
+			// these tests require a clean system
+			// since unstaking has an unbonding period
+			precompiledContractTests = append(precompiledContractTests,
+				e2etests.TestPrecompilesStakingName,
+				e2etests.TestPrecompilesDistributeName,
+				e2etests.TestPrecompilesDistributeNonZRC20Name,
+				e2etests.TestPrecompilesDistributeThroughContractName,
+			)
+		} else {
+			logger.Print("⚠️ partial precompiled run (unclean state)")
+		}
+		eg.Go(statefulPrecompilesTestRoutine(conf, deployerRunner, verbose, precompiledContractTests...))
 	}
 
 	if testAdmin {

e2e/e2etests/helpers.go

@@ -78,3 +78,13 @@ func withdrawBTCZRC20(r *runner.E2ERunner, to btcutil.Address, amount *big.Int)
 
 	return rawTx
 }
+
+// bigAdd is shorthand for new(big.Int).Add(x, y)
+func bigAdd(x *big.Int, y *big.Int) *big.Int {
+	return new(big.Int).Add(x, y)
+}
+
+// bigSub is shorthand for new(big.Int).Sub(x, y)
+func bigSub(x *big.Int, y *big.Int) *big.Int {
+	return new(big.Int).Sub(x, y)
+}

e2e/e2etests/test_precompiles_bank.go

@@ -46,6 +46,12 @@ func TestPrecompilesBank(r *runner.E2ERunner, args []string) {
 		utils.RequireTxSuccessful(r, receipt, "Resetting balance failed")
 	}()
 
+	// Ensure starting allowance is zero; this is needed when running the tests multiple times
+	tx, err := r.ERC20ZRC20.Approve(r.ZEVMAuth, bankAddress, big.NewInt(0))
+	require.NoError(r, err)
+	receipt := utils.MustWaitForTxReceipt(r.Ctx, r.ZEVMClient, tx, r.Logger, r.ReceiptTimeout)
+	utils.RequireTxSuccessful(r, receipt, "Resetting allowance failed")
+
 	// Get ERC20ZRC20.
 	txHash := r.LegacyDepositERC20WithAmountAndMessage(r.EVMAddress(), totalAmount, []byte{})
 	utils.WaitCctxMinedByInboundHash(r.Ctx, txHash.Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
@@ -54,15 +60,18 @@ func TestPrecompilesBank(r *runner.E2ERunner, args []string) {
 	bankContract, err := bank.NewIBank(bank.ContractAddress, r.ZEVMClient)
 	require.NoError(r, err, "Failed to create bank contract caller")
 
-	// Cosmos coin balance should be 0 at this point.
-	cosmosBalance, err := bankContract.BalanceOf(&bind.CallOpts{Context: r.Ctx}, r.ERC20ZRC20Addr, spender)
+	// get starting balances
+	startSpenderCosmosBalance, err := bankContract.BalanceOf(&bind.CallOpts{Context: r.Ctx}, r.ERC20ZRC20Addr, spender)
 	require.NoError(r, err, "Call bank.BalanceOf()")
-	require.Equal(r, uint64(0), cosmosBalance.Uint64(), "spender cosmos coin balance should be 0")
+	startSpenderZRC20Balance, err := r.ERC20ZRC20.BalanceOf(&bind.CallOpts{Context: r.Ctx}, spender)
+	require.NoError(r, err, "Call bank.BalanceOf()")
+	startBankZRC20Balance, err := r.ERC20ZRC20.BalanceOf(&bind.CallOpts{Context: r.Ctx}, bankAddress)
+	require.NoError(r, err, "Call ERC20ZRC20.BalanceOf")
 
 	// Approve allowance of 500 ERC20ZRC20 tokens for the bank contract. Should pass.
-	tx, err := r.ERC20ZRC20.Approve(r.ZEVMAuth, bankAddress, depositAmount)
+	tx, err = r.ERC20ZRC20.Approve(r.ZEVMAuth, bankAddress, depositAmount)
 	require.NoError(r, err)
-	receipt := utils.MustWaitForTxReceipt(r.Ctx, r.ZEVMClient, tx, r.Logger, r.ReceiptTimeout)
+	receipt = utils.MustWaitForTxReceipt(r.Ctx, r.ZEVMClient, tx, r.Logger, r.ReceiptTimeout)
 	utils.RequireTxSuccessful(r, receipt, "Approve ETHZRC20 bank allowance tx failed")
 
 	// Deposit 501 ERC20ZRC20 tokens to the bank contract.
@@ -99,17 +108,27 @@ func TestPrecompilesBank(r *runner.E2ERunner, args []string) {
 	require.Equal(r, depositAmount, eventDeposit.Amount, "Deposit event amount should be 500")
 
 	// Spender: cosmos coin balance should be 500 at this point.
-	cosmosBalance, err = bankContract.BalanceOf(&bind.CallOpts{Context: r.Ctx}, r.ERC20ZRC20Addr, spender)
+	spenderCosmosBalance, err := bankContract.BalanceOf(&bind.CallOpts{Context: r.Ctx}, r.ERC20ZRC20Addr, spender)
 	require.NoError(r, err, "Call bank.BalanceOf()")
-	require.Equal(r, uint64(500), cosmosBalance.Uint64(), "spender cosmos coin balance should be 500")
+	require.Equal(
+		r,
+		startSpenderCosmosBalance.Int64()+500,
+		spenderCosmosBalance.Int64(),
+		"spender cosmos coin balance should be +500",
+	)
 
 	// Bank: ERC20ZRC20 balance should be 500 tokens locked.
 	bankZRC20Balance, err := r.ERC20ZRC20.BalanceOf(&bind.CallOpts{Context: r.Ctx}, bankAddress)
 	require.NoError(r, err, "Call ERC20ZRC20.BalanceOf")
-	require.Equal(r, uint64(500), bankZRC20Balance.Uint64(), "bank ERC20ZRC20 balance should be 500")
+	require.Equal(
+		r,
+		startBankZRC20Balance.Int64()+500,
+		bankZRC20Balance.Int64(),
+		"bank ERC20ZRC20 balance should be +500",
+	)
 
-	// Try to withdraw 501 ERC20ZRC20 tokens. Should fail.
-	tx, err = bankContract.Withdraw(r.ZEVMAuth, r.ERC20ZRC20Addr, big.NewInt(501))
+	// Try to withdraw one more than current balance. Should fail.
+	tx, err = bankContract.Withdraw(r.ZEVMAuth, r.ERC20ZRC20Addr, new(big.Int).Add(spenderCosmosBalance, big.NewInt(1)))
 	require.NoError(r, err, "Error calling bank.withdraw()")
 	receipt = utils.MustWaitForTxReceipt(r.Ctx, r.ZEVMClient, tx, r.Logger, r.ReceiptTimeout)
 	utils.RequiredTxFailed(r, receipt, "Withdrawing more than cosmos coin balance amount should fail")
@@ -118,7 +137,12 @@ func TestPrecompilesBank(r *runner.E2ERunner, args []string) {
 	// No tokens should be unlocked with a failed withdraw.
 	bankZRC20Balance, err = r.ERC20ZRC20.BalanceOf(&bind.CallOpts{Context: r.Ctx}, bankAddress)
 	require.NoError(r, err, "Call ERC20ZRC20.BalanceOf")
-	require.Equal(r, uint64(500), bankZRC20Balance.Uint64(), "bank ERC20ZRC20 balance should be 500")
+	require.Equal(
+		r,
+		startBankZRC20Balance.Int64()+500,
+		bankZRC20Balance.Int64(),
+		"bank ERC20ZRC20 balance should be +500",
+	)
 
 	// Try to withdraw 500 ERC20ZRC20 tokens. Should pass.
 	tx, err = bankContract.Withdraw(r.ZEVMAuth, r.ERC20ZRC20Addr, depositAmount)
@@ -133,20 +157,35 @@ func TestPrecompilesBank(r *runner.E2ERunner, args []string) {
 	require.Equal(r, r.ERC20ZRC20Addr, eventWithdraw.Zrc20Token, "Withdraw event token should be ERC20ZRC20Addr")
 	require.Equal(r, depositAmount, eventWithdraw.Amount, "Withdraw event amount should be 500")
 
-	// Spender: cosmos coin balance should be 0 at this point.
-	cosmosBalance, err = bankContract.BalanceOf(&bind.CallOpts{Context: r.Ctx}, r.ERC20ZRC20Addr, spender)
+	// Spender: cosmos coin balance should be +0 at this point.
+	spenderCosmosBalance, err = bankContract.BalanceOf(&bind.CallOpts{Context: r.Ctx}, r.ERC20ZRC20Addr, spender)
 	require.NoError(r, err, "Call bank.BalanceOf()")
-	require.Equal(r, uint64(0), cosmosBalance.Uint64(), "spender cosmos coin balance should be 0")
+	require.Equal(
+		r,
+		startSpenderCosmosBalance.Int64(),
+		spenderCosmosBalance.Int64(),
+		"spender cosmos coin balance should match starting balance",
+	)
 
-	// Spender: ERC20ZRC20 balance should be 1000 at this point.
-	zrc20Balance, err := r.ERC20ZRC20.BalanceOf(&bind.CallOpts{Context: r.Ctx}, spender)
-	require.NoError(r, err, "Call bank.BalanceOf()")
-	require.Equal(r, uint64(1000), zrc20Balance.Uint64(), "spender ERC20ZRC20 balance should be 1000")
+	// Spender: ERC20ZRC20 balance should be +0 at this point.
+	spenderZRC20Balance, err := r.ERC20ZRC20.BalanceOf(&bind.CallOpts{Context: r.Ctx}, spender)
+	require.NoError(r, err, "Call ERC20ZRC20.BalanceOf")
+	require.Equal(
+		r,
+		startSpenderZRC20Balance.Int64(),
+		spenderZRC20Balance.Int64(),
+		"spender ERC20ZRC20 balance should match starting balance",
+	)
 
-	// Bank: ERC20ZRC20 balance should be 0 tokens locked.
+	// Bank: ERC20ZRC20 balance should be +0 tokens locked.
 	bankZRC20Balance, err = r.ERC20ZRC20.BalanceOf(&bind.CallOpts{Context: r.Ctx}, bankAddress)
 	require.NoError(r, err, "Call ERC20ZRC20.BalanceOf")
-	require.Equal(r, uint64(0), bankZRC20Balance.Uint64(), "bank ERC20ZRC20 balance should be 0")
+	require.Equal(
+		r,
+		startBankZRC20Balance.Int64(),
+		bankZRC20Balance.Int64(),
+		"bank ERC20ZRC20 balance should match starting balance",
+	)
 }
 
 func TestPrecompilesBankNonZRC20(r *runner.E2ERunner, args []string) {

e2e/e2etests/test_precompiles_bank_through_contract.go

@@ -47,7 +47,7 @@ func TestPrecompilesBankThroughContract(r *runner.E2ERunner, args []string) {
 		r.ZEVMAuth.GasLimit = previousGasLimit
 
 		// Reset the allowance to 0; this is needed when running upgrade tests where this test runs twice.
-		approveAllowance(r, bank.ContractAddress, big.NewInt(0))
+		approveAllowance(r, bank.ContractAddress, zero)
 
 		// Reset balance to 0; this is needed when running upgrade tests where this test runs twice.
 		tx, err = r.ERC20ZRC20.Transfer(
@@ -60,19 +60,22 @@ func TestPrecompilesBankThroughContract(r *runner.E2ERunner, args []string) {
 		utils.RequireTxSuccessful(r, receipt, "Resetting balance failed")
 	}()
 
-	// Check initial balances.
-	balanceShouldBe(r, zero, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
-	balanceShouldBe(r, oneThousand, checkZRC20Balance(r, spender))
-	balanceShouldBe(r, zero, checkZRC20Balance(r, bankAddress))
+	// always ensure allowance is set to zero before test starts
+	approveAllowance(r, bank.ContractAddress, zero)
+
+	// get starting balances
+	startSpenderCosmosBalance := checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender)
+	startSpenderZRC20Balance := checkZRC20Balance(r, spender)
+	startBankZRC20Balance := checkZRC20Balance(r, bankAddress)
 
 	// Deposit without previous alllowance should fail.
 	receipt = depositThroughTestBank(r, testBank, zrc20Address, oneThousand)
 	utils.RequiredTxFailed(r, receipt, "Deposit ERC20ZRC20 without allowance should fail")
 
 	// Check balances, should be the same.
-	balanceShouldBe(r, zero, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
-	balanceShouldBe(r, oneThousand, checkZRC20Balance(r, spender))
-	balanceShouldBe(r, zero, checkZRC20Balance(r, bankAddress))
+	balanceShouldBe(r, startSpenderCosmosBalance, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
+	balanceShouldBe(r, startSpenderZRC20Balance, checkZRC20Balance(r, spender))
+	balanceShouldBe(r, startBankZRC20Balance, checkZRC20Balance(r, bankAddress))
 
 	// Allow 500 ZRC20 to bank precompile.
 	approveAllowance(r, bankAddress, fiveHundred)
@@ -83,9 +86,9 @@ func TestPrecompilesBankThroughContract(r *runner.E2ERunner, args []string) {
 	utils.RequiredTxFailed(r, receipt, "Depositting an amount higher than allowed should fail")
 
 	// Balances shouldn't change.
-	balanceShouldBe(r, zero, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
-	balanceShouldBe(r, oneThousand, checkZRC20Balance(r, spender))
-	balanceShouldBe(r, zero, checkZRC20Balance(r, bankAddress))
+	balanceShouldBe(r, startSpenderCosmosBalance, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
+	balanceShouldBe(r, startSpenderZRC20Balance, checkZRC20Balance(r, spender))
+	balanceShouldBe(r, startBankZRC20Balance, checkZRC20Balance(r, bankAddress))
 
 	// Allow 1000 ZRC20 to bank precompile.
 	approveAllowance(r, bankAddress, oneThousand)
@@ -96,18 +99,22 @@ func TestPrecompilesBankThroughContract(r *runner.E2ERunner, args []string) {
 	utils.RequiredTxFailed(r, receipt, "Depositting an amount higher than balance should fail")
 
 	// Balances shouldn't change.
-	balanceShouldBe(r, zero, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
-	balanceShouldBe(r, oneThousand, checkZRC20Balance(r, spender))
-	balanceShouldBe(r, zero, checkZRC20Balance(r, bankAddress))
+	balanceShouldBe(r, startSpenderCosmosBalance, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
+	balanceShouldBe(r, startSpenderZRC20Balance, checkZRC20Balance(r, spender))
+	balanceShouldBe(r, startBankZRC20Balance, checkZRC20Balance(r, bankAddress))
 
 	// Deposit 500 ERC20ZRC20 tokens to the bank contract, it's within allowance and balance. Should pass.
 	receipt = depositThroughTestBank(r, testBank, zrc20Address, fiveHundred)
 	utils.RequireTxSuccessful(r, receipt, "Depositting a correct amount should pass")
 
 	// Balances should be transferred. Bank now locks 500 ZRC20 tokens.
-	balanceShouldBe(r, fiveHundred, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
-	balanceShouldBe(r, fiveHundred, checkZRC20Balance(r, spender))
-	balanceShouldBe(r, fiveHundred, checkZRC20Balance(r, bankAddress))
+	balanceShouldBe(
+		r,
+		bigAdd(startSpenderCosmosBalance, fiveHundred),
+		checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender),
+	)
+	balanceShouldBe(r, bigSub(startSpenderZRC20Balance, fiveHundred), checkZRC20Balance(r, spender))
+	balanceShouldBe(r, bigAdd(startBankZRC20Balance, fiveHundred), checkZRC20Balance(r, bankAddress))
 
 	// Check the deposit event.
 	eventDeposit, err := bankPrecompileCaller.ParseDeposit(*receipt.Logs[0])
@@ -117,22 +124,26 @@ func TestPrecompilesBankThroughContract(r *runner.E2ERunner, args []string) {
 	require.Equal(r, fiveHundred, eventDeposit.Amount, "Deposit event amount should be 500")
 
 	// Should faild to withdraw more than cosmos balance.
-	receipt = withdrawThroughTestBank(r, testBank, zrc20Address, fiveHundredOne)
+	receipt = withdrawThroughTestBank(r, testBank, zrc20Address, bigAdd(startSpenderCosmosBalance, fiveHundredOne))
 	utils.RequiredTxFailed(r, receipt, "Withdrawing an amount higher than balance should fail")
 
 	// Balances shouldn't change.
-	balanceShouldBe(r, fiveHundred, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
-	balanceShouldBe(r, fiveHundred, checkZRC20Balance(r, spender))
-	balanceShouldBe(r, fiveHundred, checkZRC20Balance(r, bankAddress))
+	balanceShouldBe(
+		r,
+		bigAdd(startSpenderCosmosBalance, fiveHundred),
+		checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender),
+	)
+	balanceShouldBe(r, bigSub(startSpenderZRC20Balance, fiveHundred), checkZRC20Balance(r, spender))
+	balanceShouldBe(r, bigAdd(startBankZRC20Balance, fiveHundred), checkZRC20Balance(r, bankAddress))
 
 	// Try to withdraw 500 ERC20ZRC20 tokens. Should pass.
 	receipt = withdrawThroughTestBank(r, testBank, zrc20Address, fiveHundred)
 	utils.RequireTxSuccessful(r, receipt, "Withdraw correct amount should pass")
 
 	// Balances should be reverted to initial state.
-	balanceShouldBe(r, zero, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
-	balanceShouldBe(r, oneThousand, checkZRC20Balance(r, spender))
-	balanceShouldBe(r, zero, checkZRC20Balance(r, bankAddress))
+	balanceShouldBe(r, startSpenderCosmosBalance, checkCosmosBalanceThroughBank(r, testBank, zrc20Address, spender))
+	balanceShouldBe(r, startSpenderZRC20Balance, checkZRC20Balance(r, spender))
+	balanceShouldBe(r, startBankZRC20Balance, checkZRC20Balance(r, bankAddress))
 
 	// Check the withdraw event.
 	eventWithdraw, err := bankPrecompileCaller.ParseWithdraw(*receipt.Logs[0])

e2e/e2etests/test_solana_deposit.go

@@ -29,6 +29,7 @@ func TestSolanaDeposit(r *runner.E2ERunner, args []string) {
 	cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, sig.String(), r.CctxClient, r.Logger, r.CctxTimeout)
 	r.Logger.CCTX(*cctx, "solana_deposit")
 	utils.RequireCCTXStatus(r, cctx, crosschaintypes.CctxStatus_OutboundMined)
+	require.Equal(r, cctx.GetCurrentOutboundParam().Receiver, r.EVMAddress().Hex())
 
 	// get ERC20 SOL balance after deposit
 	balanceAfter, err := r.SOLZRC20.BalanceOf(&bind.CallOpts{}, r.EVMAddress())

e2e/e2etests/test_solana_deposit_call.go

@@ -29,6 +29,7 @@ func TestSolanaDepositAndCall(r *runner.E2ERunner, args []string) {
 	cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, sig.String(), r.CctxClient, r.Logger, r.CctxTimeout)
 	r.Logger.CCTX(*cctx, "solana_deposit_and_call")
 	utils.RequireCCTXStatus(r, cctx, crosschaintypes.CctxStatus_OutboundMined)
+	require.Equal(r, cctx.GetCurrentOutboundParam().Receiver, contractAddr.Hex())
 
 	// check if example contract has been called, bar value should be set to amount
 	utils.MustHaveCalledExampleContract(r, contract, depositAmount)

e2e/e2etests/test_spl_deposit.go

@@ -42,6 +42,7 @@ func TestSPLDeposit(r *runner.E2ERunner, args []string) {
 	cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, sig.String(), r.CctxClient, r.Logger, r.CctxTimeout)
 	r.Logger.CCTX(*cctx, "solana_deposit_spl")
 	utils.RequireCCTXStatus(r, cctx, crosschaintypes.CctxStatus_OutboundMined)
+	require.Equal(r, cctx.GetCurrentOutboundParam().Receiver, r.EVMAddress().Hex())
 
 	// verify balances are updated
 	pdaBalanceAfter, err := r.SolanaClient.GetTokenAccountBalance(r.Ctx, pdaAta, rpc.CommitmentFinalized)

e2e/e2etests/test_spl_deposit_and_call.go

@@ -49,6 +49,7 @@ func TestSPLDepositAndCall(r *runner.E2ERunner, args []string) {
 	cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, sig.String(), r.CctxClient, r.Logger, r.CctxTimeout)
 	r.Logger.CCTX(*cctx, "solana_deposit_spl_and_call")
 	utils.RequireCCTXStatus(r, cctx, crosschaintypes.CctxStatus_OutboundMined)
+	require.Equal(r, cctx.GetCurrentOutboundParam().Receiver, contractAddr.Hex())
 
 	// check if example contract has been called, bar value should be set to amount
 	utils.MustHaveCalledExampleContract(r, contract, big.NewInt(int64(amount)))