Merge remote-tracking branch 'origin/justin/ci' into justin/ci

# Conflicts: # chain/ethereum/ethererum_chain.go # chain/ethereum/foundry/forge.go # examples/ethereum/foundry_test.go # examples/thorchain/chainspec_thorchain.go # examples/thorchain/helper.go # examples/thorchain/setup.go
strangelove-ventures · Sep 5, 2024 · acc9b04 · acc9b04
2 parents feae6d2 + 136c4bd
commit acc9b04
Show file tree

Hide file tree

Showing 41 changed files with 2,105 additions and 429 deletions.
diff --git a/chain/cosmos/chain_node.go b/chain/cosmos/chain_node.go
@@ -850,8 +850,12 @@ func (tn *ChainNode) SendIBCTransfer(
 	amount ibc.WalletAmount,
 	options ibc.TransferOptions,
 ) (string, error) {
+	port := "transfer"
+	if options.Port != "" {
+		port = options.Port
+	}
 	command := []string{
-		"ibc-transfer", "transfer", "transfer", channelID,
+		"ibc-transfer", "transfer", port, channelID,
 		amount.Address, fmt.Sprintf("%s%s", amount.Amount.String(), amount.Denom),
 		"--gas", "auto",
 	}