Merge branch 'main' of github.com:icon-project/ibc-relay into test-mu…

…lti-validator
icon-project · Jul 7, 2023 · 68371f4 · 68371f4
2 parents b1aa063 + 7cc09d5
commit 68371f4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/relayer/chains/archway/tx.go b/relayer/chains/archway/tx.go
@@ -412,7 +412,7 @@ func (ap *ArchwayProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionI
 	counterparty := conntypes.Counterparty{
 		ClientId:     msgOpenInit.ClientID,
 		ConnectionId: msgOpenInit.ConnID,
-		Prefix:       defaultChainPrefix,
+		Prefix:       msgOpenInit.CommitmentPrefix,
 	}
 
 	params := &conntypes.MsgConnectionOpenTry{
@@ -1095,6 +1095,9 @@ func (ap *ArchwayProvider) waitForTxResult(
 			return nil, fmt.Errorf("timed out after: %d; %s", waitTimeout, ErrTimeoutAfterWaitingForTxBroadcast)
 		case <-time.After(time.Millisecond * 100):
 			res, err := ap.RPCClient.Tx(ctx, txHash, false)
+			if err == nil && res == nil {
+				continue
+			}
 			if err == nil {
 				return ap.mkTxResult(res)
 			}

diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go
@@ -37,9 +37,6 @@ var (
 
 // Default IBC settings
 var (
-	defaultChainPrefix = icon.MerklePrefix{
-		KeyPrefix: []byte("commitments"),
-	}
 	defaultDelayPeriod = types.NewHexInt(0)
 
 	DefaultIBCVersionIdentifier = "1"
@@ -266,8 +263,7 @@ func (icp *IconProvider) NewClientState(
 }
 
 func (icp *IconProvider) ConnectionHandshakeProof(ctx context.Context, msgOpenInit provider.ConnectionInfo, height uint64) (provider.ConnectionProof, error) {
-
-	clientState, clientStateProof, consensusStateProof, connStateProof, proofHeight, err := icp.GenerateConnHandshakeProof(ctx, int64(height), msgOpenInit.ClientID, msgOpenInit.ConnID)
+	clientState, clientStateProof, consensusStateProof, connStateProof, proofHeight, err := icp.GenerateConnHandshakeProof(ctx, int64(msgOpenInit.Height), msgOpenInit.ClientID, msgOpenInit.ConnID)
 	if err != nil {
 		return provider.ConnectionProof{}, err
 	}
@@ -299,7 +295,7 @@ func (icp *IconProvider) ConnectionProof(ctx context.Context, msgOpenAck provide
 }
 
 func (icp *IconProvider) ChannelProof(ctx context.Context, msg provider.ChannelInfo, height uint64) (provider.ChannelProof, error) {
-	channelResult, err := icp.QueryChannel(ctx, int64(height), msg.ChannelID, msg.PortID)
+	channelResult, err := icp.QueryChannel(ctx, int64(msg.Height), msg.ChannelID, msg.PortID)
 	if err != nil {
 		return provider.ChannelProof{}, nil
 	}
@@ -341,7 +337,7 @@ func (icp *IconProvider) ValidatePacket(msgTransfer provider.PacketInfo, latestB
 
 func (icp *IconProvider) PacketCommitment(ctx context.Context, msgTransfer provider.PacketInfo, height uint64) (provider.PacketProof, error) {
 	packetCommitmentResponse, err := icp.QueryPacketCommitment(
-		ctx, int64(height), msgTransfer.SourceChannel, msgTransfer.SourcePort, msgTransfer.Sequence,
+		ctx, int64(msgTransfer.Height), msgTransfer.SourceChannel, msgTransfer.SourcePort, msgTransfer.Sequence,
 	)
 
 	if err != nil {
@@ -354,7 +350,7 @@ func (icp *IconProvider) PacketCommitment(ctx context.Context, msgTransfer provi
 }
 
 func (icp *IconProvider) PacketAcknowledgement(ctx context.Context, msgRecvPacket provider.PacketInfo, height uint64) (provider.PacketProof, error) {
-	packetAckResponse, err := icp.QueryPacketAcknowledgement(ctx, int64(height), msgRecvPacket.SourceChannel, msgRecvPacket.SourcePort, msgRecvPacket.Sequence)
+	packetAckResponse, err := icp.QueryPacketAcknowledgement(ctx, int64(msgRecvPacket.Height), msgRecvPacket.SourceChannel, msgRecvPacket.SourcePort, msgRecvPacket.Sequence)
 	if err != nil {
 		return provider.PacketProof{}, nil
 	}
@@ -366,7 +362,7 @@ func (icp *IconProvider) PacketAcknowledgement(ctx context.Context, msgRecvPacke
 }
 
 func (icp *IconProvider) PacketReceipt(ctx context.Context, msgTransfer provider.PacketInfo, height uint64) (provider.PacketProof, error) {
-	packetReceiptResponse, err := icp.QueryPacketReceipt(ctx, int64(height), msgTransfer.SourceChannel, msgTransfer.SourcePort, msgTransfer.Sequence)
+	packetReceiptResponse, err := icp.QueryPacketReceipt(ctx, int64(msgTransfer.Height), msgTransfer.SourceChannel, msgTransfer.SourcePort, msgTransfer.Sequence)
 
 	if err != nil {
 		return provider.PacketProof{}, nil
@@ -379,7 +375,7 @@ func (icp *IconProvider) PacketReceipt(ctx context.Context, msgTransfer provider
 }
 
 func (icp *IconProvider) NextSeqRecv(ctx context.Context, msgTransfer provider.PacketInfo, height uint64) (provider.PacketProof, error) {
-	nextSeqRecvResponse, err := icp.QueryNextSeqRecv(ctx, int64(height), msgTransfer.DestChannel, msgTransfer.DestPort)
+	nextSeqRecvResponse, err := icp.QueryNextSeqRecv(ctx, int64(msgTransfer.Height), msgTransfer.DestChannel, msgTransfer.DestPort)
 	if err != nil {
 		return provider.PacketProof{}, nil
 	}
@@ -459,7 +455,7 @@ func (icp *IconProvider) ProviderConfig() provider.ProviderConfig {
 }
 
 func (icp *IconProvider) CommitmentPrefix() commitmenttypes.MerklePrefix {
-	return commitmenttypes.NewMerklePrefix([]byte("commitments"))
+	return commitmenttypes.NewMerklePrefix(nil)
 }
 
 func (icp *IconProvider) Key() string {

diff --git a/relayer/chains/icon/provider_test.go b/relayer/chains/icon/provider_test.go
@@ -123,7 +123,9 @@ func TestMsgOpenTryProof(t *testing.T) {
 		Counterparty: &icn.Counterparty{
 			ClientId:     msgOpenTry.ClientId,
 			ConnectionId: "",
-			Prefix:       &defaultChainPrefix,
+			Prefix: &icon.MerklePrefix{
+				KeyPrefix: []byte("commitments"),
+			},
 		},
 	}
 	key = common.GetConnectionCommitmentKey("connection-0")

diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go
@@ -218,7 +218,7 @@ func (icp *IconProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInf
 	cc := &icon.Counterparty{
 		ClientId:     msgOpenInit.ClientID,
 		ConnectionId: msgOpenInit.ConnID,
-		Prefix:       (*icon.MerklePrefix)(&msgOpenInit.CounterpartyCommitmentPrefix),
+		Prefix:       (*icon.MerklePrefix)(&msgOpenInit.CommitmentPrefix),
 	}
 
 	ccEncode, err := proto.Marshal(cc)

diff --git a/relayer/processor/types_internal.go b/relayer/processor/types_internal.go
@@ -243,7 +243,7 @@ func (msg connectionIBCMessage) assemble(
 		msg.info.CounterpartyCommitmentPrefix = src.chainProvider.CommitmentPrefix()
 		assembleMessage = dst.chainProvider.MsgConnectionOpenInit
 	case conntypes.EventTypeConnectionOpenTry:
-		msg.info.CounterpartyCommitmentPrefix = src.chainProvider.CommitmentPrefix()
+		msg.info.CommitmentPrefix = src.chainProvider.CommitmentPrefix()
 		connProof = src.chainProvider.ConnectionHandshakeProof
 		assembleMessage = dst.chainProvider.MsgConnectionOpenTry
 	case conntypes.EventTypeConnectionOpenAck:

diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go
@@ -116,6 +116,7 @@ type ConnectionInfo struct {
 	Height                       uint64
 	ConnID                       string
 	ClientID                     string
+	CommitmentPrefix             commitmenttypes.MerklePrefix
 	CounterpartyClientID         string
 	CounterpartyConnID           string
 	CounterpartyCommitmentPrefix commitmenttypes.MerklePrefix