Skip to content

Commit

Permalink
go/relay: update relayer version (#163)
Browse files Browse the repository at this point in the history 
* go/relay: update relayer version to v0.3.1

Signed-off-by: Jun Kimura <[email protected]>
  • Loading branch information
@bluele
bluele authored Mar 20, 2023
1 parent d9d0f68 commit 64b9547
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/datachainlab/solidity-protobuf/protobuf-solidity/src/protoc/go v0.0.0-20211215073805-59460caf6e59
github.com/ethereum/go-ethereum v1.9.25
github.com/gogo/protobuf v1.3.3
github.com/hyperledger-labs/yui-relayer v0.2.1-0.20220907091804-e261b49f06cd
github.com/hyperledger-labs/yui-relayer v0.3.1
github.com/spf13/cobra v1.5.0
github.com/stretchr/testify v1.8.0
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,8 +640,8 @@ github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOc
github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo=
github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
github.com/hyperledger-labs/yui-relayer v0.2.1-0.20220907091804-e261b49f06cd h1:p9Yky5P6yf41ZbyLMjFejH1hl6/Yn1/TlMcCVD7bd70=
github.com/hyperledger-labs/yui-relayer v0.2.1-0.20220907091804-e261b49f06cd/go.mod h1:L+UZLFBu/D6lrlL+etxg8SH3eW9Zm7eZDn/0SncdDOw=
github.com/hyperledger-labs/yui-relayer v0.3.1 h1:CuBjniF0CSUJ3xP+//dvk3ymRBiyqh+z7C/i6w+5kMA=
github.com/hyperledger-labs/yui-relayer v0.3.1/go.mod h1:L+UZLFBu/D6lrlL+etxg8SH3eW9Zm7eZDn/0SncdDOw=
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
Expand Down
96 changes: 48 additions & 48 deletions pkg/relay/ethereum/chain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import (
conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types"
chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
committypes "github.com/cosmos/ibc-go/v4/modules/core/23-commitment/types"
"github.com/cosmos/ibc-go/v4/modules/core/exported"
ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported"
"github.com/ethereum/go-ethereum/accounts/abi/bind"

"github.com/hyperledger-labs/yui-ibc-solidity/pkg/client"
"github.com/hyperledger-labs/yui-ibc-solidity/pkg/contract/ibchandler"
Expand All @@ -36,7 +37,7 @@ type Chain struct {
ibcHandler *ibchandler.Ibchandler
}

var _ core.ChainI = (*Chain)(nil)
var _ core.Chain = (*Chain)(nil)

func NewChain(config ChainConfig) (*Chain, error) {
id := big.NewInt(config.EthChainId)
Expand Down Expand Up @@ -85,12 +86,12 @@ func (c *Chain) ChainID() string {
}

// GetLatestHeight gets the chain for the latest height and returns it
func (c *Chain) GetLatestHeight() (int64, error) {
func (c *Chain) LatestHeight() (ibcexported.Height, error) {
bn, err := c.client.BlockNumber(context.TODO())
if err != nil {
return 0, err
return nil, err
}
return int64(bn), nil
return clienttypes.NewHeight(0, bn), nil
}

// GetAddress returns the address of relayer
Expand All @@ -112,17 +113,12 @@ func (c *Chain) Client() *client.ETHClient {
// SetRelayInfo sets source's path and counterparty's info to the chain
func (c *Chain) SetRelayInfo(p *core.PathEnd, _ *core.ProvableChain, _ *core.PathEnd) error {
if err := p.Validate(); err != nil {
return c.ErrCantSetPath(err)
return fmt.Errorf("path on chain %s failed to set: %w", c.ChainID(), err)
}
c.pathEnd = p
return nil
}

// ErrCantSetPath returns an error if the path doesn't set properly
func (c *Chain) ErrCantSetPath(err error) error {
return fmt.Errorf("path on chain %s failed to set: %w", c.ChainID(), err)
}

func (c *Chain) Path() *core.PathEnd {
return c.pathEnd
}
Expand All @@ -133,42 +129,42 @@ func (c *Chain) RegisterMsgEventListener(listener core.MsgEventListener) {
}

// QueryClientConsensusState retrevies the latest consensus state for a client in state at a given height
func (c *Chain) QueryClientConsensusState(height int64, dstClientConsHeight exported.Height) (*clienttypes.QueryConsensusStateResponse, error) {
s, found, err := c.ibcHandler.GetConsensusState(c.CallOpts(context.Background(), height), c.pathEnd.ClientID, pbToHostHeight(dstClientConsHeight))
func (c *Chain) QueryClientConsensusState(ctx core.QueryContext, dstClientConsHeight ibcexported.Height) (*clienttypes.QueryConsensusStateResponse, error) {
s, found, err := c.ibcHandler.GetConsensusState(c.callOptsFromQueryContext(ctx), c.pathEnd.ClientID, pbToHostHeight(dstClientConsHeight))
if err != nil {
return nil, err
} else if !found {
return nil, fmt.Errorf("client consensus not found: %v", c.pathEnd.ClientID)
}
var consensusState exported.ConsensusState
var consensusState ibcexported.ConsensusState
if err := c.Codec().UnmarshalInterface(s, &consensusState); err != nil {
return nil, err
}
any, err := clienttypes.PackConsensusState(consensusState)
if err != nil {
return nil, err
}
return clienttypes.NewQueryConsensusStateResponse(any, nil, clienttypes.NewHeight(0, uint64(height))), nil
return clienttypes.NewQueryConsensusStateResponse(any, nil, ctx.Height().(clienttypes.Height)), nil
}

// QueryClientState returns the client state of dst chain
// height represents the height of dst chain
func (c *Chain) QueryClientState(height int64) (*clienttypes.QueryClientStateResponse, error) {
s, found, err := c.ibcHandler.GetClientState(c.CallOpts(context.Background(), height), c.pathEnd.ClientID)
func (c *Chain) QueryClientState(ctx core.QueryContext) (*clienttypes.QueryClientStateResponse, error) {
s, found, err := c.ibcHandler.GetClientState(c.callOptsFromQueryContext(ctx), c.pathEnd.ClientID)
if err != nil {
return nil, err
} else if !found {
return nil, fmt.Errorf("client not found: %v", c.pathEnd.ClientID)
}
var clientState exported.ClientState
var clientState ibcexported.ClientState
if err := c.Codec().UnmarshalInterface(s, &clientState); err != nil {
return nil, err
}
any, err := clienttypes.PackClientState(clientState)
if err != nil {
return nil, err
}
return clienttypes.NewQueryClientStateResponse(any, nil, clienttypes.NewHeight(0, uint64(height))), nil
return clienttypes.NewQueryClientStateResponse(any, nil, ctx.Height().(clienttypes.Height)), nil
}

var emptyConnRes = conntypes.NewQueryConnectionResponse(
Expand All @@ -188,14 +184,14 @@ var emptyConnRes = conntypes.NewQueryConnectionResponse(
)

// QueryConnection returns the remote end of a given connection
func (c *Chain) QueryConnection(height int64) (*conntypes.QueryConnectionResponse, error) {
conn, found, err := c.ibcHandler.GetConnection(c.CallOpts(context.Background(), height), c.pathEnd.ConnectionID)
func (c *Chain) QueryConnection(ctx core.QueryContext) (*conntypes.QueryConnectionResponse, error) {
conn, found, err := c.ibcHandler.GetConnection(c.callOptsFromQueryContext(ctx), c.pathEnd.ConnectionID)
if err != nil {
return nil, err
} else if !found {
return emptyConnRes, nil
}
return conntypes.NewQueryConnectionResponse(connectionEndToPB(conn), nil, clienttypes.NewHeight(0, uint64(height))), nil
return conntypes.NewQueryConnectionResponse(connectionEndToPB(conn), nil, ctx.Height().(clienttypes.Height)), nil
}

var emptyChannelRes = chantypes.NewQueryChannelResponse(
Expand All @@ -214,41 +210,41 @@ var emptyChannelRes = chantypes.NewQueryChannelResponse(
)

// QueryChannel returns the channel associated with a channelID
func (c *Chain) QueryChannel(height int64) (chanRes *chantypes.QueryChannelResponse, err error) {
chann, found, err := c.ibcHandler.GetChannel(c.CallOpts(context.Background(), height), c.pathEnd.PortID, c.pathEnd.ChannelID)
func (c *Chain) QueryChannel(ctx core.QueryContext) (chanRes *chantypes.QueryChannelResponse, err error) {
chann, found, err := c.ibcHandler.GetChannel(c.callOptsFromQueryContext(ctx), c.pathEnd.PortID, c.pathEnd.ChannelID)
if err != nil {
return nil, err
} else if !found {
return emptyChannelRes, nil
}
return chantypes.NewQueryChannelResponse(channelToPB(chann), nil, clienttypes.NewHeight(0, uint64(height))), nil
return chantypes.NewQueryChannelResponse(channelToPB(chann), nil, ctx.Height().(clienttypes.Height)), nil
}

// QueryPacketCommitment returns the packet commitment corresponding to a given sequence
func (c *Chain) QueryPacketCommitment(height int64, seq uint64) (comRes *chantypes.QueryPacketCommitmentResponse, err error) {
packet, err := c.QueryPacket(height, seq)
func (c *Chain) QueryPacketCommitment(ctx core.QueryContext, seq uint64) (comRes *chantypes.QueryPacketCommitmentResponse, err error) {
packet, err := c.QueryPacket(ctx, seq)
if err != nil {
return nil, err
}
commitment := chantypes.CommitPacket(c.Codec(), packet)
return chantypes.NewQueryPacketCommitmentResponse(commitment, nil, clienttypes.NewHeight(0, uint64(height))), nil
return chantypes.NewQueryPacketCommitmentResponse(commitment, nil, ctx.Height().(clienttypes.Height)), nil
}

// QueryPacketAcknowledgementCommitment returns the acknowledgement corresponding to a given sequence
func (c *Chain) QueryPacketAcknowledgementCommitment(height int64, seq uint64) (ackRes *chantypes.QueryPacketAcknowledgementResponse, err error) {
ack, err := c.QueryPacketAcknowledgement(height, seq)
func (c *Chain) QueryPacketAcknowledgementCommitment(ctx core.QueryContext, seq uint64) (ackRes *chantypes.QueryPacketAcknowledgementResponse, err error) {
ack, err := c.QueryPacketAcknowledgement(ctx, seq)
if err != nil {
return nil, err
}
commitment := chantypes.CommitAcknowledgement(ack)
return chantypes.NewQueryPacketAcknowledgementResponse(commitment, nil, clienttypes.NewHeight(0, uint64(height))), nil
return chantypes.NewQueryPacketAcknowledgementResponse(commitment, nil, ctx.Height().(clienttypes.Height)), nil
}

// NOTE: The current implementation returns all packets, including those for that acknowledgement has already received.
// QueryPacketCommitments returns an array of packet commitments
func (c *Chain) QueryPacketCommitments(offset uint64, limit uint64, height int64) (comRes *chantypes.QueryPacketCommitmentsResponse, err error) {
func (c *Chain) QueryPacketCommitments(ctx core.QueryContext, offset uint64, limit uint64) (comRes *chantypes.QueryPacketCommitmentsResponse, err error) {
// WARNING: It may be slow to use in the production. Instead of it, it might be better to use an external event indexer to get all packet commitments.
packets, err := c.getAllPackets(context.Background(), c.pathEnd.PortID, c.pathEnd.ChannelID)
packets, err := c.getAllPackets(ctx.Context(), c.pathEnd.PortID, c.pathEnd.ChannelID)
if err != nil {
return nil, err
}
Expand All @@ -257,15 +253,15 @@ func (c *Chain) QueryPacketCommitments(offset uint64, limit uint64, height int64
ps := chantypes.NewPacketState(c.pathEnd.PortID, c.pathEnd.ChannelID, p.Sequence, chantypes.CommitPacket(c.Codec(), p))
res.Commitments = append(res.Commitments, &ps)
}
res.Height = clienttypes.NewHeight(0, uint64(height))
res.Height = ctx.Height().(clienttypes.Height)
return &res, nil
}

// QueryUnrecievedPackets returns a list of unrelayed packet commitments
func (c *Chain) QueryUnrecievedPackets(height int64, seqs []uint64) ([]uint64, error) {
func (c *Chain) QueryUnrecievedPackets(ctx core.QueryContext, seqs []uint64) ([]uint64, error) {
var ret []uint64
for _, seq := range seqs {
found, err := c.ibcHandler.HasPacketReceipt(c.CallOpts(context.Background(), height), c.pathEnd.PortID, c.pathEnd.ChannelID, seq)
found, err := c.ibcHandler.HasPacketReceipt(c.callOptsFromQueryContext(ctx), c.pathEnd.PortID, c.pathEnd.ChannelID, seq)
if err != nil {
return nil, err
} else if !found {
Expand All @@ -276,9 +272,9 @@ func (c *Chain) QueryUnrecievedPackets(height int64, seqs []uint64) ([]uint64, e
}

// QueryPacketAcknowledgementCommitments returns an array of packet acks
func (c *Chain) QueryPacketAcknowledgementCommitments(offset uint64, limit uint64, height int64) (comRes *chantypes.QueryPacketAcknowledgementsResponse, err error) {
func (c *Chain) QueryPacketAcknowledgementCommitments(ctx core.QueryContext, offset uint64, limit uint64) (comRes *chantypes.QueryPacketAcknowledgementsResponse, err error) {
// WARNING: It may be slow to use in the production. Instead of it, it might be better to use an external event indexer to get all packet acknowledgements.
acks, err := c.getAllAcknowledgements(context.Background(), c.pathEnd.PortID, c.pathEnd.ChannelID)
acks, err := c.getAllAcknowledgements(ctx.Context(), c.pathEnd.PortID, c.pathEnd.ChannelID)
if err != nil {
return nil, err
}
Expand All @@ -291,10 +287,10 @@ func (c *Chain) QueryPacketAcknowledgementCommitments(offset uint64, limit uint6
}

// QueryUnrecievedAcknowledgements returns a list of unrelayed packet acks
func (c *Chain) QueryUnrecievedAcknowledgements(height int64, seqs []uint64) ([]uint64, error) {
func (c *Chain) QueryUnrecievedAcknowledgements(ctx core.QueryContext, seqs []uint64) ([]uint64, error) {
var ret []uint64
for _, seq := range seqs {
_, found, err := c.ibcHandler.GetHashedPacketCommitment(c.CallOpts(context.Background(), height), c.pathEnd.PortID, c.pathEnd.ChannelID, seq)
_, found, err := c.ibcHandler.GetHashedPacketCommitment(c.callOptsFromQueryContext(ctx), c.pathEnd.PortID, c.pathEnd.ChannelID, seq)
if err != nil {
return nil, err
} else if found {
Expand All @@ -305,23 +301,27 @@ func (c *Chain) QueryUnrecievedAcknowledgements(height int64, seqs []uint64) ([]
}

// QueryPacket returns the packet corresponding to a sequence
func (c *Chain) QueryPacket(height int64, sequence uint64) (*chantypes.Packet, error) {
func (c *Chain) QueryPacket(ctx core.QueryContext, sequence uint64) (*chantypes.Packet, error) {
// TODO give the height as max block number
return c.findPacket(context.Background(), c.pathEnd.PortID, c.pathEnd.ChannelID, sequence)
return c.findPacket(ctx.Context(), c.pathEnd.PortID, c.pathEnd.ChannelID, sequence)
}

// QueryPacketAcknowledgement returns the acknowledgement corresponding to a sequence
func (c *Chain) QueryPacketAcknowledgement(height int64, sequence uint64) ([]byte, error) {
func (c *Chain) QueryPacketAcknowledgement(ctx core.QueryContext, sequence uint64) ([]byte, error) {
// TODO give the height as max block number
return c.findAcknowledgement(context.Background(), c.pathEnd.PortID, c.pathEnd.ChannelID, sequence)
return c.findAcknowledgement(ctx.Context(), c.pathEnd.PortID, c.pathEnd.ChannelID, sequence)
}

// QueryBalance returns the amount of coins in the relayer account
func (c *Chain) QueryBalance(address sdk.AccAddress) (sdk.Coins, error) {
panic("not implemented") // TODO: Implement
func (c *Chain) QueryBalance(ctx core.QueryContext, address sdk.AccAddress) (sdk.Coins, error) {
panic("not supported")
}

// QueryDenomTraces returns all the denom traces from a given chain
func (c *Chain) QueryDenomTraces(offset uint64, limit uint64, height int64) (*transfertypes.QueryDenomTracesResponse, error) {
panic("not implemented") // TODO: Implement
func (c *Chain) QueryDenomTraces(ctx core.QueryContext, offset uint64, limit uint64) (*transfertypes.QueryDenomTracesResponse, error) {
panic("not supported")
}

func (c *Chain) callOptsFromQueryContext(ctx core.QueryContext) *bind.CallOpts {
return c.CallOpts(ctx.Context(), int64(ctx.Height().GetRevisionHeight()))
}
2 changes: 1 addition & 1 deletion pkg/relay/ethereum/codec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
// RegisterInterfaces register the module interfaces to protobuf Any.
func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
registry.RegisterImplementations(
(*core.ChainConfigI)(nil),
(*core.ChainConfig)(nil),
&ChainConfig{},
)
}
4 changes: 2 additions & 2 deletions pkg/relay/ethereum/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"github.com/hyperledger-labs/yui-relayer/core"
)

var _ core.ChainConfigI = (*ChainConfig)(nil)
var _ core.ChainConfig = (*ChainConfig)(nil)

func (c ChainConfig) Build() (core.ChainI, error) {
func (c ChainConfig) Build() (core.Chain, error) {
return NewChain(c)
}

Expand Down

0 comments on commit 64b9547

Please sign in to comment.