bump up yui-ibc-solidity to v0.3.27 and execute abigen

Signed-off-by: Masanori Yoshida <[email protected]>
datachainlab · Apr 27, 2024 · 0086b0f · 0086b0f
1 parent 68c2bca
commit 0086b0f
Show file tree

Hide file tree

Showing 5 changed files with 1,296 additions and 194 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 FORGE  ?= forge
-ABIGEN ?= docker run -v .:/workspace -w /workspace -it ethereum/client-go:alltools-v1.11.6 abigen
+ABIGEN ?= docker run -v .:/workspace -w /workspace -it ethereum/client-go:alltools-v1.14.0 abigen
 
 DOCKER := $(shell which docker)
 

diff --git a/pkg/contract/ibchandler/ibchandler.go b/pkg/contract/ibchandler/ibchandler.go
diff --git a/pkg/relay/ethereum/msg.go b/pkg/relay/ethereum/msg.go
@@ -72,19 +72,19 @@ func (c *Chain) parseMsgEventLogs(logs []*types.Log) ([]core.MsgEventLog, error)
 			if err != nil {
 				return nil, fmt.Errorf("failed to parse GeneratedClientIdentifier event: logIndex=%d, log=%v", i, log)
 			}
-			event = &core.EventGenerateClientIdentifier{ID: ev.Arg0}
+			event = &core.EventGenerateClientIdentifier{ID: ev.ClientId}
 		case abiGeneratedConnectionIdentifier.ID:
 			ev, err := c.ibcHandler.ParseGeneratedConnectionIdentifier(*log)
 			if err != nil {
 				return nil, fmt.Errorf("failed to parse GeneratedConnectionIdentifier event: logIndex=%d, log=%v", i, log)
 			}
-			event = &core.EventGenerateConnectionIdentifier{ID: ev.Arg0}
+			event = &core.EventGenerateConnectionIdentifier{ID: ev.ConnectionId}
 		case abiGeneratedChannelIdentifier.ID:
 			ev, err := c.ibcHandler.ParseGeneratedChannelIdentifier(*log)
 			if err != nil {
 				return nil, fmt.Errorf("failed to parse GeneratedChannelIdentifier event: logIndex=%d, log=%v", i, log)
 			}
-			event = &core.EventGenerateChannelIdentifier{ID: ev.Arg0}
+			event = &core.EventGenerateChannelIdentifier{ID: ev.ChannelId}
 		case abiSendPacket.ID:
 			ev, err := c.ibcHandler.ParseSendPacket(*log)
 			if err != nil {

diff --git a/pkg/relay/ethereum/tx.go b/pkg/relay/ethereum/tx.go
@@ -291,7 +291,7 @@ func (c *Chain) TxChannelOpenConfirm(opts *bind.TransactOpts, msg *chantypes.Msg
 
 func (c *Chain) TxRecvPacket(opts *bind.TransactOpts, msg *chantypes.MsgRecvPacket) (*gethtypes.Transaction, error) {
 	return c.ibcHandler.RecvPacket(opts, ibchandler.IIBCChannelRecvPacketMsgPacketRecv{
-		Packet: ibchandler.PacketData{
+		Packet: ibchandler.Packet{
 			Sequence:           msg.Packet.Sequence,
 			SourcePort:         msg.Packet.SourcePort,
 			SourceChannel:      msg.Packet.SourceChannel,
@@ -308,7 +308,7 @@ func (c *Chain) TxRecvPacket(opts *bind.TransactOpts, msg *chantypes.MsgRecvPack
 
 func (c *Chain) TxAcknowledgement(opts *bind.TransactOpts, msg *chantypes.MsgAcknowledgement) (*gethtypes.Transaction, error) {
 	return c.ibcHandler.AcknowledgePacket(opts, ibchandler.IIBCChannelAcknowledgePacketMsgPacketAcknowledgement{
-		Packet: ibchandler.PacketData{
+		Packet: ibchandler.Packet{
 			Sequence:           msg.Packet.Sequence,
 			SourcePort:         msg.Packet.SourcePort,
 			SourceChannel:      msg.Packet.SourceChannel,

diff --git a/yui-ibc-solidity b/yui-ibc-solidity