From 99b7ccc1e625251c97963b28f026409931924f22 Mon Sep 17 00:00:00 2001 From: Steve Miskovetz Date: Thu, 20 Apr 2023 13:38:29 -0600 Subject: [PATCH 01/35] Add wasm type support for tendermint clients --- relayer/chains/cosmos/module/app_module.go | 5 + relayer/chains/cosmos/provider.go | 1 + relayer/chains/cosmos/tx.go | 82 +- relayer/client.go | 18 +- relayer/codecs/08-wasm-types/client_state.go | 123 +++ relayer/codecs/08-wasm-types/codec.go | 32 + .../codecs/08-wasm-types/consensus_state.go | 19 + relayer/codecs/08-wasm-types/header.go | 15 + relayer/codecs/08-wasm-types/misbehavior.go | 17 + relayer/codecs/08-wasm-types/module.go | 57 + relayer/codecs/08-wasm-types/msgs.go | 21 + relayer/codecs/08-wasm-types/tx.pb.go | 635 +++++++++++ relayer/codecs/08-wasm-types/wasm.pb.go | 995 ++++++++++++++++++ relayer/provider/matcher.go | 18 + 14 files changed, 2031 insertions(+), 7 deletions(-) create mode 100644 relayer/codecs/08-wasm-types/client_state.go create mode 100644 relayer/codecs/08-wasm-types/codec.go create mode 100644 relayer/codecs/08-wasm-types/consensus_state.go create mode 100644 relayer/codecs/08-wasm-types/header.go create mode 100644 relayer/codecs/08-wasm-types/misbehavior.go create mode 100644 relayer/codecs/08-wasm-types/module.go create mode 100644 relayer/codecs/08-wasm-types/msgs.go create mode 100644 relayer/codecs/08-wasm-types/tx.pb.go create mode 100644 relayer/codecs/08-wasm-types/wasm.pb.go diff --git a/relayer/chains/cosmos/module/app_module.go b/relayer/chains/cosmos/module/app_module.go index 6a2d45f15..e6025ef72 100644 --- a/relayer/chains/cosmos/module/app_module.go +++ b/relayer/chains/cosmos/module/app_module.go @@ -5,10 +5,12 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" + localhost "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" tmlightclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + wasm "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" ) // AppModuleBasic defines the basic application module used by the module. @@ -26,6 +28,9 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {} func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) { tmlightclient.RegisterInterfaces(registry) solomachine.RegisterInterfaces(registry) + wasm.RegisterInterfaces(registry) + localhost.RegisterInterfaces(registry) + // TODO: add the localhost light client when ibc-go v7.1.0 is available } // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the ibc module. diff --git a/relayer/chains/cosmos/provider.go b/relayer/chains/cosmos/provider.go index 37d528a90..24ee6eadf 100644 --- a/relayer/chains/cosmos/provider.go +++ b/relayer/chains/cosmos/provider.go @@ -57,6 +57,7 @@ type CosmosProviderConfig struct { SigningAlgorithm string `json:"signing-algorithm" yaml:"signing-algorithm"` Broadcast provider.BroadcastMode `json:"broadcast-mode" yaml:"broadcast-mode"` MinLoopDuration time.Duration `json:"min-loop-duration" yaml:"min-loop-duration"` + WasmCodeID string `json:"wasm-code-id" yaml:"wasm-code-id"` } func (pc CosmosProviderConfig) Validate() error { diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index e553ee339..028fc0bf9 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -2,6 +2,7 @@ package cosmos import ( "context" + "encoding/hex" "errors" "fmt" "math" @@ -35,9 +36,11 @@ import ( chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" strideicqtypes "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" + wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "google.golang.org/grpc/codes" @@ -972,6 +975,7 @@ func (cc *CosmosProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelIn return NewCosmosMessage(msg), nil } + func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader) (ibcexported.ClientMessage, error) { trustedCosmosHeader, ok := trustedHeader.(provider.TendermintIBCHeader) if !ok { @@ -987,6 +991,7 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, if err != nil { return nil, fmt.Errorf("error converting trusted validators to proto object: %w", err) } + trustedValidatorsProto.TotalVotingPower = trustedCosmosHeader.ValidatorSet.TotalVotingPower() signedHeaderProto := latestCosmosHeader.SignedHeader.ToProto() @@ -994,13 +999,35 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, if err != nil { return nil, fmt.Errorf("error converting validator set to proto object: %w", err) } + validatorSetProto.TotalVotingPower = latestCosmosHeader.ValidatorSet.TotalVotingPower() + + var clientHeader ibcexported.ClientMessage - return &tmclient.Header{ + tmClientHeader := tmclient.Header{ SignedHeader: signedHeaderProto, ValidatorSet: validatorSetProto, TrustedValidators: trustedValidatorsProto, TrustedHeight: trustedHeight, - }, nil + } + + clientHeader = &tmClientHeader + + if cc.PCfg.WasmCodeID != "" { + tmClientHeaderBz, err := cc.Cdc.Marshaler.MarshalInterface(clientHeader) + if err != nil { + return &wasmclient.Header{}, nil + } + height, ok := tmClientHeader.GetHeight().(clienttypes.Height) + if !ok { + return &wasmclient.Header{}, fmt.Errorf("error converting tm client header height") + } + clientHeader = &wasmclient.Header{ + Data: tmClientHeaderBz, + Height: height, + } + } + + return clientHeader, nil } func (cc *CosmosProvider) QueryICQWithProof(ctx context.Context, path string, request []byte, height uint64) (provider.ICQProof, error) { @@ -1041,6 +1068,16 @@ func (cc *CosmosProvider) MsgSubmitQueryResponse(chainID string, queryID provide } func (cc *CosmosProvider) MsgSubmitMisbehaviour(clientID string, misbehaviour ibcexported.ClientMessage) (provider.RelayerMessage, error) { + if cc.PCfg.WasmCodeID != "" { + wasmData, err := cc.Cdc.Marshaler.MarshalInterface(misbehaviour) + if err != nil { + return nil, err + } + misbehaviour = &wasmclient.Misbehaviour{ + Data: wasmData, + } + } + signer, err := cc.Address() if err != nil { return nil, err @@ -1225,13 +1262,23 @@ func (cc *CosmosProvider) queryTMClientState(ctx context.Context, srch int64, sr return &tmclient.ClientState{}, err } - clientState, ok := clientStateExported.(*tmclient.ClientState) + switch cs := clientStateExported.(type) { + case *wasmclient.ClientState: + var clientState ibcexported.ClientState + err = cc.Cdc.Marshaler.UnmarshalInterface(cs.Data, &clientState) + if err != nil { + return &tmclient.ClientState{}, fmt.Errorf("error unmarshaling tm client state, %w", err) + } + clientStateExported = clientState + } + + tmClientState, ok := clientStateExported.(*tmclient.ClientState) if !ok { return &tmclient.ClientState{}, fmt.Errorf("error when casting exported clientstate to tendermint type") } - return clientState, nil + return tmClientState, nil } // DefaultUpgradePath is the default IBC upgrade path set for an on-chain light client @@ -1248,8 +1295,10 @@ func (cc *CosmosProvider) NewClientState( ) (ibcexported.ClientState, error) { revisionNumber := clienttypes.ParseChainID(dstChainID) + var clientState exported.ClientState + // Create the ClientState we want on 'c' tracking 'dst' - return &tmclient.ClientState{ + tmClientState := tmclient.ClientState{ ChainId: dstChainID, TrustLevel: tmclient.NewFractionFromTm(light.DefaultTrustLevel), TrustingPeriod: dstTrustingPeriod, @@ -1264,7 +1313,28 @@ func (cc *CosmosProvider) NewClientState( UpgradePath: defaultUpgradePath, AllowUpdateAfterExpiry: allowUpdateAfterExpiry, AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour, - }, nil + } + + clientState = &tmClientState + + if cc.PCfg.WasmCodeID != "" { + tmClientStateBz, err := cc.Cdc.Marshaler.MarshalInterface(clientState) + if err != nil { + return &wasmclient.ClientState{}, err + } + codeID, err := hex.DecodeString(cc.PCfg.WasmCodeID) + if err != nil { + return &wasmclient.ClientState{}, err + } + clientState = &wasmclient.ClientState{ + Data: tmClientStateBz, + CodeId: codeID, + LatestHeight: tmClientState.LatestHeight, + } + } + + + return clientState, nil } func (cc *CosmosProvider) UpdateFeesSpent(chain, key, address string, fees sdk.Coins) { diff --git a/relayer/client.go b/relayer/client.go index 1972885bf..6268118d9 100644 --- a/relayer/client.go +++ b/relayer/client.go @@ -10,7 +10,9 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + "github.com/cosmos/relayer/v2/relayer/chains/cosmos" "github.com/cosmos/relayer/v2/relayer/chains/icon" + wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" @@ -226,7 +228,21 @@ func CreateClient( // the dst chains implementation of CreateClient, to ensure the proper client/header // logic is executed, but the message gets submitted on the src chain which means // we need to sign with the address from src. - createMsg, err := src.ChainProvider.MsgCreateClient(clientState, dstUpdateHeader.ConsensusState()) + consensusState := dstUpdateHeader.ConsensusState() + switch clientState.(type) { + case *wasmclient.ClientState: + cp := src.ChainProvider.(*cosmos.CosmosProvider) + consensusStateBz, err := cp.Cdc.Marshaler.MarshalInterface(consensusState) + if err != nil { + return "", fmt.Errorf("failed to marshal consensus state for wasm client: %w", err) + } + consensusState = &wasmclient.ConsensusState{ + Data: consensusStateBz, + Timestamp: consensusState.GetTimestamp(), + } + } + + createMsg, err := src.ChainProvider.MsgCreateClient(clientState, consensusState) if err != nil { return "", fmt.Errorf("failed to compose CreateClient msg for chain{%s} tracking the state of chain{%s}: %w", src.ChainID(), dst.ChainID(), err) diff --git a/relayer/codecs/08-wasm-types/client_state.go b/relayer/codecs/08-wasm-types/client_state.go new file mode 100644 index 000000000..eb0a8417f --- /dev/null +++ b/relayer/codecs/08-wasm-types/client_state.go @@ -0,0 +1,123 @@ +package types + +import ( + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" +) + +var _ exported.ClientState = (*ClientState)(nil) + +func (c ClientState) ClientType() string { + return "" +} + +func (c ClientState) GetLatestHeight() exported.Height { + return c.LatestHeight +} + +func (c ClientState) Validate() error { + return nil +} + +func (c ClientState) Status(ctx sdk.Context, store sdk.KVStore, cdc codec.BinaryCodec) exported.Status { + return exported.Active +} + +func (c ClientState) ExportMetadata(store sdk.KVStore) []exported.GenesisMetadata { + return []exported.GenesisMetadata{} +} + +func (c ClientState) ZeroCustomFields() exported.ClientState { + return &c +} + +func (c ClientState) GetTimestampAtHeight( + ctx sdk.Context, + clientStore sdk.KVStore, + cdc codec.BinaryCodec, + height exported.Height, +) (uint64, error) { + return 0, nil +} + +func (c ClientState) Initialize(context sdk.Context, marshaler codec.BinaryCodec, store sdk.KVStore, state exported.ConsensusState) error { + return nil +} + +func (c ClientState) VerifyMembership( + ctx sdk.Context, + clientStore sdk.KVStore, + cdc codec.BinaryCodec, + height exported.Height, + delayTimePeriod uint64, + delayBlockPeriod uint64, + proof []byte, + path exported.Path, + value []byte, +) error { + return nil +} + +func (c ClientState) VerifyNonMembership( + ctx sdk.Context, + clientStore sdk.KVStore, + cdc codec.BinaryCodec, + height exported.Height, + delayTimePeriod uint64, + delayBlockPeriod uint64, + proof []byte, + path exported.Path, +) error { + return nil +} + +// VerifyClientMessage must verify a ClientMessage. A ClientMessage could be a Header, Misbehaviour, or batch update. +// It must handle each type of ClientMessage appropriately. Calls to CheckForMisbehaviour, UpdateState, and UpdateStateOnMisbehaviour +// will assume that the content of the ClientMessage has been verified and can be trusted. An error should be returned +// if the ClientMessage fails to verify. +func (c ClientState) VerifyClientMessage(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, clientMsg exported.ClientMessage) error { + return nil +} + +func (c ClientState) CheckForMisbehaviour(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, msg exported.ClientMessage) bool { + return true +} + +// UpdateStateOnMisbehaviour should perform appropriate state changes on a client state given that misbehaviour has been detected and verified +func (c ClientState) UpdateStateOnMisbehaviour(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, clientMsg exported.ClientMessage) { + +} + +func (c ClientState) UpdateState(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, clientMsg exported.ClientMessage) []exported.Height { + return []exported.Height{c.LatestHeight} +} + +func (c ClientState) CheckSubstituteAndUpdateState( + ctx sdk.Context, cdc codec.BinaryCodec, subjectClientStore, + substituteClientStore sdk.KVStore, substituteClient exported.ClientState, +) error { + return nil +} + +func (c ClientState) VerifyUpgradeAndUpdateState( + ctx sdk.Context, + cdc codec.BinaryCodec, + store sdk.KVStore, + newClient exported.ClientState, + newConsState exported.ConsensusState, + proofUpgradeClient, + proofUpgradeConsState []byte, +) error { + return nil +} + +// NewClientState creates a new ClientState instance. +func NewClientState(latestSequence uint64, consensusState *ConsensusState) *ClientState { + return &ClientState{ + Data: []byte{0}, + CodeId: []byte{}, + LatestHeight: clienttypes.Height{}, + } +} diff --git a/relayer/codecs/08-wasm-types/codec.go b/relayer/codecs/08-wasm-types/codec.go new file mode 100644 index 000000000..3408876da --- /dev/null +++ b/relayer/codecs/08-wasm-types/codec.go @@ -0,0 +1,32 @@ +package types + +import ( + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" +) + +// RegisterInterfaces registers the tendermint concrete client-related +// implementations and interfaces. +func RegisterInterfaces(registry codectypes.InterfaceRegistry) { + registry.RegisterImplementations( + (*exported.ClientState)(nil), + &ClientState{}, + ) + registry.RegisterImplementations( + (*exported.ConsensusState)(nil), + &ConsensusState{}, + ) + registry.RegisterImplementations( + (*sdk.Msg)(nil), + &MsgStoreCode{}, + ) + registry.RegisterImplementations( + (*exported.ClientMessage)(nil), + &Misbehaviour{}, + ) + registry.RegisterImplementations( + (*exported.ClientMessage)(nil), + &Header{}, + ) +} diff --git a/relayer/codecs/08-wasm-types/consensus_state.go b/relayer/codecs/08-wasm-types/consensus_state.go new file mode 100644 index 000000000..d2482589f --- /dev/null +++ b/relayer/codecs/08-wasm-types/consensus_state.go @@ -0,0 +1,19 @@ +package types + +import ( + "github.com/cosmos/ibc-go/v7/modules/core/exported" +) + +var _ exported.ConsensusState = (*ConsensusState)(nil) + +func (m ConsensusState) ClientType() string { + return "" +} + +func (m ConsensusState) GetTimestamp() uint64 { + return m.Timestamp +} + +func (m ConsensusState) ValidateBasic() error { + return nil +} diff --git a/relayer/codecs/08-wasm-types/header.go b/relayer/codecs/08-wasm-types/header.go new file mode 100644 index 000000000..f47a48f74 --- /dev/null +++ b/relayer/codecs/08-wasm-types/header.go @@ -0,0 +1,15 @@ +package types + +import ( + "github.com/cosmos/ibc-go/v7/modules/core/exported" +) + +var _ exported.ClientMessage = &Header{} + +func (m Header) ClientType() string { + return "" +} + +func (m Header) ValidateBasic() error { + return nil +} diff --git a/relayer/codecs/08-wasm-types/misbehavior.go b/relayer/codecs/08-wasm-types/misbehavior.go new file mode 100644 index 000000000..daa3623a3 --- /dev/null +++ b/relayer/codecs/08-wasm-types/misbehavior.go @@ -0,0 +1,17 @@ +package types + +import ( + exported "github.com/cosmos/ibc-go/v7/modules/core/exported" +) + +var ( + _ exported.ClientMessage = &Misbehaviour{} +) + +func (m Misbehaviour) ClientType() string { + return "" +} + +func (m Misbehaviour) ValidateBasic() error { + return nil +} diff --git a/relayer/codecs/08-wasm-types/module.go b/relayer/codecs/08-wasm-types/module.go new file mode 100644 index 000000000..85fa9f128 --- /dev/null +++ b/relayer/codecs/08-wasm-types/module.go @@ -0,0 +1,57 @@ +package types + +import ( + "encoding/json" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/codec" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/types/module" + //grpc "github.com/cosmos/gogoproto/grpc" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" +) + +var _ module.AppModuleBasic = AppModuleBasic{} + +// AppModuleBasic defines the basic application module used by the tendermint light client. +// Only the RegisterInterfaces function needs to be implemented. All other function perform +// a no-op. +type AppModuleBasic struct{} + +// Name returns the tendermint module name. +func (AppModuleBasic) Name() string { + return "08-wasm" +} + +// RegisterLegacyAminoCodec performs a no-op. The Wasm client does not support amino. +func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {} + +// RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC +// to unmarshal wasm light client types. +func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) { + RegisterInterfaces(registry) +} + +// DefaultGenesis performs a no-op. Genesis is not supported for the tendermint light client. +func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { + return nil +} + +// ValidateGenesis performs a no-op. Genesis is not supported for the tendermint light cilent. +func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncodingConfig, bz json.RawMessage) error { + return nil +} + +// RegisterGRPCGatewayRoutes performs a no-op. +func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {} + +// GetTxCmd performs a no-op. Please see the 02-client cli commands. +func (AppModuleBasic) GetTxCmd() *cobra.Command { + return nil +} + +// GetQueryCmd performs a no-op. Please see the 02-client cli commands. +func (AppModuleBasic) GetQueryCmd() *cobra.Command { + return nil +} diff --git a/relayer/codecs/08-wasm-types/msgs.go b/relayer/codecs/08-wasm-types/msgs.go new file mode 100644 index 000000000..ad8284065 --- /dev/null +++ b/relayer/codecs/08-wasm-types/msgs.go @@ -0,0 +1,21 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var ( + _ sdk.Msg = &MsgStoreCode{} +) + +func (m MsgStoreCode) ValidateBasic() error { + return nil +} + +func (m MsgStoreCode) GetSigners() []sdk.AccAddress { + signer, err := sdk.AccAddressFromBech32(m.Signer) + if err != nil { + panic(err) + } + return []sdk.AccAddress{signer} +} diff --git a/relayer/codecs/08-wasm-types/tx.pb.go b/relayer/codecs/08-wasm-types/tx.pb.go new file mode 100644 index 000000000..cce6e707c --- /dev/null +++ b/relayer/codecs/08-wasm-types/tx.pb.go @@ -0,0 +1,635 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: ibc/lightclients/wasm/v1/tx.proto + +package types + +import ( + context "context" + fmt "fmt" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +// MsgStoreCode defines the request type for the StoreCode rpc. +type MsgStoreCode struct { + Signer string `protobuf:"bytes,1,opt,name=signer,proto3" json:"signer,omitempty"` + Code []byte `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"` +} + +func (m *MsgStoreCode) Reset() { *m = MsgStoreCode{} } +func (m *MsgStoreCode) String() string { return proto.CompactTextString(m) } +func (*MsgStoreCode) ProtoMessage() {} +func (*MsgStoreCode) Descriptor() ([]byte, []int) { + return fileDescriptor_1d9737363bf1e38d, []int{0} +} +func (m *MsgStoreCode) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgStoreCode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgStoreCode.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MsgStoreCode) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgStoreCode.Merge(m, src) +} +func (m *MsgStoreCode) XXX_Size() int { + return m.Size() +} +func (m *MsgStoreCode) XXX_DiscardUnknown() { + xxx_messageInfo_MsgStoreCode.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgStoreCode proto.InternalMessageInfo + +func (m *MsgStoreCode) GetSigner() string { + if m != nil { + return m.Signer + } + return "" +} + +func (m *MsgStoreCode) GetCode() []byte { + if m != nil { + return m.Code + } + return nil +} + +// MsgStoreCodeResponse defines the response type for the StoreCode rpc +type MsgStoreCodeResponse struct { + CodeId []byte `protobuf:"bytes,1,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"` +} + +func (m *MsgStoreCodeResponse) Reset() { *m = MsgStoreCodeResponse{} } +func (m *MsgStoreCodeResponse) String() string { return proto.CompactTextString(m) } +func (*MsgStoreCodeResponse) ProtoMessage() {} +func (*MsgStoreCodeResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_1d9737363bf1e38d, []int{1} +} +func (m *MsgStoreCodeResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgStoreCodeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgStoreCodeResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MsgStoreCodeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgStoreCodeResponse.Merge(m, src) +} +func (m *MsgStoreCodeResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgStoreCodeResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgStoreCodeResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgStoreCodeResponse proto.InternalMessageInfo + +func (m *MsgStoreCodeResponse) GetCodeId() []byte { + if m != nil { + return m.CodeId + } + return nil +} + +func init() { + proto.RegisterType((*MsgStoreCode)(nil), "ibc.lightclients.wasm.v1.MsgStoreCode") + proto.RegisterType((*MsgStoreCodeResponse)(nil), "ibc.lightclients.wasm.v1.MsgStoreCodeResponse") +} + +func init() { proto.RegisterFile("ibc/lightclients/wasm/v1/tx.proto", fileDescriptor_1d9737363bf1e38d) } + +var fileDescriptor_1d9737363bf1e38d = []byte{ + // 270 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcc, 0x4c, 0x4a, 0xd6, + 0xcf, 0xc9, 0x4c, 0xcf, 0x28, 0x49, 0xce, 0xc9, 0x4c, 0xcd, 0x2b, 0x29, 0xd6, 0x2f, 0x4f, 0x2c, + 0xce, 0xd5, 0x2f, 0x33, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xc8, + 0x4c, 0x4a, 0xd6, 0x43, 0x56, 0xa2, 0x07, 0x52, 0xa2, 0x57, 0x66, 0xa8, 0x64, 0xc5, 0xc5, 0xe3, + 0x5b, 0x9c, 0x1e, 0x5c, 0x92, 0x5f, 0x94, 0xea, 0x9c, 0x9f, 0x92, 0x2a, 0x24, 0xc6, 0xc5, 0x56, + 0x9c, 0x99, 0x9e, 0x97, 0x5a, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0xe5, 0x09, 0x09, + 0x71, 0xb1, 0x24, 0xe7, 0xa7, 0xa4, 0x4a, 0x30, 0x29, 0x30, 0x6a, 0xf0, 0x04, 0x81, 0xd9, 0x4a, + 0xfa, 0x5c, 0x22, 0xc8, 0x7a, 0x83, 0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x85, 0xc4, 0xb9, + 0xd8, 0x41, 0xf2, 0xf1, 0x99, 0x29, 0x60, 0x43, 0x78, 0x82, 0xd8, 0x40, 0x5c, 0xcf, 0x14, 0xa3, + 0x2c, 0x2e, 0x66, 0xdf, 0xe2, 0x74, 0xa1, 0x64, 0x2e, 0x4e, 0x84, 0x85, 0x6a, 0x7a, 0xb8, 0xdc, + 0xa6, 0x87, 0x6c, 0xb8, 0x94, 0x1e, 0x71, 0xea, 0x60, 0x8e, 0x70, 0x8a, 0x3c, 0xf1, 0x48, 0x8e, + 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, + 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xfb, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, + 0xfc, 0x5c, 0xfd, 0xe4, 0xfc, 0xe2, 0xdc, 0xfc, 0x62, 0xfd, 0xcc, 0xa4, 0x64, 0xdd, 0xf4, 0x7c, + 0xfd, 0x32, 0x73, 0xfd, 0xdc, 0xfc, 0x94, 0xd2, 0x9c, 0xd4, 0x62, 0x48, 0x78, 0xea, 0xc2, 0x02, + 0xd4, 0xc0, 0x42, 0x17, 0x1c, 0xa6, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x40, 0x35, + 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x99, 0x32, 0xbd, 0x79, 0x01, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// MsgClient is the client API for Msg service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type MsgClient interface { + // StoreCode defines a rpc handler method for MsgStoreCode. + StoreCode(ctx context.Context, in *MsgStoreCode, opts ...grpc.CallOption) (*MsgStoreCodeResponse, error) +} + +type msgClient struct { + cc grpc1.ClientConn +} + +func NewMsgClient(cc grpc1.ClientConn) MsgClient { + return &msgClient{cc} +} + +func (c *msgClient) StoreCode(ctx context.Context, in *MsgStoreCode, opts ...grpc.CallOption) (*MsgStoreCodeResponse, error) { + out := new(MsgStoreCodeResponse) + err := c.cc.Invoke(ctx, "/ibc.lightclients.wasm.v1.Msg/StoreCode", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// MsgServer is the server API for Msg service. +type MsgServer interface { + // StoreCode defines a rpc handler method for MsgStoreCode. + StoreCode(context.Context, *MsgStoreCode) (*MsgStoreCodeResponse, error) +} + +// UnimplementedMsgServer can be embedded to have forward compatible implementations. +type UnimplementedMsgServer struct { +} + +func (*UnimplementedMsgServer) StoreCode(ctx context.Context, req *MsgStoreCode) (*MsgStoreCodeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method StoreCode not implemented") +} + +func RegisterMsgServer(s grpc1.Server, srv MsgServer) { + s.RegisterService(&_Msg_serviceDesc, srv) +} + +func _Msg_StoreCode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgStoreCode) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).StoreCode(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/ibc.lightclients.wasm.v1.Msg/StoreCode", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).StoreCode(ctx, req.(*MsgStoreCode)) + } + return interceptor(ctx, in, info, handler) +} + +var _Msg_serviceDesc = grpc.ServiceDesc{ + ServiceName: "ibc.lightclients.wasm.v1.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "StoreCode", + Handler: _Msg_StoreCode_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "ibc/lightclients/wasm/v1/tx.proto", +} + +func (m *MsgStoreCode) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MsgStoreCode) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgStoreCode) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Code) > 0 { + i -= len(m.Code) + copy(dAtA[i:], m.Code) + i = encodeVarintTx(dAtA, i, uint64(len(m.Code))) + i-- + dAtA[i] = 0x12 + } + if len(m.Signer) > 0 { + i -= len(m.Signer) + copy(dAtA[i:], m.Signer) + i = encodeVarintTx(dAtA, i, uint64(len(m.Signer))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgStoreCodeResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MsgStoreCodeResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgStoreCodeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.CodeId) > 0 { + i -= len(m.CodeId) + copy(dAtA[i:], m.CodeId) + i = encodeVarintTx(dAtA, i, uint64(len(m.CodeId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintTx(dAtA []byte, offset int, v uint64) int { + offset -= sovTx(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *MsgStoreCode) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Signer) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.Code) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func (m *MsgStoreCodeResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.CodeId) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func sovTx(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozTx(x uint64) (n int) { + return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *MsgStoreCode) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgStoreCode: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgStoreCode: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Signer = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Code = append(m.Code[:0], dAtA[iNdEx:postIndex]...) + if m.Code == nil { + m.Code = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MsgStoreCodeResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgStoreCodeResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgStoreCodeResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CodeId", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CodeId = append(m.CodeId[:0], dAtA[iNdEx:postIndex]...) + if m.CodeId == nil { + m.CodeId = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipTx(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTx + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTx + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTx + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthTx + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTx + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthTx + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthTx = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTx = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTx = fmt.Errorf("proto: unexpected end of group") +) diff --git a/relayer/codecs/08-wasm-types/wasm.pb.go b/relayer/codecs/08-wasm-types/wasm.pb.go new file mode 100644 index 000000000..0a2f17cac --- /dev/null +++ b/relayer/codecs/08-wasm-types/wasm.pb.go @@ -0,0 +1,995 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: ibc/lightclients/wasm/v1/wasm.proto + +package types + +import ( + fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + types "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +// Wasm light client's Client state +type ClientState struct { + Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + CodeId []byte `protobuf:"bytes,2,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"` + LatestHeight types.Height `protobuf:"bytes,3,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height" yaml:"latest_height"` +} + +func (m *ClientState) Reset() { *m = ClientState{} } +func (m *ClientState) String() string { return proto.CompactTextString(m) } +func (*ClientState) ProtoMessage() {} +func (*ClientState) Descriptor() ([]byte, []int) { + return fileDescriptor_678928ebbdee1807, []int{0} +} +func (m *ClientState) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ClientState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ClientState.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ClientState) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClientState.Merge(m, src) +} +func (m *ClientState) XXX_Size() int { + return m.Size() +} +func (m *ClientState) XXX_DiscardUnknown() { + xxx_messageInfo_ClientState.DiscardUnknown(m) +} + +var xxx_messageInfo_ClientState proto.InternalMessageInfo + +// Wasm light client's ConsensusState +type ConsensusState struct { + Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + // timestamp that corresponds to the block height in which the ConsensusState + // was stored. + Timestamp uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` +} + +func (m *ConsensusState) Reset() { *m = ConsensusState{} } +func (m *ConsensusState) String() string { return proto.CompactTextString(m) } +func (*ConsensusState) ProtoMessage() {} +func (*ConsensusState) Descriptor() ([]byte, []int) { + return fileDescriptor_678928ebbdee1807, []int{1} +} +func (m *ConsensusState) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ConsensusState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ConsensusState.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ConsensusState) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConsensusState.Merge(m, src) +} +func (m *ConsensusState) XXX_Size() int { + return m.Size() +} +func (m *ConsensusState) XXX_DiscardUnknown() { + xxx_messageInfo_ConsensusState.DiscardUnknown(m) +} + +var xxx_messageInfo_ConsensusState proto.InternalMessageInfo + +// Wasm light client Header +type Header struct { + Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + Height types.Height `protobuf:"bytes,2,opt,name=height,proto3" json:"height" yaml:"height"` +} + +func (m *Header) Reset() { *m = Header{} } +func (m *Header) String() string { return proto.CompactTextString(m) } +func (*Header) ProtoMessage() {} +func (*Header) Descriptor() ([]byte, []int) { + return fileDescriptor_678928ebbdee1807, []int{2} +} +func (m *Header) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Header.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Header) XXX_Merge(src proto.Message) { + xxx_messageInfo_Header.Merge(m, src) +} +func (m *Header) XXX_Size() int { + return m.Size() +} +func (m *Header) XXX_DiscardUnknown() { + xxx_messageInfo_Header.DiscardUnknown(m) +} + +var xxx_messageInfo_Header proto.InternalMessageInfo + +// Wasm light client Misbehaviour +type Misbehaviour struct { + Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` +} + +func (m *Misbehaviour) Reset() { *m = Misbehaviour{} } +func (m *Misbehaviour) String() string { return proto.CompactTextString(m) } +func (*Misbehaviour) ProtoMessage() {} +func (*Misbehaviour) Descriptor() ([]byte, []int) { + return fileDescriptor_678928ebbdee1807, []int{3} +} +func (m *Misbehaviour) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Misbehaviour) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Misbehaviour.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Misbehaviour) XXX_Merge(src proto.Message) { + xxx_messageInfo_Misbehaviour.Merge(m, src) +} +func (m *Misbehaviour) XXX_Size() int { + return m.Size() +} +func (m *Misbehaviour) XXX_DiscardUnknown() { + xxx_messageInfo_Misbehaviour.DiscardUnknown(m) +} + +var xxx_messageInfo_Misbehaviour proto.InternalMessageInfo + +func init() { + proto.RegisterType((*ClientState)(nil), "ibc.lightclients.wasm.v1.ClientState") + proto.RegisterType((*ConsensusState)(nil), "ibc.lightclients.wasm.v1.ConsensusState") + proto.RegisterType((*Header)(nil), "ibc.lightclients.wasm.v1.Header") + proto.RegisterType((*Misbehaviour)(nil), "ibc.lightclients.wasm.v1.Misbehaviour") +} + +func init() { + proto.RegisterFile("ibc/lightclients/wasm/v1/wasm.proto", fileDescriptor_678928ebbdee1807) +} + +var fileDescriptor_678928ebbdee1807 = []byte{ + // 386 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x6a, 0xea, 0x40, + 0x14, 0x86, 0x13, 0xaf, 0xe4, 0x72, 0x47, 0xbd, 0x8b, 0xe0, 0xe5, 0x06, 0x91, 0x44, 0x72, 0x37, + 0x6e, 0xcc, 0x5c, 0xdb, 0x45, 0x8b, 0x9b, 0x82, 0x6e, 0x74, 0xd1, 0x8d, 0x5d, 0xb5, 0x50, 0x64, + 0x32, 0x19, 0x92, 0x81, 0x8c, 0x23, 0xce, 0x24, 0xc5, 0x37, 0xe8, 0xb2, 0x6f, 0xd0, 0x3e, 0x8e, + 0x4b, 0x97, 0x5d, 0x49, 0xd1, 0x37, 0xe8, 0x13, 0x94, 0xcc, 0x44, 0xda, 0x82, 0xa5, 0xab, 0x9c, + 0x73, 0xf2, 0xe5, 0x3f, 0xff, 0x4f, 0x0e, 0xf8, 0x47, 0x43, 0x0c, 0x53, 0x1a, 0x27, 0x12, 0xa7, + 0x94, 0xcc, 0xa5, 0x80, 0x77, 0x48, 0x30, 0x98, 0xf7, 0xd5, 0x33, 0x58, 0x2c, 0xb9, 0xe4, 0xb6, + 0x43, 0x43, 0x1c, 0x7c, 0x84, 0x02, 0xf5, 0x32, 0xef, 0xb7, 0x9a, 0x31, 0x8f, 0xb9, 0x82, 0x60, + 0x51, 0x69, 0xbe, 0xe5, 0x15, 0xa2, 0x98, 0x2f, 0x09, 0xd4, 0x7c, 0x21, 0xa7, 0x2b, 0x0d, 0xf8, + 0x8f, 0x26, 0xa8, 0x8d, 0xd4, 0xe0, 0x4a, 0x22, 0x49, 0x6c, 0x1b, 0x54, 0x23, 0x24, 0x91, 0x63, + 0x76, 0xcc, 0x6e, 0x7d, 0xaa, 0x6a, 0xfb, 0x2f, 0xf8, 0x89, 0x79, 0x44, 0x66, 0x34, 0x72, 0x2a, + 0x6a, 0x6c, 0x15, 0xed, 0x24, 0xb2, 0x6f, 0x41, 0x23, 0x45, 0x92, 0x08, 0x39, 0x4b, 0x48, 0xe1, + 0xc9, 0xf9, 0xd1, 0x31, 0xbb, 0xb5, 0x93, 0x56, 0x50, 0xb8, 0x2c, 0xb6, 0x06, 0xe5, 0xae, 0xbc, + 0x1f, 0x8c, 0x15, 0x31, 0x6c, 0xaf, 0xb7, 0x9e, 0xf1, 0xba, 0xf5, 0x9a, 0x2b, 0xc4, 0xd2, 0x81, + 0xff, 0xe9, 0x73, 0x7f, 0x5a, 0xd7, 0xbd, 0x66, 0x07, 0xd5, 0xfb, 0x27, 0xcf, 0xf0, 0xc7, 0xe0, + 0xf7, 0x88, 0xcf, 0x05, 0x99, 0x8b, 0x4c, 0x7c, 0xed, 0xb1, 0x0d, 0x7e, 0x49, 0xca, 0x88, 0x90, + 0x88, 0x2d, 0x94, 0xcb, 0xea, 0xf4, 0x7d, 0x50, 0x2a, 0x31, 0x60, 0x8d, 0x09, 0x8a, 0xc8, 0xf2, + 0xa8, 0xc2, 0x04, 0x58, 0x65, 0x8a, 0xca, 0xb7, 0x29, 0xfe, 0x94, 0x29, 0x1a, 0x3a, 0xc5, 0xc1, + 0x7e, 0x29, 0x50, 0xae, 0xeb, 0x82, 0xfa, 0x25, 0x15, 0x21, 0x49, 0x50, 0x4e, 0x79, 0x76, 0x74, + 0xa9, 0x26, 0x87, 0xd7, 0xeb, 0x9d, 0x6b, 0x6e, 0x76, 0xae, 0xf9, 0xb2, 0x73, 0xcd, 0x87, 0xbd, + 0x6b, 0x6c, 0xf6, 0xae, 0xf1, 0xbc, 0x77, 0x8d, 0x9b, 0x8b, 0x98, 0xca, 0x24, 0x0b, 0x03, 0xcc, + 0x19, 0xc4, 0x5c, 0x30, 0x2e, 0x20, 0x0d, 0x71, 0x2f, 0xe6, 0x30, 0x3f, 0x83, 0x8c, 0x47, 0x59, + 0x4a, 0x84, 0x3e, 0x9a, 0xde, 0xe1, 0x6a, 0xfe, 0x9f, 0xf7, 0xd4, 0xe1, 0xc8, 0xd5, 0x82, 0x88, + 0xd0, 0x52, 0xbf, 0xf9, 0xf4, 0x2d, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xed, 0x18, 0x0a, 0x5e, 0x02, + 0x00, 0x00, +} + +func (m *ClientState) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ClientState) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.LatestHeight.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintWasm(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + if len(m.CodeId) > 0 { + i -= len(m.CodeId) + copy(dAtA[i:], m.CodeId) + i = encodeVarintWasm(dAtA, i, uint64(len(m.CodeId))) + i-- + dAtA[i] = 0x12 + } + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintWasm(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *ConsensusState) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ConsensusState) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ConsensusState) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Timestamp != 0 { + i = encodeVarintWasm(dAtA, i, uint64(m.Timestamp)) + i-- + dAtA[i] = 0x10 + } + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintWasm(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *Header) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Header) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Height.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintWasm(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintWasm(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *Misbehaviour) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Misbehaviour) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Misbehaviour) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintWasm(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintWasm(dAtA []byte, offset int, v uint64) int { + offset -= sovWasm(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *ClientState) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Data) + if l > 0 { + n += 1 + l + sovWasm(uint64(l)) + } + l = len(m.CodeId) + if l > 0 { + n += 1 + l + sovWasm(uint64(l)) + } + l = m.LatestHeight.Size() + n += 1 + l + sovWasm(uint64(l)) + return n +} + +func (m *ConsensusState) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Data) + if l > 0 { + n += 1 + l + sovWasm(uint64(l)) + } + if m.Timestamp != 0 { + n += 1 + sovWasm(uint64(m.Timestamp)) + } + return n +} + +func (m *Header) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Data) + if l > 0 { + n += 1 + l + sovWasm(uint64(l)) + } + l = m.Height.Size() + n += 1 + l + sovWasm(uint64(l)) + return n +} + +func (m *Misbehaviour) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Data) + if l > 0 { + n += 1 + l + sovWasm(uint64(l)) + } + return n +} + +func sovWasm(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozWasm(x uint64) (n int) { + return sovWasm(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *ClientState) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ClientState: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ClientState: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthWasm + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthWasm + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) + if m.Data == nil { + m.Data = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CodeId", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthWasm + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthWasm + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CodeId = append(m.CodeId[:0], dAtA[iNdEx:postIndex]...) + if m.CodeId == nil { + m.CodeId = []byte{} + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthWasm + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthWasm + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.LatestHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipWasm(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthWasm + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *ConsensusState) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ConsensusState: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ConsensusState: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthWasm + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthWasm + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) + if m.Data == nil { + m.Data = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType) + } + m.Timestamp = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Timestamp |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipWasm(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthWasm + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Header) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Header: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Header: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthWasm + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthWasm + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) + if m.Data == nil { + m.Data = []byte{} + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthWasm + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthWasm + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipWasm(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthWasm + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Misbehaviour) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Misbehaviour: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Misbehaviour: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWasm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthWasm + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthWasm + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) + if m.Data == nil { + m.Data = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipWasm(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthWasm + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipWasm(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowWasm + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowWasm + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowWasm + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthWasm + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupWasm + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthWasm + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthWasm = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowWasm = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupWasm = fmt.Errorf("proto: unexpected end of group") +) diff --git a/relayer/provider/matcher.go b/relayer/provider/matcher.go index 72088b0d3..ee04743c7 100644 --- a/relayer/provider/matcher.go +++ b/relayer/provider/matcher.go @@ -11,6 +11,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" ) var tendermintClientCodec = tmClientCodec() @@ -18,6 +19,7 @@ var tendermintClientCodec = tmClientCodec() func tmClientCodec() *sdkcodec.ProtoCodec { interfaceRegistry := types.NewInterfaceRegistry() tmclient.RegisterInterfaces(interfaceRegistry) + wasmclient.RegisterInterfaces(interfaceRegistry) return sdkcodec.NewProtoCodec(interfaceRegistry) } @@ -30,6 +32,14 @@ func ClientsMatch(ctx context.Context, src, dst ChainProvider, existingClient cl return "", err } + if newClient.ClientType() == "08-wasm" { // TODO: replace with ibcexported.Wasm + wasmClientState := newClient.(*wasmclient.ClientState) + newClient, err = clienttypes.UnmarshalClientState(tendermintClientCodec, wasmClientState.Data) // Does this need to be UnmarshalInterface? + if err != nil { + return "", err + } + } + if existingClientState.ClientType() != newClient.ClientType() { return "", nil } @@ -63,6 +73,14 @@ func CheckForMisbehaviour( return nil, err } + switch wasmHeader := clientMsg.(type) { + case *wasmclient.Header: + clientMsg, err = clienttypes.UnmarshalClientMessage(tendermintClientCodec, wasmHeader.Data) + if err != nil { + return nil, err + } + } + switch header := clientMsg.(type) { case *tmclient.Header: misbehavior, err = checkTendermintMisbehaviour(ctx, clientID, header, cachedHeader, counterparty) From ea42d28437dc65fd061d5c4c0f51fee3f30616b6 Mon Sep 17 00:00:00 2001 From: Steve Miskovetz Date: Fri, 21 Apr 2023 13:16:02 -0600 Subject: [PATCH 02/35] Move wasm enablement from provider config to create client / link cmd as flags --- cmd/flags.go | 4 ++ cmd/tx.go | 43 ++++++++++-- relayer/chains/cosmos/provider.go | 1 - relayer/chains/cosmos/tx.go | 14 ++-- relayer/chains/penumbra/tx.go | 90 ++++++++++++++++++++++---- relayer/client.go | 13 ++-- relayer/processor/message_processor.go | 3 + relayer/provider/provider.go | 4 +- 8 files changed, 140 insertions(+), 32 deletions(-) diff --git a/cmd/flags.go b/cmd/flags.go index 1f8396899..8c70ab2ee 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -55,6 +55,8 @@ const ( flagSrcConnID = "src-connection-id" flagDstConnID = "dst-connection-id" flagBtpBlockHeight = "btp-block-height" + flagSrcWasmCodeID = "src-wasm-code-id" + flagDstWasmCodeID = "dst-wasm-code-id" ) const ( @@ -286,6 +288,8 @@ func clientParameterFlags(v *viper.Viper, cmd *cobra.Command) *cobra.Command { cmd.Flags().BoolP(flagUpdateAfterMisbehaviour, "m", true, "allow governance to update the client if misbehaviour freezing occurs") cmd.Flags().Duration(flagClientTrustingPeriod, 0, "custom light client trusting period ex. 24h (default: 85% of chains reported unbonding time)") + cmd.Flags().String(flagSrcWasmCodeID, "", "src chain's wasm code id for clients (default: empty / not used)") + cmd.Flags().String(flagDstWasmCodeID, "", "dst chain's wasm code id for clients (default: empty / not used)") if err := v.BindPFlag(flagUpdateAfterExpiry, cmd.Flags().Lookup(flagUpdateAfterExpiry)); err != nil { panic(err) } diff --git a/cmd/tx.go b/cmd/tx.go index 44ff0af77..2262abd10 100644 --- a/cmd/tx.go +++ b/cmd/tx.go @@ -90,6 +90,16 @@ func createClientsCmd(a *appState) *cobra.Command { return err } + srcWasmCodeID, err := cmd.Flags().GetString(flagSrcWasmCodeID) + if err != nil { + return err + } + + dstWasmCodeID, err := cmd.Flags().GetString(flagDstWasmCodeID) + if err != nil { + return err + } + path := args[0] c, src, dst, err := a.config.ChainsFromPath(path) @@ -107,7 +117,7 @@ func createClientsCmd(a *appState) *cobra.Command { // TODO: make iconStartHeight compulsory // if iconStartHeight is not given it can create confusion as starting relay at any time could miss number of btp block update_client - clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight) + clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight, srcWasmCodeID, dstWasmCodeID) if err != nil { return err } @@ -162,6 +172,11 @@ func createClientCmd(a *appState) *cobra.Command { return err } + srcWasmCodeID, err := cmd.Flags().GetString(flagSrcWasmCodeID) + if err != nil { + return err + } + src, ok := a.config.Chains[args[0]] if !ok { return errChainNotFound(args[0]) @@ -238,7 +253,7 @@ func createClientCmd(a *appState) *cobra.Command { return err } - clientID, err := relayer.CreateClient(cmd.Context(), src, dst, srcUpdateHeader, dstUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight) + clientID, err := relayer.CreateClient(cmd.Context(), src, dst, srcUpdateHeader, dstUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight, srcWasmCodeID) if err != nil { return err } @@ -390,6 +405,16 @@ $ %s tx conn demo-path --timeout 5s`, return err } + srcWasmCodeID, err := cmd.Flags().GetString(flagSrcWasmCodeID) + if err != nil { + return err + } + + dstWasmCodeID, err := cmd.Flags().GetString(flagDstWasmCodeID) + if err != nil { + return err + } + // ensure that keys exist if exists := c[src].ChainProvider.KeyExists(c[src].ChainProvider.Key()); !exists { return fmt.Errorf("key %s not found on src chain %s", c[src].ChainProvider.Key(), c[src].ChainID()) @@ -411,7 +436,7 @@ $ %s tx conn demo-path --timeout 5s`, } // ensure that the clients exist - clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight) + clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight, srcWasmCodeID, dstWasmCodeID) if err != nil { return err } @@ -675,6 +700,16 @@ $ %s tx connect demo-path --src-port mock --dst-port mock --order unordered --ve return err } + srcWasmCodeID, err := cmd.Flags().GetString(flagSrcWasmCodeID) + if err != nil { + return err + } + + dstWasmCodeID, err := cmd.Flags().GetString(flagDstWasmCodeID) + if err != nil { + return err + } + // ensure that keys exist if exists := c[src].ChainProvider.KeyExists(c[src].ChainProvider.Key()); !exists { return fmt.Errorf("key %s not found on src chain %s", c[src].ChainProvider.Key(), c[src].ChainID()) @@ -696,7 +731,7 @@ $ %s tx connect demo-path --src-port mock --dst-port mock --order unordered --ve } // create clients if they aren't already created - clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight) + clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight, srcWasmCodeID, dstWasmCodeID) if err != nil { return fmt.Errorf("error creating clients: %w", err) } diff --git a/relayer/chains/cosmos/provider.go b/relayer/chains/cosmos/provider.go index 24ee6eadf..37d528a90 100644 --- a/relayer/chains/cosmos/provider.go +++ b/relayer/chains/cosmos/provider.go @@ -57,7 +57,6 @@ type CosmosProviderConfig struct { SigningAlgorithm string `json:"signing-algorithm" yaml:"signing-algorithm"` Broadcast provider.BroadcastMode `json:"broadcast-mode" yaml:"broadcast-mode"` MinLoopDuration time.Duration `json:"min-loop-duration" yaml:"min-loop-duration"` - WasmCodeID string `json:"wasm-code-id" yaml:"wasm-code-id"` } func (pc CosmosProviderConfig) Validate() error { diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 028fc0bf9..ba617ec94 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -36,7 +36,6 @@ import ( chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" - "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" strideicqtypes "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" @@ -976,7 +975,7 @@ func (cc *CosmosProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelIn } -func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader) (ibcexported.ClientMessage, error) { +func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader, clientType string) (ibcexported.ClientMessage, error) { trustedCosmosHeader, ok := trustedHeader.(provider.TendermintIBCHeader) if !ok { return nil, fmt.Errorf("unsupported IBC trusted header type, expected: TendermintIBCHeader, actual: %T", trustedHeader) @@ -1012,7 +1011,7 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, clientHeader = &tmClientHeader - if cc.PCfg.WasmCodeID != "" { + if clientType == "08-wasm" { // TODO: replace with ibcexported.Wasm at v7.2 tmClientHeaderBz, err := cc.Cdc.Marshaler.MarshalInterface(clientHeader) if err != nil { return &wasmclient.Header{}, nil @@ -1068,7 +1067,7 @@ func (cc *CosmosProvider) MsgSubmitQueryResponse(chainID string, queryID provide } func (cc *CosmosProvider) MsgSubmitMisbehaviour(clientID string, misbehaviour ibcexported.ClientMessage) (provider.RelayerMessage, error) { - if cc.PCfg.WasmCodeID != "" { + if strings.Contains(clientID, "08-wasm") { // TODO: replace with ibcexported.Wasm at v7.2 wasmData, err := cc.Cdc.Marshaler.MarshalInterface(misbehaviour) if err != nil { return nil, err @@ -1292,10 +1291,11 @@ func (cc *CosmosProvider) NewClientState( dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, + srcWasmCodeID string, ) (ibcexported.ClientState, error) { revisionNumber := clienttypes.ParseChainID(dstChainID) - var clientState exported.ClientState + var clientState ibcexported.ClientState // Create the ClientState we want on 'c' tracking 'dst' tmClientState := tmclient.ClientState{ @@ -1317,12 +1317,12 @@ func (cc *CosmosProvider) NewClientState( clientState = &tmClientState - if cc.PCfg.WasmCodeID != "" { + if srcWasmCodeID != "" { tmClientStateBz, err := cc.Cdc.Marshaler.MarshalInterface(clientState) if err != nil { return &wasmclient.ClientState{}, err } - codeID, err := hex.DecodeString(cc.PCfg.WasmCodeID) + codeID, err := hex.DecodeString(srcWasmCodeID) if err != nil { return &wasmclient.ClientState{}, err } diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go index 47e6ce81e..a29ec2e3d 100644 --- a/relayer/chains/penumbra/tx.go +++ b/relayer/chains/penumbra/tx.go @@ -2,6 +2,7 @@ package penumbra import ( "context" + "encoding/hex" "encoding/base64" "errors" "fmt" @@ -37,6 +38,7 @@ import ( penumbracrypto "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" penumbraibctypes "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/ibc/v1alpha1" penumbratypes "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/transaction/v1alpha1" + wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "google.golang.org/grpc/codes" @@ -894,6 +896,16 @@ func (cc *PenumbraProvider) MsgUpgradeClient(srcClientId string, consRes *client } func (cc *PenumbraProvider) MsgSubmitMisbehaviour(clientID string, misbehaviour ibcexported.ClientMessage) (provider.RelayerMessage, error) { + if strings.Contains(clientID, "08-wasm") { // TODO: replace with ibcexported.Wasm at v7.2 + wasmData, err := cc.Codec.Marshaler.MarshalInterface(misbehaviour) + if err != nil { + return nil, err + } + misbehaviour = &wasmclient.Misbehaviour{ + Data: wasmData, + } + } + signer, err := cc.Address() if err != nil { return nil, err @@ -1559,7 +1571,7 @@ func (cc *PenumbraProvider) MsgChannelCloseConfirm(msgCloseInit provider.Channel return cosmos.NewCosmosMessage(msg), nil } -func (cc *PenumbraProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader) (ibcexported.ClientMessage, error) { +func (cc *PenumbraProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader, clientType string) (ibcexported.ClientMessage, error) { trustedCosmosHeader, ok := trustedHeader.(PenumbraIBCHeader) if !ok { return nil, fmt.Errorf("unsupported IBC trusted header type, expected: PenumbraIBCHeader, actual: %T", trustedHeader) @@ -1574,6 +1586,7 @@ func (cc *PenumbraProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeade if err != nil { return nil, fmt.Errorf("error converting trusted validators to proto object: %w", err) } + trustedValidatorsProto.TotalVotingPower = trustedCosmosHeader.ValidatorSet.TotalVotingPower() signedHeaderProto := latestCosmosHeader.SignedHeader.ToProto() @@ -1581,13 +1594,35 @@ func (cc *PenumbraProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeade if err != nil { return nil, fmt.Errorf("error converting validator set to proto object: %w", err) } + validatorSetProto.TotalVotingPower = latestCosmosHeader.ValidatorSet.TotalVotingPower() - return &tmclient.Header{ + var clientHeader ibcexported.ClientMessage + + tmClientHeader := tmclient.Header{ SignedHeader: signedHeaderProto, ValidatorSet: validatorSetProto, TrustedValidators: trustedValidatorsProto, TrustedHeight: trustedHeight, - }, nil + } + + clientHeader = &tmClientHeader + + if clientType == "08-wasm" { // TODO: replace with ibcexported.Wasm at v7.2 + tmClientHeaderBz, err := cc.Codec.Marshaler.MarshalInterface(clientHeader) + if err != nil { + return &wasmclient.Header{}, nil + } + height, ok := tmClientHeader.GetHeight().(clienttypes.Height) + if !ok { + return &wasmclient.Header{}, fmt.Errorf("error converting tm client header height") + } + clientHeader = &wasmclient.Header{ + Data: tmClientHeaderBz, + Height: height, + } + } + + return clientHeader, nil } // RelayPacketFromSequence relays a packet with a given seq on src and returns recvPacket msgs, timeoutPacketmsgs and error @@ -1906,24 +1941,29 @@ func (cc *PenumbraProvider) queryTMClientState(ctx context.Context, srch int64, return &tmclient.ClientState{}, err } - return castClientStateToTMType(clientStateRes.ClientState) -} - -// castClientStateToTMType casts client state to tendermint type -func castClientStateToTMType(cs *codectypes.Any) (*tmclient.ClientState, error) { - clientStateExported, err := clienttypes.UnpackClientState(cs) + clientStateExported, err := clienttypes.UnpackClientState(clientStateRes.ClientState) if err != nil { return &tmclient.ClientState{}, err } + switch cs := clientStateExported.(type) { + case *wasmclient.ClientState: + var clientState ibcexported.ClientState + err = cc.Codec.Marshaler.UnmarshalInterface(cs.Data, &clientState) + if err != nil { + return &tmclient.ClientState{}, fmt.Errorf("error unmarshaling tm client state, %w", err) + } + clientStateExported = clientState + } + // cast from interface to concrete type - clientState, ok := clientStateExported.(*tmclient.ClientState) + tmClientState, ok := clientStateExported.(*tmclient.ClientState) if !ok { return &tmclient.ClientState{}, fmt.Errorf("error when casting exported clientstate to tendermint type") } - return clientState, nil + return tmClientState, nil } // DefaultUpgradePath is the default IBC upgrade path set for an on-chain light client @@ -1979,11 +2019,14 @@ func (cc *PenumbraProvider) NewClientState( dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, + srcWasmCodeID string, ) (ibcexported.ClientState, error) { revisionNumber := clienttypes.ParseChainID(dstChainID) + var clientState ibcexported.ClientState + // Create the ClientState we want on 'c' tracking 'dst' - return &tmclient.ClientState{ + tmClientState := tmclient.ClientState{ ChainId: dstChainID, TrustLevel: tmclient.NewFractionFromTm(light.DefaultTrustLevel), TrustingPeriod: dstTrustingPeriod, @@ -1998,7 +2041,28 @@ func (cc *PenumbraProvider) NewClientState( UpgradePath: defaultUpgradePath, AllowUpdateAfterExpiry: allowUpdateAfterExpiry, AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour, - }, nil + } + + clientState = &tmClientState + + if srcWasmCodeID != "" { + tmClientStateBz, err := cc.Codec.Marshaler.MarshalInterface(clientState) + if err != nil { + return &wasmclient.ClientState{}, err + } + codeID, err := hex.DecodeString(srcWasmCodeID) + if err != nil { + return &wasmclient.ClientState{}, err + } + clientState = &wasmclient.ClientState{ + Data: tmClientStateBz, + CodeId: codeID, + LatestHeight: tmClientState.LatestHeight, + } + } + + + return clientState, nil } // QueryIBCHeader returns the IBC compatible block header (CosmosIBCHeader) at a specific height. diff --git a/relayer/client.go b/relayer/client.go index 6268118d9..d324672f9 100644 --- a/relayer/client.go +++ b/relayer/client.go @@ -20,7 +20,7 @@ import ( ) // CreateClients creates clients for src on dst and dst on src if the client ids are unspecified. -func (c *Chain) CreateClients(ctx context.Context, dst *Chain, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override bool, customClientTrustingPeriod time.Duration, memo string, iconStartHeight int64) (string, string, error) { +func (c *Chain) CreateClients(ctx context.Context, dst *Chain, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override bool, customClientTrustingPeriod time.Duration, memo string, iconStartHeight int64, srcWasmCodeID, dstWasmCodeID string) (string, string, error) { // Query the latest heights on src and dst and retry if the query fails var srch, dsth int64 if err := retry.Do(func() error { @@ -64,7 +64,7 @@ func (c *Chain) CreateClients(ctx context.Context, dst *Chain, allowUpdateAfterE eg.Go(func() error { var err error // Create client on src for dst if the client id is unspecified - clientSrc, err = CreateClient(egCtx, c, dst, srcUpdateHeader, dstUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight) + clientSrc, err = CreateClient(egCtx, c, dst, srcUpdateHeader, dstUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight, srcWasmCodeID) if err != nil { return fmt.Errorf("failed to create client on src chain{%s}: %w", c.ChainID(), err) } @@ -74,7 +74,7 @@ func (c *Chain) CreateClients(ctx context.Context, dst *Chain, allowUpdateAfterE eg.Go(func() error { var err error // Create client on dst for src if the client id is unspecified - clientDst, err = CreateClient(egCtx, dst, c, dstUpdateHeader, srcUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight) + clientDst, err = CreateClient(egCtx, dst, c, dstUpdateHeader, srcUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, memo, iconStartHeight, dstWasmCodeID) if err != nil { return fmt.Errorf("failed to create client on dst chain{%s}: %w", dst.ChainID(), err) } @@ -108,6 +108,7 @@ func CreateClient( customClientTrustingPeriod time.Duration, memo string, iconStartHeight int64, + srcWasmCodeID string, ) (string, error) { var err error // If a client ID was specified in the path and override is not set, ensure the client exists. @@ -190,7 +191,8 @@ func CreateClient( // We want to create a light client on the src chain which tracks the state of the dst chain. // So we build a new client state from dst and attempt to use this for creating the light client on src. - clientState, err := dst.ChainProvider.NewClientState(dst.ChainID(), dstUpdateHeader, tp, ubdPeriod, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour) + clientState, err := dst.ChainProvider.NewClientState(dst.ChainID(), dstUpdateHeader, tp, ubdPeriod, allowUpdateAfterExpiry, + allowUpdateAfterMisbehaviour, srcWasmCodeID) if err != nil { return "", fmt.Errorf("failed to create new client state for chain{%s}: %w", dst.ChainID(), err) } @@ -355,7 +357,8 @@ func MsgUpdateClient( var updateHeader ibcexported.ClientMessage if err := retry.Do(func() error { var err error - updateHeader, err = src.ChainProvider.MsgUpdateClientHeader(srcHeader, dstClientState.GetLatestHeight().(clienttypes.Height), dstTrustedHeader) + clientType := dstClientState.ClientType() + updateHeader, err = src.ChainProvider.MsgUpdateClientHeader(srcHeader, dstClientState.GetLatestHeight().(clienttypes.Height), dstTrustedHeader, clientType) return err }, retry.Context(ctx), RtyAtt, RtyDel, RtyErr, retry.OnRetry(func(n uint, err error) { src.log.Info( diff --git a/relayer/processor/message_processor.go b/relayer/processor/message_processor.go index 44ff7a9ab..500774baf 100644 --- a/relayer/processor/message_processor.go +++ b/relayer/processor/message_processor.go @@ -5,6 +5,7 @@ import ( "context" "errors" "fmt" + "strings" "sync" "time" @@ -284,10 +285,12 @@ func (mp *messageProcessor) assembleMsgUpdateClient(ctx context.Context, src, ds trustedConsensusHeight.RevisionHeight) } + lastInd := strings.LastIndex(clientID, "-") msgUpdateClientHeader, err := src.chainProvider.MsgUpdateClientHeader( src.latestHeader, trustedConsensusHeight, dst.clientTrustedState.IBCHeader, + clientID[:lastInd], ) if err != nil { return fmt.Errorf("error assembling new client header: %w", err) diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go index 94eb8be35..e284080c9 100644 --- a/relayer/provider/provider.go +++ b/relayer/provider/provider.go @@ -236,7 +236,7 @@ type ChainProvider interface { Init(ctx context.Context) error // [Begin] Client IBC message assembly functions - NewClientState(dstChainID string, dstIBCHeader IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool) (ibcexported.ClientState, error) + NewClientState(dstChainID string, dstIBCHeader IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string) (ibcexported.ClientState, error) MsgCreateClient(clientState ibcexported.ClientState, consensusState ibcexported.ConsensusState) (RelayerMessage, error) @@ -365,7 +365,7 @@ type ChainProvider interface { // MsgUpdateClientHeader takes the latest chain header, in addition to the latest client trusted header // and assembles a new header for updating the light client on the counterparty chain. - MsgUpdateClientHeader(latestHeader IBCHeader, trustedHeight clienttypes.Height, trustedHeader IBCHeader) (ibcexported.ClientMessage, error) + MsgUpdateClientHeader(latestHeader IBCHeader, trustedHeight clienttypes.Height, trustedHeader IBCHeader, clientType string) (ibcexported.ClientMessage, error) // MsgUpdateClient takes an update client header to prove trust for the previous // consensus height and the new height, and assembles a MsgUpdateClient message From 75f4a98ee54223a2f2fa41a6baf7ec06fb2686aa Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Tue, 10 Oct 2023 18:34:06 +0545 Subject: [PATCH 03/35] fix: wasm code adjustment --- relayer/chains/icon/provider.go | 1 + relayer/chains/icon/tx.go | 2 +- relayer/chains/wasm/tx.go | 4 ++-- relayer/processor/message_processor.go | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index 45500d536..4459a4270 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -215,6 +215,7 @@ func (icp *IconProvider) NewClientState( dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, + srcWasmCodeID string, ) (ibcexported.ClientState, error) { if !dstUpdateHeader.IsCompleteBlock() { diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index a80132f15..f96c8fbb9 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -488,7 +488,7 @@ func (icp *IconProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelInf return icp.NewIconMessage(channelCloseConfirmMsg, MethodChannelCloseConfirm), nil } -func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader) (ibcexported.ClientMessage, error) { +func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader, clientType string) (ibcexported.ClientMessage, error) { latestIconHeader, ok := latestHeader.(IconIBCHeader) if !ok { diff --git a/relayer/chains/wasm/tx.go b/relayer/chains/wasm/tx.go index d2e15f2c9..e1fdaf3f5 100644 --- a/relayer/chains/wasm/tx.go +++ b/relayer/chains/wasm/tx.go @@ -149,7 +149,7 @@ func (pc *WasmProviderConfig) SignMode() signing.SignMode { return signMode } -func (ap *WasmProvider) NewClientState(dstChainID string, dstIBCHeader provider.IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool) (ibcexported.ClientState, error) { +func (ap *WasmProvider) NewClientState(dstChainID string, dstIBCHeader provider.IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, clientType string) (ibcexported.ClientState, error) { return &itm.ClientState{ ChainId: dstChainID, @@ -596,7 +596,7 @@ func (ap *WasmProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelInfo return ap.NewWasmContractMessage(MethodChannelCloseConfirm, params) } -func (ap *WasmProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader) (ibcexported.ClientMessage, error) { +func (ap *WasmProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader, clientType string) (ibcexported.ClientMessage, error) { trustedWasmHeader, ok := trustedHeader.(WasmIBCHeader) if !ok { return nil, fmt.Errorf("unsupported IBC trusted header type, expected: TendermintIBCHeader, actual: %T", trustedHeader) diff --git a/relayer/processor/message_processor.go b/relayer/processor/message_processor.go index 500774baf..47705a51c 100644 --- a/relayer/processor/message_processor.go +++ b/relayer/processor/message_processor.go @@ -349,10 +349,12 @@ func (mp *messageProcessor) handleMsgUpdateClientForBTPClient(ctx context.Contex } } + lastInd := strings.LastIndex(clientID, "-") msgUpdateClientHeader, err := src.chainProvider.MsgUpdateClientHeader( header, latestConsensusHeight, nil, + clientID[:lastInd], ) if err != nil { return fmt.Errorf("error assembling new client header: %w", err) From daa50df197fd8de0e9f1170f5b2cd9cc8c81e7e0 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Tue, 10 Oct 2023 18:45:31 +0545 Subject: [PATCH 04/35] fix: exported wasm --- go.mod | 4 +- go.sum | 860 +----------------- relayer/codecs/08-wasm-types/client_state.go | 2 +- .../codecs/08-wasm-types/consensus_state.go | 2 +- relayer/codecs/08-wasm-types/header.go | 2 +- relayer/codecs/08-wasm-types/misbehavior.go | 2 +- relayer/codecs/08-wasm-types/module.go | 4 +- 7 files changed, 16 insertions(+), 860 deletions(-) diff --git a/go.mod b/go.mod index f7c11a2da..3051616ff 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,6 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/icon-project/IBC-Integration v0.0.0-20230416064536-48d70570734d github.com/icon-project/goloop v1.3.4 - github.com/icon-project/icon-bridge v0.0.11 github.com/jsternberg/zap-logfmt v1.3.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.0 @@ -128,7 +127,6 @@ require ( github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect - github.com/haltingstate/secp256k1-go v0.0.0-20151224084235-572209b26df6 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-getter v1.7.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect @@ -216,6 +214,8 @@ require ( replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/cosmwasm/wasmd v0.40.0-rc.1.0.20230424144037-55647a1fd1f9 + github.com/cosmos/ibc-go/v7 => github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/icon-project/IBC-Integration => github.com/icon-project/ibc-integration v0.0.0-20230717083940-67949d73b622 + ) diff --git a/go.sum b/go.sum index d229285b4..233d01ca2 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,12 @@ -cloud.google.com/go v0.16.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.43.0/go.mod h1:BOSR3VbTLkk6FDC/TcffxP4NF/FFBGA5ku+jvKOP7pg= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= @@ -60,7 +57,6 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA= -cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s= cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= @@ -104,7 +100,6 @@ cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1 cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= @@ -193,8 +188,6 @@ cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xX cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= -collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= @@ -218,23 +211,7 @@ github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMb github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk= -github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= -github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= -github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -242,32 +219,21 @@ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= github.com/CosmWasm/wasmvm v1.2.3 h1:OKYlobwmVGbl0eSn0mXoAAjE5hIuXnQCLPjbNd91sVY= github.com/CosmWasm/wasmvm v1.2.3/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= -github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= -github.com/MuhammedIrfan/testify-mock v0.0.0-20220912121829-185fc90cd1b6/go.mod h1:VQGYR98EwSYg7KCoLAS0kKaPN27Iydp6i8ifKxIbQfY= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8= github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= -github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/Workiva/go-datastructures v1.0.50/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -275,15 +241,9 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= -github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= -github.com/aristanetworks/goarista v0.0.0-20190607111240-52c2a7864a08/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -294,26 +254,11 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l github.com/avast/retry-go/v4 v4.3.3 h1:G56Bp6mU0b5HE1SkaoVjscZjlQb0oy4mezwY/cGH19w= github.com/avast/retry-go/v4 v4.3.3/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.30.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.44.76/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= -github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= -github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8= -github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4= -github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= -github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= -github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= -github.com/beevik/ntp v0.3.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg= -github.com/benbjohnson/clock v1.0.2/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -325,23 +270,10 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/biter777/countries v1.3.4/go.mod h1:1HSpZ526mYqKJcpT5Ti1kcGQ0L0SrXWIaptUWjFfv2E= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -github.com/bombsimon/wsl v1.2.5/go.mod h1:43lEF/i0kpXbLCeDXL9LMT8c92HyBywXb0AsgMHYngM= -github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= -github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= -github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= -github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= -github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= -github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M= github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= github.com/btcsuite/btcd v0.23.4 h1:IzV6qqkfwbItOS/sg/aDfPDsjPP8twrCOE2R93hxMlQ= @@ -358,9 +290,7 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtyd github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= -github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= @@ -368,18 +298,14 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= -github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= +github.com/bufbuild/protocompile v0.5.1 h1:mixz5lJX4Hiz4FpqFREJHIXLfaLBntfaJv1h+/jS+Qg= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= -github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -400,8 +326,6 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= -github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -416,7 +340,6 @@ github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOG github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coinbase/rosetta-sdk-go v0.4.6/go.mod h1:Luv0AhzZH81eul2hYZ3w0hBGwmFPiexwbntYxihEZck= github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= github.com/cometbft/cometbft v0.37.1 h1:KLxkQTK2hICXYq21U2hn1W5hOVYUdQgDQ1uB+90xPIg= @@ -425,20 +348,13 @@ github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0 github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= -github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= -github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= @@ -455,8 +371,6 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-go/v7 v7.1.0-rc0 h1:b78+/74AJDp0Sc7utMO1l4nI/u4ERnyta1nqooqQrGI= -github.com/cosmos/ibc-go/v7 v7.1.0-rc0/go.mod h1:7MptlWeIyqmDiuJeRAFqBvXKY8Hybd+rF8vMSmGd2zg= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= @@ -471,79 +385,45 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= -github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= -github.com/dave/dst v0.23.1/go.mod h1:LjPcLEauK4jC5hQ1fE/wr05O41zK91Pr4Qs22Ljq7gs= -github.com/dave/gopackages v0.0.0-20170318123100-46e7023ec56e/go.mod h1:i00+b/gKdIDIxuLDFob7ustLAVqhsZRk2qVZrArELGQ= -github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= -github.com/dave/kerr v0.0.0-20170318121727-bc25dd6abe8e/go.mod h1:qZqlPyPvfsDJt+3wHJ1EvSXDuVjFTK0j2p/ca+gtsb8= -github.com/dave/rebecca v0.9.1/go.mod h1:N6XYdMD/OKw3lkF3ywh8Z6wPGuwNFDNtWYEMFWEmXBA= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4= -github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= -github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= -github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= -github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= -github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ= -github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= -github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= -github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU= -github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE= -github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= -github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= -github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= -github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= -github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= -github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= -github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= -github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -555,10 +435,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum/go-ethereum v1.4.0/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= -github.com/ethereum/go-ethereum v1.9.21/go.mod h1:RXAVzbGrSGmDkDnHymruTAIEjUR3E4TX0EOpaj702sI= -github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= -github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y= github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s= github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/evalphobia/logrus_fluent v0.5.4 h1:G4BSBTm7+L+oanWfFtA/A5Y3pvL2OMxviczyZPYO5xc= @@ -566,47 +442,26 @@ github.com/evalphobia/logrus_fluent v0.5.4/go.mod h1:hasyj+CXm3BDP1YhFk/rnTcjleg github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= -github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/fjl/memsize v0.0.0-20180929194037-2a09253e352a/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fluent/fluent-logger-golang v1.4.0 h1:uT1Lzz5yFV16YvDwWbjX6s3AYngnJz8byTCsMTIS0tU= github.com/fluent/fluent-logger-golang v1.4.0/go.mod h1:2/HCT/jTy78yGyeNGQLGQsjF3zzzAuy6Xlk6FCMV5eU= -github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ= -github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/fsnotify/fsnotify v1.4.3-0.20170329110642-4da3e2cfbabc/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/garslo/gogen v0.0.0-20170307003452-d6ebae628c7c/go.mod h1:Q0X6pkwTILDlzrGEckF6HKjXe48EgsY/l7K7vhY4MW8= -github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= -github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= -github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= -github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= -github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= -github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= -github.com/go-critic/go-critic v0.3.5-0.20190904082202-d79a9f0c64db/go.mod h1:+sE8vrLDS2M0pZkBk0wy6+nLdKexVDrl/jBqQOTDThA= -github.com/go-critic/go-critic v0.4.0/go.mod h1:7/14rZGnZbY6E38VEGk2kVhoq6itzc1E68facVDK23g= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -619,67 +474,39 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= -github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= +github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= -github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= -github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod h1:mP93XdblcopXwlyN4X4uodxXQhldPGZbcEJIimQHrkg= -github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= -github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= -github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod h1:SV2ur98SGypH1UjcPpCatrV5hPazG6+IfNHbkDXBRrk= -github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= -github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoMrjiy4zvdS+Bg6z9jZH82QXwkcgCBX6nOfnmdaHks= -github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= -github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= @@ -688,20 +515,15 @@ github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0 github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/gddo v0.0.0-20200831202555-721e228c7686/go.mod h1:sam69Hju0uq+5uvLJUMDlsKlQ21Vrs1Kd/1YFPNYdOU= -github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -732,37 +554,14 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= -github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0= -github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= -github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod h1:JXrF4TWy4tXYn62/9x8Wm/K/dm06p8tCKwFRDPZG/1o= -github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= -github.com/golangci/golangci-lint v1.21.0/go.mod h1:phxpHK52q7SE+5KpPnti4oZTdFCEsn/tKN+nFvCKXfk= -github.com/golangci/golangci-lint v1.22.2/go.mod h1:2Bj42k6hPQFTRxkDb7S3TQ+EsnumZXOmIYNqlQrp0FI= -github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= -github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= -github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/google/addlicense v0.0.0-20200827091314-d1655b921368/go.mod h1:EMjYTRimagHs1FwlIqKyX3wAM0u3rA+McvlIIWmSamA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/go-cmp v0.1.1-0.20171103154506-982329095285/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -785,11 +584,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= -github.com/google/gopacket v1.1.18/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -798,7 +594,6 @@ github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3 github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= -github.com/google/pprof v0.0.0-20181127221834-b4f47329b966/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -817,9 +612,7 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= @@ -827,7 +620,6 @@ github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= -github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -850,24 +642,14 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gosuri/uitable v0.0.0-20160404203958-36ee7e946282/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= -github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/gregjones/httpcache v0.0.0-20170920190843-316c5e0ff04e/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= @@ -878,22 +660,9 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= -github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU= -github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48= -github.com/haltingstate/secp256k1-go v0.0.0-20151224084235-572209b26df6 h1:HE4YDtvtpZgjRJ2tCOmaXlcpBTFG2e0jvfNntM5sXOs= -github.com/haltingstate/secp256k1-go v0.0.0-20151224084235-572209b26df6/go.mod h1:73mKQiY8bLnscfGakn57WAJZTzT0eSUAy3qgMQNR/DI= -github.com/harmony-ek/gencodec v0.0.0-20190215044613-e6740dbdd846/go.mod h1:YZcPnufUw70msUSudLvxcQOSpnZJgaMS9WIU8IGEtBg= -github.com/harmony-one/abool v1.0.1/go.mod h1:9sq0PJzb1SqRpKrpEV4Ttvm9WV5uud8sfrsPw3AIBJA= -github.com/harmony-one/bls v0.0.6/go.mod h1:ML9osB/z3hR9WAYZVj7qH+IP6oaPRPmshDbxrQyia7g= -github.com/harmony-one/harmony v1.10.2/go.mod h1:QsUfRGisvY6k1KvpzVeBI3VBdHhYLlpVQTEbzrMmw1U= -github.com/harmony-one/taggedrlp v0.1.4/go.mod h1:osO5TRXLKdgCP+oj2J9qfqhywMOOA+4nP5q+o8nDSYA= -github.com/harmony-one/vdf v0.0.0-20190924175951-620379da8849/go.mod h1:EgNU7X5HLNBBho+OqCm1A1NrpD6xb1SHfi9pMCYaKKw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= @@ -905,7 +674,6 @@ github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJ github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= @@ -921,10 +689,8 @@ github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/hcl v0.0.0-20170914154624-68e816d1c783/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -934,8 +700,6 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= -github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= -github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -944,92 +708,22 @@ github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0Jr github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hugobyte/keygen v0.1.0/go.mod h1:9xV3yxKUwIy54jw2IRtFikoEhTUurO8ZSEiS7IC5aLA= -github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= -github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM= -github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= 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= -github.com/icon-project/goloop v1.2.11/go.mod h1:P7mwPMmoAWFXdt0KmlrsQkRV9Qw1JswoCKqfTBpXYCw= github.com/icon-project/goloop v1.3.4 h1:82x8x+zY2XLVPEuWKHvnTj4bkeC5EYlNaaiePDqdMjk= github.com/icon-project/goloop v1.3.4/go.mod h1:9PoWRb5kowidc9jYy0RLuLpay1zT5FXgEKijx7rDQjE= github.com/icon-project/ibc-integration v0.0.0-20230717083940-67949d73b622 h1:RHutSdyBRURe7MHx/838gVEw6Iu+tYMF/x2cx9hZSxY= github.com/icon-project/ibc-integration v0.0.0-20230717083940-67949d73b622/go.mod h1:lYQTcVqXxpUhhdz/cU2xsX1rPGoIkeWalIAjiEt0K+0= -github.com/icon-project/icon-bridge v0.0.11 h1:1qUYq6YmzUQR+zCDJGnXQxXKs81NmkxATtOr8KEx4Wc= -github.com/icon-project/icon-bridge v0.0.11/go.mod h1:7GcN+biPaXdsYLvsiwC1Y/5ro6ENPinhUqm2MZL4tgQ= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= -github.com/inconshreveable/log15 v0.0.0-20170622235902-74a0988b5f80/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= -github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= -github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= -github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk= -github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE= -github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= -github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= -github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19ybifQhZoQNF5D8= -github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= -github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= -github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= -github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= -github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= -github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= -github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M= -github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog= -github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I= -github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I= -github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE= -github.com/ipfs/go-datastore v0.1.0/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE= -github.com/ipfs/go-datastore v0.1.1/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw= -github.com/ipfs/go-datastore v0.4.0/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA= -github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA= -github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA= -github.com/ipfs/go-datastore v0.4.5/go.mod h1:eXTcaaiN6uOlVCLS9GjJUJtlvJfM3xk23w3fyfrmmJs= -github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps= -github.com/ipfs/go-ds-badger v0.0.2/go.mod h1:Y3QpeSFWQf6MopLTiZD+VT6IC1yZqaGmjvRcKeSGij8= -github.com/ipfs/go-ds-badger v0.0.5/go.mod h1:g5AuuCGmr7efyzQhLL8MzwqcauPojGPUaHzfGTzuE3s= -github.com/ipfs/go-ds-badger v0.0.7/go.mod h1:qt0/fWzZDoPW6jpQeqUjR5kBfhDNB65jd9YlmAvpQBk= -github.com/ipfs/go-ds-badger v0.2.1/go.mod h1:Tx7l3aTph3FMFrRS838dcSJh+jjA7cX9DrGVwx/NOwE= -github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk= -github.com/ipfs/go-ds-badger v0.2.4/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk= -github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIykR4L04tMOYc= -github.com/ipfs/go-ds-leveldb v0.1.0/go.mod h1:hqAW8y4bwX5LWcCtku2rFNX3vjDZCy5LZCg+cSZvYb8= -github.com/ipfs/go-ds-leveldb v0.4.1/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s= -github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s= -github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw= -github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc= -github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ= -github.com/ipfs/go-ipns v0.0.2/go.mod h1:WChil4e0/m9cIINWLxZe1Jtf77oz5L05rO2ei/uKJ5U= -github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM= -github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk= -github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A= -github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs= -github.com/ipfs/go-log/v2 v2.0.2/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0= -github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0= -github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw= -github.com/ipfs/go-log/v2 v2.1.1/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHntrv9KM= -github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA= -github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod h1:rGaEvXB4uRSZMmzKNLoXvTu1sfx+1kv/DojUlPrSZGs= -github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA= -github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod h1:8GXXJV31xl8whumTzdZsTt3RnUIiPqzkyf7mxToRCMs= -github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk= -github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY= -github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4= -github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4= -github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= @@ -1039,7 +733,6 @@ github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+ github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= -github.com/jroimartin/gocui v0.4.0/go.mod h1:7i7bbj99OgFHzo7kB2zPb8pXLqMBSQegY7azfqXMkyY= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1050,318 +743,85 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= github.com/jsternberg/zap-logfmt v1.3.0 h1:z1n1AOHVVydOOVuyphbOKyR4NICDQFiJMn1IK5hVQ5Y= github.com/jsternberg/zap-logfmt v1.3.0/go.mod h1:N3DENp9WNmCZxvkBD/eReWwz1149BK6jEN9cQ4fNwZE= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= -github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2viExyCEfeWGU259JnaQ34Inuec4R38JCyBx2edgD0= -github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= -github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= -github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= -github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= -github.com/labstack/echo/v4 v4.6.1/go.mod h1:RnjgMWNDB9g/HucVWhQYNQP9PvbYf6adqftqryo7s9k= github.com/labstack/echo/v4 v4.9.0 h1:wPOF1CE6gvt/kmbMR4dGzWvHMPT+sAEUJOwOTtvITVY= github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= -github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o= github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= -github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= -github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libp2p/go-addr-util v0.0.1/go.mod h1:4ac6O7n9rIAKB1dnd+s8IbbMXkt+oBpzX4/+RACcnlQ= -github.com/libp2p/go-addr-util v0.0.2/go.mod h1:Ecd6Fb3yIuLzq4bD7VcywcVSBtefcAwnUISBM3WG15E= -github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ= -github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= -github.com/libp2p/go-cidranger v1.1.0/go.mod h1:KWZTfSr+r9qEo9OkI9/SIEeAtw+NNoU0dXIXt15Okic= -github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc= -github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod h1:hZN4MjlNetKD3Rq5Jb/P5ohUnFLNzEAR4DLSzpn2QLU= -github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4= -github.com/libp2p/go-eventbus v0.2.1/go.mod h1:jc2S4SoEVPP48H9Wpzm5aiGwUCBMfGhVhhBjyhhCJs8= -github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8= -github.com/libp2p/go-flow-metrics v0.0.2/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs= -github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs= -github.com/libp2p/go-libp2p v0.6.1/go.mod h1:CTFnWXogryAHjXAKEbOf1OWY+VeAP3lDMZkfEI5sT54= -github.com/libp2p/go-libp2p v0.7.0/go.mod h1:hZJf8txWeCduQRDC/WSqBGMxaTHCOYHt2xSU1ivxn0k= -github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniVO7zIHGMw= -github.com/libp2p/go-libp2p v0.8.1/go.mod h1:QRNH9pwdbEBpx5DTJYg+qxcVaDMAz3Ee/qDKwXujH5o= -github.com/libp2p/go-libp2p v0.12.0/go.mod h1:FpHZrfC1q7nA8jitvdjKBDF31hguaC676g/nT9PgQM0= -github.com/libp2p/go-libp2p v0.13.0/go.mod h1:pM0beYdACRfHO1WcJlp65WXyG2A6NqYM+t2DTVAJxMo= -github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo= -github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod h1:OXqkeGOY2xJVWKAGV2inNF5aKN/djNA3fdpCWloIudE= -github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod h1:DX+9teU4pEEoZUqR1PiMlqliONQdNbfzE1C718tcViI= -github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod h1:MWtAhV5Ko1l6QBsHQNSuM6b1sRkXrpk0/LqCr+vCVxI= -github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod h1:HsM62HkqZmHR2k1xgX34WuWDzk/nBwNHoeyyT4IWV6A= -github.com/libp2p/go-libp2p-autonat v0.4.0/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk= -github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro= -github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod h1:oJF0saYsAXQCSfDq254GMNmLNz6ZTHTOvtF4ZydUvwU= -github.com/libp2p/go-libp2p-blankhost v0.2.0/go.mod h1:eduNKXGTioTuQAUcZ5epXi9vMl+t4d8ugUBRQ4SqaNQ= -github.com/libp2p/go-libp2p-circuit v0.1.4/go.mod h1:CY67BrEjKNDhdTk8UgBX1Y/H5c3xkAcs3gnksxY7osU= -github.com/libp2p/go-libp2p-circuit v0.2.1/go.mod h1:BXPwYDN5A8z4OEY9sOfr2DUQMLQvKt/6oku45YUmjIo= -github.com/libp2p/go-libp2p-circuit v0.4.0/go.mod h1:t/ktoFIUzM6uLQ+o1G6NuBl2ANhBKN9Bc8jRIk31MoA= -github.com/libp2p/go-libp2p-connmgr v0.2.4/go.mod h1:YV0b/RIm8NGPnnNWM7hG9Q38OeQiQfKhHCCs1++ufn0= -github.com/libp2p/go-libp2p-core v0.0.1/go.mod h1:g/VxnTZ/1ygHxH3dKok7Vno1VfpvGcGip57wjTU4fco= -github.com/libp2p/go-libp2p-core v0.0.4/go.mod h1:jyuCQP356gzfCFtRKyvAbNkyeuxb7OlyhWZ3nls5d2I= -github.com/libp2p/go-libp2p-core v0.2.0/go.mod h1:X0eyB0Gy93v0DZtSYbEM7RnMChm9Uv3j7yRXjO77xSI= -github.com/libp2p/go-libp2p-core v0.2.2/go.mod h1:8fcwTbsG2B+lTgRJ1ICZtiM5GWCWZVoVrLaDRvIRng0= -github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g= -github.com/libp2p/go-libp2p-core v0.2.5/go.mod h1:6+5zJmKhsf7yHn1RbmYDu08qDUpIUxGdqHuEZckmZOA= -github.com/libp2p/go-libp2p-core v0.3.0/go.mod h1:ACp3DmS3/N64c2jDzcV429ukDpicbL6+TrrxANBjPGw= -github.com/libp2p/go-libp2p-core v0.3.1/go.mod h1:thvWy0hvaSBhnVBaW37BvzgVV68OUhgJJLAa6almrII= -github.com/libp2p/go-libp2p-core v0.4.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0= -github.com/libp2p/go-libp2p-core v0.5.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0= -github.com/libp2p/go-libp2p-core v0.5.1/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y= -github.com/libp2p/go-libp2p-core v0.5.3/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y= -github.com/libp2p/go-libp2p-core v0.5.4/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y= -github.com/libp2p/go-libp2p-core v0.5.5/go.mod h1:vj3awlOr9+GMZJFH9s4mpt9RHHgGqeHCopzbYKZdRjM= -github.com/libp2p/go-libp2p-core v0.5.6/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo= -github.com/libp2p/go-libp2p-core v0.5.7/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo= -github.com/libp2p/go-libp2p-core v0.6.0/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo= -github.com/libp2p/go-libp2p-core v0.6.1/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8= -github.com/libp2p/go-libp2p-core v0.7.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8= -github.com/libp2p/go-libp2p-core v0.8.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8= -github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI= -github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod h1:s4VGaxYMbw4+4+tsoQTqh7wfxg97AEdo4GYBt6BadWg= -github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod h1:o03drFnz9BVAZdzC/QUQ+NeQOu38Fu7LJGEOK2gQltw= -github.com/libp2p/go-libp2p-discovery v0.5.0/go.mod h1:+srtPIU9gDaBNu//UHvcdliKBIcr4SfDcm0/PfPJLug= -github.com/libp2p/go-libp2p-kad-dht v0.11.1/go.mod h1:5ojtR2acDPqh/jXf5orWy8YGb8bHQDS+qeDcoscL/PI= -github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod h1:XyVo99AfQH0foSf176k4jY1xUJ2+jUJIZCSDm7r2YKk= -github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90= -github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo= -github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod h1:SC99Rxs8Vuzrf/6WhmH41kNn13TiYdAWNYHrwImKLnE= -github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod h1:74S9eum0tVQdAfFiKxAyKzNdSuLqw5oadDq7+L/FELo= -github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod h1:CK3p2+9qH9x+7ER/gWWDYJ3QW5ZxWDkm+dVvjfuG3ek= -github.com/libp2p/go-libp2p-mplex v0.3.0/go.mod h1:l9QWxRbbb5/hQMECEb908GbS9Sm2UAR2KFZKUJEynEs= -github.com/libp2p/go-libp2p-mplex v0.4.0/go.mod h1:yCyWJE2sc6TBTnFpjvLuEJgTSw/u+MamvzILKdX7asw= -github.com/libp2p/go-libp2p-mplex v0.4.1/go.mod h1:cmy+3GfqfM1PceHTLL7zQzAAYaryDu6iPSC+CIb094g= -github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE= -github.com/libp2p/go-libp2p-nat v0.0.6/go.mod h1:iV59LVhB3IkFvS6S6sauVTSOrNEANnINbI/fkaLimiw= -github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU= -github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM= -github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY= -github.com/libp2p/go-libp2p-peerstore v0.1.0/go.mod h1:2CeHkQsr8svp4fZ+Oi9ykN1HBb6u0MOvdJ7YIsmcwtY= -github.com/libp2p/go-libp2p-peerstore v0.1.3/go.mod h1:BJ9sHlm59/80oSkpWgr1MyY1ciXAXV397W6h1GH/uKI= -github.com/libp2p/go-libp2p-peerstore v0.1.4/go.mod h1:+4BDbDiiKf4PzpANZDAT+knVdLxvqh7hXOujessqdzs= -github.com/libp2p/go-libp2p-peerstore v0.2.0/go.mod h1:N2l3eVIeAitSg3Pi2ipSrJYnqhVnMNQZo9nkSCuAbnQ= -github.com/libp2p/go-libp2p-peerstore v0.2.1/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA= -github.com/libp2p/go-libp2p-peerstore v0.2.2/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA= -github.com/libp2p/go-libp2p-peerstore v0.2.6/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s= -github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod h1:Qqvq6JH/oMZGwqs3N1Fqhv8NVhrdYcO0BW4wssv21LA= -github.com/libp2p/go-libp2p-pubsub v0.4.0/go.mod h1:izkeMLvz6Ht8yAISXjx60XUQZMq9ZMe5h2ih4dLIBIQ= -github.com/libp2p/go-libp2p-record v0.1.2/go.mod h1:pal0eNcT5nqZaTV7UGhqeGqxFgGdsU/9W//C8dqjQDk= -github.com/libp2p/go-libp2p-record v0.1.3/go.mod h1:yNUff/adKIfPnYQXgp6FQmNu3gLJ6EMg7+/vv2+9pY4= -github.com/libp2p/go-libp2p-routing-helpers v0.2.3/go.mod h1:795bh+9YeoFl99rMASoiVgHdi5bjack0N1+AFAdbvBw= -github.com/libp2p/go-libp2p-secio v0.1.0/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBgkOsdiKK77hE7c8= -github.com/libp2p/go-libp2p-secio v0.2.0/go.mod h1:2JdZepB8J5V9mBp79BmwsaPQhRPNN2NrnB2lKQcdy6g= -github.com/libp2p/go-libp2p-secio v0.2.1/go.mod h1:cWtZpILJqkqrSkiYcDBh5lA3wbT2Q+hz3rJQq3iftD8= -github.com/libp2p/go-libp2p-secio v0.2.2/go.mod h1:wP3bS+m5AUnFA+OFO7Er03uO1mncHG0uVwGrwvjYlNY= -github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod h1:wQVsCdjsuZoc730CgOvh5ox6K8evllckjebkdiY5ta4= -github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod h1:fvmtQ0T1nErXym1/aa1uJEyN7JzaTNyBcHImCxRpPKU= -github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod h1:P2VO/EpxRyDxtChXz/VPVXyTnszHvokHKRhfkEgFKNM= -github.com/libp2p/go-libp2p-swarm v0.2.8/go.mod h1:JQKMGSth4SMqonruY0a8yjlPVIkb0mdNSwckW7OYziM= -github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk= -github.com/libp2p/go-libp2p-swarm v0.3.1/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk= -github.com/libp2p/go-libp2p-swarm v0.4.0/go.mod h1:XVFcO52VoLoo0eitSxNQWYq4D6sydGOweTOAjJNraCw= -github.com/libp2p/go-libp2p-testing v0.0.2/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E= -github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E= -github.com/libp2p/go-libp2p-testing v0.0.4/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E= -github.com/libp2p/go-libp2p-testing v0.1.0/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0= -github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0= -github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc= -github.com/libp2p/go-libp2p-testing v0.3.0/go.mod h1:efZkql4UZ7OVsEfaxNHZPzIehtsBXMrXnCfJIgDti5g= -github.com/libp2p/go-libp2p-testing v0.4.0/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0= -github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M= -github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod h1:IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA= -github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod h1:mQcrHj4asu6ArfSoMuyojOdjx73Q47cYD7s5+gZOlns= -github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod h1:i+SKzbRnvXdVbU3D1dwydnTmKRPXiAR/fyvi1dXuL4o= -github.com/libp2p/go-libp2p-transport-upgrader v0.4.0/go.mod h1:J4ko0ObtZSmgn5BX5AmegP+dK3CSnU2lMCKsSq/EY0s= -github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod h1:Db2gU+XfLpm6E4rG5uGCFX6uXA8MEXOxFcRoXUODaK8= -github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod h1:lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw= -github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod h1:Zpgj6arbyQrmZ3wxSZxfBmbdnWtbZ48OpsfmQVTErwA= -github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod h1:X28ENrBMU/nm4I3Nx4sZ4dgjZ6VhLEn0XhIoZ5viCwU= -github.com/libp2p/go-libp2p-yamux v0.2.8/go.mod h1:/t6tDqeuZf0INZMTgd0WxIRbtK2EzI2h7HbFm9eAKI4= -github.com/libp2p/go-libp2p-yamux v0.4.0/go.mod h1:+DWDjtFMzoAwYLVkNZftoucn7PelNoy5nm3tZ3/Zw30= -github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod h1:AyR8k5EzyM2QN9Bbdg6X1SkVVuqLwTGf0L4DFq9g6po= -github.com/libp2p/go-libp2p-yamux v0.5.1/go.mod h1:dowuvDu8CRWmr0iqySMiSxK+W0iL5cMVO9S94Y6gkv4= -github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q= -github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M= -github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU= -github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0= -github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU= -github.com/libp2p/go-mplex v0.1.1/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk= -github.com/libp2p/go-mplex v0.1.2/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk= -github.com/libp2p/go-mplex v0.2.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ= -github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ= -github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ= -github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ= -github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA= -github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo= -github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU= -github.com/libp2p/go-netroute v0.1.2/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk= -github.com/libp2p/go-netroute v0.1.3/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk= -github.com/libp2p/go-openssl v0.0.2/go.mod h1:v8Zw2ijCSWBQi8Pq5GAixw6DbFfa9u6VIYDXnvOXkc0= -github.com/libp2p/go-openssl v0.0.3/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= -github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= -github.com/libp2p/go-openssl v0.0.5/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= -github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= -github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA= -github.com/libp2p/go-reuseport v0.0.2/go.mod h1:SPD+5RwGC7rcnzngoYC86GjPzjSywuQyMVAheVBD9nQ= -github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs= -github.com/libp2p/go-reuseport-transport v0.0.3/go.mod h1:Spv+MPft1exxARzP2Sruj2Wb5JSyHNncjf1Oi2dEbzM= -github.com/libp2p/go-reuseport-transport v0.0.4/go.mod h1:trPa7r/7TJK/d+0hdBLOCGvpQQVOU74OXbNCIMkufGw= -github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k= -github.com/libp2p/go-stream-muxer v0.0.1/go.mod h1:bAo8x7YkSpadMTbtTaxGVHWUQsR/l5MEaHbKaliuT14= -github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod h1:j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc= -github.com/libp2p/go-stream-muxer-multistream v0.3.0/go.mod h1:yDh8abSIzmZtqtOt64gFJUXEryejzNb0lisTt+fAMJA= -github.com/libp2p/go-tcp-transport v0.1.0/go.mod h1:oJ8I5VXryj493DEJ7OsBieu8fcg2nHGctwtInJVpipc= -github.com/libp2p/go-tcp-transport v0.1.1/go.mod h1:3HzGvLbx6etZjnFlERyakbaYPdfjg2pWP97dFZworkY= -github.com/libp2p/go-tcp-transport v0.2.0/go.mod h1:vX2U0CnWimU4h0SGSEsg++AzvBcroCGYw28kh94oLe0= -github.com/libp2p/go-tcp-transport v0.2.1/go.mod h1:zskiJ70MEfWz2MKxvFB/Pv+tPIB1PpPUrHIWQ8aFw7M= -github.com/libp2p/go-ws-transport v0.2.0/go.mod h1:9BHJz/4Q5A9ludYWKoGCFC5gUElzlHoKzu0yY9p/klM= -github.com/libp2p/go-ws-transport v0.3.0/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk= -github.com/libp2p/go-ws-transport v0.3.1/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk= -github.com/libp2p/go-ws-transport v0.4.0/go.mod h1:EcIEKqf/7GDjth6ksuS/6p7R49V4CBY6/E7R/iyhYUA= -github.com/libp2p/go-yamux v1.2.2/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow= -github.com/libp2p/go-yamux v1.3.0/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow= -github.com/libp2p/go-yamux v1.3.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow= -github.com/libp2p/go-yamux v1.3.5/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow= -github.com/libp2p/go-yamux v1.3.7/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE= -github.com/libp2p/go-yamux v1.4.0/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE= -github.com/libp2p/go-yamux v1.4.1/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE= -github.com/libp2p/go-yamux/v2 v2.0.0/go.mod h1:NVWira5+sVUIU6tu1JWvaRn1dRnG+cawOJiflsAM+7U= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/magiconair/properties v1.7.4-0.20170902060319-8d7837e64d3c/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= -github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= -github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.0.10-0.20170816031813-ad5389df28cd/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-isatty v0.0.2/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= -github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.12/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.28/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b h1:QrHweqAtyJ9EwCaGHBu1fghwxIPiopAHV06JlXrMHjk= github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b/go.mod h1:xxLb2ip6sSUts3g1irPVHyk/DGslwQsNOo9I7smJfNU= -github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= -github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= -github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= -github.com/minio/sha256-simd v0.1.0/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= -github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= -github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1369,63 +829,12 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= -github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= -github.com/mr-tron/base58 v1.1.1/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= -github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= -github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= -github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= -github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= -github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA= -github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM= -github.com/multiformats/go-multiaddr v0.0.1/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44= -github.com/multiformats/go-multiaddr v0.0.2/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44= -github.com/multiformats/go-multiaddr v0.0.4/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44= -github.com/multiformats/go-multiaddr v0.1.0/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44= -github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo= -github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4= -github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE= -github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y= -github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI= -github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc= -github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q= -github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q= -github.com/multiformats/go-multiaddr-dns v0.2.0/go.mod h1:TJ5pr5bBO7Y1B18djPuRsVkduhQH2YqYSbxWJzYGdK0= -github.com/multiformats/go-multiaddr-fmt v0.0.1/go.mod h1:aBYjqL4T/7j4Qx+R73XSv/8JsgnRFlf0w2KGLCmXl3Q= -github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo= -github.com/multiformats/go-multiaddr-net v0.0.1/go.mod h1:nw6HSxNmCIQH27XPGBuX+d1tnvM7ihcFwHMSstNAVUU= -github.com/multiformats/go-multiaddr-net v0.1.0/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ= -github.com/multiformats/go-multiaddr-net v0.1.1/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ= -github.com/multiformats/go-multiaddr-net v0.1.2/go.mod h1:QsWt3XK/3hwvNxZJp92iMQKME1qHfpYmyIjFVsSOY6Y= -github.com/multiformats/go-multiaddr-net v0.1.3/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA= -github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA= -github.com/multiformats/go-multiaddr-net v0.1.5/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA= -github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA= -github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs= -github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= -github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U= -github.com/multiformats/go-multihash v0.0.5/go.mod h1:lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po= -github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= -github.com/multiformats/go-multihash v0.0.9/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= -github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= -github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= -github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= -github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg= -github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38= -github.com/multiformats/go-multistream v0.2.0/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k= -github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= -github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= -github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= -github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76/go.mod h1:x5OoJHDHqxHS801UIuhqGl6QdSAEJvtausosHSdazIo= -github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= -github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= -github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= @@ -1433,27 +842,18 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= -github.com/near/borsh-go v0.3.1/go.mod h1:NeMochZp7jN/pYFuxLkrZtmLqbADmnp/y1+/dL+AsyQ= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nsf/termbox-go v0.0.0-20190325093121-288510b9734e/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= +github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70 h1:oZTUDZzUBp8D2h3uZfPQmZGVksrROqubHDASvFB/+u0= +github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70/go.mod h1:ISHo/Qitjtvj2svGmttaZv03zVXmS+uqvUyF9kFqlI0= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= @@ -1462,10 +862,7 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= @@ -1478,9 +875,7 @@ github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= @@ -1490,16 +885,11 @@ github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIw github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= -github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml v1.0.1-0.20170904195809-1d6b12b7cb29/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= -github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= @@ -1513,19 +903,15 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= @@ -1540,16 +926,11 @@ github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= @@ -1558,13 +939,10 @@ github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJ github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= @@ -1573,39 +951,24 @@ github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJf github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0= github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= -github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/reactivex/rxgo/v2 v2.5.0/go.mod h1:bs4fVZxcb5ZckLIOeIeVH942yunJLWDABWGbrHAW+qU= github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= -github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= -github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= -github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.6.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -1616,20 +979,7 @@ github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0 github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d/go.mod h1:w5+eXa0mYznDkHaMCXA4XYffjlH+cy1oyKbfzJXa2Do= -github.com/segmentio/golines v0.0.0-20200824192126-7f30d3046793/go.mod h1:bQSh5qdVR67XiCKbaVvYO41s50c5hQo+3cY/1CQQ3xQ= -github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= -github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= -github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= -github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= -github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -1639,58 +989,39 @@ github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= -github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0= -github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v0.0.0-20170901052352-ee1bd8ee15a1/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= -github.com/spf13/cast v1.1.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= -github.com/spf13/jwalterweatherman v0.0.0-20170901151539-12bd96e66386/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.1-0.20170901120850-7aff26db30c1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.0.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= -github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc= -github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= -github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -1704,85 +1035,44 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= -github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= -github.com/teivah/onecontext v0.0.0-20200513185103-40f981bfd775/go.mod h1:XUZ4x3oGhWfiOnUvTslnKKs39AWUct3g3yJvXTQSJOQ= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= -github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= -github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0= -github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= -github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/sjson v1.1.1/go.mod h1:yvVuSnpEQv5cYIrO+AT6kw4QVfd5SDZoGIS7/5+fZFs= -github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= -github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= -github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vmihailenco/msgpack/v4 v4.3.11 h1:Q47CePddpNGNhk4GCnAx9DDtASi2rasatE0cd26cZoE= github.com/vmihailenco/msgpack/v4 v4.3.11/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= -github.com/vmihailenco/msgpack/v5 v5.0.0-beta.1/go.mod h1:xlngVLeyQ/Qi05oQxhQ+oTuqa03RjMwMfk/7/TCs+QI= github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= -github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc= -github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM= -github.com/whyrusleeping/go-logging v0.0.1/go.mod h1:lDPYj54zutzG1XYfHAhcc7oNXEburHQBn+Iqd4yS4vE= -github.com/whyrusleeping/mafmt v1.2.8/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA= -github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4= -github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI= -github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee/go.mod h1:m2aV4LZI4Aez7dP5PMyVKEHhUyEJ/RjmPEDOpDvudHg= -github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= -github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1790,12 +1080,10 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= @@ -1804,7 +1092,6 @@ go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -1816,70 +1103,39 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= -go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= -go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -golang.org/x/arch v0.0.0-20180920145803-b19384d3c130/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= @@ -1890,7 +1146,6 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1907,12 +1162,10 @@ golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPI golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -1925,8 +1178,6 @@ golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1934,19 +1185,16 @@ golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190227160552-c95aed5357e7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1964,14 +1212,12 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= @@ -1979,9 +1225,6 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1996,7 +1239,6 @@ golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2024,7 +1266,6 @@ golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= -golang.org/x/sync v0.0.0-20170517211232-f52d1811a629/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2043,10 +1284,8 @@ golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2054,36 +1293,25 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191024172528-b4ff53e7a1cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2103,12 +1331,8 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2119,11 +1343,8 @@ golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2135,11 +1356,9 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2170,7 +1389,6 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -2188,66 +1406,39 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/time v0.0.0-20170424234030-8be79e1e0910/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181127232545-e782529d0ddd/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190924052046-3ac2a5bbd98a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191024220359-3d91e92cde03/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -2264,10 +1455,7 @@ golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729181040-64cdafbe085c/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= @@ -2286,7 +1474,6 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= -golang.org/x/tools/gopls v0.4.4/go.mod h1:zhyGzA+CAtREUwwq/btQxEx2FHnGzDwJvGs5YqdVCbE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2296,13 +1483,6 @@ golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNq golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= -gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/api v0.0.0-20170921000349-586095a6e407/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -2363,7 +1543,6 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -2371,7 +1550,6 @@ google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -2379,7 +1557,6 @@ google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= @@ -2477,7 +1654,6 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= -google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2492,7 +1668,6 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= @@ -2546,30 +1721,21 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v9 v9.28.0 h1:6pzvnzx1RWaaQiAmv6e1DvCFULRaz5cKoP5j1VcrLsc= gopkg.in/go-playground/validator.v9 v9.28.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= -gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/src-d/go-billy.v4 v4.3.0/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= -gopkg.in/src-d/go-cli.v0 v0.0.0-20181105080154-d492247bbc0d/go.mod h1:z+K8VcOYVYcSwSjGebuDL6176A1XskgbtNl64NSg+n8= -gopkg.in/src-d/go-log.v1 v1.0.1/go.mod h1:GN34hKP0g305ysm2/hctJ0Y8nWP3zxXXJ8GFabTyABE= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -2577,7 +1743,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -2587,7 +1752,6 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -2597,24 +1761,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f/go.mod h1:9VQ397fNXEnF84t90W4r4TRCQK+pg9f8ugVfyj+S26w= -mvdan.cc/gofumpt v0.0.0-20200802201014-ab5a8192947d/go.mod h1:bzrjFmaD6+xqohD3KYP0H2FEuxknnBmyyOxdhLdaIws= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= -mvdan.cc/xurls/v2 v2.2.0/go.mod h1:EV1RMtya9D6G5DMYPGD8zTQzaHet6Jh8gFlRgGRJeO8= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= diff --git a/relayer/codecs/08-wasm-types/client_state.go b/relayer/codecs/08-wasm-types/client_state.go index eb0a8417f..5e36700de 100644 --- a/relayer/codecs/08-wasm-types/client_state.go +++ b/relayer/codecs/08-wasm-types/client_state.go @@ -10,7 +10,7 @@ import ( var _ exported.ClientState = (*ClientState)(nil) func (c ClientState) ClientType() string { - return "" + return exported.Wasm } func (c ClientState) GetLatestHeight() exported.Height { diff --git a/relayer/codecs/08-wasm-types/consensus_state.go b/relayer/codecs/08-wasm-types/consensus_state.go index d2482589f..f93e69d67 100644 --- a/relayer/codecs/08-wasm-types/consensus_state.go +++ b/relayer/codecs/08-wasm-types/consensus_state.go @@ -7,7 +7,7 @@ import ( var _ exported.ConsensusState = (*ConsensusState)(nil) func (m ConsensusState) ClientType() string { - return "" + return exported.Wasm } func (m ConsensusState) GetTimestamp() uint64 { diff --git a/relayer/codecs/08-wasm-types/header.go b/relayer/codecs/08-wasm-types/header.go index f47a48f74..45451cef8 100644 --- a/relayer/codecs/08-wasm-types/header.go +++ b/relayer/codecs/08-wasm-types/header.go @@ -7,7 +7,7 @@ import ( var _ exported.ClientMessage = &Header{} func (m Header) ClientType() string { - return "" + return exported.Wasm } func (m Header) ValidateBasic() error { diff --git a/relayer/codecs/08-wasm-types/misbehavior.go b/relayer/codecs/08-wasm-types/misbehavior.go index daa3623a3..16776843e 100644 --- a/relayer/codecs/08-wasm-types/misbehavior.go +++ b/relayer/codecs/08-wasm-types/misbehavior.go @@ -9,7 +9,7 @@ var ( ) func (m Misbehaviour) ClientType() string { - return "" + return exported.Wasm } func (m Misbehaviour) ValidateBasic() error { diff --git a/relayer/codecs/08-wasm-types/module.go b/relayer/codecs/08-wasm-types/module.go index 85fa9f128..b8dae8d56 100644 --- a/relayer/codecs/08-wasm-types/module.go +++ b/relayer/codecs/08-wasm-types/module.go @@ -7,6 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + //grpc "github.com/cosmos/gogoproto/grpc" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" @@ -21,7 +23,7 @@ type AppModuleBasic struct{} // Name returns the tendermint module name. func (AppModuleBasic) Name() string { - return "08-wasm" + return exported.Wasm } // RegisterLegacyAminoCodec performs a no-op. The Wasm client does not support amino. From 972f5f57f93905c4c8682403416f81a8af40259e Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Tue, 10 Oct 2023 18:47:10 +0545 Subject: [PATCH 05/35] fix: update client setup --- relayer/chains/cosmos/tx.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index ba617ec94..691f19903 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -36,6 +36,7 @@ import ( chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" strideicqtypes "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" @@ -974,7 +975,6 @@ func (cc *CosmosProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelIn return NewCosmosMessage(msg), nil } - func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader, clientType string) (ibcexported.ClientMessage, error) { trustedCosmosHeader, ok := trustedHeader.(provider.TendermintIBCHeader) if !ok { @@ -1011,7 +1011,7 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, clientHeader = &tmClientHeader - if clientType == "08-wasm" { // TODO: replace with ibcexported.Wasm at v7.2 + if clientType == exported.Wasm { // TODO: replace with ibcexported.Wasm at v7.2 tmClientHeaderBz, err := cc.Cdc.Marshaler.MarshalInterface(clientHeader) if err != nil { return &wasmclient.Header{}, nil @@ -1021,7 +1021,7 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, return &wasmclient.Header{}, fmt.Errorf("error converting tm client header height") } clientHeader = &wasmclient.Header{ - Data: tmClientHeaderBz, + Data: tmClientHeaderBz, Height: height, } } @@ -1076,7 +1076,7 @@ func (cc *CosmosProvider) MsgSubmitMisbehaviour(clientID string, misbehaviour ib Data: wasmData, } } - + signer, err := cc.Address() if err != nil { return nil, err @@ -1270,7 +1270,7 @@ func (cc *CosmosProvider) queryTMClientState(ctx context.Context, srch int64, sr } clientStateExported = clientState } - + tmClientState, ok := clientStateExported.(*tmclient.ClientState) if !ok { return &tmclient.ClientState{}, @@ -1327,13 +1327,12 @@ func (cc *CosmosProvider) NewClientState( return &wasmclient.ClientState{}, err } clientState = &wasmclient.ClientState{ - Data: tmClientStateBz, - CodeId: codeID, + Data: tmClientStateBz, + CodeId: codeID, LatestHeight: tmClientState.LatestHeight, } } - return clientState, nil } From 98153f63be246483c4393219a9de8f0982370fce Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Tue, 10 Oct 2023 21:36:14 +0545 Subject: [PATCH 06/35] fix: issue --- relayer/chains/icon/tx.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index f96c8fbb9..ebbf99450 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -13,7 +13,9 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" // tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" @@ -542,6 +544,20 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, CurrentValidators: currentValidatorList.Validators, } + // wrap with wasm client + if clientType == exported.Wasm { + + tmClientHeaderBz, err := icp.codec.Marshaler.MarshalInterface(signedHeader) + if err != nil { + return &wasmclient.Header{}, nil + } + return &wasmclient.Header{ + Data: tmClientHeaderBz, + Height: clienttypes.NewHeight(0, latestIconHeader.Header.MainHeight), + }, nil + + } + return signedHeader, nil } From 97f066b4e2ae200961f692f5a9cff87f269ce02d Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Fri, 27 Oct 2023 17:33:07 +0545 Subject: [PATCH 07/35] fix: multiple wasm module register issue --- relayer/chains/cosmos/module/app_module.go | 2 +- relayer/chains/cosmos/tx.go | 4 +- relayer/chains/icon/tx.go | 2 +- relayer/chains/penumbra/tx.go | 16 +- relayer/client.go | 2 +- relayer/codecs/08-wasm-types/client_state.go | 123 --- relayer/codecs/08-wasm-types/codec.go | 32 - .../codecs/08-wasm-types/consensus_state.go | 19 - relayer/codecs/08-wasm-types/header.go | 15 - relayer/codecs/08-wasm-types/misbehavior.go | 17 - relayer/codecs/08-wasm-types/module.go | 59 -- relayer/codecs/08-wasm-types/msgs.go | 21 - relayer/codecs/08-wasm-types/tx.pb.go | 635 ----------- relayer/codecs/08-wasm-types/wasm.pb.go | 995 ------------------ relayer/provider/matcher.go | 5 +- 15 files changed, 16 insertions(+), 1931 deletions(-) delete mode 100644 relayer/codecs/08-wasm-types/client_state.go delete mode 100644 relayer/codecs/08-wasm-types/codec.go delete mode 100644 relayer/codecs/08-wasm-types/consensus_state.go delete mode 100644 relayer/codecs/08-wasm-types/header.go delete mode 100644 relayer/codecs/08-wasm-types/misbehavior.go delete mode 100644 relayer/codecs/08-wasm-types/module.go delete mode 100644 relayer/codecs/08-wasm-types/msgs.go delete mode 100644 relayer/codecs/08-wasm-types/tx.pb.go delete mode 100644 relayer/codecs/08-wasm-types/wasm.pb.go diff --git a/relayer/chains/cosmos/module/app_module.go b/relayer/chains/cosmos/module/app_module.go index e6025ef72..7e9e88cb6 100644 --- a/relayer/chains/cosmos/module/app_module.go +++ b/relayer/chains/cosmos/module/app_module.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" tmlightclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - wasm "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" + wasm "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" ) // AppModuleBasic defines the basic application module used by the module. diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 691f19903..c5c3ca174 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -39,8 +39,8 @@ import ( "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" strideicqtypes "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" - wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "google.golang.org/grpc/codes" @@ -1067,7 +1067,7 @@ func (cc *CosmosProvider) MsgSubmitQueryResponse(chainID string, queryID provide } func (cc *CosmosProvider) MsgSubmitMisbehaviour(clientID string, misbehaviour ibcexported.ClientMessage) (provider.RelayerMessage, error) { - if strings.Contains(clientID, "08-wasm") { // TODO: replace with ibcexported.Wasm at v7.2 + if strings.Contains(clientID, exported.Wasm) { // TODO: replace with ibcexported.Wasm at v7.2 wasmData, err := cc.Cdc.Marshaler.MarshalInterface(misbehaviour) if err != nil { return nil, err diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index ebbf99450..836b2e8bf 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -15,7 +15,7 @@ import ( chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" + wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" // tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go index a29ec2e3d..920986a91 100644 --- a/relayer/chains/penumbra/tx.go +++ b/relayer/chains/penumbra/tx.go @@ -2,8 +2,8 @@ package penumbra import ( "context" - "encoding/hex" "encoding/base64" + "encoding/hex" "errors" "fmt" "math/rand" @@ -31,14 +31,15 @@ import ( chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" ics23 "github.com/cosmos/ics23/go" "github.com/cosmos/relayer/v2/relayer/chains/cosmos" penumbracrypto "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" penumbraibctypes "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/ibc/v1alpha1" penumbratypes "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/transaction/v1alpha1" - wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "google.golang.org/grpc/codes" @@ -896,7 +897,7 @@ func (cc *PenumbraProvider) MsgUpgradeClient(srcClientId string, consRes *client } func (cc *PenumbraProvider) MsgSubmitMisbehaviour(clientID string, misbehaviour ibcexported.ClientMessage) (provider.RelayerMessage, error) { - if strings.Contains(clientID, "08-wasm") { // TODO: replace with ibcexported.Wasm at v7.2 + if strings.Contains(clientID, exported.Wasm) { // TODO: replace with ibcexported.Wasm at v7.2 wasmData, err := cc.Codec.Marshaler.MarshalInterface(misbehaviour) if err != nil { return nil, err @@ -1607,7 +1608,7 @@ func (cc *PenumbraProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeade clientHeader = &tmClientHeader - if clientType == "08-wasm" { // TODO: replace with ibcexported.Wasm at v7.2 + if clientType == exported.Wasm { tmClientHeaderBz, err := cc.Codec.Marshaler.MarshalInterface(clientHeader) if err != nil { return &wasmclient.Header{}, nil @@ -1617,7 +1618,7 @@ func (cc *PenumbraProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeade return &wasmclient.Header{}, fmt.Errorf("error converting tm client header height") } clientHeader = &wasmclient.Header{ - Data: tmClientHeaderBz, + Data: tmClientHeaderBz, Height: height, } } @@ -2055,13 +2056,12 @@ func (cc *PenumbraProvider) NewClientState( return &wasmclient.ClientState{}, err } clientState = &wasmclient.ClientState{ - Data: tmClientStateBz, - CodeId: codeID, + Data: tmClientStateBz, + CodeId: codeID, LatestHeight: tmClientState.LatestHeight, } } - return clientState, nil } diff --git a/relayer/client.go b/relayer/client.go index d324672f9..181a019af 100644 --- a/relayer/client.go +++ b/relayer/client.go @@ -10,9 +10,9 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" "github.com/cosmos/relayer/v2/relayer/chains/cosmos" "github.com/cosmos/relayer/v2/relayer/chains/icon" - wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" diff --git a/relayer/codecs/08-wasm-types/client_state.go b/relayer/codecs/08-wasm-types/client_state.go deleted file mode 100644 index 5e36700de..000000000 --- a/relayer/codecs/08-wasm-types/client_state.go +++ /dev/null @@ -1,123 +0,0 @@ -package types - -import ( - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - "github.com/cosmos/ibc-go/v7/modules/core/exported" -) - -var _ exported.ClientState = (*ClientState)(nil) - -func (c ClientState) ClientType() string { - return exported.Wasm -} - -func (c ClientState) GetLatestHeight() exported.Height { - return c.LatestHeight -} - -func (c ClientState) Validate() error { - return nil -} - -func (c ClientState) Status(ctx sdk.Context, store sdk.KVStore, cdc codec.BinaryCodec) exported.Status { - return exported.Active -} - -func (c ClientState) ExportMetadata(store sdk.KVStore) []exported.GenesisMetadata { - return []exported.GenesisMetadata{} -} - -func (c ClientState) ZeroCustomFields() exported.ClientState { - return &c -} - -func (c ClientState) GetTimestampAtHeight( - ctx sdk.Context, - clientStore sdk.KVStore, - cdc codec.BinaryCodec, - height exported.Height, -) (uint64, error) { - return 0, nil -} - -func (c ClientState) Initialize(context sdk.Context, marshaler codec.BinaryCodec, store sdk.KVStore, state exported.ConsensusState) error { - return nil -} - -func (c ClientState) VerifyMembership( - ctx sdk.Context, - clientStore sdk.KVStore, - cdc codec.BinaryCodec, - height exported.Height, - delayTimePeriod uint64, - delayBlockPeriod uint64, - proof []byte, - path exported.Path, - value []byte, -) error { - return nil -} - -func (c ClientState) VerifyNonMembership( - ctx sdk.Context, - clientStore sdk.KVStore, - cdc codec.BinaryCodec, - height exported.Height, - delayTimePeriod uint64, - delayBlockPeriod uint64, - proof []byte, - path exported.Path, -) error { - return nil -} - -// VerifyClientMessage must verify a ClientMessage. A ClientMessage could be a Header, Misbehaviour, or batch update. -// It must handle each type of ClientMessage appropriately. Calls to CheckForMisbehaviour, UpdateState, and UpdateStateOnMisbehaviour -// will assume that the content of the ClientMessage has been verified and can be trusted. An error should be returned -// if the ClientMessage fails to verify. -func (c ClientState) VerifyClientMessage(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, clientMsg exported.ClientMessage) error { - return nil -} - -func (c ClientState) CheckForMisbehaviour(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, msg exported.ClientMessage) bool { - return true -} - -// UpdateStateOnMisbehaviour should perform appropriate state changes on a client state given that misbehaviour has been detected and verified -func (c ClientState) UpdateStateOnMisbehaviour(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, clientMsg exported.ClientMessage) { - -} - -func (c ClientState) UpdateState(ctx sdk.Context, cdc codec.BinaryCodec, clientStore sdk.KVStore, clientMsg exported.ClientMessage) []exported.Height { - return []exported.Height{c.LatestHeight} -} - -func (c ClientState) CheckSubstituteAndUpdateState( - ctx sdk.Context, cdc codec.BinaryCodec, subjectClientStore, - substituteClientStore sdk.KVStore, substituteClient exported.ClientState, -) error { - return nil -} - -func (c ClientState) VerifyUpgradeAndUpdateState( - ctx sdk.Context, - cdc codec.BinaryCodec, - store sdk.KVStore, - newClient exported.ClientState, - newConsState exported.ConsensusState, - proofUpgradeClient, - proofUpgradeConsState []byte, -) error { - return nil -} - -// NewClientState creates a new ClientState instance. -func NewClientState(latestSequence uint64, consensusState *ConsensusState) *ClientState { - return &ClientState{ - Data: []byte{0}, - CodeId: []byte{}, - LatestHeight: clienttypes.Height{}, - } -} diff --git a/relayer/codecs/08-wasm-types/codec.go b/relayer/codecs/08-wasm-types/codec.go deleted file mode 100644 index 3408876da..000000000 --- a/relayer/codecs/08-wasm-types/codec.go +++ /dev/null @@ -1,32 +0,0 @@ -package types - -import ( - codectypes "github.com/cosmos/cosmos-sdk/codec/types" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/ibc-go/v7/modules/core/exported" -) - -// RegisterInterfaces registers the tendermint concrete client-related -// implementations and interfaces. -func RegisterInterfaces(registry codectypes.InterfaceRegistry) { - registry.RegisterImplementations( - (*exported.ClientState)(nil), - &ClientState{}, - ) - registry.RegisterImplementations( - (*exported.ConsensusState)(nil), - &ConsensusState{}, - ) - registry.RegisterImplementations( - (*sdk.Msg)(nil), - &MsgStoreCode{}, - ) - registry.RegisterImplementations( - (*exported.ClientMessage)(nil), - &Misbehaviour{}, - ) - registry.RegisterImplementations( - (*exported.ClientMessage)(nil), - &Header{}, - ) -} diff --git a/relayer/codecs/08-wasm-types/consensus_state.go b/relayer/codecs/08-wasm-types/consensus_state.go deleted file mode 100644 index f93e69d67..000000000 --- a/relayer/codecs/08-wasm-types/consensus_state.go +++ /dev/null @@ -1,19 +0,0 @@ -package types - -import ( - "github.com/cosmos/ibc-go/v7/modules/core/exported" -) - -var _ exported.ConsensusState = (*ConsensusState)(nil) - -func (m ConsensusState) ClientType() string { - return exported.Wasm -} - -func (m ConsensusState) GetTimestamp() uint64 { - return m.Timestamp -} - -func (m ConsensusState) ValidateBasic() error { - return nil -} diff --git a/relayer/codecs/08-wasm-types/header.go b/relayer/codecs/08-wasm-types/header.go deleted file mode 100644 index 45451cef8..000000000 --- a/relayer/codecs/08-wasm-types/header.go +++ /dev/null @@ -1,15 +0,0 @@ -package types - -import ( - "github.com/cosmos/ibc-go/v7/modules/core/exported" -) - -var _ exported.ClientMessage = &Header{} - -func (m Header) ClientType() string { - return exported.Wasm -} - -func (m Header) ValidateBasic() error { - return nil -} diff --git a/relayer/codecs/08-wasm-types/misbehavior.go b/relayer/codecs/08-wasm-types/misbehavior.go deleted file mode 100644 index 16776843e..000000000 --- a/relayer/codecs/08-wasm-types/misbehavior.go +++ /dev/null @@ -1,17 +0,0 @@ -package types - -import ( - exported "github.com/cosmos/ibc-go/v7/modules/core/exported" -) - -var ( - _ exported.ClientMessage = &Misbehaviour{} -) - -func (m Misbehaviour) ClientType() string { - return exported.Wasm -} - -func (m Misbehaviour) ValidateBasic() error { - return nil -} diff --git a/relayer/codecs/08-wasm-types/module.go b/relayer/codecs/08-wasm-types/module.go deleted file mode 100644 index b8dae8d56..000000000 --- a/relayer/codecs/08-wasm-types/module.go +++ /dev/null @@ -1,59 +0,0 @@ -package types - -import ( - "encoding/json" - - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/codec" - codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/ibc-go/v7/modules/core/exported" - - //grpc "github.com/cosmos/gogoproto/grpc" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" -) - -var _ module.AppModuleBasic = AppModuleBasic{} - -// AppModuleBasic defines the basic application module used by the tendermint light client. -// Only the RegisterInterfaces function needs to be implemented. All other function perform -// a no-op. -type AppModuleBasic struct{} - -// Name returns the tendermint module name. -func (AppModuleBasic) Name() string { - return exported.Wasm -} - -// RegisterLegacyAminoCodec performs a no-op. The Wasm client does not support amino. -func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {} - -// RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC -// to unmarshal wasm light client types. -func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) { - RegisterInterfaces(registry) -} - -// DefaultGenesis performs a no-op. Genesis is not supported for the tendermint light client. -func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { - return nil -} - -// ValidateGenesis performs a no-op. Genesis is not supported for the tendermint light cilent. -func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncodingConfig, bz json.RawMessage) error { - return nil -} - -// RegisterGRPCGatewayRoutes performs a no-op. -func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {} - -// GetTxCmd performs a no-op. Please see the 02-client cli commands. -func (AppModuleBasic) GetTxCmd() *cobra.Command { - return nil -} - -// GetQueryCmd performs a no-op. Please see the 02-client cli commands. -func (AppModuleBasic) GetQueryCmd() *cobra.Command { - return nil -} diff --git a/relayer/codecs/08-wasm-types/msgs.go b/relayer/codecs/08-wasm-types/msgs.go deleted file mode 100644 index ad8284065..000000000 --- a/relayer/codecs/08-wasm-types/msgs.go +++ /dev/null @@ -1,21 +0,0 @@ -package types - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" -) - -var ( - _ sdk.Msg = &MsgStoreCode{} -) - -func (m MsgStoreCode) ValidateBasic() error { - return nil -} - -func (m MsgStoreCode) GetSigners() []sdk.AccAddress { - signer, err := sdk.AccAddressFromBech32(m.Signer) - if err != nil { - panic(err) - } - return []sdk.AccAddress{signer} -} diff --git a/relayer/codecs/08-wasm-types/tx.pb.go b/relayer/codecs/08-wasm-types/tx.pb.go deleted file mode 100644 index cce6e707c..000000000 --- a/relayer/codecs/08-wasm-types/tx.pb.go +++ /dev/null @@ -1,635 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ibc/lightclients/wasm/v1/tx.proto - -package types - -import ( - context "context" - fmt "fmt" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// MsgStoreCode defines the request type for the StoreCode rpc. -type MsgStoreCode struct { - Signer string `protobuf:"bytes,1,opt,name=signer,proto3" json:"signer,omitempty"` - Code []byte `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"` -} - -func (m *MsgStoreCode) Reset() { *m = MsgStoreCode{} } -func (m *MsgStoreCode) String() string { return proto.CompactTextString(m) } -func (*MsgStoreCode) ProtoMessage() {} -func (*MsgStoreCode) Descriptor() ([]byte, []int) { - return fileDescriptor_1d9737363bf1e38d, []int{0} -} -func (m *MsgStoreCode) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgStoreCode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgStoreCode.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MsgStoreCode) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgStoreCode.Merge(m, src) -} -func (m *MsgStoreCode) XXX_Size() int { - return m.Size() -} -func (m *MsgStoreCode) XXX_DiscardUnknown() { - xxx_messageInfo_MsgStoreCode.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgStoreCode proto.InternalMessageInfo - -func (m *MsgStoreCode) GetSigner() string { - if m != nil { - return m.Signer - } - return "" -} - -func (m *MsgStoreCode) GetCode() []byte { - if m != nil { - return m.Code - } - return nil -} - -// MsgStoreCodeResponse defines the response type for the StoreCode rpc -type MsgStoreCodeResponse struct { - CodeId []byte `protobuf:"bytes,1,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"` -} - -func (m *MsgStoreCodeResponse) Reset() { *m = MsgStoreCodeResponse{} } -func (m *MsgStoreCodeResponse) String() string { return proto.CompactTextString(m) } -func (*MsgStoreCodeResponse) ProtoMessage() {} -func (*MsgStoreCodeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1d9737363bf1e38d, []int{1} -} -func (m *MsgStoreCodeResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgStoreCodeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgStoreCodeResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MsgStoreCodeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgStoreCodeResponse.Merge(m, src) -} -func (m *MsgStoreCodeResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgStoreCodeResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgStoreCodeResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgStoreCodeResponse proto.InternalMessageInfo - -func (m *MsgStoreCodeResponse) GetCodeId() []byte { - if m != nil { - return m.CodeId - } - return nil -} - -func init() { - proto.RegisterType((*MsgStoreCode)(nil), "ibc.lightclients.wasm.v1.MsgStoreCode") - proto.RegisterType((*MsgStoreCodeResponse)(nil), "ibc.lightclients.wasm.v1.MsgStoreCodeResponse") -} - -func init() { proto.RegisterFile("ibc/lightclients/wasm/v1/tx.proto", fileDescriptor_1d9737363bf1e38d) } - -var fileDescriptor_1d9737363bf1e38d = []byte{ - // 270 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcc, 0x4c, 0x4a, 0xd6, - 0xcf, 0xc9, 0x4c, 0xcf, 0x28, 0x49, 0xce, 0xc9, 0x4c, 0xcd, 0x2b, 0x29, 0xd6, 0x2f, 0x4f, 0x2c, - 0xce, 0xd5, 0x2f, 0x33, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xc8, - 0x4c, 0x4a, 0xd6, 0x43, 0x56, 0xa2, 0x07, 0x52, 0xa2, 0x57, 0x66, 0xa8, 0x64, 0xc5, 0xc5, 0xe3, - 0x5b, 0x9c, 0x1e, 0x5c, 0x92, 0x5f, 0x94, 0xea, 0x9c, 0x9f, 0x92, 0x2a, 0x24, 0xc6, 0xc5, 0x56, - 0x9c, 0x99, 0x9e, 0x97, 0x5a, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0xe5, 0x09, 0x09, - 0x71, 0xb1, 0x24, 0xe7, 0xa7, 0xa4, 0x4a, 0x30, 0x29, 0x30, 0x6a, 0xf0, 0x04, 0x81, 0xd9, 0x4a, - 0xfa, 0x5c, 0x22, 0xc8, 0x7a, 0x83, 0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x85, 0xc4, 0xb9, - 0xd8, 0x41, 0xf2, 0xf1, 0x99, 0x29, 0x60, 0x43, 0x78, 0x82, 0xd8, 0x40, 0x5c, 0xcf, 0x14, 0xa3, - 0x2c, 0x2e, 0x66, 0xdf, 0xe2, 0x74, 0xa1, 0x64, 0x2e, 0x4e, 0x84, 0x85, 0x6a, 0x7a, 0xb8, 0xdc, - 0xa6, 0x87, 0x6c, 0xb8, 0x94, 0x1e, 0x71, 0xea, 0x60, 0x8e, 0x70, 0x8a, 0x3c, 0xf1, 0x48, 0x8e, - 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, - 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xfb, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, - 0xfc, 0x5c, 0xfd, 0xe4, 0xfc, 0xe2, 0xdc, 0xfc, 0x62, 0xfd, 0xcc, 0xa4, 0x64, 0xdd, 0xf4, 0x7c, - 0xfd, 0x32, 0x73, 0xfd, 0xdc, 0xfc, 0x94, 0xd2, 0x9c, 0xd4, 0x62, 0x48, 0x78, 0xea, 0xc2, 0x02, - 0xd4, 0xc0, 0x42, 0x17, 0x1c, 0xa6, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x40, 0x35, - 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x99, 0x32, 0xbd, 0x79, 0x01, 0x00, 0x00, -} - -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 - -// MsgClient is the client API for Msg service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type MsgClient interface { - // StoreCode defines a rpc handler method for MsgStoreCode. - StoreCode(ctx context.Context, in *MsgStoreCode, opts ...grpc.CallOption) (*MsgStoreCodeResponse, error) -} - -type msgClient struct { - cc grpc1.ClientConn -} - -func NewMsgClient(cc grpc1.ClientConn) MsgClient { - return &msgClient{cc} -} - -func (c *msgClient) StoreCode(ctx context.Context, in *MsgStoreCode, opts ...grpc.CallOption) (*MsgStoreCodeResponse, error) { - out := new(MsgStoreCodeResponse) - err := c.cc.Invoke(ctx, "/ibc.lightclients.wasm.v1.Msg/StoreCode", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -// MsgServer is the server API for Msg service. -type MsgServer interface { - // StoreCode defines a rpc handler method for MsgStoreCode. - StoreCode(context.Context, *MsgStoreCode) (*MsgStoreCodeResponse, error) -} - -// UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct { -} - -func (*UnimplementedMsgServer) StoreCode(ctx context.Context, req *MsgStoreCode) (*MsgStoreCodeResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method StoreCode not implemented") -} - -func RegisterMsgServer(s grpc1.Server, srv MsgServer) { - s.RegisterService(&_Msg_serviceDesc, srv) -} - -func _Msg_StoreCode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgStoreCode) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(MsgServer).StoreCode(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/ibc.lightclients.wasm.v1.Msg/StoreCode", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).StoreCode(ctx, req.(*MsgStoreCode)) - } - return interceptor(ctx, in, info, handler) -} - -var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "ibc.lightclients.wasm.v1.Msg", - HandlerType: (*MsgServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "StoreCode", - Handler: _Msg_StoreCode_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "ibc/lightclients/wasm/v1/tx.proto", -} - -func (m *MsgStoreCode) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MsgStoreCode) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgStoreCode) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Code) > 0 { - i -= len(m.Code) - copy(dAtA[i:], m.Code) - i = encodeVarintTx(dAtA, i, uint64(len(m.Code))) - i-- - dAtA[i] = 0x12 - } - if len(m.Signer) > 0 { - i -= len(m.Signer) - copy(dAtA[i:], m.Signer) - i = encodeVarintTx(dAtA, i, uint64(len(m.Signer))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgStoreCodeResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MsgStoreCodeResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgStoreCodeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.CodeId) > 0 { - i -= len(m.CodeId) - copy(dAtA[i:], m.CodeId) - i = encodeVarintTx(dAtA, i, uint64(len(m.CodeId))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintTx(dAtA []byte, offset int, v uint64) int { - offset -= sovTx(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *MsgStoreCode) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Signer) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - l = len(m.Code) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - return n -} - -func (m *MsgStoreCodeResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.CodeId) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } - return n -} - -func sovTx(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozTx(x uint64) (n int) { - return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *MsgStoreCode) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MsgStoreCode: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgStoreCode: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Signer = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Code = append(m.Code[:0], dAtA[iNdEx:postIndex]...) - if m.Code == nil { - m.Code = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTx(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTx - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgStoreCodeResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MsgStoreCodeResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgStoreCodeResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CodeId", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CodeId = append(m.CodeId[:0], dAtA[iNdEx:postIndex]...) - if m.CodeId == nil { - m.CodeId = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTx(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTx - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipTx(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTx - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTx - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTx - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthTx - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupTx - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthTx - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthTx = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTx = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupTx = fmt.Errorf("proto: unexpected end of group") -) diff --git a/relayer/codecs/08-wasm-types/wasm.pb.go b/relayer/codecs/08-wasm-types/wasm.pb.go deleted file mode 100644 index 0a2f17cac..000000000 --- a/relayer/codecs/08-wasm-types/wasm.pb.go +++ /dev/null @@ -1,995 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ibc/lightclients/wasm/v1/wasm.proto - -package types - -import ( - fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - types "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// Wasm light client's Client state -type ClientState struct { - Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` - CodeId []byte `protobuf:"bytes,2,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"` - LatestHeight types.Height `protobuf:"bytes,3,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height" yaml:"latest_height"` -} - -func (m *ClientState) Reset() { *m = ClientState{} } -func (m *ClientState) String() string { return proto.CompactTextString(m) } -func (*ClientState) ProtoMessage() {} -func (*ClientState) Descriptor() ([]byte, []int) { - return fileDescriptor_678928ebbdee1807, []int{0} -} -func (m *ClientState) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ClientState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ClientState.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ClientState) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClientState.Merge(m, src) -} -func (m *ClientState) XXX_Size() int { - return m.Size() -} -func (m *ClientState) XXX_DiscardUnknown() { - xxx_messageInfo_ClientState.DiscardUnknown(m) -} - -var xxx_messageInfo_ClientState proto.InternalMessageInfo - -// Wasm light client's ConsensusState -type ConsensusState struct { - Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` - // timestamp that corresponds to the block height in which the ConsensusState - // was stored. - Timestamp uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` -} - -func (m *ConsensusState) Reset() { *m = ConsensusState{} } -func (m *ConsensusState) String() string { return proto.CompactTextString(m) } -func (*ConsensusState) ProtoMessage() {} -func (*ConsensusState) Descriptor() ([]byte, []int) { - return fileDescriptor_678928ebbdee1807, []int{1} -} -func (m *ConsensusState) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ConsensusState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ConsensusState.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ConsensusState) XXX_Merge(src proto.Message) { - xxx_messageInfo_ConsensusState.Merge(m, src) -} -func (m *ConsensusState) XXX_Size() int { - return m.Size() -} -func (m *ConsensusState) XXX_DiscardUnknown() { - xxx_messageInfo_ConsensusState.DiscardUnknown(m) -} - -var xxx_messageInfo_ConsensusState proto.InternalMessageInfo - -// Wasm light client Header -type Header struct { - Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` - Height types.Height `protobuf:"bytes,2,opt,name=height,proto3" json:"height" yaml:"height"` -} - -func (m *Header) Reset() { *m = Header{} } -func (m *Header) String() string { return proto.CompactTextString(m) } -func (*Header) ProtoMessage() {} -func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_678928ebbdee1807, []int{2} -} -func (m *Header) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Header.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Header) XXX_Merge(src proto.Message) { - xxx_messageInfo_Header.Merge(m, src) -} -func (m *Header) XXX_Size() int { - return m.Size() -} -func (m *Header) XXX_DiscardUnknown() { - xxx_messageInfo_Header.DiscardUnknown(m) -} - -var xxx_messageInfo_Header proto.InternalMessageInfo - -// Wasm light client Misbehaviour -type Misbehaviour struct { - Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` -} - -func (m *Misbehaviour) Reset() { *m = Misbehaviour{} } -func (m *Misbehaviour) String() string { return proto.CompactTextString(m) } -func (*Misbehaviour) ProtoMessage() {} -func (*Misbehaviour) Descriptor() ([]byte, []int) { - return fileDescriptor_678928ebbdee1807, []int{3} -} -func (m *Misbehaviour) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Misbehaviour) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Misbehaviour.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Misbehaviour) XXX_Merge(src proto.Message) { - xxx_messageInfo_Misbehaviour.Merge(m, src) -} -func (m *Misbehaviour) XXX_Size() int { - return m.Size() -} -func (m *Misbehaviour) XXX_DiscardUnknown() { - xxx_messageInfo_Misbehaviour.DiscardUnknown(m) -} - -var xxx_messageInfo_Misbehaviour proto.InternalMessageInfo - -func init() { - proto.RegisterType((*ClientState)(nil), "ibc.lightclients.wasm.v1.ClientState") - proto.RegisterType((*ConsensusState)(nil), "ibc.lightclients.wasm.v1.ConsensusState") - proto.RegisterType((*Header)(nil), "ibc.lightclients.wasm.v1.Header") - proto.RegisterType((*Misbehaviour)(nil), "ibc.lightclients.wasm.v1.Misbehaviour") -} - -func init() { - proto.RegisterFile("ibc/lightclients/wasm/v1/wasm.proto", fileDescriptor_678928ebbdee1807) -} - -var fileDescriptor_678928ebbdee1807 = []byte{ - // 386 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x6a, 0xea, 0x40, - 0x14, 0x86, 0x13, 0xaf, 0xe4, 0x72, 0x47, 0xbd, 0x8b, 0xe0, 0xe5, 0x06, 0x91, 0x44, 0x72, 0x37, - 0x6e, 0xcc, 0x5c, 0xdb, 0x45, 0x8b, 0x9b, 0x82, 0x6e, 0x74, 0xd1, 0x8d, 0x5d, 0xb5, 0x50, 0x64, - 0x32, 0x19, 0x92, 0x81, 0x8c, 0x23, 0xce, 0x24, 0xc5, 0x37, 0xe8, 0xb2, 0x6f, 0xd0, 0x3e, 0x8e, - 0x4b, 0x97, 0x5d, 0x49, 0xd1, 0x37, 0xe8, 0x13, 0x94, 0xcc, 0x44, 0xda, 0x82, 0xa5, 0xab, 0x9c, - 0x73, 0xf2, 0xe5, 0x3f, 0xff, 0x4f, 0x0e, 0xf8, 0x47, 0x43, 0x0c, 0x53, 0x1a, 0x27, 0x12, 0xa7, - 0x94, 0xcc, 0xa5, 0x80, 0x77, 0x48, 0x30, 0x98, 0xf7, 0xd5, 0x33, 0x58, 0x2c, 0xb9, 0xe4, 0xb6, - 0x43, 0x43, 0x1c, 0x7c, 0x84, 0x02, 0xf5, 0x32, 0xef, 0xb7, 0x9a, 0x31, 0x8f, 0xb9, 0x82, 0x60, - 0x51, 0x69, 0xbe, 0xe5, 0x15, 0xa2, 0x98, 0x2f, 0x09, 0xd4, 0x7c, 0x21, 0xa7, 0x2b, 0x0d, 0xf8, - 0x8f, 0x26, 0xa8, 0x8d, 0xd4, 0xe0, 0x4a, 0x22, 0x49, 0x6c, 0x1b, 0x54, 0x23, 0x24, 0x91, 0x63, - 0x76, 0xcc, 0x6e, 0x7d, 0xaa, 0x6a, 0xfb, 0x2f, 0xf8, 0x89, 0x79, 0x44, 0x66, 0x34, 0x72, 0x2a, - 0x6a, 0x6c, 0x15, 0xed, 0x24, 0xb2, 0x6f, 0x41, 0x23, 0x45, 0x92, 0x08, 0x39, 0x4b, 0x48, 0xe1, - 0xc9, 0xf9, 0xd1, 0x31, 0xbb, 0xb5, 0x93, 0x56, 0x50, 0xb8, 0x2c, 0xb6, 0x06, 0xe5, 0xae, 0xbc, - 0x1f, 0x8c, 0x15, 0x31, 0x6c, 0xaf, 0xb7, 0x9e, 0xf1, 0xba, 0xf5, 0x9a, 0x2b, 0xc4, 0xd2, 0x81, - 0xff, 0xe9, 0x73, 0x7f, 0x5a, 0xd7, 0xbd, 0x66, 0x07, 0xd5, 0xfb, 0x27, 0xcf, 0xf0, 0xc7, 0xe0, - 0xf7, 0x88, 0xcf, 0x05, 0x99, 0x8b, 0x4c, 0x7c, 0xed, 0xb1, 0x0d, 0x7e, 0x49, 0xca, 0x88, 0x90, - 0x88, 0x2d, 0x94, 0xcb, 0xea, 0xf4, 0x7d, 0x50, 0x2a, 0x31, 0x60, 0x8d, 0x09, 0x8a, 0xc8, 0xf2, - 0xa8, 0xc2, 0x04, 0x58, 0x65, 0x8a, 0xca, 0xb7, 0x29, 0xfe, 0x94, 0x29, 0x1a, 0x3a, 0xc5, 0xc1, - 0x7e, 0x29, 0x50, 0xae, 0xeb, 0x82, 0xfa, 0x25, 0x15, 0x21, 0x49, 0x50, 0x4e, 0x79, 0x76, 0x74, - 0xa9, 0x26, 0x87, 0xd7, 0xeb, 0x9d, 0x6b, 0x6e, 0x76, 0xae, 0xf9, 0xb2, 0x73, 0xcd, 0x87, 0xbd, - 0x6b, 0x6c, 0xf6, 0xae, 0xf1, 0xbc, 0x77, 0x8d, 0x9b, 0x8b, 0x98, 0xca, 0x24, 0x0b, 0x03, 0xcc, - 0x19, 0xc4, 0x5c, 0x30, 0x2e, 0x20, 0x0d, 0x71, 0x2f, 0xe6, 0x30, 0x3f, 0x83, 0x8c, 0x47, 0x59, - 0x4a, 0x84, 0x3e, 0x9a, 0xde, 0xe1, 0x6a, 0xfe, 0x9f, 0xf7, 0xd4, 0xe1, 0xc8, 0xd5, 0x82, 0x88, - 0xd0, 0x52, 0xbf, 0xf9, 0xf4, 0x2d, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xed, 0x18, 0x0a, 0x5e, 0x02, - 0x00, 0x00, -} - -func (m *ClientState) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ClientState) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size, err := m.LatestHeight.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintWasm(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - if len(m.CodeId) > 0 { - i -= len(m.CodeId) - copy(dAtA[i:], m.CodeId) - i = encodeVarintWasm(dAtA, i, uint64(len(m.CodeId))) - i-- - dAtA[i] = 0x12 - } - if len(m.Data) > 0 { - i -= len(m.Data) - copy(dAtA[i:], m.Data) - i = encodeVarintWasm(dAtA, i, uint64(len(m.Data))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ConsensusState) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ConsensusState) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ConsensusState) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Timestamp != 0 { - i = encodeVarintWasm(dAtA, i, uint64(m.Timestamp)) - i-- - dAtA[i] = 0x10 - } - if len(m.Data) > 0 { - i -= len(m.Data) - copy(dAtA[i:], m.Data) - i = encodeVarintWasm(dAtA, i, uint64(len(m.Data))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *Header) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Header) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size, err := m.Height.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintWasm(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - if len(m.Data) > 0 { - i -= len(m.Data) - copy(dAtA[i:], m.Data) - i = encodeVarintWasm(dAtA, i, uint64(len(m.Data))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *Misbehaviour) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Misbehaviour) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Misbehaviour) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Data) > 0 { - i -= len(m.Data) - copy(dAtA[i:], m.Data) - i = encodeVarintWasm(dAtA, i, uint64(len(m.Data))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintWasm(dAtA []byte, offset int, v uint64) int { - offset -= sovWasm(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *ClientState) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Data) - if l > 0 { - n += 1 + l + sovWasm(uint64(l)) - } - l = len(m.CodeId) - if l > 0 { - n += 1 + l + sovWasm(uint64(l)) - } - l = m.LatestHeight.Size() - n += 1 + l + sovWasm(uint64(l)) - return n -} - -func (m *ConsensusState) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Data) - if l > 0 { - n += 1 + l + sovWasm(uint64(l)) - } - if m.Timestamp != 0 { - n += 1 + sovWasm(uint64(m.Timestamp)) - } - return n -} - -func (m *Header) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Data) - if l > 0 { - n += 1 + l + sovWasm(uint64(l)) - } - l = m.Height.Size() - n += 1 + l + sovWasm(uint64(l)) - return n -} - -func (m *Misbehaviour) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Data) - if l > 0 { - n += 1 + l + sovWasm(uint64(l)) - } - return n -} - -func sovWasm(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozWasm(x uint64) (n int) { - return sovWasm(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *ClientState) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ClientState: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ClientState: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthWasm - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthWasm - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) - if m.Data == nil { - m.Data = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CodeId", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthWasm - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthWasm - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CodeId = append(m.CodeId[:0], dAtA[iNdEx:postIndex]...) - if m.CodeId == nil { - m.CodeId = []byte{} - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LatestHeight", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthWasm - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthWasm - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.LatestHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipWasm(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthWasm - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ConsensusState) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ConsensusState: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ConsensusState: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthWasm - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthWasm - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) - if m.Data == nil { - m.Data = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType) - } - m.Timestamp = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Timestamp |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipWasm(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthWasm - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Header) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Header: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Header: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthWasm - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthWasm - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) - if m.Data == nil { - m.Data = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthWasm - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthWasm - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Height.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipWasm(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthWasm - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Misbehaviour) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Misbehaviour: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Misbehaviour: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWasm - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthWasm - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthWasm - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) - if m.Data == nil { - m.Data = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipWasm(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthWasm - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipWasm(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowWasm - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowWasm - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowWasm - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthWasm - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupWasm - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthWasm - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthWasm = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowWasm = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupWasm = fmt.Errorf("proto: unexpected end of group") -) diff --git a/relayer/provider/matcher.go b/relayer/provider/matcher.go index ee04743c7..364e15c5b 100644 --- a/relayer/provider/matcher.go +++ b/relayer/provider/matcher.go @@ -9,9 +9,10 @@ import ( sdkcodec "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - wasmclient "github.com/cosmos/relayer/v2/relayer/codecs/08-wasm-types" + wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" ) var tendermintClientCodec = tmClientCodec() @@ -32,7 +33,7 @@ func ClientsMatch(ctx context.Context, src, dst ChainProvider, existingClient cl return "", err } - if newClient.ClientType() == "08-wasm" { // TODO: replace with ibcexported.Wasm + if newClient.ClientType() == exported.Wasm { wasmClientState := newClient.(*wasmclient.ClientState) newClient, err = clienttypes.UnmarshalClientState(tendermintClientCodec, wasmClientState.Data) // Does this need to be UnmarshalInterface? if err != nil { From 23a0472c76563cdf4b2c59549f64d66f2e00503a Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Fri, 27 Oct 2023 18:23:26 +0545 Subject: [PATCH 08/35] feat: wasm client creation of icon on cosmos native module --- relayer/chains/cosmos/codec.go | 2 ++ relayer/chains/cosmos/tx.go | 2 +- relayer/chains/icon/provider.go | 29 ++++++++++++++++++++++++++--- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/relayer/chains/cosmos/codec.go b/relayer/chains/cosmos/codec.go index bfeb42425..04847ff7c 100644 --- a/relayer/chains/cosmos/codec.go +++ b/relayer/chains/cosmos/codec.go @@ -27,6 +27,7 @@ import ( cosmosmodule "github.com/cosmos/relayer/v2/relayer/chains/cosmos/module" "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" + icon_module "github.com/cosmos/relayer/v2/relayer/chains/icon/module" ethermintcodecs "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" injectivecodecs "github.com/cosmos/relayer/v2/relayer/codecs/injective" ) @@ -58,6 +59,7 @@ var ModuleBasics = []module.AppModuleBasic{ cosmosmodule.AppModuleBasic{}, stride.AppModuleBasic{}, ibcfee.AppModuleBasic{}, + icon_module.AppModuleBasic{}, } type Codec struct { diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index c5c3ca174..e9fe22fd5 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -1011,7 +1011,7 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, clientHeader = &tmClientHeader - if clientType == exported.Wasm { // TODO: replace with ibcexported.Wasm at v7.2 + if clientType == exported.Wasm { tmClientHeaderBz, err := cc.Cdc.Marshaler.MarshalInterface(clientHeader) if err != nil { return &wasmclient.Header{}, nil diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index 4459a4270..f28d43d15 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -3,6 +3,7 @@ package icon import ( "context" "encoding/base64" + "encoding/hex" "fmt" "sync" "time" @@ -23,6 +24,7 @@ import ( chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" // integration_types "github.com/icon-project/IBC-Integration/libraries/go/common/icon" ) @@ -218,6 +220,8 @@ func (icp *IconProvider) NewClientState( srcWasmCodeID string, ) (ibcexported.ClientState, error) { + var clientState ibcexported.ClientState + if !dstUpdateHeader.IsCompleteBlock() { return nil, fmt.Errorf("Not complete block at height:%d", dstUpdateHeader.Height()) } @@ -228,8 +232,7 @@ func (icp *IconProvider) NewClientState( trustingBlockPeriod := uint64(dstTrustingPeriod) / (icp.PCfg.BlockInterval * uint64(common.NanoToMilliRatio)) - return &icon.ClientState{ - // In case of Icon: Trusting Period is block Difference // see: light.proto in ibc-integration + clientState = &icon.ClientState{ TrustingPeriod: trustingBlockPeriod, FrozenHeight: 0, MaxClockDrift: 3600, @@ -237,7 +240,27 @@ func (icp *IconProvider) NewClientState( SrcNetworkId: getSrcNetworkId(icp.PCfg.ICONNetworkID), NetworkId: uint64(icp.PCfg.BTPNetworkID), NetworkTypeId: uint64(icp.PCfg.BTPNetworkTypeID), - }, nil + } + + latestHeight := clienttypes.NewHeight(0, dstUpdateHeader.Height()) + + if srcWasmCodeID != "" { + tmClientStateBz, err := icp.codec.Marshaler.MarshalInterface(clientState) + if err != nil { + return &wasmclient.ClientState{}, err + } + codeID, err := hex.DecodeString(srcWasmCodeID) + if err != nil { + return &wasmclient.ClientState{}, err + } + clientState = &wasmclient.ClientState{ + Data: tmClientStateBz, + CodeId: codeID, + LatestHeight: latestHeight, + } + } + + return clientState, nil } From fa05d10d3858279b028294c45834fe00819d5091 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Mon, 30 Oct 2023 18:58:05 +0545 Subject: [PATCH 09/35] fix: update ibc-integration repo --- .gitmodules | 2 +- go.mod | 79 ++++---- go.sum | 170 +++++++++--------- relayer/chains/cosmos/tx.go | 25 ++- relayer/chains/icon/client_test.go | 2 +- relayer/chains/icon/codec_test.go | 10 +- .../chains/icon/cryptoutils/merkle_proof.go | 2 +- .../chains/icon/cryptoutils/merkle_test.go | 2 +- relayer/chains/icon/event_parser.go | 2 +- relayer/chains/icon/event_parser_test.go | 2 +- relayer/chains/icon/module/app_module.go | 4 +- relayer/chains/icon/provider.go | 5 +- relayer/chains/icon/provider_test.go | 26 ++- relayer/chains/icon/query.go | 4 +- relayer/chains/icon/query_test.go | 2 +- relayer/chains/icon/tx.go | 4 +- relayer/chains/icon/types/types.go | 2 +- relayer/chains/icon/utils.go | 4 +- relayer/chains/wasm/module/app_module.go | 2 +- relayer/chains/wasm/provider.go | 2 +- relayer/chains/wasm/provider_test.go | 2 +- relayer/chains/wasm/query.go | 2 +- relayer/chains/wasm/tx.go | 12 +- 23 files changed, 213 insertions(+), 154 deletions(-) diff --git a/.gitmodules b/.gitmodules index 034f7b2ec..adb290966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ [submodule ".github/scripts/IBC-Integration"] path = .github/scripts/IBC-Integration - url = https://github.com/icon-project/IBC-Integration.git + url = https://github.com/icon-project/ibc-integration.git [submodule ".github/scripts/archway"] path = .github/scripts/archway url = https://github.com/archway-network/archway.git diff --git a/go.mod b/go.mod index 3051616ff..5125a0df3 100644 --- a/go.mod +++ b/go.mod @@ -4,18 +4,18 @@ go 1.19 require ( cosmossdk.io/api v0.3.1 - cosmossdk.io/errors v1.0.0-beta.7 + cosmossdk.io/errors v1.0.0 cosmossdk.io/math v1.0.1 - github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 - github.com/avast/retry-go/v4 v4.3.3 + github.com/CosmWasm/wasmd v0.40.0-rc.1 + github.com/avast/retry-go/v4 v4.3.4 github.com/btcsuite/btcd v0.23.4 github.com/btcsuite/btcd/btcutil v1.1.3 - github.com/cometbft/cometbft v0.37.1 + github.com/cometbft/cometbft v0.37.2 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.3 + github.com/cosmos/cosmos-sdk v0.47.4 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-go/v7 v7.1.0-rc0 + github.com/cosmos/ibc-go/v7 v7.2.0 github.com/cosmos/ics23/go v0.10.0 github.com/ethereum/go-ethereum v1.10.26 github.com/gofrs/flock v0.8.1 @@ -24,22 +24,22 @@ require ( github.com/google/go-github/v43 v43.0.0 github.com/gorilla/websocket v1.5.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/icon-project/IBC-Integration v0.0.0-20230416064536-48d70570734d github.com/icon-project/goloop v1.3.4 + github.com/icon-project/ibc-integration v1.0.0 github.com/jsternberg/zap-logfmt v1.3.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.0 github.com/spf13/cobra v1.7.0 - github.com/spf13/viper v1.15.0 - github.com/stretchr/testify v1.8.2 + github.com/spf13/viper v1.16.0 + github.com/stretchr/testify v1.8.4 github.com/tyler-smith/go-bip39 v1.1.0 - go.uber.org/multierr v1.8.0 + go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 - golang.org/x/crypto v0.8.0 - golang.org/x/mod v0.10.0 - golang.org/x/sync v0.1.0 - golang.org/x/text v0.9.0 - google.golang.org/grpc v1.55.0 + golang.org/x/crypto v0.11.0 + golang.org/x/mod v0.12.0 + golang.org/x/sync v0.3.0 + golang.org/x/text v0.11.0 + google.golang.org/grpc v1.56.2 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 @@ -47,15 +47,15 @@ require ( ) require ( - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.18.0 // indirect + cloud.google.com/go v0.110.4 // indirect + cloud.google.com/go/compute v1.20.1 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.12.0 // indirect - cloud.google.com/go/storage v1.29.0 // indirect + cloud.google.com/go/iam v1.1.0 // indirect + cloud.google.com/go/storage v1.30.1 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - cosmossdk.io/log v1.1.0 // indirect + cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -77,7 +77,7 @@ require ( github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect - github.com/cometbft/cometbft-db v0.7.0 // indirect + github.com/cometbft/cometbft-db v0.8.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect @@ -92,7 +92,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.4 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/docker/distribution v2.8.1+incompatible // indirect + github.com/docker/distribution v2.8.2+incompatible // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/evalphobia/logrus_fluent v0.5.4 // indirect @@ -118,9 +118,10 @@ require ( github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/orderedcode v0.0.1 // indirect + github.com/google/s2a-go v0.1.4 // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.0 // indirect + github.com/googleapis/gax-go/v2 v2.11.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect @@ -141,16 +142,17 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/klauspost/compress v1.16.3 // indirect + github.com/klauspost/compress v1.16.4 // indirect github.com/labstack/echo/v4 v4.9.0 // indirect github.com/labstack/gommon v0.3.1 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/linxGnu/grocksdb v1.7.16 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect github.com/minio/highwayhash v1.0.2 // indirect @@ -159,7 +161,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/pelletier/go-toml/v2 v2.0.9 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/philhofer/fwd v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -173,13 +175,12 @@ require ( github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect - github.com/spf13/afero v1.9.3 // indirect - github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/afero v1.9.5 // indirect + github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.6.0 // indirect github.com/tinylib/msgp v1.1.2 // indirect @@ -194,19 +195,21 @@ require ( go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect - golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.6.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/term v0.7.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/term v0.10.0 // indirect golang.org/x/time v0.1.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.110.0 // indirect + google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/go-playground/validator.v9 v9.28.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - nhooyr.io/websocket v1.8.6 // indirect + nhooyr.io/websocket v1.8.7 // indirect pgregory.net/rapid v0.5.5 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) @@ -216,6 +219,6 @@ replace ( github.com/CosmWasm/wasmd => github.com/cosmwasm/wasmd v0.40.0-rc.1.0.20230424144037-55647a1fd1f9 github.com/cosmos/ibc-go/v7 => github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/icon-project/IBC-Integration => github.com/icon-project/ibc-integration v0.0.0-20230717083940-67949d73b622 + github.com/icon-project/ibc-integration => github.com/icon-project/ibc-integration v1.0.1-0.20231030122034-eba3565c0499 ) diff --git a/go.sum b/go.sum index 233d01ca2..e1eaf5b5e 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk= +cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -70,8 +70,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY= -cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= +cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg= +cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -111,13 +111,12 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE= -cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY= +cloud.google.com/go/iam v1.1.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94= +cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -175,8 +174,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= -cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= +cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= +cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= @@ -196,10 +195,10 @@ cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= -cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= -cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= -cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= +cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= +cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= +cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca h1:msenprh2BLLRwNT7zN56TbBHOGk/7ARQckXHxXyvjoQ= +cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca/go.mod h1:PkIAKXZvaxrTRc++z53XMRvFk8AcGGWYHcMIPzVYX9c= cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -213,7 +212,7 @@ github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XB github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= @@ -251,8 +250,8 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/avast/retry-go/v4 v4.3.3 h1:G56Bp6mU0b5HE1SkaoVjscZjlQb0oy4mezwY/cGH19w= -github.com/avast/retry-go/v4 v4.3.3/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU= +github.com/avast/retry-go/v4 v4.3.4 h1:pHLkL7jvCvP317I8Ge+Km2Yhntv3SdkJm7uekkqbKhM= +github.com/avast/retry-go/v4 v4.3.4/go.mod h1:rv+Nla6Vk3/ilU0H51VHddWHiwimzX66yZ0JT6T+UvE= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= @@ -342,10 +341,10 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= -github.com/cometbft/cometbft v0.37.1 h1:KLxkQTK2hICXYq21U2hn1W5hOVYUdQgDQ1uB+90xPIg= -github.com/cometbft/cometbft v0.37.1/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= -github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= -github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= +github.com/cometbft/cometbft v0.37.2 h1:XB0yyHGT0lwmJlFmM4+rsRnczPlHoAKFX6K8Zgc2/Jc= +github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= +github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= +github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= @@ -359,8 +358,8 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.3 h1:r0hGmZoAzP2D+MaPaFGHwAaTdFQq3pNpHaUp1BsffbM= -github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= +github.com/cosmos/cosmos-sdk v0.47.4 h1:FVUpEprm58nMmBX4xkRdMDaIG5Nr4yy92HZAfGAw9bg= +github.com/cosmos/cosmos-sdk v0.47.4/go.mod h1:R5n+uM7vguVPFap4pgkdvQCT1nVo/OtPwrlAU40rvok= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -410,8 +409,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= -github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= +github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -439,9 +438,6 @@ github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqB github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/evalphobia/logrus_fluent v0.5.4 h1:G4BSBTm7+L+oanWfFtA/A5Y3pvL2OMxviczyZPYO5xc= github.com/evalphobia/logrus_fluent v0.5.4/go.mod h1:hasyj+CXm3BDP1YhFk/rnTcjlegyqvkokV9A25cQsaA= -github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= -github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= @@ -451,7 +447,7 @@ github.com/fluent/fluent-logger-golang v1.4.0/go.mod h1:2/HCT/jTy78yGyeNGQLGQsjF github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= @@ -480,7 +476,7 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= @@ -611,6 +607,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= +github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -629,8 +627,8 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= +github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4= +github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -681,8 +679,8 @@ github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoD github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= @@ -712,8 +710,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/icon-project/goloop v1.3.4 h1:82x8x+zY2XLVPEuWKHvnTj4bkeC5EYlNaaiePDqdMjk= github.com/icon-project/goloop v1.3.4/go.mod h1:9PoWRb5kowidc9jYy0RLuLpay1zT5FXgEKijx7rDQjE= -github.com/icon-project/ibc-integration v0.0.0-20230717083940-67949d73b622 h1:RHutSdyBRURe7MHx/838gVEw6Iu+tYMF/x2cx9hZSxY= -github.com/icon-project/ibc-integration v0.0.0-20230717083940-67949d73b622/go.mod h1:lYQTcVqXxpUhhdz/cU2xsX1rPGoIkeWalIAjiEt0K+0= +github.com/icon-project/ibc-integration v1.0.1-0.20231030122034-eba3565c0499 h1:PTvHnPGqhkiQB2qtCzn8Nhkim0n93Xv839ek4Uycsag= +github.com/icon-project/ibc-integration v1.0.1-0.20231030122034-eba3565c0499/go.mod h1:fjKA13uq7vf75WBzQrs5xfnf6+p7Wnhoe59z9xsENFc= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -755,8 +753,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= -github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.4 h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU= +github.com/klauspost/compress v1.16.4/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -779,6 +777,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/linxGnu/grocksdb v1.7.16 h1:Q2co1xrpdkr5Hx3Fp+f+f7fRGhQFQhvi/+226dtLmA8= +github.com/linxGnu/grocksdb v1.7.16/go.mod h1:JkS7pl5qWpGpuVb3bPqTz8nC12X3YtPZT+Xq7+QfQo4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= @@ -795,8 +795,8 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= @@ -866,7 +866,7 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= +github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -887,8 +887,8 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= -github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= +github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= @@ -995,11 +995,11 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= @@ -1012,8 +1012,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= @@ -1032,23 +1032,22 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= +github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4= github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= @@ -1103,14 +1102,13 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= @@ -1130,9 +1128,10 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= -golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= +golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1172,8 +1171,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1225,6 +1224,7 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1237,8 +1237,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1264,8 +1264,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= -golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1280,8 +1280,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1387,13 +1387,13 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= -golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= +golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1403,9 +1403,10 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1473,7 +1474,7 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= +golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1532,8 +1533,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.110.0 h1:l+rh0KYUooe9JGbGVx71tbFo4SMbMTXK3I3ia2QSEeU= -google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= +google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o= +google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1652,8 +1653,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 h1:s5YSX+ZH5b5vS9rnpGymvIyMpLRJizowqDlOuyjXnTk= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1695,8 +1700,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= -google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= +google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= +google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1713,8 +1718,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1752,7 +1757,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1761,8 +1766,9 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= +nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= +nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index e9fe22fd5..ee1a30e35 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -38,10 +38,14 @@ import ( host "github.com/cosmos/ibc-go/v7/modules/core/24-host" "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" strideicqtypes "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" + "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" + itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -1269,6 +1273,9 @@ func (cc *CosmosProvider) queryTMClientState(ctx context.Context, srch int64, sr return &tmclient.ClientState{}, fmt.Errorf("error unmarshaling tm client state, %w", err) } clientStateExported = clientState + + // different handling for the icon client + } tmClientState, ok := clientStateExported.(*tmclient.ClientState) @@ -1292,13 +1299,29 @@ func (cc *CosmosProvider) NewClientState( allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string, + srcChainId string, ) (ibcexported.ClientState, error) { revisionNumber := clienttypes.ParseChainID(dstChainID) var clientState ibcexported.ClientState + // different clientState in case of icon + if strings.Contains(srcChainId, common.IconModule) { + latestHeight := icon.NewHeight(revisionNumber, dstUpdateHeader.Height()) + return &itm.ClientState{ + ChainId: dstChainID, + TrustLevel: &itm.Fraction{Numerator: light.DefaultTrustLevel.Numerator, Denominator: light.DefaultTrustLevel.Denominator}, + TrustingPeriod: &itm.Duration{Seconds: int64(dstTrustingPeriod.Seconds())}, + UnbondingPeriod: &itm.Duration{Seconds: int64(dstUbdPeriod.Seconds())}, + FrozenHeight: &icon.Height{}, + LatestHeight: &latestHeight, + AllowUpdateAfterExpiry: allowUpdateAfterExpiry, + AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour, + }, nil + } + // Create the ClientState we want on 'c' tracking 'dst' - tmClientState := tmclient.ClientState{ + tmClientState := tendermint.ClientState{ ChainId: dstChainID, TrustLevel: tmclient.NewFractionFromTm(light.DefaultTrustLevel), TrustingPeriod: dstTrustingPeriod, diff --git a/relayer/chains/icon/client_test.go b/relayer/chains/icon/client_test.go index fe925683a..7b031721f 100644 --- a/relayer/chains/icon/client_test.go +++ b/relayer/chains/icon/client_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" "github.com/icon-project/goloop/common/codec" "github.com/icon-project/goloop/common/wallet" "github.com/icon-project/goloop/module" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/relayer/chains/icon/codec_test.go b/relayer/chains/icon/codec_test.go index 4f923c589..f5ffb48bd 100644 --- a/relayer/chains/icon/codec_test.go +++ b/relayer/chains/icon/codec_test.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/cosmos/ibc-go/v7/modules/core/exported" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" - tendermint_client "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" + tendermint_client "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/stretchr/testify/assert" ) @@ -42,8 +42,10 @@ func TestClientState(t *testing.T) { func TestCodecEncode(t *testing.T) { testData := tendermint_client.ClientState{ - ChainId: "tendermint", - LatestHeight: 40, + ChainId: "tendermint", + LatestHeight: &icon.Height{ + RevisionHeight: 40, + }, } codec := MakeCodec(ModuleBasics, []string{}) diff --git a/relayer/chains/icon/cryptoutils/merkle_proof.go b/relayer/chains/icon/cryptoutils/merkle_proof.go index 7424dce8b..d57f5d4c4 100644 --- a/relayer/chains/icon/cryptoutils/merkle_proof.go +++ b/relayer/chains/icon/cryptoutils/merkle_proof.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/relayer/v2/relayer/chains/icon/types" "github.com/cosmos/relayer/v2/relayer/common" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" ) const hashLen = 32 diff --git a/relayer/chains/icon/cryptoutils/merkle_test.go b/relayer/chains/icon/cryptoutils/merkle_test.go index 3a6470c98..30abfb913 100644 --- a/relayer/chains/icon/cryptoutils/merkle_test.go +++ b/relayer/chains/icon/cryptoutils/merkle_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/relayer/v2/relayer/chains/icon/types" "github.com/cosmos/relayer/v2/relayer/common" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" "github.com/stretchr/testify/assert" ) diff --git a/relayer/chains/icon/event_parser.go b/relayer/chains/icon/event_parser.go index 05642f887..ba0f11b58 100644 --- a/relayer/chains/icon/event_parser.go +++ b/relayer/chains/icon/event_parser.go @@ -7,7 +7,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/relayer/v2/relayer/chains/icon/types" "github.com/cosmos/relayer/v2/relayer/provider" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" "go.uber.org/zap" ) diff --git a/relayer/chains/icon/event_parser_test.go b/relayer/chains/icon/event_parser_test.go index bdb4e31a2..58da19f60 100644 --- a/relayer/chains/icon/event_parser_test.go +++ b/relayer/chains/icon/event_parser_test.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/relayer/chains/icon/module/app_module.go b/relayer/chains/icon/module/app_module.go index 02690d1ab..91ef210c2 100644 --- a/relayer/chains/icon/module/app_module.go +++ b/relayer/chains/icon/module/app_module.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" - "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" + "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/spf13/cobra" ) diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index f28d43d15..85342787d 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -13,8 +13,8 @@ import ( "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/processor" "github.com/cosmos/relayer/v2/relayer/provider" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" "github.com/icon-project/goloop/module" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" "go.uber.org/zap" @@ -25,7 +25,7 @@ import ( commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" - // integration_types "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + // integration_types "github.com/icon-project/ibc-integration/libraries/go/common/icon" ) var ( @@ -218,6 +218,7 @@ func (icp *IconProvider) NewClientState( allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string, + srcChainId string, ) (ibcexported.ClientState, error) { var clientState ibcexported.ClientState diff --git a/relayer/chains/icon/provider_test.go b/relayer/chains/icon/provider_test.go index c52e7e83a..ff4570fe2 100644 --- a/relayer/chains/icon/provider_test.go +++ b/relayer/chains/icon/provider_test.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/relayer/v2/relayer/chains/icon/types" "github.com/cosmos/relayer/v2/relayer/common" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" - icn "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" + icn "github.com/icon-project/ibc-integration/libraries/go/common/icon" "github.com/stretchr/testify/assert" "go.uber.org/zap" @@ -477,3 +477,25 @@ func TestHash(t *testing.T) { // assert.True(t, isValid) // } + +func TestGetBala(t *testing.T) { + + prov := GetMockIconProvider(2, "cx4f79451103e51baba633e10e4d355f28ceda3103") + + // ctx := context.Background() + // bal, err := prov.QueryBalanceWithAddress(ctx, "hxb6b5791be0b5ef67063b3c10b840fb81514db2fd") + // assert.NoError(t, err) + // fmt.Println("balance ", bal) + b, _ := hex.DecodeString("0a1063656e74617572692d746573746e65741204080110031a0408c0ba1222040880df6e32003a0310cb0240014801") + + data, err := prov.ClientToAny("07-tendermint-4", b) + assert.NoError(t, err) + + fmt.Println("data is ", data.Value) +} + +func TestIconConsensusState(t *testing.T) { + consensusState := icon.ConsensusState{} + fmt.Println(consensusState.GetTimestamp()) + +} diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index 20b67b911..088639636 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -23,8 +23,8 @@ import ( "github.com/cosmos/relayer/v2/relayer/chains/icon/types" "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" - itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" + itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/relayer/chains/icon/query_test.go b/relayer/chains/icon/query_test.go index 67d2e76f1..19caff51a 100644 --- a/relayer/chains/icon/query_test.go +++ b/relayer/chains/icon/query_test.go @@ -8,7 +8,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/gogo/protobuf/proto" - itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/stretchr/testify/assert" ) diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index 836b2e8bf..11e25d8d5 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -18,11 +18,11 @@ import ( wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" // tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/cosmos/relayer/v2/relayer/chains/icon/types" "github.com/cosmos/relayer/v2/relayer/provider" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" "go.uber.org/zap" ) diff --git a/relayer/chains/icon/types/types.go b/relayer/chains/icon/types/types.go index 7026f4a54..641aee21a 100644 --- a/relayer/chains/icon/types/types.go +++ b/relayer/chains/icon/types/types.go @@ -25,9 +25,9 @@ import ( "strings" "github.com/gorilla/websocket" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" "github.com/icon-project/goloop/common" "github.com/icon-project/goloop/common/codec" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" relayer_common "github.com/cosmos/relayer/v2/relayer/common" "github.com/icon-project/goloop/server/jsonrpc" diff --git a/relayer/chains/icon/utils.go b/relayer/chains/icon/utils.go index 167172356..c20187987 100644 --- a/relayer/chains/icon/utils.go +++ b/relayer/chains/icon/utils.go @@ -15,12 +15,12 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" - icn "github.com/icon-project/IBC-Integration/libraries/go/common/icon" "github.com/icon-project/goloop/common/codec" "github.com/icon-project/goloop/common/crypto" "github.com/icon-project/goloop/common/db" "github.com/icon-project/goloop/common/trie/ompt" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" + icn "github.com/icon-project/ibc-integration/libraries/go/common/icon" ) var ( diff --git a/relayer/chains/wasm/module/app_module.go b/relayer/chains/wasm/module/app_module.go index 375e20b8c..22e981782 100644 --- a/relayer/chains/wasm/module/app_module.go +++ b/relayer/chains/wasm/module/app_module.go @@ -6,7 +6,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/spf13/cobra" ) diff --git a/relayer/chains/wasm/provider.go b/relayer/chains/wasm/provider.go index c3ad74207..7df0dbbef 100644 --- a/relayer/chains/wasm/provider.go +++ b/relayer/chains/wasm/provider.go @@ -14,7 +14,7 @@ import ( comettypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/client" - itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/relayer/chains/wasm/provider_test.go b/relayer/chains/wasm/provider_test.go index 58bd1f74a..4df2d1a8c 100644 --- a/relayer/chains/wasm/provider_test.go +++ b/relayer/chains/wasm/provider_test.go @@ -10,7 +10,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/gogoproto/proto" - itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" diff --git a/relayer/chains/wasm/query.go b/relayer/chains/wasm/query.go index 764ca191d..d65b749b4 100644 --- a/relayer/chains/wasm/query.go +++ b/relayer/chains/wasm/query.go @@ -19,7 +19,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/proto" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" "go.uber.org/zap" querytypes "github.com/cosmos/cosmos-sdk/types/query" diff --git a/relayer/chains/wasm/tx.go b/relayer/chains/wasm/tx.go index e1fdaf3f5..60aa153bb 100644 --- a/relayer/chains/wasm/tx.go +++ b/relayer/chains/wasm/tx.go @@ -35,7 +35,8 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" "github.com/cosmos/relayer/v2/relayer/provider" - itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" + itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/input" @@ -149,15 +150,16 @@ func (pc *WasmProviderConfig) SignMode() signing.SignMode { return signMode } -func (ap *WasmProvider) NewClientState(dstChainID string, dstIBCHeader provider.IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, clientType string) (ibcexported.ClientState, error) { - +func (ap *WasmProvider) NewClientState(dstChainID string, dstIBCHeader provider.IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string, srcChainId string) (ibcexported.ClientState, error) { + revisionNumber := clienttypes.ParseChainID(dstChainID) + latestHeight := icon.NewHeight(revisionNumber, dstIBCHeader.Height()) return &itm.ClientState{ ChainId: dstChainID, TrustLevel: &itm.Fraction{Numerator: light.DefaultTrustLevel.Numerator, Denominator: light.DefaultTrustLevel.Denominator}, TrustingPeriod: &itm.Duration{Seconds: int64(dstTrustingPeriod.Seconds())}, UnbondingPeriod: &itm.Duration{Seconds: int64(dstUbdPeriod.Seconds())}, - FrozenHeight: 0, - LatestHeight: int64(dstIBCHeader.Height()), + FrozenHeight: &icon.Height{}, + LatestHeight: &latestHeight, AllowUpdateAfterExpiry: allowUpdateAfterExpiry, AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour, }, nil From 738b6a5d82f8b41f45963d1ce77828e56967388e Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Mon, 30 Oct 2023 18:59:01 +0545 Subject: [PATCH 10/35] fix: adjust clientState of cosmos native module for icon-ibc --- relayer/chains/icon/icon_chain_processor.go | 7 +++++-- relayer/chains/icon/provider_helper.go | 8 +++++--- relayer/chains/icon/query.go | 3 +++ relayer/chains/penumbra/tx.go | 1 + relayer/client.go | 2 +- relayer/provider/provider.go | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/relayer/chains/icon/icon_chain_processor.go b/relayer/chains/icon/icon_chain_processor.go index ba8dc4bd1..5cfb3e056 100644 --- a/relayer/chains/icon/icon_chain_processor.go +++ b/relayer/chains/icon/icon_chain_processor.go @@ -710,8 +710,11 @@ func (icp *IconChainProcessor) clientState(ctx context.Context, clientID string) } clientState := provider.ClientState{ - ClientID: clientID, - ConsensusHeight: cs.GetLatestHeight().(clienttypes.Height), + ClientID: clientID, + ConsensusHeight: clienttypes.Height{ + RevisionNumber: cs.GetLatestHeight().GetRevisionNumber(), + RevisionHeight: cs.GetLatestHeight().GetRevisionHeight(), + }, } icp.latestClientState[clientID] = clientState return clientState, nil diff --git a/relayer/chains/icon/provider_helper.go b/relayer/chains/icon/provider_helper.go index 0648e6879..0996c0198 100644 --- a/relayer/chains/icon/provider_helper.go +++ b/relayer/chains/icon/provider_helper.go @@ -8,8 +8,9 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/cosmos/relayer/v2/relayer/common" - "github.com/icon-project/IBC-Integration/libraries/go/common/icon" - itm "github.com/icon-project/IBC-Integration/libraries/go/common/tendermint" + "github.com/gogo/protobuf/proto" + "github.com/icon-project/ibc-integration/libraries/go/common/icon" + itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" ) // Implement when a new chain is added to ICON IBC Contract @@ -24,10 +25,11 @@ func (icp *IconProvider) ClientToAny(clientId string, clientStateB []byte) (*cod } if strings.Contains(clientId, common.TendermintLightClient) { var clientState itm.ClientState - err := icp.codec.Marshaler.Unmarshal(clientStateB, &clientState) + err := proto.Unmarshal(clientStateB, &clientState) if err != nil { return nil, err } + fmt.Printf("is tendermint client: %s\n", clientState.GetChainID()) return clienttypes.PackClientState(&clientState) } diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index 088639636..148cefa43 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -151,6 +151,7 @@ func (icp *IconProvider) QueryBalanceWithAddress(ctx context.Context, addr strin if err != nil { return nil, err } + return sdk.Coins{sdk.Coin{ Denom: "ICX", Amount: math.NewInt(balance.Int64()), @@ -219,6 +220,7 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in "clientId": srcClientId, }, callParamsWithHeight(types.NewHexInt(height))) + fmt.Println("[QueryClientStateResponse] callparams:", callParams) //similar should be implemented var clientStateB types.HexBytes err := icp.client.Call(callParams, &clientStateB) @@ -230,6 +232,7 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in if err != nil { return nil, err } + fmt.Printf("[QueryClientStateResponse] clientStateByte: %x \n ", clientStateB) any, err := icp.ClientToAny(srcClientId, clientStateByte) if err != nil { diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go index 920986a91..5c89e061b 100644 --- a/relayer/chains/penumbra/tx.go +++ b/relayer/chains/penumbra/tx.go @@ -2021,6 +2021,7 @@ func (cc *PenumbraProvider) NewClientState( allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string, + srcChainId string, ) (ibcexported.ClientState, error) { revisionNumber := clienttypes.ParseChainID(dstChainID) diff --git a/relayer/client.go b/relayer/client.go index 181a019af..0ed775980 100644 --- a/relayer/client.go +++ b/relayer/client.go @@ -192,7 +192,7 @@ func CreateClient( // We want to create a light client on the src chain which tracks the state of the dst chain. // So we build a new client state from dst and attempt to use this for creating the light client on src. clientState, err := dst.ChainProvider.NewClientState(dst.ChainID(), dstUpdateHeader, tp, ubdPeriod, allowUpdateAfterExpiry, - allowUpdateAfterMisbehaviour, srcWasmCodeID) + allowUpdateAfterMisbehaviour, srcWasmCodeID, src.ChainID()) if err != nil { return "", fmt.Errorf("failed to create new client state for chain{%s}: %w", dst.ChainID(), err) } diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go index e284080c9..e1ca4c3a4 100644 --- a/relayer/provider/provider.go +++ b/relayer/provider/provider.go @@ -236,7 +236,7 @@ type ChainProvider interface { Init(ctx context.Context) error // [Begin] Client IBC message assembly functions - NewClientState(dstChainID string, dstIBCHeader IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string) (ibcexported.ClientState, error) + NewClientState(dstChainID string, dstIBCHeader IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string, srcChainId string) (ibcexported.ClientState, error) MsgCreateClient(clientState ibcexported.ClientState, consensusState ibcexported.ConsensusState) (RelayerMessage, error) From 21becb3ce014fb4060da6b17e8a8c80e8e7c30ac Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Mon, 30 Oct 2023 19:18:49 +0545 Subject: [PATCH 11/35] chore: remove println --- cmd/paths.go | 1 - relayer/chains/cosmos/tx.go | 2 -- relayer/chains/icon/provider_helper.go | 1 - relayer/chains/icon/query.go | 2 -- relayer/chains/penumbra/msg.go | 4 ---- relayer/chains/wasm/helper_debug_msg.go | 3 --- 6 files changed, 13 deletions(-) diff --git a/cmd/paths.go b/cmd/paths.go index 640414fa5..be5dd3549 100644 --- a/cmd/paths.go +++ b/cmd/paths.go @@ -408,7 +408,6 @@ $ %s pth fch`, appName, defaultHome, appName)), client, _, err := client.Repositories.DownloadContents(cmd.Context(), "cosmos", "chain-registry", regPath, nil) if err != nil { if errors.As(err, new(*github.RateLimitError)) { - fmt.Println("some paths failed: ", err) break } fmt.Fprintf(cmd.ErrOrStderr(), "failure retrieving: %s: consider adding to cosmos/chain-registry: ERR: %v\n", pthName, err) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index ee1a30e35..5dff78c34 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -1274,8 +1274,6 @@ func (cc *CosmosProvider) queryTMClientState(ctx context.Context, srch int64, sr } clientStateExported = clientState - // different handling for the icon client - } tmClientState, ok := clientStateExported.(*tmclient.ClientState) diff --git a/relayer/chains/icon/provider_helper.go b/relayer/chains/icon/provider_helper.go index 0996c0198..b0deba35e 100644 --- a/relayer/chains/icon/provider_helper.go +++ b/relayer/chains/icon/provider_helper.go @@ -29,7 +29,6 @@ func (icp *IconProvider) ClientToAny(clientId string, clientStateB []byte) (*cod if err != nil { return nil, err } - fmt.Printf("is tendermint client: %s\n", clientState.GetChainID()) return clienttypes.PackClientState(&clientState) } diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index 148cefa43..6d0795475 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -220,7 +220,6 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in "clientId": srcClientId, }, callParamsWithHeight(types.NewHexInt(height))) - fmt.Println("[QueryClientStateResponse] callparams:", callParams) //similar should be implemented var clientStateB types.HexBytes err := icp.client.Call(callParams, &clientStateB) @@ -232,7 +231,6 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in if err != nil { return nil, err } - fmt.Printf("[QueryClientStateResponse] clientStateByte: %x \n ", clientStateB) any, err := icp.ClientToAny(srcClientId, clientStateByte) if err != nil { diff --git a/relayer/chains/penumbra/msg.go b/relayer/chains/penumbra/msg.go index 689a3267d..eaca6b993 100644 --- a/relayer/chains/penumbra/msg.go +++ b/relayer/chains/penumbra/msg.go @@ -1,8 +1,6 @@ package penumbra import ( - "fmt" - "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -24,7 +22,6 @@ func NewPenumbraMessage(msg sdk.Msg) provider.RelayerMessage { func PenumbraMsg(rm provider.RelayerMessage) sdk.Msg { if val, ok := rm.(PenumbraMessage); !ok { - fmt.Printf("got data of type %T but wanted PenumbraMessage \n", val) return nil } else { return val.Msg @@ -52,7 +49,6 @@ func PenumbraMsgs(rm ...provider.RelayerMessage) []sdk.Msg { case cosmos.CosmosMessage: sdkMsgs = append(sdkMsgs, rMsg.(cosmos.CosmosMessage).Msg) default: - fmt.Printf("got data of type %T but wanted PenumbraMessage \n", rMsg) return nil } } diff --git a/relayer/chains/wasm/helper_debug_msg.go b/relayer/chains/wasm/helper_debug_msg.go index 5ab3f0b8d..8636a334a 100644 --- a/relayer/chains/wasm/helper_debug_msg.go +++ b/relayer/chains/wasm/helper_debug_msg.go @@ -18,14 +18,12 @@ func jsonDumpDataFile(filename string, bufs interface{}) { // Marshal the slice of structs to JSON format jsonData, err := json.MarshalIndent(bufs, "", " ") if err != nil { - fmt.Println("Error marshaling slice of structs to JSON:", err) os.Exit(1) } // Write JSON data to file err = ioutil.WriteFile(filename, jsonData, 0644) if err != nil { - fmt.Println("Error writing JSON to file:", err) os.Exit(1) } @@ -68,7 +66,6 @@ func SaveMsgToFile(filename string, msgs []provider.RelayerMessage) { var d []DataFormat err := readExistingData(filename, &d) if err != nil { - fmt.Println("error savingtoFile ", err) return } From ae12a8b18390e63796167306cd37cafe516edab1 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Mon, 11 Dec 2023 19:06:30 +0800 Subject: [PATCH 12/35] wip: fix made changes --- .../chains/cosmos/cosmos_chain_processor.go | 14 +- relayer/chains/cosmos/provider_test.go | 214 ++++++++++++++++++ relayer/chains/cosmos/tx.go | 112 ++++++--- relayer/chains/icon/icon_chain_processor.go | 4 + relayer/chains/icon/provider.go | 7 +- relayer/chains/icon/provider_helper.go | 3 +- relayer/chains/icon/query.go | 40 ++-- relayer/chains/icon/tx.go | 102 ++++++--- relayer/chains/penumbra/query.go | 2 +- relayer/chains/penumbra/tx.go | 2 +- relayer/chains/wasm/provider.go | 119 ---------- relayer/chains/wasm/provider_test.go | 31 +-- relayer/chains/wasm/query.go | 4 +- relayer/chains/wasm/tx.go | 6 +- relayer/client.go | 2 +- relayer/common/utils.go | 6 + relayer/processor/message_processor.go | 2 + relayer/processor/path_end_runtime.go | 6 +- relayer/processor/path_processor_internal.go | 3 +- relayer/processor/utils.go | 4 + relayer/provider/provider.go | 130 ++++++++++- 21 files changed, 571 insertions(+), 242 deletions(-) create mode 100644 relayer/chains/cosmos/provider_test.go diff --git a/relayer/chains/cosmos/cosmos_chain_processor.go b/relayer/chains/cosmos/cosmos_chain_processor.go index f02f4d243..079882224 100644 --- a/relayer/chains/cosmos/cosmos_chain_processor.go +++ b/relayer/chains/cosmos/cosmos_chain_processor.go @@ -9,7 +9,6 @@ import ( "github.com/avast/retry-go/v4" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/processor" @@ -94,7 +93,7 @@ func (l latestClientState) update(ctx context.Context, clientInfo clientInfo, cc trustingPeriod = existingClientInfo.TrustingPeriod } if trustingPeriod == 0 { - cs, err := ccp.chainProvider.queryTMClientState(ctx, 0, clientInfo.clientID) + cs, err := ccp.chainProvider.queryProviderClientState(ctx, 0, clientInfo.clientID) if err != nil { ccp.log.Error( "Failed to query client state to get trusting period", @@ -166,17 +165,12 @@ func (ccp *CosmosChainProcessor) clientState(ctx context.Context, clientID strin if state, ok := ccp.latestClientState[clientID]; ok && state.TrustingPeriod > 0 { return state, nil } - cs, err := ccp.chainProvider.queryTMClientState(ctx, int64(ccp.latestBlock.Height), clientID) + cs, err := ccp.chainProvider.queryProviderClientState(ctx, int64(ccp.latestBlock.Height), clientID) if err != nil { return provider.ClientState{}, err } - clientState := provider.ClientState{ - ClientID: clientID, - ConsensusHeight: cs.GetLatestHeight().(clienttypes.Height), - TrustingPeriod: cs.TrustingPeriod, - } - ccp.latestClientState[clientID] = clientState - return clientState, nil + ccp.latestClientState[clientID] = cs + return cs, nil } // queryCyclePersistence hold the variables that should be retained across queryCycles. diff --git a/relayer/chains/cosmos/provider_test.go b/relayer/chains/cosmos/provider_test.go new file mode 100644 index 000000000..7e69a45a9 --- /dev/null +++ b/relayer/chains/cosmos/provider_test.go @@ -0,0 +1,214 @@ +package cosmos + +import ( + "context" + "encoding/hex" + "fmt" + "testing" + + "github.com/cosmos/gogoproto/proto" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" + commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" + tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + ics23 "github.com/cosmos/ics23/go" + "github.com/stretchr/testify/assert" + "go.uber.org/zap" +) + +func GetMockCosmosProvider() (*CosmosProvider, error) { + + pcfg := CosmosProviderConfig{ + AccountPrefix: "centauri", + RPCAddr: "http://localhost:26657", + Timeout: "10h", + KeyringBackend: "test", + ChainID: "centauri-testnet-1", + } + log := zap.NewNop() + prov, err := pcfg.NewProvider(log, "/", false, "centaurid") + if err != nil { + return nil, err + } + + ctx := context.Background() + if err := prov.Init(ctx); err != nil { + return nil, err + } + + provid, ok := prov.(*CosmosProvider) + if !ok { + return nil, fmt.Errorf("failed to convert type ") + } + return provid, nil +} + +func TestDecodeMerkleProof(t *testing.T) { + + pro, err := GetMockCosmosProvider() + assert.NoError(t, err) + ctx := context.Background() + + height := 10635 + connectionId := "connection-13" + connection, err := pro.QueryConnection(ctx, int64(height), connectionId) + assert.NoError(t, err) + + // fromData, _ := hex.DecodeString("0ae0020add020a19636f6e6e656374696f6e732f636f6e6e656374696f6e2d3130124c0a0930382d7761736d2d3212230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f524445524544180122180a0f30372d74656e6465726d696e742d351a050a036962631a0d0801180120012a050002908001222b08011227020490800120abcebf1caa17e720f9981d4d23b934bff8263b961cdd8726fd508399085cab3120222b08011227040892800120804fb31d265f9febe4df8069e8e867634d9728d79865ed173945bd2e9500d45e20222d08011206060e928001201a21202575ba006a05b3e0b4f777bce72154b0807054a5473412807ba1daa14f5555c5222d080112060a20928001201a212072f68ca2f134b05702d0c81481a33d57b03a184896f939bf6fe78059815ab469222b080112270c4292800120c17c6efb37ea9abaffe34e4dc2f1928e8cbdcf221bc5f5927cab5b9d05e90180200afc010af9010a0369626312205e6ab940f7f3e6758c049b0ed9cdfba1f6b92e605d6e8cb5f1a42c6d5a460c3a1a090801180120012a0100222508011221014e1d5c563b0db0ffdcba6fc97dc0c7b13b5b5c9c341357f08827565047d6c6b9222708011201011a20316a36d621713cc96f137fdce34e0b887317e5bc1d400bdbc7d43a3392f3b441222508011221019f05c673d5e30ae4ce84687b527ec6823f0bb48f41a6f7c0359ff576b5faea1822250801122101c169322de4a462eaecada7ca8e80a4ffb299c9dfad87ce9d79b79c43d0593c9f222708011201011a2034d7875e7c32775823aa0a922f7e23dd09cf55f152f5a40b1778b26e191ca855") + // assert.Equal(t, connection.Proof, fromData, "proof is not equal") + fmt.Printf("proof %x \n", connection.Proof) + + var op commitmenttypes.MerkleProof + err = proto.Unmarshal(connection.Proof, &op) + assert.NoError(t, err) + + block, err := pro.LightProvider.LightBlock(ctx, int64(height)) + assert.NoError(t, err) + + // consensus state from data + // csByte, _ := hex.DecodeString("0a0b08ace083aa0610d884c53412220a2031f8b6bfb694c2148c695feeb25834b8ad737a61f1b7883fe7d86b3f6aac1d1d1a209867d31b94e8280141b7cbfd18f675e8cc7066b60932a39404aebcf7e8f6d02d") + // var cs tmclient.ConsensusState + // err = proto.Unmarshal(csByte, &cs) + // assert.NoError(t, err) + + fmt.Printf("root : %x \n", block.SignedHeader.AppHash) + root := commitmenttypes.MerkleRoot{Hash: block.SignedHeader.AppHash} + + key := host.ConnectionKey(connectionId) + fmt.Println("connection key: ", string(key)) + merklePath := commitmenttypes.NewMerklePath(string(key)) + path, err := commitmenttypes.ApplyPrefix(defaultChainPrefix, merklePath) + assert.NoError(t, err) + + // value + value, err := proto.Marshal(connection.Connection) + assert.NoError(t, err) + fmt.Printf("value: %x \n ", value) + + err = op.VerifyMembership([]*ics23.ProofSpec{ics23.IavlSpec, ics23.TendermintSpec}, root, path, value) + assert.NoError(t, err) + +} + +func TestGenerateConnectionHandshakeProof(t *testing.T) { + + pro, err := GetMockCosmosProvider() + assert.NoError(t, err) + ctx := context.Background() + + height := 10924 + connectionId := "connection-14" + + cs, _, _, _, _, err := pro.GenerateConnHandshakeProof(ctx, int64(height), "08-wasm-3", connectionId) + assert.NoError(t, err) + anyCs, err := clienttypes.PackClientState(cs) + assert.NoError(t, err) + + b, err := proto.Marshal(anyCs) + + fmt.Printf("client state %x \n", b) + +} + +func TestGenerateVal(t *testing.T) { + + d, _ := hex.DecodeString("0ad8030ad5030a1d636c69656e74732f30382d7761736d2d332f636c69656e7453746174651290010a252f6962632e6c69676874636c69656e74732e7761736d2e76312e436c69656e74537461746512670a3d0a202f69636f6e2e6c69676874636c69656e742e76312e436c69656e745374617465121908c0ba1218901c20c98e072a083078332e69636f6e300338011220dba26dce04b22164b34751ba0e42e60a18e22d179c0d848ad006bd201e7f8bf71a0410c98e071a0d0801180120012a0500028ea601222d080112060204d6aa01201a212003d57c97977de25765fd5ffc14fe57b794d67a665bc3f036d6d15d1635836a82222d080112060408d6aa01201a212050a51e1b4cb7b7b14711ad715ccb4f300f6024a4a98fe4d3d88781fc6d16762b222b080112270610d6aa012025b8312b97b25ee63807b2ecc1592709b283a2b001b5564a69c8f91cbd765c2820222b080112270820d6aa0120047ca7f7a99eb529aa47e5897275f38f5b7f2180f5e6fa4e6fdf6ec3616e3b1920222b080112270a2ed6aa0120c5449ed0890d620585729df614200b9c7630cfa4d9f885ca397173306683158f20222d080112060c56d6aa01201a2120350cea2ecd3e13944b23107b2476e6d1c6accaa99a6c892cbb027f85f66106490afc010af9010a036962631220d497023d6818dfafccb12532875e29df65983eb20b86f7c375875fef2af7ae6d1a090801180120012a0100222508011221014e1d5c563b0db0ffdcba6fc97dc0c7b13b5b5c9c341357f08827565047d6c6b9222708011201011a20316a36d621713cc96f137fdce34e0b887317e5bc1d400bdbc7d43a3392f3b441222508011221019f05c673d5e30ae4ce84687b527ec6823f0bb48f41a6f7c0359ff576b5faea1822250801122101990b5a6d14f4c2ca4ae83341cb992b3a191eb703adfd0b5c538c3986cdda7c6c222708011201011a2004939260c79a0f69a25f2a5a01c8a27286f210729d8c0238e9d59035e768a9e5") + var c conntypes.ConnectionEnd + proto.Unmarshal(d, &c) + fmt.Printf("%s \n", d) + + var op commitmenttypes.MerkleProof + err := proto.Unmarshal(d, &op) + assert.NoError(t, err) + + for _, v := range op.Proofs { + + fmt.Printf("key is %x \n", v.GetExist().Key) + fmt.Printf("value is %x\n", v.GetExist().Value) + } + + // d ,_ := hex.DecodeString("0a252f6962632e6c69676874636c69656e74732e7761736d2e76312e436c69656e74537461746512670a3d0a202f69636f6e2e6c69676874636c69656e742e76312e436c69656e745374617465121908c0ba1218901c20c98e072a083078332e69636f6e300338011220dba26dce04b22164b34751ba0e42e60a18e22d179c0d848ad006bd201e7f8bf71a0410c98e07") + // var op wasmclient.ClientState + // err := proto.Unmarshal(d, &op) + // assert.NoError(t, err) + // fmt.Printf("data is: %s ", op.CodeId) + +} + +func TestWasmClientProtoFile(t *testing.T) { + + // op:= wasmclient.ClientState{ + // Data: []byte("data"), + // CodeId: []byte("code-id"), + // LatestHeight: types.NewHeight(0,20), + // } + + // b, err := proto.Marshal(&op) + // assert.NoError(t, err) + // fmt.Printf("byte %x \n", b) + + // clientId := "08-wasm" + + // lastInd := strings.LastIndex(clientId, "-") + // fmt.Println(lastInd) + + pro, err := GetMockCosmosProvider() + assert.NoError(t, err) + ctx := context.Background() + + // height := 10924 + // connectionId := "connection-14" + clientId := "08-wasm-0" + + // height := clienttypes.NewHeight(1, 2201) + + cs, err := pro.QueryClientState(ctx, 0, clientId) + assert.NoError(t, err) + + // data, err := proto.Marshal(cs.ConsensusState) + // fmt.Printf("data %x\n", data) + fmt.Println("type", cs.ClientType()) + fmt.Printf("cs %d \n", cs.GetLatestHeight().GetRevisionHeight()) + fmt.Printf("cs %d \n", cs.GetLatestHeight().GetRevisionNumber()) + +} + +func TestConnectionOpenAck(t *testing.T) { + + //b, _ := hex.DecodeString("0a0c636f6e6e656374696f6e2d33120d636f6e6e656374696f6e2d31321a230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f52444552454422b5010a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651285010a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a0310d90142180a090801180120012a0100120b0a010110211804200c300142180a090801180120012a0100120b0a010110201801200130014a07757067726164654a1075706772616465644942435374617465500158012a0608011086c20532280a0208010a2212200f67ed62f02aaf9b0629782874ec141d891722c1bd7660703b8e614d7e08f1de3a4c0a240801122014b0d8d883caf0fef230e3bb3fb81b1714a5855e0689940ff48c4cfe5c909e080a24080112206090ec3291eb757be2b7178f3432b35e7784b54f70d28a57898d761fb0e48593424a0a221220330b2ee265bfe0e88446a7c000661b3f1f567ee18e562036383f6b46f6af82a60a24080112206090ec3291eb757be2b7178f3432b35e7784b54f70d28a57898d761fb0e485934a05080110d901522f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") + // + //var m conntypes.MsgConnectionOpenAck + //err := proto.Unmarshal(b, &m) + //assert.NoError(t, err) + // + //fmt.Printf("value %x \n", m.ClientState.Value) + // cs, err := clienttypes.UnpackClientState(m.ClientState) + // assert.NoError(t, err) + + // fmt.Println("connectionOpenAck", cs.GetLatestHeight()) + + b, _ := hex.DecodeString("0x0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110c50342190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801") + var m tendermint.ClientState + + err := proto.Unmarshal(b, &m) + assert.NoError(t, err) + + fmt.Println(m.GetLatestHeight().GetRevisionNumber()) + +} + +func TestProtoBufDecode(t *testing.T) { + // b, _ := hex.DecodeString("0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110fd0242180a090801180120012a0100120b0a010110211804200c300142180a090801180120012a0100120b0a010110201801200130014a07757067726164654a107570677261646564494243537461746550015801") + + b2Equal, _ := hex.DecodeString("0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110cb0742190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801") + + var cs tendermint.ClientState + + err := proto.Unmarshal(b2Equal, &cs) + assert.NoError(t, err) + + specs := commitmenttypes.GetSDKSpecs() + assert.Equal(t, specs, cs.ProofSpecs) +} diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 5dff78c34..544940bbd 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -44,8 +44,6 @@ import ( strideicqtypes "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" - "github.com/icon-project/ibc-integration/libraries/go/common/icon" - itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -148,6 +146,13 @@ func (cc *CosmosProvider) SendMessagesToMempool( cc.txMu.Lock() defer cc.txMu.Unlock() + for _, m := range msgs { + fmt.Println("[cosmos] from mempool messageType:", m.Type()) + b, _ := m.MsgBytes() + fmt.Printf("[commos] message %x \n ", b) + + } + txBytes, sequence, fees, err := cc.buildMessages(ctx, msgs, memo) if err != nil { // Account sequence mismatch errors can happen on the simulated transaction also. @@ -217,6 +222,10 @@ func (cc *CosmosProvider) broadcastTx( err = fmt.Errorf("transaction failed to execute") } } + + for _, m := range msgs { + fmt.Printf("msg: %x", m) + } cc.LogFailedTx(rlyResp, err, msgs) return err } @@ -703,6 +712,8 @@ func (cc *CosmosProvider) MsgTimeoutOnClose(msgTransfer provider.PacketInfo, pro } func (cc *CosmosProvider) MsgConnectionOpenInit(info provider.ConnectionInfo, proof provider.ConnectionProof) (provider.RelayerMessage, error) { + fmt.Println("[cosmos] msgconnectionOpenInit") + signer, err := cc.Address() if err != nil { return nil, err @@ -750,6 +761,8 @@ func (cc *CosmosProvider) ConnectionHandshakeProof( } func (cc *CosmosProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInfo, proof provider.ConnectionProof) (provider.RelayerMessage, error) { + fmt.Println("[cosmos] msgconnectionOpenTry") + signer, err := cc.Address() if err != nil { return nil, err @@ -795,20 +808,26 @@ func (cc *CosmosProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInf return nil, err } + // if msgOpenTry client is wasm client then we need to incorporate it + msg := &conntypes.MsgConnectionOpenAck{ ConnectionId: msgOpenTry.CounterpartyConnID, CounterpartyConnectionId: msgOpenTry.ConnID, Version: conntypes.DefaultIBCVersion, ClientState: csAny, ProofHeight: clienttypes.Height{ - RevisionNumber: proof.ProofHeight.GetRevisionNumber(), + RevisionNumber: 1, RevisionHeight: proof.ProofHeight.GetRevisionHeight(), }, - ProofTry: proof.ConnectionStateProof, - ProofClient: proof.ClientStateProof, - ProofConsensus: proof.ConsensusStateProof, - ConsensusHeight: proof.ClientState.GetLatestHeight().(clienttypes.Height), - Signer: signer, + ProofTry: proof.ConnectionStateProof, + ProofClient: proof.ClientStateProof, + ProofConsensus: proof.ConsensusStateProof, + // ConsensusHeight: proof.ClientState.GetLatestHeight().(clienttypes.Height), + ConsensusHeight: clienttypes.Height{ + RevisionNumber: 1, + RevisionHeight: proof.ClientState.GetLatestHeight().GetRevisionHeight(), + }, + Signer: signer, } return NewCosmosMessage(msg), nil @@ -980,6 +999,7 @@ func (cc *CosmosProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelIn } func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader, clientType string) (ibcexported.ClientMessage, error) { + trustedCosmosHeader, ok := trustedHeader.(provider.TendermintIBCHeader) if !ok { return nil, fmt.Errorf("unsupported IBC trusted header type, expected: TendermintIBCHeader, actual: %T", trustedHeader) @@ -1015,6 +1035,20 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, clientHeader = &tmClientHeader + // TODO: handle case for icon header + // if true { + // wasmLatestHeader := provider.NewWasmIBCHeaderFromLightBlock(latestCosmosHeader.LightBlock()) + // wasmTrustedHeader := provider.NewWasmIBCHeaderFromLightBlock(trustedCosmosHeader.LightBlock()) + + // clientHeader := itm.TmHeader{ + // SignedHeader: wasmLatestHeader.SignedHeader, + // ValidatorSet: wasmLatestHeader.ValidatorSet, + // TrustedValidators: wasmTrustedHeader.ValidatorSet, + // TrustedHeight: int64(trustedHeight.RevisionHeight), + // } + // return &clientHeader, nil + // } + if clientType == exported.Wasm { tmClientHeaderBz, err := cc.Cdc.Marshaler.MarshalInterface(clientHeader) if err != nil { @@ -1254,15 +1288,15 @@ func (cc *CosmosProvider) InjectTrustedFields(ctx context.Context, header ibcexp // queryTMClientState retrieves the latest consensus state for a client in state at a given height // and unpacks/cast it to tendermint clientstate -func (cc *CosmosProvider) queryTMClientState(ctx context.Context, srch int64, srcClientId string) (*tmclient.ClientState, error) { +func (cc *CosmosProvider) queryProviderClientState(ctx context.Context, srch int64, srcClientId string) (provider.ClientState, error) { clientStateRes, err := cc.QueryClientStateResponse(ctx, srch, srcClientId) if err != nil { - return &tmclient.ClientState{}, err + return provider.ClientState{}, err } clientStateExported, err := clienttypes.UnpackClientState(clientStateRes.ClientState) if err != nil { - return &tmclient.ClientState{}, err + return provider.ClientState{}, err } switch cs := clientStateExported.(type) { @@ -1270,7 +1304,7 @@ func (cc *CosmosProvider) queryTMClientState(ctx context.Context, srch int64, sr var clientState ibcexported.ClientState err = cc.Cdc.Marshaler.UnmarshalInterface(cs.Data, &clientState) if err != nil { - return &tmclient.ClientState{}, fmt.Errorf("error unmarshaling tm client state, %w", err) + return provider.ClientState{}, fmt.Errorf("error unmarshaling tm client state, %w", err) } clientStateExported = clientState @@ -1278,11 +1312,27 @@ func (cc *CosmosProvider) queryTMClientState(ctx context.Context, srch int64, sr tmClientState, ok := clientStateExported.(*tmclient.ClientState) if !ok { - return &tmclient.ClientState{}, + // icon client doesn't have real trusting period so setting large value as trusting period + if strings.Contains(clientStateExported.ClientType(), common.IconModule) { + return provider.ClientState{ + ClientID: srcClientId, + ConsensusHeight: clientStateExported.GetLatestHeight().(clienttypes.Height), + // using 1 month as the trusting period constant + TrustingPeriod: time.Hour * 24 * 7 * 4, + }, nil + } + + fmt.Println("chain type ", clientStateExported.ClientType()) + return provider.ClientState{}, fmt.Errorf("error when casting exported clientstate to tendermint type") } - return tmClientState, nil + return provider.ClientState{ + ClientID: srcClientId, + ConsensusHeight: clientStateExported.GetLatestHeight().(clienttypes.Height), + TrustingPeriod: tmClientState.TrustingPeriod, + }, nil + } // DefaultUpgradePath is the default IBC upgrade path set for an on-chain light client @@ -1297,26 +1347,29 @@ func (cc *CosmosProvider) NewClientState( allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string, - srcChainId string, + srcChainType string, ) (ibcexported.ClientState, error) { revisionNumber := clienttypes.ParseChainID(dstChainID) + fmt.Println("[cosmos] srcWasmCodeId", srcWasmCodeID) + fmt.Println("revision number", revisionNumber) + var clientState ibcexported.ClientState - // different clientState in case of icon - if strings.Contains(srcChainId, common.IconModule) { - latestHeight := icon.NewHeight(revisionNumber, dstUpdateHeader.Height()) - return &itm.ClientState{ - ChainId: dstChainID, - TrustLevel: &itm.Fraction{Numerator: light.DefaultTrustLevel.Numerator, Denominator: light.DefaultTrustLevel.Denominator}, - TrustingPeriod: &itm.Duration{Seconds: int64(dstTrustingPeriod.Seconds())}, - UnbondingPeriod: &itm.Duration{Seconds: int64(dstUbdPeriod.Seconds())}, - FrozenHeight: &icon.Height{}, - LatestHeight: &latestHeight, - AllowUpdateAfterExpiry: allowUpdateAfterExpiry, - AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour, - }, nil - } + // // different clientState in case of icon + // if srcChainType == common.IconModule { + // latestHeight := icon.NewHeight(revisionNumber, dstUpdateHeader.Height()) + // return &itm.ClientState{ + // ChainId: dstChainID, + // TrustLevel: &itm.Fraction{Numerator: light.DefaultTrustLevel.Numerator, Denominator: light.DefaultTrustLevel.Denominator}, + // TrustingPeriod: &itm.Duration{Seconds: int64(dstTrustingPeriod.Seconds())}, + // UnbondingPeriod: &itm.Duration{Seconds: int64(dstUbdPeriod.Seconds())}, + // FrozenHeight: &icon.Height{}, + // LatestHeight: &latestHeight, + // AllowUpdateAfterExpiry: allowUpdateAfterExpiry, + // AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour, + // }, nil + // } // Create the ClientState we want on 'c' tracking 'dst' tmClientState := tendermint.ClientState{ @@ -1354,6 +1407,7 @@ func (cc *CosmosProvider) NewClientState( } } + fmt.Println("[cosmos] newclientState", clientState) return clientState, nil } diff --git a/relayer/chains/icon/icon_chain_processor.go b/relayer/chains/icon/icon_chain_processor.go index 5cfb3e056..ce744c1a2 100644 --- a/relayer/chains/icon/icon_chain_processor.go +++ b/relayer/chains/icon/icon_chain_processor.go @@ -95,6 +95,8 @@ type latestClientState map[string]provider.ClientState func (l latestClientState) update(ctx context.Context, clientInfo clientInfo, icp *IconChainProcessor) { + fmt.Println("clientInfo::", clientInfo) + existingClientInfo, ok := l[clientInfo.clientID] if ok { if clientInfo.consensusHeight.LT(existingClientInfo.ConsensusHeight) { @@ -709,6 +711,8 @@ func (icp *IconChainProcessor) clientState(ctx context.Context, clientID string) return provider.ClientState{}, err } + //clientState should be of icon + clientState := provider.ClientState{ ClientID: clientID, ConsensusHeight: clienttypes.Height{ diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index 85342787d..127cf9ea5 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -243,9 +243,12 @@ func (icp *IconProvider) NewClientState( NetworkTypeId: uint64(icp.PCfg.BTPNetworkTypeID), } - latestHeight := clienttypes.NewHeight(0, dstUpdateHeader.Height()) + // TODO: arrange better way + latestHeight := clienttypes.NewHeight(1, dstUpdateHeader.Height()) if srcWasmCodeID != "" { + + fmt.Println("inside srcWAsmCodeID") tmClientStateBz, err := icp.codec.Marshaler.MarshalInterface(clientState) if err != nil { return &wasmclient.ClientState{}, err @@ -457,7 +460,7 @@ func (icp *IconProvider) ProviderConfig() provider.ProviderConfig { } func (icp *IconProvider) CommitmentPrefix() commitmenttypes.MerklePrefix { - return commitmenttypes.NewMerklePrefix(nil) + return commitmenttypes.NewMerklePrefix([]byte("ibc")) } func (icp *IconProvider) Key() string { diff --git a/relayer/chains/icon/provider_helper.go b/relayer/chains/icon/provider_helper.go index b0deba35e..fc941f944 100644 --- a/relayer/chains/icon/provider_helper.go +++ b/relayer/chains/icon/provider_helper.go @@ -7,6 +7,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "github.com/cosmos/relayer/v2/relayer/common" "github.com/gogo/protobuf/proto" "github.com/icon-project/ibc-integration/libraries/go/common/icon" @@ -24,7 +25,7 @@ func (icp *IconProvider) ClientToAny(clientId string, clientStateB []byte) (*cod return clienttypes.PackClientState(&clientState) } if strings.Contains(clientId, common.TendermintLightClient) { - var clientState itm.ClientState + var clientState tendermint.ClientState err := proto.Unmarshal(clientStateB, &clientState) if err != nil { return nil, err diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index 6d0795475..4715d6c64 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -204,7 +204,7 @@ func (icp *IconProvider) QueryClientStateWithoutProof(ctx context.Context, heigh return nil, err } - clientStateRes := clienttypes.NewQueryClientStateResponse(any, nil, clienttypes.NewHeight(0, uint64(height))) + clientStateRes := clienttypes.NewQueryClientStateResponse(any, nil, common.NewHeight(uint64(height))) clientStateExported, err := clienttypes.UnpackClientState(clientStateRes.ClientState) if err != nil { return nil, err @@ -243,15 +243,13 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in return nil, err } - return clienttypes.NewQueryClientStateResponse(any, proof, clienttypes.NewHeight(0, uint64(height))), nil + return clienttypes.NewQueryClientStateResponse(any, proof, common.NewHeight(uint64(height))), nil } func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHeight int64, clientid string, clientHeight ibcexported.Height) (*clienttypes.QueryConsensusStateResponse, error) { - h, ok := clientHeight.(clienttypes.Height) - if !ok { - return nil, fmt.Errorf("clientHeight type mismatched ") - } + h := clienttypes.NewHeight(clientHeight.GetRevisionNumber(), clientHeight.GetRevisionHeight()) + fmt.Println("[icon] queryClientConsensusState height: ", h) heightBytes, err := icp.codec.Marshaler.Marshal(&h) if err != nil { @@ -278,7 +276,9 @@ func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHei return nil, err } - key := common.GetConsensusStateCommitmentKey(clientid, big.NewInt(0), big.NewInt(int64(h.RevisionHeight))) + fmt.Println("[icon] QueryClientConsensusState height: ", h) + + key := common.GetConsensusStateCommitmentKey(clientid, big.NewInt(int64(h.RevisionNumber)), big.NewInt(int64(h.RevisionHeight))) commitmentHash := getCommitmentHash(key, cnsStateByte) proof, err := icp.QueryIconProof(ctx, chainHeight, commitmentHash) @@ -289,7 +289,7 @@ func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHei return &clienttypes.QueryConsensusStateResponse{ ConsensusState: any, Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(chainHeight)), + ProofHeight: common.NewHeight(uint64(chainHeight)), }, nil } @@ -368,6 +368,8 @@ func (icp *IconProvider) QueryConnection(ctx context.Context, height int64, conn return emptyConnRes, err } + fmt.Println("connection::::", conn) + key := common.GetConnectionCommitmentKey(connectionid) commitmentHash := getCommitmentHash(key, connectionBytes) @@ -376,7 +378,7 @@ func (icp *IconProvider) QueryConnection(ctx context.Context, height int64, conn return emptyConnRes, err } - return conntypes.NewQueryConnectionResponse(conn, proof, clienttypes.NewHeight(0, uint64(height))), nil + return conntypes.NewQueryConnectionResponse(conn, proof, common.NewHeight(uint64(height))), nil } @@ -483,12 +485,16 @@ func (icp *IconProvider) GenerateConnHandshakeProof(ctx context.Context, height []byte, []byte, []byte, ibcexported.Height, error) { + fmt.Println("[icon] generateConnHandshakeProof") + // clientProof clientResponse, err := icp.QueryClientStateResponse(ctx, height, clientId) if err != nil { return nil, nil, nil, nil, clienttypes.Height{}, err } + fmt.Println("[icon] got clientResponse ") + // clientState anyClientState := clientResponse.ClientState clientState_, err := clienttypes.UnpackClientState(anyClientState) @@ -502,13 +508,17 @@ func (icp *IconProvider) GenerateConnHandshakeProof(ctx context.Context, height return nil, nil, nil, nil, clienttypes.Height{}, err } + fmt.Println("[icon] got QueryClientConsensusState", consensusRes) + // connectionProof connResponse, err := icp.QueryConnection(ctx, height, connId) if err != nil { return nil, nil, nil, nil, clienttypes.Height{}, err } - return clientState_, clientResponse.Proof, consensusRes.Proof, connResponse.Proof, clienttypes.NewHeight(0, uint64(height)), nil + fmt.Println("[icon] got QueryConnection", connResponse) + + return clientState_, clientResponse.Proof, consensusRes.Proof, connResponse.Proof, common.NewHeight(uint64(height)), nil } // ics 04 - channel @@ -553,7 +563,7 @@ func (icp *IconProvider) QueryChannel(ctx context.Context, height int64, channel channel.Version, ) - return chantypes.NewQueryChannelResponse(cosmosChan, proof, clienttypes.NewHeight(0, uint64(height))), nil + return chantypes.NewQueryChannelResponse(cosmosChan, proof, common.NewHeight(uint64(height))), nil } var emptyChannelRes = chantypes.NewQueryChannelResponse( @@ -694,7 +704,7 @@ func (icp *IconProvider) QueryNextSeqRecv(ctx context.Context, height int64, cha return &chantypes.QueryNextSequenceReceiveResponse{ NextSequenceReceive: uint64(nextSeq), Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(height)), + ProofHeight: common.NewHeight(uint64(height)), }, nil } @@ -726,7 +736,7 @@ func (icp *IconProvider) QueryPacketCommitment(ctx context.Context, height int64 return &chantypes.QueryPacketCommitmentResponse{ Commitment: packetCommitmentBytes, Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(height)), + ProofHeight: common.NewHeight(uint64(height)), }, nil } @@ -760,7 +770,7 @@ func (icp *IconProvider) QueryPacketAcknowledgement(ctx context.Context, height return &chantypes.QueryPacketAcknowledgementResponse{ Acknowledgement: packetAckBytes, Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(height)), + ProofHeight: common.NewHeight(uint64(height)), }, nil } @@ -789,7 +799,7 @@ func (icp *IconProvider) QueryPacketReceipt(ctx context.Context, height int64, c return &chantypes.QueryPacketReceiptResponse{ Received: packetReceipt == 1, Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(height)), + ProofHeight: common.NewHeight(uint64(height)), }, nil } diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index 11e25d8d5..3c30c7e84 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -17,10 +17,10 @@ import ( ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" - // tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" + // itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/cosmos/relayer/v2/relayer/chains/icon/types" + "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" "github.com/icon-project/ibc-integration/libraries/go/common/icon" "go.uber.org/zap" @@ -228,11 +228,27 @@ func (icp *IconProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInf if err != nil { return nil, err } + clientStateEncode, err := proto.Marshal(proof.ClientState) if err != nil { return nil, err } + // client is 08-wasm then + // then the client state that could be proved is any type byte + // if strings.Split(msgOpenInit.ClientID, "-")[0]==exported.Wasm{ + anyCs, err := clienttypes.PackClientState(proof.ClientState) + if err != nil { + return nil, err + } + anyCsByte, err := proto.Marshal(anyCs) + if err != nil { + return nil, err + } + + clientStateEncode = anyCsByte + // } + ht := &icon.Height{ RevisionNumber: proof.ProofHeight.RevisionNumber, RevisionHeight: proof.ProofHeight.RevisionHeight, @@ -243,7 +259,7 @@ func (icp *IconProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInf } consHt := &icon.Height{ - RevisionNumber: 0, + RevisionNumber: proof.ClientState.GetLatestHeight().GetRevisionNumber(), RevisionHeight: proof.ClientState.GetLatestHeight().GetRevisionHeight(), } consHtEncode, err := proto.Marshal(consHt) @@ -284,11 +300,26 @@ func (icp *IconProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInfo return nil, err } - clientStateEncode, err := icp.codec.Marshaler.Marshal(iconClientState) + clientStateEncode, err := proto.Marshal(iconClientState) + if err != nil { + return nil, err + } + + // client is 08-wasm then + // then the client state that could be proved is any type byte + // if strings.Split(msgOpenTry.ClientID, "-")[0]==exported.Wasm{ + anyCs, err := clienttypes.PackClientState(proof.ClientState) + if err != nil { + return nil, err + } + anyCsByte, err := proto.Marshal(anyCs) if err != nil { return nil, err } + clientStateEncode = anyCsByte + // } + ht := &icon.Height{ RevisionNumber: proof.ProofHeight.RevisionNumber, RevisionHeight: proof.ProofHeight.RevisionHeight, @@ -497,14 +528,14 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, return nil, fmt.Errorf("Unsupported IBC Header type. Expected: IconIBCHeader,actual: %T", latestHeader) } - btp_proof, err := icp.GetBTPProof(int64(latestIconHeader.Header.MainHeight)) + btp_proof, err := icp.GetBTPProof(int64(latestIconHeader.Height())) if err != nil { return nil, err } var currentValidatorList types.ValidatorList // subtract 1 because it is a current validator not last validator - info, err := icp.client.GetNetworkTypeInfo(int64(latestIconHeader.Header.MainHeight-1), icp.PCfg.BTPNetworkTypeID) + info, err := icp.client.GetNetworkTypeInfo(int64(latestIconHeader.Height()-1), icp.PCfg.BTPNetworkTypeID) if err != nil { return nil, err } @@ -516,7 +547,7 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, var nextValidators types.ValidatorList // subtract 1 because it is a current validator not last validator - next_info, err := icp.client.GetNetworkTypeInfo(int64(latestIconHeader.Header.MainHeight), icp.PCfg.BTPNetworkTypeID) + next_info, err := icp.client.GetNetworkTypeInfo(int64(latestIconHeader.Height()), icp.PCfg.BTPNetworkTypeID) if err != nil { return nil, err } @@ -544,6 +575,7 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, CurrentValidators: currentValidatorList.Validators, } + fmt.Println("[icon] msgUpdateClientHeader client type", clientType) // wrap with wasm client if clientType == exported.Wasm { @@ -552,8 +584,9 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, return &wasmclient.Header{}, nil } return &wasmclient.Header{ - Data: tmClientHeaderBz, - Height: clienttypes.NewHeight(0, latestIconHeader.Header.MainHeight), + Data: tmClientHeaderBz, + // TODO: forcefully set 1 + Height: common.NewHeight(latestIconHeader.Header.MainHeight), }, nil } @@ -564,8 +597,7 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, func (icp *IconProvider) MsgUpdateClient(clientID string, counterpartyHeader ibcexported.ClientMessage) (provider.RelayerMessage, error) { - cs := counterpartyHeader.(*itm.TmHeader) - clientMsg, err := proto.Marshal(cs) + clientMsg, err := proto.Marshal(counterpartyHeader) if err != nil { return nil, err } @@ -730,34 +762,38 @@ func (icp *IconProvider) SendIconTransaction( return err } - txParamEst := &types.TransactionParamForEstimate{ - Version: types.NewHexInt(types.JsonrpcApiVersion), - FromAddress: types.Address(wallet.Address().String()), - ToAddress: types.Address(icp.PCfg.IbcHandlerAddress), - NetworkID: types.NewHexInt(icp.PCfg.ICONNetworkID), - DataType: "call", - Data: types.CallData{ - Method: m.Method, - Params: m.Params, - }, - } - - step, err := icp.client.EstimateStep(txParamEst) - if err != nil { - return fmt.Errorf("failed estimating step: %w", err) - } - stepVal, err := step.Int() - if err != nil { - return err - } - stepLimit := types.NewHexInt(int64(stepVal + 200_000)) + fmt.Println("[icon] mempool", msg.Type()) + b, _ := msg.MsgBytes() + fmt.Printf("[icon] mempool %x \n", b) + + // txParamEst := &types.TransactionParamForEstimate{ + // Version: types.NewHexInt(types.JsonrpcApiVersion), + // FromAddress: types.Address(wallet.Address().String()), + // ToAddress: types.Address(icp.PCfg.IbcHandlerAddress), + // NetworkID: types.NewHexInt(icp.PCfg.ICONNetworkID), + // DataType: "call", + // Data: types.CallData{ + // Method: m.Method, + // Params: m.Params, + // }, + // } + + // step, err := icp.client.EstimateStep(txParamEst) + // if err != nil { + // return fmt.Errorf("failed estimating step: %w", err) + // } + // stepVal, err := step.Int() + // if err != nil { + // return err + // } + // stepLimit := types.NewHexInt(int64(stepVal + 200_000)) txParam := &types.TransactionParam{ Version: types.NewHexInt(types.JsonrpcApiVersion), FromAddress: types.Address(wallet.Address().String()), ToAddress: types.Address(icp.PCfg.IbcHandlerAddress), NetworkID: types.NewHexInt(icp.PCfg.ICONNetworkID), - StepLimit: stepLimit, + StepLimit: types.NewHexInt(200_000_000), DataType: "call", Data: types.CallData{ Method: m.Method, diff --git a/relayer/chains/penumbra/query.go b/relayer/chains/penumbra/query.go index e20a64889..45e83fab3 100644 --- a/relayer/chains/penumbra/query.go +++ b/relayer/chains/penumbra/query.go @@ -490,7 +490,7 @@ func (cc *PenumbraProvider) QueryConnectionsUsingClient(ctx context.Context, hei // GenerateConnHandshakeProof generates all the proofs needed to prove the existence of the // connection state on this chain. A counterparty should use these generated proofs. -func (cc *PenumbraProvider) GenerateConnHandshakeProof(ctx context.Context, height int64, clientId, connId string) (clientState ibcexported.ClientState, clientStateProof []byte, consensusProof []byte, connectionProof []byte, connectionProofHeight ibcexported.Height, err error) { +func (cc *PenumbraProvider) GenerateConnHandshakeProof(ctx context.Context, height int64, clientId, connId string ) (clientState ibcexported.ClientState, clientStateProof []byte, consensusProof []byte, connectionProof []byte, connectionProofHeight ibcexported.Height, err error) { var ( clientStateRes *clienttypes.QueryClientStateResponse consensusStateRes *clienttypes.QueryConsensusStateResponse diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go index 5c89e061b..b809cc42e 100644 --- a/relayer/chains/penumbra/tx.go +++ b/relayer/chains/penumbra/tx.go @@ -1307,7 +1307,7 @@ func (cc *PenumbraProvider) MsgConnectionOpenInit(info provider.ConnectionInfo, return cosmos.NewCosmosMessage(msg), nil } -func (cc *PenumbraProvider) ConnectionHandshakeProof(ctx context.Context, msgOpenInit provider.ConnectionInfo, height uint64) (provider.ConnectionProof, error) { +func (cc *PenumbraProvider) ConnectionHandshakeProof(ctx context.Context, msgOpenInit provider.ConnectionInfo, height uint64 ) (provider.ConnectionProof, error) { clientState, clientStateProof, consensusStateProof, connStateProof, proofHeight, err := cc.GenerateConnHandshakeProof(ctx, int64(height), msgOpenInit.ClientID, msgOpenInit.ConnID) if err != nil { return provider.ConnectionProof{}, err diff --git a/relayer/chains/wasm/provider.go b/relayer/chains/wasm/provider.go index 7df0dbbef..45a839d4b 100644 --- a/relayer/chains/wasm/provider.go +++ b/relayer/chains/wasm/provider.go @@ -11,10 +11,8 @@ import ( "github.com/CosmWasm/wasmd/app" provtypes "github.com/cometbft/cometbft/light/provider" - comettypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/client" - itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -26,7 +24,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/gogoproto/proto" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" - ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" "github.com/cosmos/relayer/v2/relayer/processor" "github.com/cosmos/relayer/v2/relayer/provider" @@ -70,122 +67,6 @@ type WasmProviderConfig struct { BlockInterval uint64 `json:"block-interval" yaml:"block-interval"` } -type WasmIBCHeader struct { - SignedHeader *itm.SignedHeader - ValidatorSet *itm.ValidatorSet -} - -func NewWasmIBCHeader(header *itm.SignedHeader, validators *itm.ValidatorSet) WasmIBCHeader { - return WasmIBCHeader{ - SignedHeader: header, - ValidatorSet: validators, - } -} - -func NewWasmIBCHeaderFromLightBlock(lightBlock *comettypes.LightBlock) WasmIBCHeader { - vSets := make([]*itm.Validator, 0) - for _, v := range lightBlock.ValidatorSet.Validators { - _v := &itm.Validator{ - Address: v.Address, - PubKey: &itm.PublicKey{ - Sum: itm.GetPubKeyFromTx(v.PubKey.Type(), v.PubKey.Bytes()), - }, - VotingPower: v.VotingPower, - ProposerPriority: v.ProposerPriority, - } - - vSets = append(vSets, _v) - } - - signatures := make([]*itm.CommitSig, 0) - for _, d := range lightBlock.Commit.Signatures { - - _d := &itm.CommitSig{ - BlockIdFlag: itm.BlockIDFlag(d.BlockIDFlag), - ValidatorAddress: d.ValidatorAddress, - Timestamp: &itm.Timestamp{ - Seconds: int64(d.Timestamp.Unix()), - Nanos: int32(d.Timestamp.Nanosecond()), - }, - Signature: d.Signature, - } - signatures = append(signatures, _d) - } - - return WasmIBCHeader{ - SignedHeader: &itm.SignedHeader{ - Header: &itm.LightHeader{ - Version: &itm.Consensus{ - Block: lightBlock.Version.Block, - App: lightBlock.Version.App, - }, - ChainId: lightBlock.ChainID, - - Height: lightBlock.Height, - Time: &itm.Timestamp{ - Seconds: int64(lightBlock.Time.Unix()), - Nanos: int32(lightBlock.Time.Nanosecond()), // this is the offset after the nanosecond - }, - LastBlockId: &itm.BlockID{ - Hash: lightBlock.LastBlockID.Hash, - PartSetHeader: &itm.PartSetHeader{ - Total: lightBlock.LastBlockID.PartSetHeader.Total, - Hash: lightBlock.LastBlockID.PartSetHeader.Hash, - }, - }, - LastCommitHash: lightBlock.LastCommitHash, - DataHash: lightBlock.DataHash, - ValidatorsHash: lightBlock.ValidatorsHash, - NextValidatorsHash: lightBlock.NextValidatorsHash, - ConsensusHash: lightBlock.ConsensusHash, - AppHash: lightBlock.AppHash, - LastResultsHash: lightBlock.LastResultsHash, - EvidenceHash: lightBlock.EvidenceHash, - ProposerAddress: lightBlock.ProposerAddress, - }, - Commit: &itm.Commit{ - Height: lightBlock.Commit.Height, - Round: lightBlock.Commit.Round, - BlockId: &itm.BlockID{ - Hash: lightBlock.Commit.BlockID.Hash, - PartSetHeader: &itm.PartSetHeader{ - Total: lightBlock.Commit.BlockID.PartSetHeader.Total, - Hash: lightBlock.Commit.BlockID.PartSetHeader.Hash, - }, - }, - Signatures: signatures, - }, - }, - ValidatorSet: &itm.ValidatorSet{ - Validators: vSets, - }, - } -} - -func (h WasmIBCHeader) ConsensusState() ibcexported.ConsensusState { - return &itm.ConsensusState{ - Timestamp: h.SignedHeader.Header.Time, - Root: &itm.MerkleRoot{Hash: h.SignedHeader.Header.AppHash}, - NextValidatorsHash: h.SignedHeader.Header.NextValidatorsHash, - } -} - -func (a WasmIBCHeader) Height() uint64 { - return uint64(a.SignedHeader.Header.Height) -} - -func (a WasmIBCHeader) IsCompleteBlock() bool { - return true -} - -func (a WasmIBCHeader) NextValidatorsHash() []byte { - return a.SignedHeader.Header.NextValidatorsHash -} - -func (a WasmIBCHeader) ShouldUpdateWithZeroMessage() bool { - return false -} - func (pp *WasmProviderConfig) ValidateContractAddress(addr string) bool { prefix, _, err := bech32.DecodeAndConvert(addr) if err != nil { diff --git a/relayer/chains/wasm/provider_test.go b/relayer/chains/wasm/provider_test.go index 4df2d1a8c..d2776c6f5 100644 --- a/relayer/chains/wasm/provider_test.go +++ b/relayer/chains/wasm/provider_test.go @@ -42,7 +42,7 @@ func GetProvider(ctx context.Context, handlerAddr string, local bool) (provider. Key: "testWallet", ChainName: "archway", ChainID: "localnet", - RPCAddr: "http://localhost:26657", + RPCAddr: "http://localhost:13357", AccountPrefix: "archway", KeyringBackend: "test", GasAdjustment: 1.5, @@ -598,26 +598,6 @@ func TestDecodeProto(t *testing.T) { // } -// func TestDecodeMerkleProof(t *testing.T) { - -// v := common.MustHexStrToBytes("0x0ac90612c6060a7b03ade4a5f5803a439835c636395a8d648dee57b2fc90d98dc17fa887159b69638b30303062363336663665366536353633373436393666366537336230326433663334643963373863663565353734396637373131373861386361663034653731303432636366336636396165656430356230383066333336373712f5020a4503ade4a5f5803a439835c636395a8d648dee57b2fc90d98dc17fa887159b69638b0016636c69656e745f696d706c656d656e746174696f6e7369636f6e636c69656e742d3012442261726368776179316e633574617461667636657971376c6c6b7232677635306666396532326d6e66373071676a6c763733376b746d74346573777271676a33336736221a0b0801180120012a03000238222b0801120402043e201a2120a30ef45adecacce36447237e218f8cf3ad48357e82cae6aeea7df465573854cb22290801122504083e20fd6187d3aeb814e2a15d3987fd093b63aae12f9a04ba1c871e8a06c9f85a710b2022290801122508163e2064cfaa6db5902310f5d7255b7e8733f455699291f73d3988a17dc47348d63323202229080112250a2a3e2090d36297ce6f62cdb1110921e2482c20cd630e2817648bb0b95a42ce9fe081a420222b080112040c403e201a2120a8753c7dfe3f41e2bb9936721c8e0547e2c74a46a6d25c3f144d784204ceb86e1ace020a2e03ade4a5f5803a439835c636395a8d648dee57b2fc90d98dc17fa887159b69638b636f6e74726163745f696e666f12367b22636f6e7472616374223a226372617465732e696f3a63772d6962632d636f7265222c2276657273696f6e223a22302e312e30227d1a0b0801180120012a0300021422290801122502043e205a76cca2d1f3103d95080d98bf27abb862829151eb227f6be56d3dc8990d47182022290801122504083e20fd6187d3aeb814e2a15d3987fd093b63aae12f9a04ba1c871e8a06c9f85a710b2022290801122508163e2064cfaa6db5902310f5d7255b7e8733f455699291f73d3988a17dc47348d63323202229080112250a2a3e2090d36297ce6f62cdb1110921e2482c20cd630e2817648bb0b95a42ce9fe081a420222b080112040c403e201a2120a8753c7dfe3f41e2bb9936721c8e0547e2c74a46a6d25c3f144d784204ceb86e0a84010a81010a047761736d122031710a6b9c07bb7f1d7816f5b76f65d48e53ea30ad6d8138322f31374e8733321a090801180120012a0100222508011221011107704879ce264af2b8ca54a7ad461538067d296f22b7de0482e4fdf43314b922250801122101efb0c2cf8ed06dea231b3f0f26942e24623f13012e6297b343e7e1afc3863d6d") - -// var op commitmenttypes.MerkleProof -// err := proto.Unmarshal(v, &op) -// assert.NoError(t, err) - -// for i, v := range op.Proofs { -// fmt.Printf("index %d \n ", i) -// fmt.Printf("existence proof %x : \n ", v.GetExist()) -// fmt.Printf("Non-existence proof %x : \n", v.GetNonexist()) - -// } - -// // err = op.VerifyMembership([]*ics23.ProofSpec{ics23.IavlSpec, ics23.TendermintSpec}, root, path, result.Response.Value) -// assert.NoError(t, err) - -// } - // func TestCommitmentKey(t *testing.T) { // fmt.Printf("%x \n ", common.GetConnectionCommitmentKey("connection-0")) @@ -842,3 +822,12 @@ func TestProtoUnmarshal(t *testing.T) { // _, err := archwayP.GetCommitmentPrefixFromContract(ctx) // assert.NoError(t, err) // } + +func TestHeightConversion(t *testing.T) { + + h := clienttypes.NewHeight(1, 5570) + b, err := proto.Marshal(&h) + assert.NoError(t, err) + fmt.Printf("proto encoded height %x \n", b) + +} diff --git a/relayer/chains/wasm/query.go b/relayer/chains/wasm/query.go index d65b749b4..fd1614d94 100644 --- a/relayer/chains/wasm/query.go +++ b/relayer/chains/wasm/query.go @@ -139,7 +139,7 @@ func (ap *WasmProvider) QueryIBCHeader(ctx context.Context, h int64) (provider.I return nil, err } - return NewWasmIBCHeaderFromLightBlock(lightBlock), nil + return provider.NewWasmIBCHeaderFromLightBlock(lightBlock), nil } func (ap *WasmProvider) QueryLightBlock(ctx context.Context, h int64) (provider.IBCHeader, *tmtypes.LightBlock, error) { @@ -151,7 +151,7 @@ func (ap *WasmProvider) QueryLightBlock(ctx context.Context, h int64) (provider. return nil, nil, err } - return NewWasmIBCHeaderFromLightBlock(lightBlock), lightBlock, nil + return provider.NewWasmIBCHeaderFromLightBlock(lightBlock), lightBlock, nil } // query packet info for sequence diff --git a/relayer/chains/wasm/tx.go b/relayer/chains/wasm/tx.go index 60aa153bb..3dc9b836a 100644 --- a/relayer/chains/wasm/tx.go +++ b/relayer/chains/wasm/tx.go @@ -401,6 +401,7 @@ func (ap *WasmProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInfo Prefix: msgOpenInit.CommitmentPrefix, } + params := &conntypes.MsgConnectionOpenTry{ ClientId: msgOpenInit.CounterpartyClientID, PreviousConnectionId: msgOpenInit.CounterpartyConnID, @@ -431,6 +432,7 @@ func (ap *WasmProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInfo, return nil, err } + params := &conntypes.MsgConnectionOpenAck{ ConnectionId: msgOpenTry.CounterpartyConnID, CounterpartyConnectionId: msgOpenTry.ConnID, @@ -599,12 +601,12 @@ func (ap *WasmProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelInfo } func (ap *WasmProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader, clientType string) (ibcexported.ClientMessage, error) { - trustedWasmHeader, ok := trustedHeader.(WasmIBCHeader) + trustedWasmHeader, ok := trustedHeader.(provider.WasmIBCHeader) if !ok { return nil, fmt.Errorf("unsupported IBC trusted header type, expected: TendermintIBCHeader, actual: %T", trustedHeader) } - latestWasmHeader, ok := latestHeader.(WasmIBCHeader) + latestWasmHeader, ok := latestHeader.(provider.WasmIBCHeader) if !ok { return nil, fmt.Errorf("unsupported IBC header type, expected: TendermintIBCHeader, actual: %T", latestHeader) } diff --git a/relayer/client.go b/relayer/client.go index 0ed775980..462c9f093 100644 --- a/relayer/client.go +++ b/relayer/client.go @@ -192,7 +192,7 @@ func CreateClient( // We want to create a light client on the src chain which tracks the state of the dst chain. // So we build a new client state from dst and attempt to use this for creating the light client on src. clientState, err := dst.ChainProvider.NewClientState(dst.ChainID(), dstUpdateHeader, tp, ubdPeriod, allowUpdateAfterExpiry, - allowUpdateAfterMisbehaviour, srcWasmCodeID, src.ChainID()) + allowUpdateAfterMisbehaviour, srcWasmCodeID, src.ChainProvider.Type()) if err != nil { return "", fmt.Errorf("failed to create new client state for chain{%s}: %w", dst.ChainID(), err) } diff --git a/relayer/common/utils.go b/relayer/common/utils.go index 47b4ee60c..47a48d37d 100644 --- a/relayer/common/utils.go +++ b/relayer/common/utils.go @@ -7,6 +7,8 @@ import ( "path" "strconv" "strings" + + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ) func MustHexStrToBytes(hex_string string) []byte { @@ -58,3 +60,7 @@ func LoadSnapshotHeight(chain_id string) (int64, error) { } return strconv.ParseInt(strings.TrimSuffix(string(content), "\n"), 10, 64) } + +func NewHeight(height uint64) clienttypes.Height { + return clienttypes.NewHeight(1, height) +} diff --git a/relayer/processor/message_processor.go b/relayer/processor/message_processor.go index 47705a51c..17b86e147 100644 --- a/relayer/processor/message_processor.go +++ b/relayer/processor/message_processor.go @@ -296,6 +296,8 @@ func (mp *messageProcessor) assembleMsgUpdateClient(ctx context.Context, src, ds return fmt.Errorf("error assembling new client header: %w", err) } + // fmt.Println("message update header is", msgUpdateClientHeader) + // fmt.Println("dst is ", dst.chainProvider.ChainId()) msgUpdateClient, err := dst.chainProvider.MsgUpdateClient(clientID, msgUpdateClientHeader) if err != nil { return fmt.Errorf("error assembling MsgUpdateClient: %w", err) diff --git a/relayer/processor/path_end_runtime.go b/relayer/processor/path_end_runtime.go index c134ab8bf..b3c6414a3 100644 --- a/relayer/processor/path_end_runtime.go +++ b/relayer/processor/path_end_runtime.go @@ -394,8 +394,10 @@ func (pathEnd *pathEndRuntime) mergeCacheData(ctx context.Context, cancel func() if pathEnd.chainProvider.Type() == common.IconModule && d.LatestHeader.IsCompleteBlock() { pathEnd.BTPHeightQueue.Enqueue(BlockInfoHeight{Height: int64(d.LatestHeader.Height()), IsProcessing: false}) } - - terminate, err := pathEnd.checkForMisbehaviour(ctx, pathEnd.clientState, counterParty) + var err error + // TODO: uncomment this added for the hop chain + // terminate, err := pathEnd.checkForMisbehaviour(ctx, pathEnd.clientState, counterParty) + terminate, err := false, nil if err != nil { pathEnd.log.Error( "Failed to check for misbehaviour", diff --git a/relayer/processor/path_processor_internal.go b/relayer/processor/path_processor_internal.go index 8dd0c7f2f..e2058ce91 100644 --- a/relayer/processor/path_processor_internal.go +++ b/relayer/processor/path_processor_internal.go @@ -8,7 +8,6 @@ import ( "sort" "sync" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -1581,7 +1580,7 @@ func (pp *PathProcessor) UpdateBTPHeight(ctx context.Context, src *pathEndRuntim continue } if dst.clientState.ConsensusHeight.RevisionHeight > uint64(btpHeightInfo.Height) { - cs, err := dst.chainProvider.QueryClientConsensusState(ctx, int64(dst.latestBlock.Height), dst.clientState.ClientID, clienttypes.NewHeight(0, uint64(btpHeightInfo.Height))) + cs, err := dst.chainProvider.QueryClientConsensusState(ctx, int64(dst.latestBlock.Height), dst.clientState.ClientID, common.NewHeight(uint64(btpHeightInfo.Height))) if err == nil && cs != nil { // removing latest height element src.BTPHeightQueue.Dequeue() diff --git a/relayer/processor/utils.go b/relayer/processor/utils.go index 1837546f9..14d795f67 100644 --- a/relayer/processor/utils.go +++ b/relayer/processor/utils.go @@ -12,6 +12,10 @@ func IsBTPLightClient(cs provider.ClientState) bool { if strings.Contains(cs.ClientID, common.IconLightClient) { return true } + + if strings.Contains(cs.ClientID, "wasm") { + return true + } return false } diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go index e1ca4c3a4..2bfffa5b6 100644 --- a/relayer/provider/provider.go +++ b/relayer/provider/provider.go @@ -7,6 +7,8 @@ import ( "github.com/cometbft/cometbft/proto/tendermint/crypto" "github.com/cometbft/cometbft/types" + comettypes "github.com/cometbft/cometbft/types" + tmtypes "github.com/cometbft/cometbft/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/proto" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" @@ -16,6 +18,8 @@ import ( commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + + itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -304,7 +308,7 @@ type ChainProvider interface { // [Begin] Connection handshake IBC message assembly // ConnectionHandshakeProof queries for proof of an initialized connection handshake. - ConnectionHandshakeProof(ctx context.Context, msgOpenInit ConnectionInfo, height uint64) (ConnectionProof, error) + ConnectionHandshakeProof(ctx context.Context, msgOpenInit ConnectionInfo, height uint64,) (ConnectionProof, error) // ConnectionProof queries for proof of an acked handshake. ConnectionProof(ctx context.Context, msgOpenAck ConnectionInfo, height uint64) (ConnectionProof, error) @@ -579,3 +583,127 @@ func (h TendermintIBCHeader) TMHeader() (*tendermint.Header, error) { TrustedValidators: trustedVals, }, nil } + +func (h TendermintIBCHeader) LightBlock() *comettypes.LightBlock { + return &tmtypes.LightBlock{ + SignedHeader: h.SignedHeader, + ValidatorSet: h.ValidatorSet, + } +} + +// ######################for wasm ############## +type WasmIBCHeader struct { + SignedHeader *itm.SignedHeader + ValidatorSet *itm.ValidatorSet +} + +func NewWasmIBCHeader(header *itm.SignedHeader, validators *itm.ValidatorSet) WasmIBCHeader { + return WasmIBCHeader{ + SignedHeader: header, + ValidatorSet: validators, + } +} + +func (h WasmIBCHeader) ConsensusState() ibcexported.ConsensusState { + return &itm.ConsensusState{ + Timestamp: h.SignedHeader.Header.Time, + Root: &itm.MerkleRoot{Hash: h.SignedHeader.Header.AppHash}, + NextValidatorsHash: h.SignedHeader.Header.NextValidatorsHash, + } +} + +func (a WasmIBCHeader) Height() uint64 { + return uint64(a.SignedHeader.Header.Height) +} + +func (a WasmIBCHeader) IsCompleteBlock() bool { + return true +} + +func (a WasmIBCHeader) NextValidatorsHash() []byte { + return a.SignedHeader.Header.NextValidatorsHash +} + +func (a WasmIBCHeader) ShouldUpdateWithZeroMessage() bool { + return false +} + +func NewWasmIBCHeaderFromLightBlock(lightBlock *comettypes.LightBlock) WasmIBCHeader { + vSets := make([]*itm.Validator, 0) + for _, v := range lightBlock.ValidatorSet.Validators { + _v := &itm.Validator{ + Address: v.Address, + PubKey: &itm.PublicKey{ + Sum: itm.GetPubKeyFromTx(v.PubKey.Type(), v.PubKey.Bytes()), + }, + VotingPower: v.VotingPower, + ProposerPriority: v.ProposerPriority, + } + + vSets = append(vSets, _v) + } + + signatures := make([]*itm.CommitSig, 0) + for _, d := range lightBlock.Commit.Signatures { + + _d := &itm.CommitSig{ + BlockIdFlag: itm.BlockIDFlag(d.BlockIDFlag), + ValidatorAddress: d.ValidatorAddress, + Timestamp: &itm.Timestamp{ + Seconds: int64(d.Timestamp.Unix()), + Nanos: int32(d.Timestamp.Nanosecond()), + }, + Signature: d.Signature, + } + signatures = append(signatures, _d) + } + + return WasmIBCHeader{ + SignedHeader: &itm.SignedHeader{ + Header: &itm.LightHeader{ + Version: &itm.Consensus{ + Block: lightBlock.Version.Block, + App: lightBlock.Version.App, + }, + ChainId: lightBlock.ChainID, + + Height: lightBlock.Height, + Time: &itm.Timestamp{ + Seconds: int64(lightBlock.Time.Unix()), + Nanos: int32(lightBlock.Time.Nanosecond()), // this is the offset after the nanosecond + }, + LastBlockId: &itm.BlockID{ + Hash: lightBlock.LastBlockID.Hash, + PartSetHeader: &itm.PartSetHeader{ + Total: lightBlock.LastBlockID.PartSetHeader.Total, + Hash: lightBlock.LastBlockID.PartSetHeader.Hash, + }, + }, + LastCommitHash: lightBlock.LastCommitHash, + DataHash: lightBlock.DataHash, + ValidatorsHash: lightBlock.ValidatorsHash, + NextValidatorsHash: lightBlock.NextValidatorsHash, + ConsensusHash: lightBlock.ConsensusHash, + AppHash: lightBlock.AppHash, + LastResultsHash: lightBlock.LastResultsHash, + EvidenceHash: lightBlock.EvidenceHash, + ProposerAddress: lightBlock.ProposerAddress, + }, + Commit: &itm.Commit{ + Height: lightBlock.Commit.Height, + Round: lightBlock.Commit.Round, + BlockId: &itm.BlockID{ + Hash: lightBlock.Commit.BlockID.Hash, + PartSetHeader: &itm.PartSetHeader{ + Total: lightBlock.Commit.BlockID.PartSetHeader.Total, + Hash: lightBlock.Commit.BlockID.PartSetHeader.Hash, + }, + }, + Signatures: signatures, + }, + }, + ValidatorSet: &itm.ValidatorSet{ + Validators: vSets, + }, + } +} From f5bed1763c4a7219bc9edcafaf45743f47528e53 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Mon, 11 Dec 2023 19:16:32 +0800 Subject: [PATCH 13/35] wip: proof shouldnt be empty --- relayer/chains/cosmos/tx.go | 20 ++------------------ relayer/common/const.go | 1 + relayer/common/utils.go | 7 +++++++ 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 544940bbd..1cf7e404f 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -822,7 +822,6 @@ func (cc *CosmosProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInf ProofTry: proof.ConnectionStateProof, ProofClient: proof.ClientStateProof, ProofConsensus: proof.ConsensusStateProof, - // ConsensusHeight: proof.ClientState.GetLatestHeight().(clienttypes.Height), ConsensusHeight: clienttypes.Height{ RevisionNumber: 1, RevisionHeight: proof.ClientState.GetLatestHeight().GetRevisionHeight(), @@ -944,7 +943,7 @@ func (cc *CosmosProvider) MsgChannelOpenAck(msgOpenTry provider.ChannelInfo, pro ChannelId: msgOpenTry.CounterpartyChannelID, CounterpartyChannelId: msgOpenTry.ChannelID, CounterpartyVersion: proof.Version, - ProofTry: proof.Proof, + ProofTry: common.ChangeProof(proof.Proof, true), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -960,7 +959,7 @@ func (cc *CosmosProvider) MsgChannelOpenConfirm(msgOpenAck provider.ChannelInfo, msg := &chantypes.MsgChannelOpenConfirm{ PortId: msgOpenAck.CounterpartyPortID, ChannelId: msgOpenAck.CounterpartyChannelID, - ProofAck: proof.Proof, + ProofAck: common.ChangeProof(proof.Proof, true), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -1356,21 +1355,6 @@ func (cc *CosmosProvider) NewClientState( var clientState ibcexported.ClientState - // // different clientState in case of icon - // if srcChainType == common.IconModule { - // latestHeight := icon.NewHeight(revisionNumber, dstUpdateHeader.Height()) - // return &itm.ClientState{ - // ChainId: dstChainID, - // TrustLevel: &itm.Fraction{Numerator: light.DefaultTrustLevel.Numerator, Denominator: light.DefaultTrustLevel.Denominator}, - // TrustingPeriod: &itm.Duration{Seconds: int64(dstTrustingPeriod.Seconds())}, - // UnbondingPeriod: &itm.Duration{Seconds: int64(dstUbdPeriod.Seconds())}, - // FrozenHeight: &icon.Height{}, - // LatestHeight: &latestHeight, - // AllowUpdateAfterExpiry: allowUpdateAfterExpiry, - // AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour, - // }, nil - // } - // Create the ClientState we want on 'c' tracking 'dst' tmClientState := tendermint.ClientState{ ChainId: dstChainID, diff --git a/relayer/common/const.go b/relayer/common/const.go index 55dee1afc..038192e87 100644 --- a/relayer/common/const.go +++ b/relayer/common/const.go @@ -16,6 +16,7 @@ var ( ChannelKey = "channel" ONE_HOUR = 60 * 60 * 1000 NanoToMilliRatio = 1000_000 + EmptyProofConst = []byte("empty") ) var ( diff --git a/relayer/common/utils.go b/relayer/common/utils.go index 47a48d37d..2c2096eca 100644 --- a/relayer/common/utils.go +++ b/relayer/common/utils.go @@ -64,3 +64,10 @@ func LoadSnapshotHeight(chain_id string) (int64, error) { func NewHeight(height uint64) clienttypes.Height { return clienttypes.NewHeight(1, height) } + +func ChangeProof(proof []byte, shouldNeverBeEmpty bool) []byte { + if proof == nil && shouldNeverBeEmpty { + return EmptyProofConst + } + return proof +} From 60827eb463a3dbe78590eb7b44cc2e08c1c09036 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Mon, 11 Dec 2023 20:16:23 +0800 Subject: [PATCH 14/35] wip: change new height with revision name --- relayer/chains/icon/query.go | 20 ++++++++++---------- relayer/chains/icon/tx.go | 2 +- relayer/common/utils.go | 2 +- relayer/processor/path_processor_internal.go | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index 4715d6c64..cd297da4b 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -204,7 +204,7 @@ func (icp *IconProvider) QueryClientStateWithoutProof(ctx context.Context, heigh return nil, err } - clientStateRes := clienttypes.NewQueryClientStateResponse(any, nil, common.NewHeight(uint64(height))) + clientStateRes := clienttypes.NewQueryClientStateResponse(any, nil, common.NewHeightWithRevisionOne(uint64(height))) clientStateExported, err := clienttypes.UnpackClientState(clientStateRes.ClientState) if err != nil { return nil, err @@ -243,7 +243,7 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in return nil, err } - return clienttypes.NewQueryClientStateResponse(any, proof, common.NewHeight(uint64(height))), nil + return clienttypes.NewQueryClientStateResponse(any, proof, common.NewHeightWithRevisionOne(uint64(height))), nil } func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHeight int64, clientid string, clientHeight ibcexported.Height) (*clienttypes.QueryConsensusStateResponse, error) { @@ -289,7 +289,7 @@ func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHei return &clienttypes.QueryConsensusStateResponse{ ConsensusState: any, Proof: proof, - ProofHeight: common.NewHeight(uint64(chainHeight)), + ProofHeight: common.NewHeightWithRevisionOne(uint64(chainHeight)), }, nil } @@ -378,7 +378,7 @@ func (icp *IconProvider) QueryConnection(ctx context.Context, height int64, conn return emptyConnRes, err } - return conntypes.NewQueryConnectionResponse(conn, proof, common.NewHeight(uint64(height))), nil + return conntypes.NewQueryConnectionResponse(conn, proof, common.NewHeightWithRevisionOne(uint64(height))), nil } @@ -518,7 +518,7 @@ func (icp *IconProvider) GenerateConnHandshakeProof(ctx context.Context, height fmt.Println("[icon] got QueryConnection", connResponse) - return clientState_, clientResponse.Proof, consensusRes.Proof, connResponse.Proof, common.NewHeight(uint64(height)), nil + return clientState_, clientResponse.Proof, consensusRes.Proof, connResponse.Proof, common.NewHeightWithRevisionOne(uint64(height)), nil } // ics 04 - channel @@ -563,7 +563,7 @@ func (icp *IconProvider) QueryChannel(ctx context.Context, height int64, channel channel.Version, ) - return chantypes.NewQueryChannelResponse(cosmosChan, proof, common.NewHeight(uint64(height))), nil + return chantypes.NewQueryChannelResponse(cosmosChan, proof, common.NewHeightWithRevisionOne(uint64(height))), nil } var emptyChannelRes = chantypes.NewQueryChannelResponse( @@ -704,7 +704,7 @@ func (icp *IconProvider) QueryNextSeqRecv(ctx context.Context, height int64, cha return &chantypes.QueryNextSequenceReceiveResponse{ NextSequenceReceive: uint64(nextSeq), Proof: proof, - ProofHeight: common.NewHeight(uint64(height)), + ProofHeight: common.NewHeightWithRevisionOne(uint64(height)), }, nil } @@ -736,7 +736,7 @@ func (icp *IconProvider) QueryPacketCommitment(ctx context.Context, height int64 return &chantypes.QueryPacketCommitmentResponse{ Commitment: packetCommitmentBytes, Proof: proof, - ProofHeight: common.NewHeight(uint64(height)), + ProofHeight: common.NewHeightWithRevisionOne(uint64(height)), }, nil } @@ -770,7 +770,7 @@ func (icp *IconProvider) QueryPacketAcknowledgement(ctx context.Context, height return &chantypes.QueryPacketAcknowledgementResponse{ Acknowledgement: packetAckBytes, Proof: proof, - ProofHeight: common.NewHeight(uint64(height)), + ProofHeight: common.NewHeightWithRevisionOne(uint64(height)), }, nil } @@ -799,7 +799,7 @@ func (icp *IconProvider) QueryPacketReceipt(ctx context.Context, height int64, c return &chantypes.QueryPacketReceiptResponse{ Received: packetReceipt == 1, Proof: proof, - ProofHeight: common.NewHeight(uint64(height)), + ProofHeight: common.NewHeightWithRevisionOne(uint64(height)), }, nil } diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index 3c30c7e84..20b3e279c 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -586,7 +586,7 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, return &wasmclient.Header{ Data: tmClientHeaderBz, // TODO: forcefully set 1 - Height: common.NewHeight(latestIconHeader.Header.MainHeight), + Height: common.NewHeightWithRevisionOne(latestIconHeader.Header.MainHeight), }, nil } diff --git a/relayer/common/utils.go b/relayer/common/utils.go index 2c2096eca..758d7a034 100644 --- a/relayer/common/utils.go +++ b/relayer/common/utils.go @@ -61,7 +61,7 @@ func LoadSnapshotHeight(chain_id string) (int64, error) { return strconv.ParseInt(strings.TrimSuffix(string(content), "\n"), 10, 64) } -func NewHeight(height uint64) clienttypes.Height { +func NewHeightWithRevisionOne(height uint64) clienttypes.Height { return clienttypes.NewHeight(1, height) } diff --git a/relayer/processor/path_processor_internal.go b/relayer/processor/path_processor_internal.go index e2058ce91..b0f3c1628 100644 --- a/relayer/processor/path_processor_internal.go +++ b/relayer/processor/path_processor_internal.go @@ -1580,7 +1580,7 @@ func (pp *PathProcessor) UpdateBTPHeight(ctx context.Context, src *pathEndRuntim continue } if dst.clientState.ConsensusHeight.RevisionHeight > uint64(btpHeightInfo.Height) { - cs, err := dst.chainProvider.QueryClientConsensusState(ctx, int64(dst.latestBlock.Height), dst.clientState.ClientID, common.NewHeight(uint64(btpHeightInfo.Height))) + cs, err := dst.chainProvider.QueryClientConsensusState(ctx, int64(dst.latestBlock.Height), dst.clientState.ClientID, common.NewHeightWithRevisionOne(uint64(btpHeightInfo.Height))) if err == nil && cs != nil { // removing latest height element src.BTPHeightQueue.Dequeue() From 4e4b2351324b81def27daff91e7158ac94b36d45 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Wed, 10 Jan 2024 21:00:01 +0800 Subject: [PATCH 15/35] chore: remove old changes and handle some more for revision number --- relayer/chains/cosmos/provider_test.go | 55 ++++++++++++++++++++++++++ relayer/chains/cosmos/tx.go | 37 ++++++----------- relayer/chains/icon/provider.go | 11 +++++- relayer/chains/icon/query.go | 3 -- relayer/chains/icon/tx.go | 46 ++++++++++----------- 5 files changed, 98 insertions(+), 54 deletions(-) diff --git a/relayer/chains/cosmos/provider_test.go b/relayer/chains/cosmos/provider_test.go index 7e69a45a9..439ae24df 100644 --- a/relayer/chains/cosmos/provider_test.go +++ b/relayer/chains/cosmos/provider_test.go @@ -9,8 +9,12 @@ import ( "github.com/cosmos/gogoproto/proto" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + "github.com/cosmos/relayer/v2/relayer/common" + + tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ics23 "github.com/cosmos/ics23/go" @@ -212,3 +216,54 @@ func TestProtoBufDecode(t *testing.T) { specs := commitmenttypes.GetSDKSpecs() assert.Equal(t, specs, cs.ProofSpecs) } + +func TestKecca(t *testing.T) { + + d, err := hex.DecodeString("080612087472616e736665721a096368616e6e656c2d3322087472616e736665722a096368616e6e656c2d3132a3017b22616d6f756e74223a22393530303030303030303030222c2264656e6f6d223a22767370222c227265636569766572223a22617263687761793164787979787968797035686b7a676c3372776b6a666b63773530333032636137676539647072222c2273656e646572223a22687862366235373931626530623565663637303633623363313062383430666238313531346462326664222c226d656d6f223a22227d3a06080110a0c21e") + assert.NoError(t, err) + + var recvPacket chantypes.Packet + + err = proto.Unmarshal(d, &recvPacket) + assert.NoError(t, err) + + pkt := recvPacket + + fmt.Println("pkt is ", pkt) + + key := host.PacketCommitmentKey(pkt.SourcePort, pkt.SourceChannel, pkt.Sequence) + + fmt.Printf("packet commitment key: %x \n", common.Sha3keccak256(key)) + + cdc := MakeCodec(ModuleBasics, []string{}) + + commitment := chantypes.CommitPacket(cdc.Marshaler, pkt) + + fmt.Printf("commitment: %x \n", commitment) + + k := common.Sha3keccak256(commitment) + + fmt.Printf("keccak hash: %x \n", k) + + // 174c5d4caf630a3177179384fcb937b32ff2b9c9aa1b75baf9d001ca44c8ba1c8abf0ea23d6df15e019beb89069adde801d0b416ad7313dda3b8918dffcee648 +} + +func TestCheck(t *testing.T) { + + d, _ := hex.DecodeString("0a0f30372d74656e6465726d696e742d311283070a262f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e48656164657212d8060ace040a91030a02080b120a6c6f63616c6e65742d3318df1a220c08c7dfefac0610f8cb8689022a480a209bc206431636d37aaa0620d7104181cfa522c6a638ea94b18b208b345e785eee122408011220333c8c2b0f836e0257ef81e3604b0facf87c464c949918823a99140e26d8afa73220f1e36484f9e67181627dfc77c8c36b6d630aefc7d76ce7d2076fcda3cc09505e3a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8554220e06ea33faadb850b5a99dd0d3c278b093e7e04b4e766a6d61f19f1e23c0106e54a20e06ea33faadb850b5a99dd0d3c278b093e7e04b4e766a6d61f19f1e23c0106e55220048091bc7ddc283f77bfbf91d73c44da58c3df8a9cbc867405d8b7f3daada22f5a20dd3c4644a259c0febeba7acdbdd700cd6e6329c7fe49c3c5bf3feec489d387666220e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8556a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8557214440ea6739f834de47390081854d31627a334f0ce12b70108df1a1a480a2065d83642db4469b00280176c8fe2d893f5525365537595c2dd4f8f97a181f0e11224080112207f393760e873ee774879a4ab65ae1a19e97c07859a388dd5f95714c7f80ee341226808021214440ea6739f834de47390081854d31627a334f0ce1a0c08ccdfefac0610ecb18e940222408fd31fd6548a5fc0a6d4d4443a725aca5cb8285e566c17c81a287795194d82b5dd540d131ee89ed554c722e1a4ad1ca3ffc7cb3e7a27fca3ed848e1a676e1805127e0a3c0a14440ea6739f834de47390081854d31627a334f0ce12220a20cee457ef07f72b3bdcbbdb3c82777da1dc89d09020a19fc7ffc2e5fef7ce4c34180a123c0a14440ea6739f834de47390081854d31627a334f0ce12220a20cee457ef07f72b3bdcbbdb3c82777da1dc89d09020a19fc7ffc2e5fef7ce4c34180a180a1a05080310d91a227e0a3c0a14440ea6739f834de47390081854d31627a334f0ce12220a20cee457ef07f72b3bdcbbdb3c82777da1dc89d09020a19fc7ffc2e5fef7ce4c34180a123c0a14440ea6739f834de47390081854d31627a334f0ce12220a20cee457ef07f72b3bdcbbdb3c82777da1dc89d09020a19fc7ffc2e5fef7ce4c34180a180a1a2f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") + + var msgUpdateClient clienttypes.MsgUpdateClient + + err := proto.Unmarshal(d, &msgUpdateClient) + assert.NoError(t, err) + + fmt.Println(msgUpdateClient.ClientMessage.Value) + + var d2 tmclient.Header + err = proto.Unmarshal(msgUpdateClient.ClientMessage.Value, &d2) + + assert.NoError(t, err) + + fmt.Println(d2.SignedHeader.Header.Height) + +} diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 1cf7e404f..1c6be48e2 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -149,7 +149,7 @@ func (cc *CosmosProvider) SendMessagesToMempool( for _, m := range msgs { fmt.Println("[cosmos] from mempool messageType:", m.Type()) b, _ := m.MsgBytes() - fmt.Printf("[commos] message %x \n ", b) + fmt.Printf("[cosmos] message %x \n ", b) } @@ -592,7 +592,7 @@ func (cc *CosmosProvider) MsgRecvPacket( } msg := &chantypes.MsgRecvPacket{ Packet: msgTransfer.Packet(), - ProofCommitment: proof.Proof, + ProofCommitment: common.ChangeProof(proof.Proof, true), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -630,7 +630,7 @@ func (cc *CosmosProvider) MsgAcknowledgement( msg := &chantypes.MsgAcknowledgement{ Packet: msgRecvPacket.Packet(), Acknowledgement: msgRecvPacket.Ack, - ProofAcked: proof.Proof, + ProofAcked: common.ChangeProof(proof.Proof, true), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -682,7 +682,7 @@ func (cc *CosmosProvider) MsgTimeout(msgTransfer provider.PacketInfo, proof prov } assembled := &chantypes.MsgTimeout{ Packet: msgTransfer.Packet(), - ProofUnreceived: proof.Proof, + ProofUnreceived: common.ChangeProof(proof.Proof, true), ProofHeight: proof.ProofHeight, NextSequenceRecv: msgTransfer.Sequence, Signer: signer, @@ -702,7 +702,7 @@ func (cc *CosmosProvider) MsgTimeoutOnClose(msgTransfer provider.PacketInfo, pro } assembled := &chantypes.MsgTimeoutOnClose{ Packet: msgTransfer.Packet(), - ProofUnreceived: proof.Proof, + ProofUnreceived: common.ChangeProof(proof.Proof, true), ProofHeight: proof.ProofHeight, NextSequenceRecv: msgTransfer.Sequence, Signer: signer, @@ -810,20 +810,22 @@ func (cc *CosmosProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInf // if msgOpenTry client is wasm client then we need to incorporate it + fmt.Println("[cosmos] msgConnectionOpenAck proofHeight.RevisionNumber: ", proof.ProofHeight.RevisionNumber) + msg := &conntypes.MsgConnectionOpenAck{ ConnectionId: msgOpenTry.CounterpartyConnID, CounterpartyConnectionId: msgOpenTry.ConnID, Version: conntypes.DefaultIBCVersion, ClientState: csAny, ProofHeight: clienttypes.Height{ - RevisionNumber: 1, + RevisionNumber: proof.ProofHeight.RevisionNumber, RevisionHeight: proof.ProofHeight.GetRevisionHeight(), }, ProofTry: proof.ConnectionStateProof, ProofClient: proof.ClientStateProof, ProofConsensus: proof.ConsensusStateProof, ConsensusHeight: clienttypes.Height{ - RevisionNumber: 1, + RevisionNumber: proof.ClientState.GetLatestHeight().GetRevisionNumber(), RevisionHeight: proof.ClientState.GetLatestHeight().GetRevisionHeight(), }, Signer: signer, @@ -855,7 +857,7 @@ func (cc *CosmosProvider) MsgConnectionOpenConfirm(msgOpenAck provider.Connectio } msg := &conntypes.MsgConnectionOpenConfirm{ ConnectionId: msgOpenAck.CounterpartyConnID, - ProofAck: proof.ConnectionStateProof, + ProofAck: common.ChangeProof(proof.ConnectionStateProof, true), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -925,7 +927,7 @@ func (cc *CosmosProvider) MsgChannelOpenTry(msgOpenInit provider.ChannelInfo, pr Version: proof.Version, }, CounterpartyVersion: proof.Version, - ProofInit: proof.Proof, + ProofInit: common.ChangeProof(proof.Proof, true), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -989,7 +991,7 @@ func (cc *CosmosProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelIn msg := &chantypes.MsgChannelCloseConfirm{ PortId: msgCloseInit.CounterpartyPortID, ChannelId: msgCloseInit.CounterpartyChannelID, - ProofInit: proof.Proof, + ProofInit: common.ChangeProof(proof.Proof, true), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -1034,21 +1036,8 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, clientHeader = &tmClientHeader - // TODO: handle case for icon header - // if true { - // wasmLatestHeader := provider.NewWasmIBCHeaderFromLightBlock(latestCosmosHeader.LightBlock()) - // wasmTrustedHeader := provider.NewWasmIBCHeaderFromLightBlock(trustedCosmosHeader.LightBlock()) - - // clientHeader := itm.TmHeader{ - // SignedHeader: wasmLatestHeader.SignedHeader, - // ValidatorSet: wasmLatestHeader.ValidatorSet, - // TrustedValidators: wasmTrustedHeader.ValidatorSet, - // TrustedHeight: int64(trustedHeight.RevisionHeight), - // } - // return &clientHeader, nil - // } - if clientType == exported.Wasm { + tmClientHeaderBz, err := cc.Cdc.Marshaler.MarshalInterface(clientHeader) if err != nil { return &wasmclient.Header{}, nil diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index 127cf9ea5..762ebd141 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -67,6 +67,7 @@ type IconProviderConfig struct { IbcHandlerAddress string `json:"ibc-handler-address" yaml:"ibc-handler-address"` FirstRetryBlockAfter uint64 `json:"first-retry-block-after" yaml:"first-retry-block-after"` BlockInterval uint64 `json:"block-interval" yaml:"block-interval"` + RevisionNumber uint64 `json:"revision-number" yaml:"revision-number"` } func (pp *IconProviderConfig) Validate() error { @@ -247,8 +248,6 @@ func (icp *IconProvider) NewClientState( latestHeight := clienttypes.NewHeight(1, dstUpdateHeader.Height()) if srcWasmCodeID != "" { - - fmt.Println("inside srcWAsmCodeID") tmClientStateBz, err := icp.codec.Marshaler.MarshalInterface(clientState) if err != nil { return &wasmclient.ClientState{}, err @@ -576,3 +575,11 @@ func (icp *IconProvider) GetCurrentBtpNetworkStartHeight() (int64, error) { func (icp *IconProvider) MsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayeeAddr string) (provider.RelayerMessage, error) { panic(fmt.Sprintf("%s%s", icp.ChainName(), NOT_IMPLEMENTED)) } + +// TODO: revisionNumber cannot be zero +func (icp *IconProvider) IconRevisionNumber() uint64 { + if icp.PCfg.RevisionNumber != 0 { + return icp.PCfg.RevisionNumber + } + return 1 +} diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index cd297da4b..629977880 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -249,7 +249,6 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHeight int64, clientid string, clientHeight ibcexported.Height) (*clienttypes.QueryConsensusStateResponse, error) { h := clienttypes.NewHeight(clientHeight.GetRevisionNumber(), clientHeight.GetRevisionHeight()) - fmt.Println("[icon] queryClientConsensusState height: ", h) heightBytes, err := icp.codec.Marshaler.Marshal(&h) if err != nil { @@ -276,8 +275,6 @@ func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHei return nil, err } - fmt.Println("[icon] QueryClientConsensusState height: ", h) - key := common.GetConsensusStateCommitmentKey(clientid, big.NewInt(int64(h.RevisionNumber)), big.NewInt(int64(h.RevisionHeight))) commitmentHash := getCommitmentHash(key, cnsStateByte) diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index 20b3e279c..8ed3dae61 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -762,38 +762,34 @@ func (icp *IconProvider) SendIconTransaction( return err } - fmt.Println("[icon] mempool", msg.Type()) - b, _ := msg.MsgBytes() - fmt.Printf("[icon] mempool %x \n", b) - - // txParamEst := &types.TransactionParamForEstimate{ - // Version: types.NewHexInt(types.JsonrpcApiVersion), - // FromAddress: types.Address(wallet.Address().String()), - // ToAddress: types.Address(icp.PCfg.IbcHandlerAddress), - // NetworkID: types.NewHexInt(icp.PCfg.ICONNetworkID), - // DataType: "call", - // Data: types.CallData{ - // Method: m.Method, - // Params: m.Params, - // }, - // } + txParamEst := &types.TransactionParamForEstimate{ + Version: types.NewHexInt(types.JsonrpcApiVersion), + FromAddress: types.Address(wallet.Address().String()), + ToAddress: types.Address(icp.PCfg.IbcHandlerAddress), + NetworkID: types.NewHexInt(icp.PCfg.ICONNetworkID), + DataType: "call", + Data: types.CallData{ + Method: m.Method, + Params: m.Params, + }, + } - // step, err := icp.client.EstimateStep(txParamEst) - // if err != nil { - // return fmt.Errorf("failed estimating step: %w", err) - // } - // stepVal, err := step.Int() - // if err != nil { - // return err - // } - // stepLimit := types.NewHexInt(int64(stepVal + 200_000)) + step, err := icp.client.EstimateStep(txParamEst) + if err != nil { + return fmt.Errorf("failed estimating step: %w", err) + } + stepVal, err := step.Int() + if err != nil { + return err + } + stepLimit := types.NewHexInt(int64(stepVal + 200_000)) txParam := &types.TransactionParam{ Version: types.NewHexInt(types.JsonrpcApiVersion), FromAddress: types.Address(wallet.Address().String()), ToAddress: types.Address(icp.PCfg.IbcHandlerAddress), NetworkID: types.NewHexInt(icp.PCfg.ICONNetworkID), - StepLimit: types.NewHexInt(200_000_000), + StepLimit: stepLimit, DataType: "call", Data: types.CallData{ Method: m.Method, From be9894ac5051b7c6ae736f6c2f5919eedcf2a19c Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Wed, 17 Jan 2024 09:52:24 +0800 Subject: [PATCH 16/35] chore: handle revision number properly --- relayer/chains/cosmos/provider.go | 5 +++++ relayer/chains/icon/provider.go | 4 ++-- relayer/chains/icon/query.go | 20 ++++++++++---------- relayer/chains/icon/tx.go | 3 +-- relayer/chains/penumbra/provider.go | 5 +++++ relayer/chains/wasm/provider.go | 5 +++++ relayer/chains/wasm/provider_test.go | 9 --------- relayer/common/utils.go | 6 ------ relayer/processor/path_processor_internal.go | 7 +++++-- relayer/provider/provider.go | 3 ++- 10 files changed, 35 insertions(+), 32 deletions(-) diff --git a/relayer/chains/cosmos/provider.go b/relayer/chains/cosmos/provider.go index 37d528a90..df82f46bf 100644 --- a/relayer/chains/cosmos/provider.go +++ b/relayer/chains/cosmos/provider.go @@ -18,6 +18,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/gogoproto/proto" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" "github.com/cosmos/relayer/v2/relayer/processor" @@ -318,6 +319,10 @@ func (cc *CosmosProvider) legacyEncodedEvents(log *zap.Logger, version string) b return semver.Compare("v"+version, cometEncodingThreshold) < 0 } +func (cc *CosmosProvider) RevisionNumber() uint64 { + return clienttypes.ParseChainID(cc.ChainId()) +} + // keysDir returns a string representing the path on the local filesystem where the keystore will be initialized. func keysDir(home, chainID string) string { return path.Join(home, "keys", chainID) diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index 762ebd141..bdabadf02 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -245,7 +245,7 @@ func (icp *IconProvider) NewClientState( } // TODO: arrange better way - latestHeight := clienttypes.NewHeight(1, dstUpdateHeader.Height()) + latestHeight := clienttypes.NewHeight(icp.RevisionNumber(), dstUpdateHeader.Height()) if srcWasmCodeID != "" { tmClientStateBz, err := icp.codec.Marshaler.MarshalInterface(clientState) @@ -577,7 +577,7 @@ func (icp *IconProvider) MsgRegisterCounterpartyPayee(portID, channelID, relayer } // TODO: revisionNumber cannot be zero -func (icp *IconProvider) IconRevisionNumber() uint64 { +func (icp *IconProvider) RevisionNumber() uint64 { if icp.PCfg.RevisionNumber != 0 { return icp.PCfg.RevisionNumber } diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index 629977880..0b22519b5 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -204,7 +204,7 @@ func (icp *IconProvider) QueryClientStateWithoutProof(ctx context.Context, heigh return nil, err } - clientStateRes := clienttypes.NewQueryClientStateResponse(any, nil, common.NewHeightWithRevisionOne(uint64(height))) + clientStateRes := clienttypes.NewQueryClientStateResponse(any, nil, clienttypes.NewHeight(icp.RevisionNumber(), uint64(height))) clientStateExported, err := clienttypes.UnpackClientState(clientStateRes.ClientState) if err != nil { return nil, err @@ -243,7 +243,7 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in return nil, err } - return clienttypes.NewQueryClientStateResponse(any, proof, common.NewHeightWithRevisionOne(uint64(height))), nil + return clienttypes.NewQueryClientStateResponse(any, proof, clienttypes.NewHeight(icp.RevisionNumber(), uint64(height))), nil } func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHeight int64, clientid string, clientHeight ibcexported.Height) (*clienttypes.QueryConsensusStateResponse, error) { @@ -286,7 +286,7 @@ func (icp *IconProvider) QueryClientConsensusState(ctx context.Context, chainHei return &clienttypes.QueryConsensusStateResponse{ ConsensusState: any, Proof: proof, - ProofHeight: common.NewHeightWithRevisionOne(uint64(chainHeight)), + ProofHeight: clienttypes.NewHeight(icp.RevisionNumber(), uint64(chainHeight)), }, nil } @@ -375,7 +375,7 @@ func (icp *IconProvider) QueryConnection(ctx context.Context, height int64, conn return emptyConnRes, err } - return conntypes.NewQueryConnectionResponse(conn, proof, common.NewHeightWithRevisionOne(uint64(height))), nil + return conntypes.NewQueryConnectionResponse(conn, proof, clienttypes.NewHeight(icp.RevisionNumber(), uint64(height))), nil } @@ -515,7 +515,7 @@ func (icp *IconProvider) GenerateConnHandshakeProof(ctx context.Context, height fmt.Println("[icon] got QueryConnection", connResponse) - return clientState_, clientResponse.Proof, consensusRes.Proof, connResponse.Proof, common.NewHeightWithRevisionOne(uint64(height)), nil + return clientState_, clientResponse.Proof, consensusRes.Proof, connResponse.Proof, clienttypes.NewHeight(icp.RevisionNumber(), uint64(height)), nil } // ics 04 - channel @@ -560,7 +560,7 @@ func (icp *IconProvider) QueryChannel(ctx context.Context, height int64, channel channel.Version, ) - return chantypes.NewQueryChannelResponse(cosmosChan, proof, common.NewHeightWithRevisionOne(uint64(height))), nil + return chantypes.NewQueryChannelResponse(cosmosChan, proof, clienttypes.NewHeight(icp.RevisionNumber(), uint64(height))), nil } var emptyChannelRes = chantypes.NewQueryChannelResponse( @@ -701,7 +701,7 @@ func (icp *IconProvider) QueryNextSeqRecv(ctx context.Context, height int64, cha return &chantypes.QueryNextSequenceReceiveResponse{ NextSequenceReceive: uint64(nextSeq), Proof: proof, - ProofHeight: common.NewHeightWithRevisionOne(uint64(height)), + ProofHeight: clienttypes.NewHeight(icp.RevisionNumber(), uint64(height)), }, nil } @@ -733,7 +733,7 @@ func (icp *IconProvider) QueryPacketCommitment(ctx context.Context, height int64 return &chantypes.QueryPacketCommitmentResponse{ Commitment: packetCommitmentBytes, Proof: proof, - ProofHeight: common.NewHeightWithRevisionOne(uint64(height)), + ProofHeight: clienttypes.NewHeight(icp.RevisionNumber(), uint64(height)), }, nil } @@ -767,7 +767,7 @@ func (icp *IconProvider) QueryPacketAcknowledgement(ctx context.Context, height return &chantypes.QueryPacketAcknowledgementResponse{ Acknowledgement: packetAckBytes, Proof: proof, - ProofHeight: common.NewHeightWithRevisionOne(uint64(height)), + ProofHeight: clienttypes.NewHeight(icp.RevisionNumber(), uint64(height)), }, nil } @@ -796,7 +796,7 @@ func (icp *IconProvider) QueryPacketReceipt(ctx context.Context, height int64, c return &chantypes.QueryPacketReceiptResponse{ Received: packetReceipt == 1, Proof: proof, - ProofHeight: common.NewHeightWithRevisionOne(uint64(height)), + ProofHeight: clienttypes.NewHeight(icp.RevisionNumber(), uint64(height)), }, nil } diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index 8ed3dae61..8d1b0b115 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -20,7 +20,6 @@ import ( // itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/cosmos/relayer/v2/relayer/chains/icon/types" - "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" "github.com/icon-project/ibc-integration/libraries/go/common/icon" "go.uber.org/zap" @@ -586,7 +585,7 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, return &wasmclient.Header{ Data: tmClientHeaderBz, // TODO: forcefully set 1 - Height: common.NewHeightWithRevisionOne(latestIconHeader.Header.MainHeight), + Height: clienttypes.NewHeight(icp.RevisionNumber(), latestIconHeader.Header.MainHeight), }, nil } diff --git a/relayer/chains/penumbra/provider.go b/relayer/chains/penumbra/provider.go index f57902aeb..b98a2d01a 100644 --- a/relayer/chains/penumbra/provider.go +++ b/relayer/chains/penumbra/provider.go @@ -18,6 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/gogoproto/proto" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" @@ -343,6 +344,10 @@ func (cc *PenumbraProvider) FirstRetryBlockAfter() uint64 { return 1 } +func (cc *PenumbraProvider) RevisionNumber() uint64 { + return clienttypes.ParseChainID(cc.ChainId()) +} + // keysDir returns a string representing the path on the local filesystem where the keystore will be initialized. func keysDir(home, chainID string) string { return path.Join(home, "keys", chainID) diff --git a/relayer/chains/wasm/provider.go b/relayer/chains/wasm/provider.go index 45a839d4b..60f6dacfc 100644 --- a/relayer/chains/wasm/provider.go +++ b/relayer/chains/wasm/provider.go @@ -23,6 +23,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/bech32" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/gogoproto/proto" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" "github.com/cosmos/relayer/v2/relayer/processor" @@ -375,6 +376,10 @@ func (ap *WasmProvider) MsgRegisterCounterpartyPayee(portID, channelID, relayerA panic(fmt.Sprintf("%s%s", ap.ChainName(), NOT_IMPLEMENTED)) } +func (cc *WasmProvider) RevisionNumber() uint64 { + return clienttypes.ParseChainID(cc.ChainId()) +} + // keysDir returns a string representing the path on the local filesystem where the keystore will be initialized. func keysDir(home, chainID string) string { return path.Join(home, "keys", chainID) diff --git a/relayer/chains/wasm/provider_test.go b/relayer/chains/wasm/provider_test.go index d2776c6f5..9714fb501 100644 --- a/relayer/chains/wasm/provider_test.go +++ b/relayer/chains/wasm/provider_test.go @@ -822,12 +822,3 @@ func TestProtoUnmarshal(t *testing.T) { // _, err := archwayP.GetCommitmentPrefixFromContract(ctx) // assert.NoError(t, err) // } - -func TestHeightConversion(t *testing.T) { - - h := clienttypes.NewHeight(1, 5570) - b, err := proto.Marshal(&h) - assert.NoError(t, err) - fmt.Printf("proto encoded height %x \n", b) - -} diff --git a/relayer/common/utils.go b/relayer/common/utils.go index 758d7a034..c659e5091 100644 --- a/relayer/common/utils.go +++ b/relayer/common/utils.go @@ -7,8 +7,6 @@ import ( "path" "strconv" "strings" - - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ) func MustHexStrToBytes(hex_string string) []byte { @@ -61,10 +59,6 @@ func LoadSnapshotHeight(chain_id string) (int64, error) { return strconv.ParseInt(strings.TrimSuffix(string(content), "\n"), 10, 64) } -func NewHeightWithRevisionOne(height uint64) clienttypes.Height { - return clienttypes.NewHeight(1, height) -} - func ChangeProof(proof []byte, shouldNeverBeEmpty bool) []byte { if proof == nil && shouldNeverBeEmpty { return EmptyProofConst diff --git a/relayer/processor/path_processor_internal.go b/relayer/processor/path_processor_internal.go index b0f3c1628..cdd5f8c5d 100644 --- a/relayer/processor/path_processor_internal.go +++ b/relayer/processor/path_processor_internal.go @@ -8,11 +8,13 @@ import ( "sort" "sync" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" + "go.uber.org/zap" "golang.org/x/sync/errgroup" ) @@ -1551,7 +1553,7 @@ func (pp *PathProcessor) UpdateBTPHeight(ctx context.Context, src *pathEndRuntim srcIsIcon := src.chainProvider.Type() == common.IconModule dstIsBtpClient := IsBTPLightClient(dst.clientState) - if !srcIsIcon && !dstIsBtpClient { + if !srcIsIcon { return } @@ -1566,6 +1568,7 @@ func (pp *PathProcessor) UpdateBTPHeight(ctx context.Context, src *pathEndRuntim if src.BTPHeightQueue.Size() == 0 { return } + size := src.BTPHeightQueue.Size() for i := 0; i < size; i++ { btpHeightInfo, err := src.BTPHeightQueue.GetQueue() @@ -1580,7 +1583,7 @@ func (pp *PathProcessor) UpdateBTPHeight(ctx context.Context, src *pathEndRuntim continue } if dst.clientState.ConsensusHeight.RevisionHeight > uint64(btpHeightInfo.Height) { - cs, err := dst.chainProvider.QueryClientConsensusState(ctx, int64(dst.latestBlock.Height), dst.clientState.ClientID, common.NewHeightWithRevisionOne(uint64(btpHeightInfo.Height))) + cs, err := dst.chainProvider.QueryClientConsensusState(ctx, int64(dst.latestBlock.Height), dst.clientState.ClientID, clienttypes.NewHeight(src.chainProvider.RevisionNumber(), uint64(btpHeightInfo.Height))) if err == nil && cs != nil { // removing latest height element src.BTPHeightQueue.Dequeue() diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go index 2bfffa5b6..60e2a5694 100644 --- a/relayer/provider/provider.go +++ b/relayer/provider/provider.go @@ -308,7 +308,7 @@ type ChainProvider interface { // [Begin] Connection handshake IBC message assembly // ConnectionHandshakeProof queries for proof of an initialized connection handshake. - ConnectionHandshakeProof(ctx context.Context, msgOpenInit ConnectionInfo, height uint64,) (ConnectionProof, error) + ConnectionHandshakeProof(ctx context.Context, msgOpenInit ConnectionInfo, height uint64) (ConnectionProof, error) // ConnectionProof queries for proof of an acked handshake. ConnectionProof(ctx context.Context, msgOpenAck ConnectionInfo, height uint64) (ConnectionProof, error) @@ -417,6 +417,7 @@ type ChainProvider interface { TrustingPeriod(ctx context.Context) (time.Duration, error) WaitForNBlocks(ctx context.Context, n int64) error Sprint(toPrint proto.Message) (string, error) + RevisionNumber() uint64 } // Do we need intermediate types? i.e. can we use the SDK types for both substrate and cosmos? From 56d6a911b61afc0c0696191183e2fb678050a418 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Wed, 17 Jan 2024 09:59:56 +0800 Subject: [PATCH 17/35] chore: wasm refractor revision Number --- relayer/chains/wasm/provider.go | 5 +++-- relayer/chains/wasm/provider_test.go | 2 +- relayer/chains/wasm/query.go | 18 +++++++++--------- relayer/processor/path_processor_internal.go | 9 --------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/relayer/chains/wasm/provider.go b/relayer/chains/wasm/provider.go index 60f6dacfc..039b20251 100644 --- a/relayer/chains/wasm/provider.go +++ b/relayer/chains/wasm/provider.go @@ -23,7 +23,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/bech32" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/gogoproto/proto" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" "github.com/cosmos/relayer/v2/relayer/codecs/ethermint" "github.com/cosmos/relayer/v2/relayer/processor" @@ -377,7 +376,9 @@ func (ap *WasmProvider) MsgRegisterCounterpartyPayee(portID, channelID, relayerA } func (cc *WasmProvider) RevisionNumber() uint64 { - return clienttypes.ParseChainID(cc.ChainId()) + // note: use zero because prevision javascore version + // didn't use revisionNumber + return 0 } // keysDir returns a string representing the path on the local filesystem where the keystore will be initialized. diff --git a/relayer/chains/wasm/provider_test.go b/relayer/chains/wasm/provider_test.go index 9714fb501..75362fc4d 100644 --- a/relayer/chains/wasm/provider_test.go +++ b/relayer/chains/wasm/provider_test.go @@ -518,7 +518,7 @@ func GetIconProvider(network_id int) *icon.IconProvider { // ctx := context.Background() -// op, err := iconP.QueryClientConsensusState(ctx, 200, "07-tendermint-34", clienttypes.NewHeight(0, 31600)) +// op, err := iconP.QueryClientConsensusState(ctx, 200, "07-tendermint-34", clienttypes.NewHeight(ap.RevisionNumber(), 31600)) // assert.NoError(t, err) // fmt.Println(op) // } diff --git a/relayer/chains/wasm/query.go b/relayer/chains/wasm/query.go index fd1614d94..7e5ecb6d9 100644 --- a/relayer/chains/wasm/query.go +++ b/relayer/chains/wasm/query.go @@ -248,7 +248,7 @@ func (ap *WasmProvider) QueryClientStateResponse(ctx context.Context, height int return &clienttypes.QueryClientStateResponse{ ClientState: anyClientState, Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(height)), + ProofHeight: clienttypes.NewHeight(ap.RevisionNumber(), uint64(height)), }, nil } @@ -336,7 +336,7 @@ func (ap *WasmProvider) QueryClientConsensusState(ctx context.Context, chainHeig if err != nil { return nil, err } - return clienttypes.NewQueryConsensusStateResponse(anyConsensusState, nil, clienttypes.NewHeight(0, uint64(chainHeight))), nil + return clienttypes.NewQueryConsensusStateResponse(anyConsensusState, nil, clienttypes.NewHeight(ap.RevisionNumber(), uint64(chainHeight))), nil } func (ap *WasmProvider) QueryIBCHandlerContract(ctx context.Context, param wasmtypes.RawContractMessage) (op *wasmtypes.QuerySmartContractStateResponse, err error) { @@ -526,7 +526,7 @@ func (ap *WasmProvider) QueryConnection(ctx context.Context, height int64, conne return nil, err } - return conntypes.NewQueryConnectionResponse(conn, connProof, clienttypes.NewHeight(0, uint64(height))), nil + return conntypes.NewQueryConnectionResponse(conn, connProof, clienttypes.NewHeight(ap.RevisionNumber(), uint64(height))), nil } func (ap *WasmProvider) QueryWasmProof(ctx context.Context, storageKey []byte, height int64) ([]byte, error) { @@ -641,7 +641,7 @@ func (ap *WasmProvider) GenerateConnHandshakeProof(ctx context.Context, height i if err != nil { return nil, nil, nil, nil, nil, err } - return clientState_, clientResponse.GetProof(), proofConsensusBytes, proofConnBytes, clienttypes.NewHeight(0, uint64(height)), nil + return clientState_, clientResponse.GetProof(), proofConsensusBytes, proofConnBytes, clienttypes.NewHeight(ap.RevisionNumber(), uint64(height)), nil } // ics 04 - channel @@ -671,7 +671,7 @@ func (ap *WasmProvider) QueryChannel(ctx context.Context, height int64, channeli return nil, err } - return chantypes.NewQueryChannelResponse(channelS, proof, clienttypes.NewHeight(0, uint64(height))), nil + return chantypes.NewQueryChannelResponse(channelS, proof, clienttypes.NewHeight(ap.RevisionNumber(), uint64(height))), nil } func (ap *WasmProvider) QueryChannelClient(ctx context.Context, height int64, channelid, portid string) (*clienttypes.IdentifiedClientState, error) { @@ -772,7 +772,7 @@ func (ap *WasmProvider) QueryNextSeqRecv(ctx context.Context, height int64, chan return &chantypes.QueryNextSequenceReceiveResponse{ NextSequenceReceive: seq, Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(height)), + ProofHeight: clienttypes.NewHeight(ap.RevisionNumber(), uint64(height)), }, nil } @@ -794,7 +794,7 @@ func (ap *WasmProvider) QueryPacketCommitment(ctx context.Context, height int64, return &chantypes.QueryPacketCommitmentResponse{ Commitment: pktCommitment.Data.Bytes(), Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(height)), + ProofHeight: clienttypes.NewHeight(ap.RevisionNumber(), uint64(height)), }, nil } @@ -814,7 +814,7 @@ func (ap *WasmProvider) QueryPacketAcknowledgement(ctx context.Context, height i return &chantypes.QueryPacketAcknowledgementResponse{ Acknowledgement: pktAcknowledgement.Data.Bytes(), Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(height)), + ProofHeight: clienttypes.NewHeight(ap.RevisionNumber(), uint64(height)), }, nil } @@ -840,7 +840,7 @@ func (ap *WasmProvider) QueryPacketReceipt(ctx context.Context, height int64, ch return &chantypes.QueryPacketReceiptResponse{ Received: pktReceipt != nil, // TODO: Bytes to boolean Proof: proof, - ProofHeight: clienttypes.NewHeight(0, uint64(height)), + ProofHeight: clienttypes.NewHeight(ap.RevisionNumber(), uint64(height)), }, nil } diff --git a/relayer/processor/path_processor_internal.go b/relayer/processor/path_processor_internal.go index cdd5f8c5d..008839560 100644 --- a/relayer/processor/path_processor_internal.go +++ b/relayer/processor/path_processor_internal.go @@ -1551,20 +1551,11 @@ func (pp *PathProcessor) shouldTerminateForFlushComplete() bool { func (pp *PathProcessor) UpdateBTPHeight(ctx context.Context, src *pathEndRuntime, dst *pathEndRuntime) { srcIsIcon := src.chainProvider.Type() == common.IconModule - dstIsBtpClient := IsBTPLightClient(dst.clientState) if !srcIsIcon { return } - if srcIsIcon && !dstIsBtpClient || !srcIsIcon && dstIsBtpClient { - pp.log.Error("Src Icon module mismatch with dst btp client", - zap.String("Src Chain Type ", src.chainProvider.Type()), - zap.String("Dst client Id", dst.clientState.ClientID), - ) - return - } - if src.BTPHeightQueue.Size() == 0 { return } From d1cf219b77cbdc7596b56bd56faa0a3072bc7428 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Wed, 17 Jan 2024 10:08:07 +0800 Subject: [PATCH 18/35] chore: fix wasm --- relayer/chains/wasm/query.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relayer/chains/wasm/query.go b/relayer/chains/wasm/query.go index 7e5ecb6d9..f5ef6bcec 100644 --- a/relayer/chains/wasm/query.go +++ b/relayer/chains/wasm/query.go @@ -908,5 +908,5 @@ func (ap *WasmProvider) QueryClientPrevConsensusStateHeight(ctx context.Context, if len(heights) == 0 { return nil, fmt.Errorf("consensus state of client %s before %d", clientId, clientHeight) } - return clienttypes.Height{RevisionNumber: 0, RevisionHeight: uint64(heights[0])}, nil + return clienttypes.NewHeight(ap.RevisionNumber(), uint64(heights[0])), nil } From 79ca1477cd8c8c02ae2e2fe4907e06990b964220 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Wed, 24 Jan 2024 00:04:16 +0800 Subject: [PATCH 19/35] fix: after merge --- go.mod | 83 +++++++++++++++++-------------- go.sum | 14 ++++-- relayer/chains/icon/codec_test.go | 6 +-- relayer/chains/wasm/tx.go | 11 ++-- relayer/client.go | 2 +- relayer/provider/provider.go | 3 ++ 6 files changed, 64 insertions(+), 55 deletions(-) diff --git a/go.mod b/go.mod index 56f2e1314..fe06757eb 100644 --- a/go.mod +++ b/go.mod @@ -4,18 +4,18 @@ go 1.19 require ( cosmossdk.io/api v0.3.1 - cosmossdk.io/errors v1.0.0-beta.7 + cosmossdk.io/errors v1.0.0 cosmossdk.io/math v1.0.1 - github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 - github.com/avast/retry-go/v4 v4.3.3 + github.com/CosmWasm/wasmd v0.40.0-rc.1 + github.com/avast/retry-go/v4 v4.3.4 github.com/btcsuite/btcd v0.23.4 github.com/btcsuite/btcd/btcutil v1.1.3 - github.com/cometbft/cometbft v0.37.1 + github.com/cometbft/cometbft v0.37.2 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.3 + github.com/cosmos/cosmos-sdk v0.47.4 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-go/v7 v7.1.0-rc0 + github.com/cosmos/ibc-go/v7 v7.2.0 github.com/cosmos/ics23/go v0.10.0 github.com/ethereum/go-ethereum v1.10.26 github.com/gofrs/flock v0.8.1 @@ -24,22 +24,22 @@ require ( github.com/google/go-github/v43 v43.0.0 github.com/gorilla/websocket v1.5.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/icon-project/IBC-Integration v0.0.0-20230416064536-48d70570734d github.com/icon-project/goloop v1.3.4 + github.com/icon-project/ibc-integration v1.1.2 github.com/jsternberg/zap-logfmt v1.3.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.0 github.com/spf13/cobra v1.7.0 - github.com/spf13/viper v1.15.0 - github.com/stretchr/testify v1.8.2 + github.com/spf13/viper v1.16.0 + github.com/stretchr/testify v1.8.4 github.com/tyler-smith/go-bip39 v1.1.0 - go.uber.org/multierr v1.8.0 + go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 - golang.org/x/crypto v0.8.0 - golang.org/x/mod v0.10.0 - golang.org/x/sync v0.1.0 - golang.org/x/text v0.9.0 - google.golang.org/grpc v1.55.0 + golang.org/x/crypto v0.11.0 + golang.org/x/mod v0.12.0 + golang.org/x/sync v0.3.0 + golang.org/x/text v0.11.0 + google.golang.org/grpc v1.56.2 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 @@ -47,15 +47,15 @@ require ( ) require ( - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.18.0 // indirect + cloud.google.com/go v0.110.4 // indirect + cloud.google.com/go/compute v1.20.1 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.12.0 // indirect - cloud.google.com/go/storage v1.29.0 // indirect + cloud.google.com/go/iam v1.1.0 // indirect + cloud.google.com/go/storage v1.30.1 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - cosmossdk.io/log v1.1.0 // indirect + cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -77,7 +77,7 @@ require ( github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect - github.com/cometbft/cometbft-db v0.7.0 // indirect + github.com/cometbft/cometbft-db v0.8.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect @@ -92,7 +92,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.4 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/docker/distribution v2.8.1+incompatible // indirect + github.com/docker/distribution v2.8.2+incompatible // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/evalphobia/logrus_fluent v0.5.4 // indirect @@ -102,6 +102,7 @@ require ( github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-stack/stack v1.8.1 // indirect @@ -118,9 +119,10 @@ require ( github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/orderedcode v0.0.1 // indirect + github.com/google/s2a-go v0.1.4 // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.0 // indirect + github.com/googleapis/gax-go/v2 v2.11.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect @@ -141,16 +143,17 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/klauspost/compress v1.16.3 // indirect + github.com/klauspost/compress v1.16.4 // indirect github.com/labstack/echo/v4 v4.9.0 // indirect github.com/labstack/gommon v0.3.1 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/linxGnu/grocksdb v1.7.16 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect github.com/minio/highwayhash v1.0.2 // indirect @@ -159,7 +162,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/pelletier/go-toml/v2 v2.0.9 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/philhofer/fwd v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -173,16 +176,16 @@ require ( github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect - github.com/spf13/afero v1.9.3 // indirect - github.com/spf13/cast v1.5.0 // indirect + github.com/spf13/afero v1.9.5 // indirect + github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.6.0 // indirect github.com/tinylib/msgp v1.1.2 // indirect + github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/ulikunitz/xz v0.5.11 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.1 // indirect @@ -194,19 +197,21 @@ require ( go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect - golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.6.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/term v0.7.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/term v0.10.0 // indirect golang.org/x/time v0.1.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.110.0 // indirect + google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/go-playground/validator.v9 v9.28.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - nhooyr.io/websocket v1.8.6 // indirect + nhooyr.io/websocket v1.8.7 // indirect pgregory.net/rapid v0.5.5 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) @@ -214,6 +219,8 @@ require ( replace ( github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d github.com/CosmWasm/wasmd => github.com/cosmwasm/wasmd v0.40.0-rc.1.0.20230424144037-55647a1fd1f9 + github.com/cosmos/ibc-go/v7 => github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/icon-project/IBC-Integration => github.com/icon-project/ibc-integration v0.0.0-20230717083940-67949d73b622 -) \ No newline at end of file + +) diff --git a/go.sum b/go.sum index e1eaf5b5e..c0e0643e0 100644 --- a/go.sum +++ b/go.sum @@ -476,7 +476,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= @@ -710,8 +711,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/icon-project/goloop v1.3.4 h1:82x8x+zY2XLVPEuWKHvnTj4bkeC5EYlNaaiePDqdMjk= github.com/icon-project/goloop v1.3.4/go.mod h1:9PoWRb5kowidc9jYy0RLuLpay1zT5FXgEKijx7rDQjE= -github.com/icon-project/ibc-integration v1.0.1-0.20231030122034-eba3565c0499 h1:PTvHnPGqhkiQB2qtCzn8Nhkim0n93Xv839ek4Uycsag= -github.com/icon-project/ibc-integration v1.0.1-0.20231030122034-eba3565c0499/go.mod h1:fjKA13uq7vf75WBzQrs5xfnf6+p7Wnhoe59z9xsENFc= +github.com/icon-project/ibc-integration v1.1.2 h1:ev1Rwqyrvkkm/weLS5D8ecu9GShznYfSHeG/gSxBE+A= +github.com/icon-project/ibc-integration v1.1.2/go.mod h1:GcfjRAcIS19mr/tXPiqM/GOwJkRCHtknSezYy8VHiKY= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -1047,8 +1048,10 @@ github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4= -github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= +github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= +github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= @@ -1304,6 +1307,7 @@ golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/relayer/chains/icon/codec_test.go b/relayer/chains/icon/codec_test.go index f5ffb48bd..5790d905d 100644 --- a/relayer/chains/icon/codec_test.go +++ b/relayer/chains/icon/codec_test.go @@ -42,10 +42,8 @@ func TestClientState(t *testing.T) { func TestCodecEncode(t *testing.T) { testData := tendermint_client.ClientState{ - ChainId: "tendermint", - LatestHeight: &icon.Height{ - RevisionHeight: 40, - }, + ChainId: "tendermint", + LatestHeight: 40, } codec := MakeCodec(ModuleBasics, []string{}) diff --git a/relayer/chains/wasm/tx.go b/relayer/chains/wasm/tx.go index aed579cc3..ac30a2e3d 100644 --- a/relayer/chains/wasm/tx.go +++ b/relayer/chains/wasm/tx.go @@ -35,7 +35,6 @@ import ( conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" "github.com/cosmos/relayer/v2/relayer/provider" - "github.com/icon-project/ibc-integration/libraries/go/common/icon" itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/cosmos/cosmos-sdk/client" @@ -151,15 +150,15 @@ func (pc *WasmProviderConfig) SignMode() signing.SignMode { } func (ap *WasmProvider) NewClientState(dstChainID string, dstIBCHeader provider.IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string, srcChainId string) (ibcexported.ClientState, error) { - revisionNumber := clienttypes.ParseChainID(dstChainID) - latestHeight := icon.NewHeight(revisionNumber, dstIBCHeader.Height()) + // revisionNumber := clienttypes.ParseChainID(dstChainID) + // latestHeight := icon.NewHeight(revisionNumber, ) return &itm.ClientState{ ChainId: dstChainID, TrustLevel: &itm.Fraction{Numerator: light.DefaultTrustLevel.Numerator, Denominator: light.DefaultTrustLevel.Denominator}, TrustingPeriod: &itm.Duration{Seconds: int64(dstTrustingPeriod.Seconds())}, UnbondingPeriod: &itm.Duration{Seconds: int64(dstUbdPeriod.Seconds())}, - FrozenHeight: &icon.Height{}, - LatestHeight: &latestHeight, + FrozenHeight: int64(dstIBCHeader.Height()), + LatestHeight: int64(dstIBCHeader.Height()), AllowUpdateAfterExpiry: allowUpdateAfterExpiry, AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour, }, nil @@ -401,7 +400,6 @@ func (ap *WasmProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInfo Prefix: msgOpenInit.CommitmentPrefix, } - params := &conntypes.MsgConnectionOpenTry{ ClientId: msgOpenInit.CounterpartyClientID, PreviousConnectionId: msgOpenInit.CounterpartyConnID, @@ -432,7 +430,6 @@ func (ap *WasmProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInfo, return nil, err } - params := &conntypes.MsgConnectionOpenAck{ ConnectionId: msgOpenTry.CounterpartyConnID, CounterpartyConnectionId: msgOpenTry.ConnID, diff --git a/relayer/client.go b/relayer/client.go index b4bd1fdcf..64eba4f22 100644 --- a/relayer/client.go +++ b/relayer/client.go @@ -407,7 +407,7 @@ func msgUpdateClientOneWay(ctx context.Context, src, dst *Chain, height int64) ( RevisionHeight: trustedHdr.Height(), } - updateHeader, err = src.ChainProvider.MsgUpdateClientHeader(latestHdr, trustedHeight, trustedHdr) + updateHeader, err = src.ChainProvider.MsgUpdateClientHeader(latestHdr, trustedHeight, trustedHdr, dstClientState.ClientType()) return err }, retry.Context(ctx), RtyAtt, RtyDel, RtyErr, retry.OnRetry(func(n uint, err error) { dst.log.Info( diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go index 05d1fd2f4..446bb11f7 100644 --- a/relayer/provider/provider.go +++ b/relayer/provider/provider.go @@ -628,6 +628,9 @@ func (a WasmIBCHeader) NextValidatorsHash() []byte { func (a WasmIBCHeader) ShouldUpdateWithZeroMessage() bool { return false } +func (a WasmIBCHeader) ShouldUpdateForProofContextChange() bool { + return false +} func NewWasmIBCHeaderFromLightBlock(lightBlock *comettypes.LightBlock) WasmIBCHeader { vSets := make([]*itm.Validator, 0) From 7762af97ac29dab6e5f4d0e41dd9ab693830ba4a Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Fri, 26 Jan 2024 13:17:29 +0800 Subject: [PATCH 20/35] fix: cleanup to handle both contract and ICS --- relayer/chains/cosmos/provider.go | 2 +- relayer/chains/cosmos/provider_test.go | 32 +++--- relayer/chains/cosmos/tx.go | 4 +- relayer/chains/icon/icon_chain_processor.go | 2 - relayer/chains/icon/provider.go | 9 +- relayer/chains/icon/provider_helper.go | 23 +++++ relayer/chains/icon/provider_test.go | 11 ++ relayer/chains/icon/tx.go | 106 ++++++++++++-------- relayer/chains/penumbra/provider.go | 2 +- relayer/chains/penumbra/tx.go | 2 +- relayer/chains/wasm/provider.go | 2 +- relayer/chains/wasm/tx.go | 4 +- relayer/client.go | 11 +- relayer/common/const.go | 25 +++-- relayer/connection.go | 4 +- relayer/processor/path_end_runtime.go | 23 +++-- relayer/processor/types_internal.go | 4 +- relayer/provider/provider.go | 2 +- 18 files changed, 170 insertions(+), 98 deletions(-) diff --git a/relayer/chains/cosmos/provider.go b/relayer/chains/cosmos/provider.go index df82f46bf..4c4891b09 100644 --- a/relayer/chains/cosmos/provider.go +++ b/relayer/chains/cosmos/provider.go @@ -159,7 +159,7 @@ func (cc *CosmosProvider) Timeout() string { } // CommitmentPrefix returns the commitment prefix for Cosmos -func (cc *CosmosProvider) CommitmentPrefix() commitmenttypes.MerklePrefix { +func (cc *CosmosProvider) CommitmentPrefix(clientId string) commitmenttypes.MerklePrefix { return defaultChainPrefix } diff --git a/relayer/chains/cosmos/provider_test.go b/relayer/chains/cosmos/provider_test.go index 439ae24df..ef737bb8c 100644 --- a/relayer/chains/cosmos/provider_test.go +++ b/relayer/chains/cosmos/provider_test.go @@ -181,25 +181,31 @@ func TestWasmClientProtoFile(t *testing.T) { func TestConnectionOpenAck(t *testing.T) { - //b, _ := hex.DecodeString("0a0c636f6e6e656374696f6e2d33120d636f6e6e656374696f6e2d31321a230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f52444552454422b5010a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651285010a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a0310d90142180a090801180120012a0100120b0a010110211804200c300142180a090801180120012a0100120b0a010110201801200130014a07757067726164654a1075706772616465644942435374617465500158012a0608011086c20532280a0208010a2212200f67ed62f02aaf9b0629782874ec141d891722c1bd7660703b8e614d7e08f1de3a4c0a240801122014b0d8d883caf0fef230e3bb3fb81b1714a5855e0689940ff48c4cfe5c909e080a24080112206090ec3291eb757be2b7178f3432b35e7784b54f70d28a57898d761fb0e48593424a0a221220330b2ee265bfe0e88446a7c000661b3f1f567ee18e562036383f6b46f6af82a60a24080112206090ec3291eb757be2b7178f3432b35e7784b54f70d28a57898d761fb0e485934a05080110d901522f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") - // - //var m conntypes.MsgConnectionOpenAck - //err := proto.Unmarshal(b, &m) - //assert.NoError(t, err) - // - //fmt.Printf("value %x \n", m.ClientState.Value) + b, _ := hex.DecodeString("0a0c636f6e6e656374696f6e2d31120c636f6e6e656374696f6e2d321a230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f52444552454422b8010a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651288010a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a040801103542190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a1075706772616465644942435374617465500158012a06080110c2a40432280a0208010a22122063128404e5cd488d475fa9f5cb7264fff1cfa3e7a7521148eb28a0e5a87d87113a4c0a2408011220dea1f8b19f170ba89f9bec9cbc608c095f1551f740e7193dc1897ebfe69ff6d00a2408011220d06ed9394fd8737c9639fb57ef2305e9fc0e2f2c73fb87b74bfa0caf9363a410424a0a221220e62fbf1bd5989eb5b07fb67fe58e162bf129471bdb4889ca2e4f659bc72556e20a2408011220d06ed9394fd8737c9639fb57ef2305e9fc0e2f2c73fb87b74bfa0caf9363a4104a0408011035522f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") + + var m conntypes.MsgConnectionOpenAck + err := proto.Unmarshal(b, &m) + assert.NoError(t, err) + + fmt.Printf("clientState %x \n", m.ClientState.Value) // cs, err := clienttypes.UnpackClientState(m.ClientState) - // assert.NoError(t, err) + assert.NoError(t, err) // fmt.Println("connectionOpenAck", cs.GetLatestHeight()) - b, _ := hex.DecodeString("0x0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110c50342190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801") - var m tendermint.ClientState + // b, _ := hex.DecodeString("0x0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110c50342190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801") + var tCS tendermint.ClientState - err := proto.Unmarshal(b, &m) + err = proto.Unmarshal(m.ClientState.Value, &tCS) assert.NoError(t, err) - fmt.Println(m.GetLatestHeight().GetRevisionNumber()) + path := common.GetClientStateCommitmentKey("ics08-tendermint-0") + csByte := common.Sha3keccak256(m.ClientState.Value) + + fmt.Printf("path : %x \n", path) + fmt.Printf("clientState keccak: %x \n ", csByte) + + fmt.Println(tCS.GetLatestHeight().GetRevisionHeight()) } @@ -250,7 +256,7 @@ func TestKecca(t *testing.T) { func TestCheck(t *testing.T) { - d, _ := hex.DecodeString("0a0f30372d74656e6465726d696e742d311283070a262f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e48656164657212d8060ace040a91030a02080b120a6c6f63616c6e65742d3318df1a220c08c7dfefac0610f8cb8689022a480a209bc206431636d37aaa0620d7104181cfa522c6a638ea94b18b208b345e785eee122408011220333c8c2b0f836e0257ef81e3604b0facf87c464c949918823a99140e26d8afa73220f1e36484f9e67181627dfc77c8c36b6d630aefc7d76ce7d2076fcda3cc09505e3a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8554220e06ea33faadb850b5a99dd0d3c278b093e7e04b4e766a6d61f19f1e23c0106e54a20e06ea33faadb850b5a99dd0d3c278b093e7e04b4e766a6d61f19f1e23c0106e55220048091bc7ddc283f77bfbf91d73c44da58c3df8a9cbc867405d8b7f3daada22f5a20dd3c4644a259c0febeba7acdbdd700cd6e6329c7fe49c3c5bf3feec489d387666220e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8556a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8557214440ea6739f834de47390081854d31627a334f0ce12b70108df1a1a480a2065d83642db4469b00280176c8fe2d893f5525365537595c2dd4f8f97a181f0e11224080112207f393760e873ee774879a4ab65ae1a19e97c07859a388dd5f95714c7f80ee341226808021214440ea6739f834de47390081854d31627a334f0ce1a0c08ccdfefac0610ecb18e940222408fd31fd6548a5fc0a6d4d4443a725aca5cb8285e566c17c81a287795194d82b5dd540d131ee89ed554c722e1a4ad1ca3ffc7cb3e7a27fca3ed848e1a676e1805127e0a3c0a14440ea6739f834de47390081854d31627a334f0ce12220a20cee457ef07f72b3bdcbbdb3c82777da1dc89d09020a19fc7ffc2e5fef7ce4c34180a123c0a14440ea6739f834de47390081854d31627a334f0ce12220a20cee457ef07f72b3bdcbbdb3c82777da1dc89d09020a19fc7ffc2e5fef7ce4c34180a180a1a05080310d91a227e0a3c0a14440ea6739f834de47390081854d31627a334f0ce12220a20cee457ef07f72b3bdcbbdb3c82777da1dc89d09020a19fc7ffc2e5fef7ce4c34180a123c0a14440ea6739f834de47390081854d31627a334f0ce12220a20cee457ef07f72b3bdcbbdb3c82777da1dc89d09020a19fc7ffc2e5fef7ce4c34180a180a1a2f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") + d, _ := hex.DecodeString("0a0d636f6e6e656374696f6e2d3139120c636f6e6e656374696f6e2d301a230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f52444552454422b9010a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651289010a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110ed5f42190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a1075706772616465644942435374617465500158012a06080110e18d0432280a0208010a2212208a2aa818cbcbf23a39ab8b89ad6e919f63c9a73086c47cb5f42b020c5238f4923a4c0a2408011220a11c2fe63965c80acf540f3641b8a2ab29f4b08e00cfedea6fc08a4ac18c29c00a2408011220199f72f4420d2e29ffe56cbb27858e3b8b2cffacfa0eb1dec3c1add51c2c089e424a0a221220b5f7c49ba32adeb09a4067f59a0140204179a5753700ab778c3ef1d5e05d9f270a2408011220199f72f4420d2e29ffe56cbb27858e3b8b2cffacfa0eb1dec3c1add51c2c089e4a05080110ed5f522f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") var msgUpdateClient clienttypes.MsgUpdateClient diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 1c6be48e2..af24abd79 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -451,6 +451,7 @@ func (cc *CosmosProvider) handleAccountSequenceMismatchError(err error) { func (cc *CosmosProvider) MsgCreateClient( clientState ibcexported.ClientState, consensusState ibcexported.ConsensusState, + ) (provider.RelayerMessage, error) { signer, err := cc.Address() if err != nil { @@ -1339,9 +1340,6 @@ func (cc *CosmosProvider) NewClientState( ) (ibcexported.ClientState, error) { revisionNumber := clienttypes.ParseChainID(dstChainID) - fmt.Println("[cosmos] srcWasmCodeId", srcWasmCodeID) - fmt.Println("revision number", revisionNumber) - var clientState ibcexported.ClientState // Create the ClientState we want on 'c' tracking 'dst' diff --git a/relayer/chains/icon/icon_chain_processor.go b/relayer/chains/icon/icon_chain_processor.go index 1cff6506e..fd234a5d0 100644 --- a/relayer/chains/icon/icon_chain_processor.go +++ b/relayer/chains/icon/icon_chain_processor.go @@ -95,8 +95,6 @@ type latestClientState map[string]provider.ClientState func (l latestClientState) update(ctx context.Context, clientInfo clientInfo, icp *IconChainProcessor) { - fmt.Println("clientInfo::", clientInfo) - existingClientInfo, ok := l[clientInfo.clientID] if ok { if clientInfo.consensusHeight.LT(existingClientInfo.ConsensusHeight) { diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index 765b24355..65539b291 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -5,6 +5,7 @@ import ( "encoding/base64" "encoding/hex" "fmt" + "strings" "sync" "time" @@ -245,7 +246,6 @@ func (icp *IconProvider) NewClientState( NetworkTypeId: uint64(icp.PCfg.BTPNetworkTypeID), } - // TODO: arrange better way latestHeight := clienttypes.NewHeight(icp.RevisionNumber(), dstUpdateHeader.Height()) if srcWasmCodeID != "" { @@ -459,8 +459,11 @@ func (icp *IconProvider) ProviderConfig() provider.ProviderConfig { return icp.PCfg } -func (icp *IconProvider) CommitmentPrefix() commitmenttypes.MerklePrefix { - return commitmenttypes.NewMerklePrefix([]byte("ibc")) +func (icp *IconProvider) CommitmentPrefix(clientId string) commitmenttypes.MerklePrefix { + if strings.Contains(clientId, common.WasmLightClient) { + return commitmenttypes.NewMerklePrefix([]byte("ibc")) + } + return commitmenttypes.NewMerklePrefix(nil) } func (icp *IconProvider) Key() string { diff --git a/relayer/chains/icon/provider_helper.go b/relayer/chains/icon/provider_helper.go index fc941f944..d965b2c96 100644 --- a/relayer/chains/icon/provider_helper.go +++ b/relayer/chains/icon/provider_helper.go @@ -24,7 +24,20 @@ func (icp *IconProvider) ClientToAny(clientId string, clientStateB []byte) (*cod } return clienttypes.PackClientState(&clientState) } + + // 07-tendermint decode if strings.Contains(clientId, common.TendermintLightClient) { + var clientState itm.ClientState + err := proto.Unmarshal(clientStateB, &clientState) + if err != nil { + return nil, err + } + + return clienttypes.PackClientState(&clientState) + } + + // wasm ics08 tendermint lightClient + if strings.Contains(clientId, common.TendermintWasmLightClient) { var clientState tendermint.ClientState err := proto.Unmarshal(clientStateB, &clientState) if err != nil { @@ -54,6 +67,16 @@ func (icp *IconProvider) ConsensusToAny(clientId string, cb []byte) (*codectypes return clienttypes.PackConsensusState(&consensusState) } + + if strings.Contains(clientId, common.TendermintWasmLightClient) { + var consensusState tendermint.ConsensusState + err := icp.codec.Marshaler.Unmarshal(cb, &consensusState) + if err != nil { + return nil, err + } + + return clienttypes.PackConsensusState(&consensusState) + } return nil, fmt.Errorf("unknown consensus type") } diff --git a/relayer/chains/icon/provider_test.go b/relayer/chains/icon/provider_test.go index ff4570fe2..cbf8e1a50 100644 --- a/relayer/chains/icon/provider_test.go +++ b/relayer/chains/icon/provider_test.go @@ -7,6 +7,8 @@ import ( "path/filepath" "testing" + "github.com/cosmos/gogoproto/proto" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" @@ -499,3 +501,12 @@ func TestIconConsensusState(t *testing.T) { fmt.Println(consensusState.GetTimestamp()) } + +func TestMarhsal(t *testing.T) { + + h := clienttypes.NewHeight(1, 14758) + + b, _ := proto.Marshal(&h) + fmt.Printf("encoded heiht %x \n", b) + +} diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index 8d1b0b115..db28663a5 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -15,11 +15,13 @@ import ( chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" // itm "github.com/icon-project/ibc-integration/libraries/go/common/tendermint" "github.com/cosmos/relayer/v2/relayer/chains/icon/types" + "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" "github.com/icon-project/ibc-integration/libraries/go/common/icon" "go.uber.org/zap" @@ -46,11 +48,19 @@ func (icp *IconProvider) MsgCreateClient(clientState ibcexported.ClientState, co return nil, err } + clientType := clientState.ClientType() + + _, ok := clientState.(*tendermint.ClientState) + //hack: done to seperately handle ics08-tendermint client + if ok { + clientType = common.TendermintWasmLightClient + } + clS := &types.GenericClientParams[types.MsgCreateClient]{ Msg: types.MsgCreateClient{ ClientState: types.NewHexBytes(clientStateBytes), ConsensusState: types.NewHexBytes(consensusStateBytes), - ClientType: clientState.ClientType(), + ClientType: clientType, BtpNetworkId: types.NewHexInt(icp.PCfg.BTPNetworkID), }, } @@ -235,18 +245,21 @@ func (icp *IconProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInf // client is 08-wasm then // then the client state that could be proved is any type byte - // if strings.Split(msgOpenInit.ClientID, "-")[0]==exported.Wasm{ - anyCs, err := clienttypes.PackClientState(proof.ClientState) - if err != nil { - return nil, err - } - anyCsByte, err := proto.Marshal(anyCs) - if err != nil { - return nil, err - } + splitClientId := strings.Split(msgOpenInit.ClientID, "-") + clientType := strings.Join(splitClientId[:len(splitClientId)-1], "-") - clientStateEncode = anyCsByte - // } + if clientType == exported.Wasm { + anyCs, err := clienttypes.PackClientState(proof.ClientState) + if err != nil { + return nil, err + } + anyCsByte, err := proto.Marshal(anyCs) + if err != nil { + return nil, err + } + + clientStateEncode = anyCsByte + } ht := &icon.Height{ RevisionNumber: proof.ProofHeight.RevisionNumber, @@ -304,20 +317,21 @@ func (icp *IconProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInfo return nil, err } - // client is 08-wasm then + splitClientId := strings.Split(msgOpenTry.ClientID, "-") + clientType := strings.Join(splitClientId[:len(splitClientId)-1], "-") // then the client state that could be proved is any type byte - // if strings.Split(msgOpenTry.ClientID, "-")[0]==exported.Wasm{ - anyCs, err := clienttypes.PackClientState(proof.ClientState) - if err != nil { - return nil, err - } - anyCsByte, err := proto.Marshal(anyCs) - if err != nil { - return nil, err - } + if clientType == exported.Wasm { + anyCs, err := clienttypes.PackClientState(proof.ClientState) + if err != nil { + return nil, err + } + anyCsByte, err := proto.Marshal(anyCs) + if err != nil { + return nil, err + } - clientStateEncode = anyCsByte - // } + clientStateEncode = anyCsByte + } ht := &icon.Height{ RevisionNumber: proof.ProofHeight.RevisionNumber, @@ -761,27 +775,31 @@ func (icp *IconProvider) SendIconTransaction( return err } - txParamEst := &types.TransactionParamForEstimate{ - Version: types.NewHexInt(types.JsonrpcApiVersion), - FromAddress: types.Address(wallet.Address().String()), - ToAddress: types.Address(icp.PCfg.IbcHandlerAddress), - NetworkID: types.NewHexInt(icp.PCfg.ICONNetworkID), - DataType: "call", - Data: types.CallData{ - Method: m.Method, - Params: m.Params, - }, - } + msgByte, _ := msg.MsgBytes() + fmt.Printf("[icon] messagebyte %x \n", msgByte) - step, err := icp.client.EstimateStep(txParamEst) - if err != nil { - return fmt.Errorf("failed estimating step: %w", err) - } - stepVal, err := step.Int() - if err != nil { - return err - } - stepLimit := types.NewHexInt(int64(stepVal + 200_000)) + // txParamEst := &types.TransactionParamForEstimate{ + // Version: types.NewHexInt(types.JsonrpcApiVersion), + // FromAddress: types.Address(wallet.Address().String()), + // ToAddress: types.Address(icp.PCfg.IbcHandlerAddress), + // NetworkID: types.NewHexInt(icp.PCfg.ICONNetworkID), + // DataType: "call", + // Data: types.CallData{ + // Method: m.Method, + // Params: m.Params, + // }, + // } + + // step, err := icp.client.EstimateStep(txParamEst) + // if err != nil { + // return fmt.Errorf("failed estimating step: %w", err) + // } + // stepVal, err := step.Int() + // if err != nil { + // return err + // } + // stepLimit := types.NewHexInt(int64(stepVal + 200_000)) + stepLimit := types.NewHexInt(int64(20_000_000)) txParam := &types.TransactionParam{ Version: types.NewHexInt(types.JsonrpcApiVersion), diff --git a/relayer/chains/penumbra/provider.go b/relayer/chains/penumbra/provider.go index cf57cc84a..76da9211a 100644 --- a/relayer/chains/penumbra/provider.go +++ b/relayer/chains/penumbra/provider.go @@ -188,7 +188,7 @@ func (cc *PenumbraProvider) Timeout() string { return cc.PCfg.Timeout } -func (cc *PenumbraProvider) CommitmentPrefix() commitmenttypes.MerklePrefix { +func (cc *PenumbraProvider) CommitmentPrefix(clientId string) commitmenttypes.MerklePrefix { return commitmenttypes.NewMerklePrefix([]byte("PenumbraAppHash")) } diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go index b809cc42e..5c89e061b 100644 --- a/relayer/chains/penumbra/tx.go +++ b/relayer/chains/penumbra/tx.go @@ -1307,7 +1307,7 @@ func (cc *PenumbraProvider) MsgConnectionOpenInit(info provider.ConnectionInfo, return cosmos.NewCosmosMessage(msg), nil } -func (cc *PenumbraProvider) ConnectionHandshakeProof(ctx context.Context, msgOpenInit provider.ConnectionInfo, height uint64 ) (provider.ConnectionProof, error) { +func (cc *PenumbraProvider) ConnectionHandshakeProof(ctx context.Context, msgOpenInit provider.ConnectionInfo, height uint64) (provider.ConnectionProof, error) { clientState, clientStateProof, consensusStateProof, connStateProof, proofHeight, err := cc.GenerateConnHandshakeProof(ctx, int64(height), msgOpenInit.ClientID, msgOpenInit.ConnID) if err != nil { return provider.ConnectionProof{}, err diff --git a/relayer/chains/wasm/provider.go b/relayer/chains/wasm/provider.go index 8eb587cac..1b4e1c19c 100644 --- a/relayer/chains/wasm/provider.go +++ b/relayer/chains/wasm/provider.go @@ -208,7 +208,7 @@ func (ap *WasmProvider) legacyEncodedEvents(log *zap.Logger, version string) boo } // CommitmentPrefix returns the commitment prefix for Cosmos -func (ap *WasmProvider) CommitmentPrefix() commitmenttypes.MerklePrefix { +func (ap *WasmProvider) CommitmentPrefix(clientId string) commitmenttypes.MerklePrefix { ctx := context.Background() b, _ := ap.GetCommitmentPrefixFromContract(ctx) return commitmenttypes.NewMerklePrefix(b) diff --git a/relayer/chains/wasm/tx.go b/relayer/chains/wasm/tx.go index ac30a2e3d..11f127fdc 100644 --- a/relayer/chains/wasm/tx.go +++ b/relayer/chains/wasm/tx.go @@ -150,14 +150,12 @@ func (pc *WasmProviderConfig) SignMode() signing.SignMode { } func (ap *WasmProvider) NewClientState(dstChainID string, dstIBCHeader provider.IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool, srcWasmCodeID string, srcChainId string) (ibcexported.ClientState, error) { - // revisionNumber := clienttypes.ParseChainID(dstChainID) - // latestHeight := icon.NewHeight(revisionNumber, ) return &itm.ClientState{ ChainId: dstChainID, TrustLevel: &itm.Fraction{Numerator: light.DefaultTrustLevel.Numerator, Denominator: light.DefaultTrustLevel.Denominator}, TrustingPeriod: &itm.Duration{Seconds: int64(dstTrustingPeriod.Seconds())}, UnbondingPeriod: &itm.Duration{Seconds: int64(dstUbdPeriod.Seconds())}, - FrozenHeight: int64(dstIBCHeader.Height()), + FrozenHeight: 0, LatestHeight: int64(dstIBCHeader.Height()), AllowUpdateAfterExpiry: allowUpdateAfterExpiry, AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour, diff --git a/relayer/client.go b/relayer/client.go index 64eba4f22..a53ab88b9 100644 --- a/relayer/client.go +++ b/relayer/client.go @@ -238,9 +238,18 @@ func CreateClient( if err != nil { return "", fmt.Errorf("failed to marshal consensus state for wasm client: %w", err) } + + // TODO: the consensus state of Icon dont have timestamp + // this is dont to escape validation in Icon side escape validation + // find a better way for icon + timeStamp := consensusState.GetTimestamp() + if consensusState.ClientType() == common.IconModule { + timeStamp = 1 + } + consensusState = &wasmclient.ConsensusState{ Data: consensusStateBz, - Timestamp: consensusState.GetTimestamp(), + Timestamp: timeStamp, } } diff --git a/relayer/common/const.go b/relayer/common/const.go index 038192e87..cf04bae20 100644 --- a/relayer/common/const.go +++ b/relayer/common/const.go @@ -6,17 +6,20 @@ import ( ) var ( - EventTimeoutRequest = "TimeoutRequest(bytes)" - IconModule = "icon" - WasmModule = "wasm" - ArchwayModule = "archway" - TendermintLightClient = "07-tendermint" - IconLightClient = "iconclient" - ConnectionKey = "connection" - ChannelKey = "channel" - ONE_HOUR = 60 * 60 * 1000 - NanoToMilliRatio = 1000_000 - EmptyProofConst = []byte("empty") + EventTimeoutRequest = "TimeoutRequest(bytes)" + IconModule = "icon" + WasmModule = "wasm" + ArchwayModule = "archway" + + TendermintLightClient = "07-tendermint" + TendermintWasmLightClient = "ics08-tendermint" + IconLightClient = "iconclient" + WasmLightClient = "08-wasm" + ConnectionKey = "connection" + ChannelKey = "channel" + ONE_HOUR = 60 * 60 * 1000 + NanoToMilliRatio = 1000_000 + EmptyProofConst = []byte("empty") ) var ( diff --git a/relayer/connection.go b/relayer/connection.go index 9c64619cc..bd9535fe4 100644 --- a/relayer/connection.go +++ b/relayer/connection.go @@ -73,7 +73,7 @@ func (c *Chain) CreateOpenConnections( Info: provider.ConnectionInfo{ ClientID: c.PathEnd.ClientID, CounterpartyClientID: dst.PathEnd.ClientID, - CounterpartyCommitmentPrefix: dst.ChainProvider.CommitmentPrefix(), + CounterpartyCommitmentPrefix: dst.ChainProvider.CommitmentPrefix(dst.PathEnd.ClientID), }, }, Termination: &processor.ConnectionMessage{ @@ -82,7 +82,7 @@ func (c *Chain) CreateOpenConnections( Info: provider.ConnectionInfo{ ClientID: dst.PathEnd.ClientID, CounterpartyClientID: c.PathEnd.ClientID, - CounterpartyCommitmentPrefix: c.ChainProvider.CommitmentPrefix(), + CounterpartyCommitmentPrefix: c.ChainProvider.CommitmentPrefix(c.PathEnd.ClientID), }, }, }). diff --git a/relayer/processor/path_end_runtime.go b/relayer/processor/path_end_runtime.go index aa48f414e..e5b6fb3d9 100644 --- a/relayer/processor/path_end_runtime.go +++ b/relayer/processor/path_end_runtime.go @@ -391,14 +391,17 @@ func (pathEnd *pathEndRuntime) mergeCacheData(ctx context.Context, cancel func() pathEnd.latestHeader = d.LatestHeader pathEnd.clientState = d.ClientState - terminate, err := pathEnd.checkForMisbehaviour(ctx, pathEnd.clientState, counterParty) - if err != nil { - pathEnd.log.Error( - "Failed to check for misbehaviour", - zap.String("client_id", pathEnd.info.ClientID), - zap.Error(err), - ) - } + // TODO: find a better way if any + // Centaurid dont have registered icon header and clientType + // so, misbehaviour cannot find those type + // terminate, err := pathEnd.checkForMisbehaviour(ctx, pathEnd.clientState, counterParty) + // if err != nil { + // pathEnd.log.Error( + // "Failed to check for misbehaviour", + // zap.String("client_id", pathEnd.info.ClientID), + // zap.Error(err), + // ) + // } if d.ClientState.ConsensusHeight != pathEnd.clientState.ConsensusHeight { pathEnd.clientState = d.ClientState @@ -410,7 +413,9 @@ func (pathEnd *pathEndRuntime) mergeCacheData(ctx context.Context, cancel func() pathEnd.handleCallbacks(d.IBCMessagesCache) - if pathEnd.shouldTerminate(d.IBCMessagesCache, messageLifecycle) || terminate { + // TODO: cannot check for misbehaviour because of Icon ClientTypeHeader and all not registered on centauri chain + // if pathEnd.shouldTerminate(d.IBCMessagesCache, messageLifecycle) || terminate { + if pathEnd.shouldTerminate(d.IBCMessagesCache, messageLifecycle) { cancel() return } diff --git a/relayer/processor/types_internal.go b/relayer/processor/types_internal.go index 54ab3ada8..c4eb11e64 100644 --- a/relayer/processor/types_internal.go +++ b/relayer/processor/types_internal.go @@ -240,10 +240,10 @@ func (msg connectionIBCMessage) assemble( switch msg.eventType { case conntypes.EventTypeConnectionOpenInit: // don't need proof for this message - msg.info.CounterpartyCommitmentPrefix = src.chainProvider.CommitmentPrefix() + msg.info.CounterpartyCommitmentPrefix = src.chainProvider.CommitmentPrefix(msg.info.ClientID) assembleMessage = dst.chainProvider.MsgConnectionOpenInit case conntypes.EventTypeConnectionOpenTry: - msg.info.CommitmentPrefix = src.chainProvider.CommitmentPrefix() + msg.info.CommitmentPrefix = src.chainProvider.CommitmentPrefix(msg.info.ClientID) connProof = src.chainProvider.ConnectionHandshakeProof assembleMessage = dst.chainProvider.MsgConnectionOpenTry case conntypes.EventTypeConnectionOpenAck: diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go index 446bb11f7..d7b97cc0f 100644 --- a/relayer/provider/provider.go +++ b/relayer/provider/provider.go @@ -301,7 +301,7 @@ type ChainProvider interface { MsgTimeoutOnClose(msgTransfer PacketInfo, proofUnreceived PacketProof) (RelayerMessage, error) // Get the commitment prefix of the chain. - CommitmentPrefix() commitmenttypes.MerklePrefix + CommitmentPrefix(clientId string) commitmenttypes.MerklePrefix // [End] Packet flow IBC message assembly From 85615236fec101f51d6560dd40469ed2228a700b Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Sun, 28 Jan 2024 10:30:23 +0800 Subject: [PATCH 21/35] chore: remove fmt logs and comment test cmds --- relayer/chains/cosmos/provider_test.go | 313 ++++++++++++------------- relayer/chains/cosmos/tx.go | 9 - relayer/chains/icon/provider_test.go | 42 ++-- relayer/chains/icon/query.go | 10 - relayer/chains/icon/tx.go | 1 - relayer/processor/message_processor.go | 2 - 6 files changed, 169 insertions(+), 208 deletions(-) diff --git a/relayer/chains/cosmos/provider_test.go b/relayer/chains/cosmos/provider_test.go index ef737bb8c..ce0f7e622 100644 --- a/relayer/chains/cosmos/provider_test.go +++ b/relayer/chains/cosmos/provider_test.go @@ -2,23 +2,8 @@ package cosmos import ( "context" - "encoding/hex" "fmt" - "testing" - "github.com/cosmos/gogoproto/proto" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" - tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/cosmos/relayer/v2/relayer/common" - - tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" - ics23 "github.com/cosmos/ics23/go" - "github.com/stretchr/testify/assert" "go.uber.org/zap" ) @@ -49,227 +34,227 @@ func GetMockCosmosProvider() (*CosmosProvider, error) { return provid, nil } -func TestDecodeMerkleProof(t *testing.T) { +// func TestDecodeMerkleProof(t *testing.T) { - pro, err := GetMockCosmosProvider() - assert.NoError(t, err) - ctx := context.Background() +// pro, err := GetMockCosmosProvider() +// assert.NoError(t, err) +// ctx := context.Background() - height := 10635 - connectionId := "connection-13" - connection, err := pro.QueryConnection(ctx, int64(height), connectionId) - assert.NoError(t, err) +// height := 10635 +// connectionId := "connection-13" +// connection, err := pro.QueryConnection(ctx, int64(height), connectionId) +// assert.NoError(t, err) - // fromData, _ := hex.DecodeString("0ae0020add020a19636f6e6e656374696f6e732f636f6e6e656374696f6e2d3130124c0a0930382d7761736d2d3212230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f524445524544180122180a0f30372d74656e6465726d696e742d351a050a036962631a0d0801180120012a050002908001222b08011227020490800120abcebf1caa17e720f9981d4d23b934bff8263b961cdd8726fd508399085cab3120222b08011227040892800120804fb31d265f9febe4df8069e8e867634d9728d79865ed173945bd2e9500d45e20222d08011206060e928001201a21202575ba006a05b3e0b4f777bce72154b0807054a5473412807ba1daa14f5555c5222d080112060a20928001201a212072f68ca2f134b05702d0c81481a33d57b03a184896f939bf6fe78059815ab469222b080112270c4292800120c17c6efb37ea9abaffe34e4dc2f1928e8cbdcf221bc5f5927cab5b9d05e90180200afc010af9010a0369626312205e6ab940f7f3e6758c049b0ed9cdfba1f6b92e605d6e8cb5f1a42c6d5a460c3a1a090801180120012a0100222508011221014e1d5c563b0db0ffdcba6fc97dc0c7b13b5b5c9c341357f08827565047d6c6b9222708011201011a20316a36d621713cc96f137fdce34e0b887317e5bc1d400bdbc7d43a3392f3b441222508011221019f05c673d5e30ae4ce84687b527ec6823f0bb48f41a6f7c0359ff576b5faea1822250801122101c169322de4a462eaecada7ca8e80a4ffb299c9dfad87ce9d79b79c43d0593c9f222708011201011a2034d7875e7c32775823aa0a922f7e23dd09cf55f152f5a40b1778b26e191ca855") - // assert.Equal(t, connection.Proof, fromData, "proof is not equal") - fmt.Printf("proof %x \n", connection.Proof) +// // fromData, _ := hex.DecodeString("0ae0020add020a19636f6e6e656374696f6e732f636f6e6e656374696f6e2d3130124c0a0930382d7761736d2d3212230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f524445524544180122180a0f30372d74656e6465726d696e742d351a050a036962631a0d0801180120012a050002908001222b08011227020490800120abcebf1caa17e720f9981d4d23b934bff8263b961cdd8726fd508399085cab3120222b08011227040892800120804fb31d265f9febe4df8069e8e867634d9728d79865ed173945bd2e9500d45e20222d08011206060e928001201a21202575ba006a05b3e0b4f777bce72154b0807054a5473412807ba1daa14f5555c5222d080112060a20928001201a212072f68ca2f134b05702d0c81481a33d57b03a184896f939bf6fe78059815ab469222b080112270c4292800120c17c6efb37ea9abaffe34e4dc2f1928e8cbdcf221bc5f5927cab5b9d05e90180200afc010af9010a0369626312205e6ab940f7f3e6758c049b0ed9cdfba1f6b92e605d6e8cb5f1a42c6d5a460c3a1a090801180120012a0100222508011221014e1d5c563b0db0ffdcba6fc97dc0c7b13b5b5c9c341357f08827565047d6c6b9222708011201011a20316a36d621713cc96f137fdce34e0b887317e5bc1d400bdbc7d43a3392f3b441222508011221019f05c673d5e30ae4ce84687b527ec6823f0bb48f41a6f7c0359ff576b5faea1822250801122101c169322de4a462eaecada7ca8e80a4ffb299c9dfad87ce9d79b79c43d0593c9f222708011201011a2034d7875e7c32775823aa0a922f7e23dd09cf55f152f5a40b1778b26e191ca855") +// // assert.Equal(t, connection.Proof, fromData, "proof is not equal") +// fmt.Printf("proof %x \n", connection.Proof) - var op commitmenttypes.MerkleProof - err = proto.Unmarshal(connection.Proof, &op) - assert.NoError(t, err) +// var op commitmenttypes.MerkleProof +// err = proto.Unmarshal(connection.Proof, &op) +// assert.NoError(t, err) - block, err := pro.LightProvider.LightBlock(ctx, int64(height)) - assert.NoError(t, err) +// block, err := pro.LightProvider.LightBlock(ctx, int64(height)) +// assert.NoError(t, err) - // consensus state from data - // csByte, _ := hex.DecodeString("0a0b08ace083aa0610d884c53412220a2031f8b6bfb694c2148c695feeb25834b8ad737a61f1b7883fe7d86b3f6aac1d1d1a209867d31b94e8280141b7cbfd18f675e8cc7066b60932a39404aebcf7e8f6d02d") - // var cs tmclient.ConsensusState - // err = proto.Unmarshal(csByte, &cs) - // assert.NoError(t, err) +// // consensus state from data +// // csByte, _ := hex.DecodeString("0a0b08ace083aa0610d884c53412220a2031f8b6bfb694c2148c695feeb25834b8ad737a61f1b7883fe7d86b3f6aac1d1d1a209867d31b94e8280141b7cbfd18f675e8cc7066b60932a39404aebcf7e8f6d02d") +// // var cs tmclient.ConsensusState +// // err = proto.Unmarshal(csByte, &cs) +// // assert.NoError(t, err) - fmt.Printf("root : %x \n", block.SignedHeader.AppHash) - root := commitmenttypes.MerkleRoot{Hash: block.SignedHeader.AppHash} +// fmt.Printf("root : %x \n", block.SignedHeader.AppHash) +// root := commitmenttypes.MerkleRoot{Hash: block.SignedHeader.AppHash} - key := host.ConnectionKey(connectionId) - fmt.Println("connection key: ", string(key)) - merklePath := commitmenttypes.NewMerklePath(string(key)) - path, err := commitmenttypes.ApplyPrefix(defaultChainPrefix, merklePath) - assert.NoError(t, err) +// key := host.ConnectionKey(connectionId) +// fmt.Println("connection key: ", string(key)) +// merklePath := commitmenttypes.NewMerklePath(string(key)) +// path, err := commitmenttypes.ApplyPrefix(defaultChainPrefix, merklePath) +// assert.NoError(t, err) - // value - value, err := proto.Marshal(connection.Connection) - assert.NoError(t, err) - fmt.Printf("value: %x \n ", value) +// // value +// value, err := proto.Marshal(connection.Connection) +// assert.NoError(t, err) +// fmt.Printf("value: %x \n ", value) - err = op.VerifyMembership([]*ics23.ProofSpec{ics23.IavlSpec, ics23.TendermintSpec}, root, path, value) - assert.NoError(t, err) +// err = op.VerifyMembership([]*ics23.ProofSpec{ics23.IavlSpec, ics23.TendermintSpec}, root, path, value) +// assert.NoError(t, err) -} +// } -func TestGenerateConnectionHandshakeProof(t *testing.T) { +// func TestGenerateConnectionHandshakeProof(t *testing.T) { - pro, err := GetMockCosmosProvider() - assert.NoError(t, err) - ctx := context.Background() +// pro, err := GetMockCosmosProvider() +// assert.NoError(t, err) +// ctx := context.Background() - height := 10924 - connectionId := "connection-14" +// height := 10924 +// connectionId := "connection-14" - cs, _, _, _, _, err := pro.GenerateConnHandshakeProof(ctx, int64(height), "08-wasm-3", connectionId) - assert.NoError(t, err) - anyCs, err := clienttypes.PackClientState(cs) - assert.NoError(t, err) +// cs, _, _, _, _, err := pro.GenerateConnHandshakeProof(ctx, int64(height), "08-wasm-3", connectionId) +// assert.NoError(t, err) +// anyCs, err := clienttypes.PackClientState(cs) +// assert.NoError(t, err) - b, err := proto.Marshal(anyCs) +// b, err := proto.Marshal(anyCs) - fmt.Printf("client state %x \n", b) +// fmt.Printf("client state %x \n", b) -} +// } -func TestGenerateVal(t *testing.T) { +// func TestGenerateVal(t *testing.T) { - d, _ := hex.DecodeString("0ad8030ad5030a1d636c69656e74732f30382d7761736d2d332f636c69656e7453746174651290010a252f6962632e6c69676874636c69656e74732e7761736d2e76312e436c69656e74537461746512670a3d0a202f69636f6e2e6c69676874636c69656e742e76312e436c69656e745374617465121908c0ba1218901c20c98e072a083078332e69636f6e300338011220dba26dce04b22164b34751ba0e42e60a18e22d179c0d848ad006bd201e7f8bf71a0410c98e071a0d0801180120012a0500028ea601222d080112060204d6aa01201a212003d57c97977de25765fd5ffc14fe57b794d67a665bc3f036d6d15d1635836a82222d080112060408d6aa01201a212050a51e1b4cb7b7b14711ad715ccb4f300f6024a4a98fe4d3d88781fc6d16762b222b080112270610d6aa012025b8312b97b25ee63807b2ecc1592709b283a2b001b5564a69c8f91cbd765c2820222b080112270820d6aa0120047ca7f7a99eb529aa47e5897275f38f5b7f2180f5e6fa4e6fdf6ec3616e3b1920222b080112270a2ed6aa0120c5449ed0890d620585729df614200b9c7630cfa4d9f885ca397173306683158f20222d080112060c56d6aa01201a2120350cea2ecd3e13944b23107b2476e6d1c6accaa99a6c892cbb027f85f66106490afc010af9010a036962631220d497023d6818dfafccb12532875e29df65983eb20b86f7c375875fef2af7ae6d1a090801180120012a0100222508011221014e1d5c563b0db0ffdcba6fc97dc0c7b13b5b5c9c341357f08827565047d6c6b9222708011201011a20316a36d621713cc96f137fdce34e0b887317e5bc1d400bdbc7d43a3392f3b441222508011221019f05c673d5e30ae4ce84687b527ec6823f0bb48f41a6f7c0359ff576b5faea1822250801122101990b5a6d14f4c2ca4ae83341cb992b3a191eb703adfd0b5c538c3986cdda7c6c222708011201011a2004939260c79a0f69a25f2a5a01c8a27286f210729d8c0238e9d59035e768a9e5") - var c conntypes.ConnectionEnd - proto.Unmarshal(d, &c) - fmt.Printf("%s \n", d) +// d, _ := hex.DecodeString("0ad8030ad5030a1d636c69656e74732f30382d7761736d2d332f636c69656e7453746174651290010a252f6962632e6c69676874636c69656e74732e7761736d2e76312e436c69656e74537461746512670a3d0a202f69636f6e2e6c69676874636c69656e742e76312e436c69656e745374617465121908c0ba1218901c20c98e072a083078332e69636f6e300338011220dba26dce04b22164b34751ba0e42e60a18e22d179c0d848ad006bd201e7f8bf71a0410c98e071a0d0801180120012a0500028ea601222d080112060204d6aa01201a212003d57c97977de25765fd5ffc14fe57b794d67a665bc3f036d6d15d1635836a82222d080112060408d6aa01201a212050a51e1b4cb7b7b14711ad715ccb4f300f6024a4a98fe4d3d88781fc6d16762b222b080112270610d6aa012025b8312b97b25ee63807b2ecc1592709b283a2b001b5564a69c8f91cbd765c2820222b080112270820d6aa0120047ca7f7a99eb529aa47e5897275f38f5b7f2180f5e6fa4e6fdf6ec3616e3b1920222b080112270a2ed6aa0120c5449ed0890d620585729df614200b9c7630cfa4d9f885ca397173306683158f20222d080112060c56d6aa01201a2120350cea2ecd3e13944b23107b2476e6d1c6accaa99a6c892cbb027f85f66106490afc010af9010a036962631220d497023d6818dfafccb12532875e29df65983eb20b86f7c375875fef2af7ae6d1a090801180120012a0100222508011221014e1d5c563b0db0ffdcba6fc97dc0c7b13b5b5c9c341357f08827565047d6c6b9222708011201011a20316a36d621713cc96f137fdce34e0b887317e5bc1d400bdbc7d43a3392f3b441222508011221019f05c673d5e30ae4ce84687b527ec6823f0bb48f41a6f7c0359ff576b5faea1822250801122101990b5a6d14f4c2ca4ae83341cb992b3a191eb703adfd0b5c538c3986cdda7c6c222708011201011a2004939260c79a0f69a25f2a5a01c8a27286f210729d8c0238e9d59035e768a9e5") +// var c conntypes.ConnectionEnd +// proto.Unmarshal(d, &c) +// fmt.Printf("%s \n", d) - var op commitmenttypes.MerkleProof - err := proto.Unmarshal(d, &op) - assert.NoError(t, err) +// var op commitmenttypes.MerkleProof +// err := proto.Unmarshal(d, &op) +// assert.NoError(t, err) - for _, v := range op.Proofs { +// for _, v := range op.Proofs { - fmt.Printf("key is %x \n", v.GetExist().Key) - fmt.Printf("value is %x\n", v.GetExist().Value) - } +// fmt.Printf("key is %x \n", v.GetExist().Key) +// fmt.Printf("value is %x\n", v.GetExist().Value) +// } - // d ,_ := hex.DecodeString("0a252f6962632e6c69676874636c69656e74732e7761736d2e76312e436c69656e74537461746512670a3d0a202f69636f6e2e6c69676874636c69656e742e76312e436c69656e745374617465121908c0ba1218901c20c98e072a083078332e69636f6e300338011220dba26dce04b22164b34751ba0e42e60a18e22d179c0d848ad006bd201e7f8bf71a0410c98e07") - // var op wasmclient.ClientState - // err := proto.Unmarshal(d, &op) - // assert.NoError(t, err) - // fmt.Printf("data is: %s ", op.CodeId) +// // d ,_ := hex.DecodeString("0a252f6962632e6c69676874636c69656e74732e7761736d2e76312e436c69656e74537461746512670a3d0a202f69636f6e2e6c69676874636c69656e742e76312e436c69656e745374617465121908c0ba1218901c20c98e072a083078332e69636f6e300338011220dba26dce04b22164b34751ba0e42e60a18e22d179c0d848ad006bd201e7f8bf71a0410c98e07") +// // var op wasmclient.ClientState +// // err := proto.Unmarshal(d, &op) +// // assert.NoError(t, err) +// // fmt.Printf("data is: %s ", op.CodeId) -} +// } -func TestWasmClientProtoFile(t *testing.T) { +// func TestWasmClientProtoFile(t *testing.T) { - // op:= wasmclient.ClientState{ - // Data: []byte("data"), - // CodeId: []byte("code-id"), - // LatestHeight: types.NewHeight(0,20), - // } +// // op:= wasmclient.ClientState{ +// // Data: []byte("data"), +// // CodeId: []byte("code-id"), +// // LatestHeight: types.NewHeight(0,20), +// // } - // b, err := proto.Marshal(&op) - // assert.NoError(t, err) - // fmt.Printf("byte %x \n", b) +// // b, err := proto.Marshal(&op) +// // assert.NoError(t, err) +// // fmt.Printf("byte %x \n", b) - // clientId := "08-wasm" +// // clientId := "08-wasm" - // lastInd := strings.LastIndex(clientId, "-") - // fmt.Println(lastInd) +// // lastInd := strings.LastIndex(clientId, "-") +// // fmt.Println(lastInd) - pro, err := GetMockCosmosProvider() - assert.NoError(t, err) - ctx := context.Background() +// pro, err := GetMockCosmosProvider() +// assert.NoError(t, err) +// ctx := context.Background() - // height := 10924 - // connectionId := "connection-14" - clientId := "08-wasm-0" +// // height := 10924 +// // connectionId := "connection-14" +// clientId := "08-wasm-0" - // height := clienttypes.NewHeight(1, 2201) +// // height := clienttypes.NewHeight(1, 2201) - cs, err := pro.QueryClientState(ctx, 0, clientId) - assert.NoError(t, err) +// cs, err := pro.QueryClientState(ctx, 0, clientId) +// assert.NoError(t, err) - // data, err := proto.Marshal(cs.ConsensusState) - // fmt.Printf("data %x\n", data) - fmt.Println("type", cs.ClientType()) - fmt.Printf("cs %d \n", cs.GetLatestHeight().GetRevisionHeight()) - fmt.Printf("cs %d \n", cs.GetLatestHeight().GetRevisionNumber()) +// // data, err := proto.Marshal(cs.ConsensusState) +// // fmt.Printf("data %x\n", data) +// fmt.Println("type", cs.ClientType()) +// fmt.Printf("cs %d \n", cs.GetLatestHeight().GetRevisionHeight()) +// fmt.Printf("cs %d \n", cs.GetLatestHeight().GetRevisionNumber()) -} +// } -func TestConnectionOpenAck(t *testing.T) { +// func TestConnectionOpenAck(t *testing.T) { - b, _ := hex.DecodeString("0a0c636f6e6e656374696f6e2d31120c636f6e6e656374696f6e2d321a230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f52444552454422b8010a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651288010a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a040801103542190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a1075706772616465644942435374617465500158012a06080110c2a40432280a0208010a22122063128404e5cd488d475fa9f5cb7264fff1cfa3e7a7521148eb28a0e5a87d87113a4c0a2408011220dea1f8b19f170ba89f9bec9cbc608c095f1551f740e7193dc1897ebfe69ff6d00a2408011220d06ed9394fd8737c9639fb57ef2305e9fc0e2f2c73fb87b74bfa0caf9363a410424a0a221220e62fbf1bd5989eb5b07fb67fe58e162bf129471bdb4889ca2e4f659bc72556e20a2408011220d06ed9394fd8737c9639fb57ef2305e9fc0e2f2c73fb87b74bfa0caf9363a4104a0408011035522f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") +// b, _ := hex.DecodeString("0a0c636f6e6e656374696f6e2d31120c636f6e6e656374696f6e2d321a230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f52444552454422b8010a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651288010a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a040801103542190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a1075706772616465644942435374617465500158012a06080110c2a40432280a0208010a22122063128404e5cd488d475fa9f5cb7264fff1cfa3e7a7521148eb28a0e5a87d87113a4c0a2408011220dea1f8b19f170ba89f9bec9cbc608c095f1551f740e7193dc1897ebfe69ff6d00a2408011220d06ed9394fd8737c9639fb57ef2305e9fc0e2f2c73fb87b74bfa0caf9363a410424a0a221220e62fbf1bd5989eb5b07fb67fe58e162bf129471bdb4889ca2e4f659bc72556e20a2408011220d06ed9394fd8737c9639fb57ef2305e9fc0e2f2c73fb87b74bfa0caf9363a4104a0408011035522f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") - var m conntypes.MsgConnectionOpenAck - err := proto.Unmarshal(b, &m) - assert.NoError(t, err) +// var m conntypes.MsgConnectionOpenAck +// err := proto.Unmarshal(b, &m) +// assert.NoError(t, err) - fmt.Printf("clientState %x \n", m.ClientState.Value) - // cs, err := clienttypes.UnpackClientState(m.ClientState) - assert.NoError(t, err) +// fmt.Printf("clientState %x \n", m.ClientState.Value) +// // cs, err := clienttypes.UnpackClientState(m.ClientState) +// assert.NoError(t, err) - // fmt.Println("connectionOpenAck", cs.GetLatestHeight()) +// // fmt.Println("connectionOpenAck", cs.GetLatestHeight()) - // b, _ := hex.DecodeString("0x0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110c50342190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801") - var tCS tendermint.ClientState +// // b, _ := hex.DecodeString("0x0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110c50342190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801") +// var tCS tendermint.ClientState - err = proto.Unmarshal(m.ClientState.Value, &tCS) - assert.NoError(t, err) +// err = proto.Unmarshal(m.ClientState.Value, &tCS) +// assert.NoError(t, err) - path := common.GetClientStateCommitmentKey("ics08-tendermint-0") - csByte := common.Sha3keccak256(m.ClientState.Value) +// path := common.GetClientStateCommitmentKey("ics08-tendermint-0") +// csByte := common.Sha3keccak256(m.ClientState.Value) - fmt.Printf("path : %x \n", path) - fmt.Printf("clientState keccak: %x \n ", csByte) +// fmt.Printf("path : %x \n", path) +// fmt.Printf("clientState keccak: %x \n ", csByte) - fmt.Println(tCS.GetLatestHeight().GetRevisionHeight()) +// fmt.Println(tCS.GetLatestHeight().GetRevisionHeight()) -} +// } -func TestProtoBufDecode(t *testing.T) { - // b, _ := hex.DecodeString("0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110fd0242180a090801180120012a0100120b0a010110211804200c300142180a090801180120012a0100120b0a010110201801200130014a07757067726164654a107570677261646564494243537461746550015801") +// func TestProtoBufDecode(t *testing.T) { +// // b, _ := hex.DecodeString("0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110fd0242180a090801180120012a0100120b0a010110211804200c300142180a090801180120012a0100120b0a010110201801200130014a07757067726164654a107570677261646564494243537461746550015801") - b2Equal, _ := hex.DecodeString("0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110cb0742190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801") +// b2Equal, _ := hex.DecodeString("0a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110cb0742190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801") - var cs tendermint.ClientState +// var cs tendermint.ClientState - err := proto.Unmarshal(b2Equal, &cs) - assert.NoError(t, err) +// err := proto.Unmarshal(b2Equal, &cs) +// assert.NoError(t, err) - specs := commitmenttypes.GetSDKSpecs() - assert.Equal(t, specs, cs.ProofSpecs) -} +// specs := commitmenttypes.GetSDKSpecs() +// assert.Equal(t, specs, cs.ProofSpecs) +// } -func TestKecca(t *testing.T) { +// func TestKecca(t *testing.T) { - d, err := hex.DecodeString("080612087472616e736665721a096368616e6e656c2d3322087472616e736665722a096368616e6e656c2d3132a3017b22616d6f756e74223a22393530303030303030303030222c2264656e6f6d223a22767370222c227265636569766572223a22617263687761793164787979787968797035686b7a676c3372776b6a666b63773530333032636137676539647072222c2273656e646572223a22687862366235373931626530623565663637303633623363313062383430666238313531346462326664222c226d656d6f223a22227d3a06080110a0c21e") - assert.NoError(t, err) +// d, err := hex.DecodeString("080612087472616e736665721a096368616e6e656c2d3322087472616e736665722a096368616e6e656c2d3132a3017b22616d6f756e74223a22393530303030303030303030222c2264656e6f6d223a22767370222c227265636569766572223a22617263687761793164787979787968797035686b7a676c3372776b6a666b63773530333032636137676539647072222c2273656e646572223a22687862366235373931626530623565663637303633623363313062383430666238313531346462326664222c226d656d6f223a22227d3a06080110a0c21e") +// assert.NoError(t, err) - var recvPacket chantypes.Packet +// var recvPacket chantypes.Packet - err = proto.Unmarshal(d, &recvPacket) - assert.NoError(t, err) +// err = proto.Unmarshal(d, &recvPacket) +// assert.NoError(t, err) - pkt := recvPacket +// pkt := recvPacket - fmt.Println("pkt is ", pkt) +// fmt.Println("pkt is ", pkt) - key := host.PacketCommitmentKey(pkt.SourcePort, pkt.SourceChannel, pkt.Sequence) +// key := host.PacketCommitmentKey(pkt.SourcePort, pkt.SourceChannel, pkt.Sequence) - fmt.Printf("packet commitment key: %x \n", common.Sha3keccak256(key)) +// fmt.Printf("packet commitment key: %x \n", common.Sha3keccak256(key)) - cdc := MakeCodec(ModuleBasics, []string{}) +// cdc := MakeCodec(ModuleBasics, []string{}) - commitment := chantypes.CommitPacket(cdc.Marshaler, pkt) +// commitment := chantypes.CommitPacket(cdc.Marshaler, pkt) - fmt.Printf("commitment: %x \n", commitment) +// fmt.Printf("commitment: %x \n", commitment) - k := common.Sha3keccak256(commitment) +// k := common.Sha3keccak256(commitment) - fmt.Printf("keccak hash: %x \n", k) +// fmt.Printf("keccak hash: %x \n", k) - // 174c5d4caf630a3177179384fcb937b32ff2b9c9aa1b75baf9d001ca44c8ba1c8abf0ea23d6df15e019beb89069adde801d0b416ad7313dda3b8918dffcee648 -} +// // 174c5d4caf630a3177179384fcb937b32ff2b9c9aa1b75baf9d001ca44c8ba1c8abf0ea23d6df15e019beb89069adde801d0b416ad7313dda3b8918dffcee648 +// } -func TestCheck(t *testing.T) { +// func TestCheck(t *testing.T) { - d, _ := hex.DecodeString("0a0d636f6e6e656374696f6e2d3139120c636f6e6e656374696f6e2d301a230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f52444552454422b9010a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651289010a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110ed5f42190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a1075706772616465644942435374617465500158012a06080110e18d0432280a0208010a2212208a2aa818cbcbf23a39ab8b89ad6e919f63c9a73086c47cb5f42b020c5238f4923a4c0a2408011220a11c2fe63965c80acf540f3641b8a2ab29f4b08e00cfedea6fc08a4ac18c29c00a2408011220199f72f4420d2e29ffe56cbb27858e3b8b2cffacfa0eb1dec3c1add51c2c089e424a0a221220b5f7c49ba32adeb09a4067f59a0140204179a5753700ab778c3ef1d5e05d9f270a2408011220199f72f4420d2e29ffe56cbb27858e3b8b2cffacfa0eb1dec3c1add51c2c089e4a05080110ed5f522f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") +// d, _ := hex.DecodeString("0a0d636f6e6e656374696f6e2d3139120c636f6e6e656374696f6e2d301a230a0131120d4f524445525f4f524445524544120f4f524445525f554e4f52444552454422b9010a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651289010a1263656e74617572692d746573746e65742d311204080110031a0408c0ba1222040880df6e2a0308d80432003a05080110ed5f42190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a1075706772616465644942435374617465500158012a06080110e18d0432280a0208010a2212208a2aa818cbcbf23a39ab8b89ad6e919f63c9a73086c47cb5f42b020c5238f4923a4c0a2408011220a11c2fe63965c80acf540f3641b8a2ab29f4b08e00cfedea6fc08a4ac18c29c00a2408011220199f72f4420d2e29ffe56cbb27858e3b8b2cffacfa0eb1dec3c1add51c2c089e424a0a221220b5f7c49ba32adeb09a4067f59a0140204179a5753700ab778c3ef1d5e05d9f270a2408011220199f72f4420d2e29ffe56cbb27858e3b8b2cffacfa0eb1dec3c1add51c2c089e4a05080110ed5f522f63656e74617572693167357232766d6e70366c74613963707374346c7a6334737979336b636a326c6a746533746c68") - var msgUpdateClient clienttypes.MsgUpdateClient +// var msgUpdateClient clienttypes.MsgUpdateClient - err := proto.Unmarshal(d, &msgUpdateClient) - assert.NoError(t, err) +// err := proto.Unmarshal(d, &msgUpdateClient) +// assert.NoError(t, err) - fmt.Println(msgUpdateClient.ClientMessage.Value) +// fmt.Println(msgUpdateClient.ClientMessage.Value) - var d2 tmclient.Header - err = proto.Unmarshal(msgUpdateClient.ClientMessage.Value, &d2) +// var d2 tmclient.Header +// err = proto.Unmarshal(msgUpdateClient.ClientMessage.Value, &d2) - assert.NoError(t, err) +// assert.NoError(t, err) - fmt.Println(d2.SignedHeader.Header.Height) +// fmt.Println(d2.SignedHeader.Header.Height) -} +// } diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index af24abd79..9a8435617 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -223,9 +223,6 @@ func (cc *CosmosProvider) broadcastTx( } } - for _, m := range msgs { - fmt.Printf("msg: %x", m) - } cc.LogFailedTx(rlyResp, err, msgs) return err } @@ -713,7 +710,6 @@ func (cc *CosmosProvider) MsgTimeoutOnClose(msgTransfer provider.PacketInfo, pro } func (cc *CosmosProvider) MsgConnectionOpenInit(info provider.ConnectionInfo, proof provider.ConnectionProof) (provider.RelayerMessage, error) { - fmt.Println("[cosmos] msgconnectionOpenInit") signer, err := cc.Address() if err != nil { @@ -762,7 +758,6 @@ func (cc *CosmosProvider) ConnectionHandshakeProof( } func (cc *CosmosProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInfo, proof provider.ConnectionProof) (provider.RelayerMessage, error) { - fmt.Println("[cosmos] msgconnectionOpenTry") signer, err := cc.Address() if err != nil { @@ -811,8 +806,6 @@ func (cc *CosmosProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInf // if msgOpenTry client is wasm client then we need to incorporate it - fmt.Println("[cosmos] msgConnectionOpenAck proofHeight.RevisionNumber: ", proof.ProofHeight.RevisionNumber) - msg := &conntypes.MsgConnectionOpenAck{ ConnectionId: msgOpenTry.CounterpartyConnID, CounterpartyConnectionId: msgOpenTry.ConnID, @@ -1311,7 +1304,6 @@ func (cc *CosmosProvider) queryProviderClientState(ctx context.Context, srch int }, nil } - fmt.Println("chain type ", clientStateExported.ClientType()) return provider.ClientState{}, fmt.Errorf("error when casting exported clientstate to tendermint type") } @@ -1378,7 +1370,6 @@ func (cc *CosmosProvider) NewClientState( } } - fmt.Println("[cosmos] newclientState", clientState) return clientState, nil } diff --git a/relayer/chains/icon/provider_test.go b/relayer/chains/icon/provider_test.go index cbf8e1a50..d14048851 100644 --- a/relayer/chains/icon/provider_test.go +++ b/relayer/chains/icon/provider_test.go @@ -7,8 +7,6 @@ import ( "path/filepath" "testing" - "github.com/cosmos/gogoproto/proto" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" @@ -480,33 +478,33 @@ func TestHash(t *testing.T) { // assert.True(t, isValid) // } -func TestGetBala(t *testing.T) { +// func TestGetBala(t *testing.T) { - prov := GetMockIconProvider(2, "cx4f79451103e51baba633e10e4d355f28ceda3103") +// prov := GetMockIconProvider(2, "cx4f79451103e51baba633e10e4d355f28ceda3103") - // ctx := context.Background() - // bal, err := prov.QueryBalanceWithAddress(ctx, "hxb6b5791be0b5ef67063b3c10b840fb81514db2fd") - // assert.NoError(t, err) - // fmt.Println("balance ", bal) - b, _ := hex.DecodeString("0a1063656e74617572692d746573746e65741204080110031a0408c0ba1222040880df6e32003a0310cb0240014801") +// // ctx := context.Background() +// // bal, err := prov.QueryBalanceWithAddress(ctx, "hxb6b5791be0b5ef67063b3c10b840fb81514db2fd") +// // assert.NoError(t, err) +// // fmt.Println("balance ", bal) +// b, _ := hex.DecodeString("0a1063656e74617572692d746573746e65741204080110031a0408c0ba1222040880df6e32003a0310cb0240014801") - data, err := prov.ClientToAny("07-tendermint-4", b) - assert.NoError(t, err) +// data, err := prov.ClientToAny("07-tendermint-4", b) +// assert.NoError(t, err) - fmt.Println("data is ", data.Value) -} +// fmt.Println("data is ", data.Value) +// } -func TestIconConsensusState(t *testing.T) { - consensusState := icon.ConsensusState{} - fmt.Println(consensusState.GetTimestamp()) +// func TestIconConsensusState(t *testing.T) { +// consensusState := icon.ConsensusState{} +// fmt.Println(consensusState.GetTimestamp()) -} +// } -func TestMarhsal(t *testing.T) { +// func TestMarhsal(t *testing.T) { - h := clienttypes.NewHeight(1, 14758) +// h := clienttypes.NewHeight(1, 14758) - b, _ := proto.Marshal(&h) - fmt.Printf("encoded heiht %x \n", b) +// b, _ := proto.Marshal(&h) +// fmt.Printf("encoded heiht %x \n", b) -} +// } diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index 8bcae7bc1..64294d340 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -365,8 +365,6 @@ func (icp *IconProvider) QueryConnection(ctx context.Context, height int64, conn return emptyConnRes, err } - fmt.Println("connection::::", conn) - key := common.GetConnectionCommitmentKey(connectionid) commitmentHash := getCommitmentHash(key, connectionBytes) @@ -482,16 +480,12 @@ func (icp *IconProvider) GenerateConnHandshakeProof(ctx context.Context, height []byte, []byte, []byte, ibcexported.Height, error) { - fmt.Println("[icon] generateConnHandshakeProof") - // clientProof clientResponse, err := icp.QueryClientStateResponse(ctx, height, clientId) if err != nil { return nil, nil, nil, nil, clienttypes.Height{}, err } - fmt.Println("[icon] got clientResponse ") - // clientState anyClientState := clientResponse.ClientState clientState_, err := clienttypes.UnpackClientState(anyClientState) @@ -505,16 +499,12 @@ func (icp *IconProvider) GenerateConnHandshakeProof(ctx context.Context, height return nil, nil, nil, nil, clienttypes.Height{}, err } - fmt.Println("[icon] got QueryClientConsensusState", consensusRes) - // connectionProof connResponse, err := icp.QueryConnection(ctx, height, connId) if err != nil { return nil, nil, nil, nil, clienttypes.Height{}, err } - fmt.Println("[icon] got QueryConnection", connResponse) - return clientState_, clientResponse.Proof, consensusRes.Proof, connResponse.Proof, clienttypes.NewHeight(icp.RevisionNumber(), uint64(height)), nil } diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index db28663a5..3356fa8fd 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -588,7 +588,6 @@ func (icp *IconProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, CurrentValidators: currentValidatorList.Validators, } - fmt.Println("[icon] msgUpdateClientHeader client type", clientType) // wrap with wasm client if clientType == exported.Wasm { diff --git a/relayer/processor/message_processor.go b/relayer/processor/message_processor.go index 8fab291b7..a6ce463bf 100644 --- a/relayer/processor/message_processor.go +++ b/relayer/processor/message_processor.go @@ -296,8 +296,6 @@ func (mp *messageProcessor) assembleMsgUpdateClient(ctx context.Context, src, ds return fmt.Errorf("error assembling new client header: %w", err) } - // fmt.Println("message update header is", msgUpdateClientHeader) - // fmt.Println("dst is ", dst.chainProvider.ChainId()) msgUpdateClient, err := dst.chainProvider.MsgUpdateClient(clientID, msgUpdateClientHeader) if err != nil { return fmt.Errorf("error assembling MsgUpdateClient: %w", err) From 087650297aa378575525a4747e3c2f389a23e486 Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Wed, 31 Jan 2024 23:53:22 +0800 Subject: [PATCH 22/35] chore: msgConnection icon client check remove --- relayer/chains/icon/tx.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index 3356fa8fd..4db25553b 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -306,13 +306,7 @@ func (icp *IconProvider) MsgConnectionOpenTry(msgOpenInit provider.ConnectionInf func (icp *IconProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInfo, proof provider.ConnectionProof) (provider.RelayerMessage, error) { - // proof from chainB should return clientState of chainB tracking chainA - iconClientState, err := icp.MustReturnIconClientState(proof.ClientState) - if err != nil { - return nil, err - } - - clientStateEncode, err := proto.Marshal(iconClientState) + clientStateEncode, err := proto.Marshal(proof.ClientState) if err != nil { return nil, err } From e8f9f37bbd9ed49cd9e52d1fb2b24f96febd67cf Mon Sep 17 00:00:00 2001 From: viveksharmapoudel Date: Mon, 30 Oct 2023 19:18:49 +0545 Subject: [PATCH 23/35] chore: remove println --- cmd/paths.go | 1 - relayer/chains/cosmos/tx.go | 2 -- relayer/chains/icon/provider_helper.go | 1 - relayer/chains/icon/query.go | 2 -- relayer/chains/penumbra/msg.go | 4 ---- relayer/chains/wasm/helper_debug_msg.go | 3 --- 6 files changed, 13 deletions(-) diff --git a/cmd/paths.go b/cmd/paths.go index 640414fa5..be5dd3549 100644 --- a/cmd/paths.go +++ b/cmd/paths.go @@ -408,7 +408,6 @@ $ %s pth fch`, appName, defaultHome, appName)), client, _, err := client.Repositories.DownloadContents(cmd.Context(), "cosmos", "chain-registry", regPath, nil) if err != nil { if errors.As(err, new(*github.RateLimitError)) { - fmt.Println("some paths failed: ", err) break } fmt.Fprintf(cmd.ErrOrStderr(), "failure retrieving: %s: consider adding to cosmos/chain-registry: ERR: %v\n", pthName, err) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index ee1a30e35..5dff78c34 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -1274,8 +1274,6 @@ func (cc *CosmosProvider) queryTMClientState(ctx context.Context, srch int64, sr } clientStateExported = clientState - // different handling for the icon client - } tmClientState, ok := clientStateExported.(*tmclient.ClientState) diff --git a/relayer/chains/icon/provider_helper.go b/relayer/chains/icon/provider_helper.go index 0996c0198..b0deba35e 100644 --- a/relayer/chains/icon/provider_helper.go +++ b/relayer/chains/icon/provider_helper.go @@ -29,7 +29,6 @@ func (icp *IconProvider) ClientToAny(clientId string, clientStateB []byte) (*cod if err != nil { return nil, err } - fmt.Printf("is tendermint client: %s\n", clientState.GetChainID()) return clienttypes.PackClientState(&clientState) } diff --git a/relayer/chains/icon/query.go b/relayer/chains/icon/query.go index 148cefa43..6d0795475 100644 --- a/relayer/chains/icon/query.go +++ b/relayer/chains/icon/query.go @@ -220,7 +220,6 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in "clientId": srcClientId, }, callParamsWithHeight(types.NewHexInt(height))) - fmt.Println("[QueryClientStateResponse] callparams:", callParams) //similar should be implemented var clientStateB types.HexBytes err := icp.client.Call(callParams, &clientStateB) @@ -232,7 +231,6 @@ func (icp *IconProvider) QueryClientStateResponse(ctx context.Context, height in if err != nil { return nil, err } - fmt.Printf("[QueryClientStateResponse] clientStateByte: %x \n ", clientStateB) any, err := icp.ClientToAny(srcClientId, clientStateByte) if err != nil { diff --git a/relayer/chains/penumbra/msg.go b/relayer/chains/penumbra/msg.go index 689a3267d..eaca6b993 100644 --- a/relayer/chains/penumbra/msg.go +++ b/relayer/chains/penumbra/msg.go @@ -1,8 +1,6 @@ package penumbra import ( - "fmt" - "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" @@ -24,7 +22,6 @@ func NewPenumbraMessage(msg sdk.Msg) provider.RelayerMessage { func PenumbraMsg(rm provider.RelayerMessage) sdk.Msg { if val, ok := rm.(PenumbraMessage); !ok { - fmt.Printf("got data of type %T but wanted PenumbraMessage \n", val) return nil } else { return val.Msg @@ -52,7 +49,6 @@ func PenumbraMsgs(rm ...provider.RelayerMessage) []sdk.Msg { case cosmos.CosmosMessage: sdkMsgs = append(sdkMsgs, rMsg.(cosmos.CosmosMessage).Msg) default: - fmt.Printf("got data of type %T but wanted PenumbraMessage \n", rMsg) return nil } } diff --git a/relayer/chains/wasm/helper_debug_msg.go b/relayer/chains/wasm/helper_debug_msg.go index 5ab3f0b8d..8636a334a 100644 --- a/relayer/chains/wasm/helper_debug_msg.go +++ b/relayer/chains/wasm/helper_debug_msg.go @@ -18,14 +18,12 @@ func jsonDumpDataFile(filename string, bufs interface{}) { // Marshal the slice of structs to JSON format jsonData, err := json.MarshalIndent(bufs, "", " ") if err != nil { - fmt.Println("Error marshaling slice of structs to JSON:", err) os.Exit(1) } // Write JSON data to file err = ioutil.WriteFile(filename, jsonData, 0644) if err != nil { - fmt.Println("Error writing JSON to file:", err) os.Exit(1) } @@ -68,7 +66,6 @@ func SaveMsgToFile(filename string, msgs []provider.RelayerMessage) { var d []DataFormat err := readExistingData(filename, &d) if err != nil { - fmt.Println("error savingtoFile ", err) return } From ce6d3e9677a4a188d3968192df0b31d2bcfeb53e Mon Sep 17 00:00:00 2001 From: sherpalden Date: Mon, 12 Feb 2024 19:59:11 +0545 Subject: [PATCH 24/35] chore: remove redundant import for tm client --- relayer/chains/cosmos/tx.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 6997cddc6..1b32b0fcc 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -38,7 +38,6 @@ import ( host "github.com/cosmos/ibc-go/v7/modules/core/24-host" "github.com/cosmos/ibc-go/v7/modules/core/exported" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" strideicqtypes "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" @@ -1343,7 +1342,7 @@ func (cc *CosmosProvider) NewClientState( var clientState ibcexported.ClientState // Create the ClientState we want on 'c' tracking 'dst' - tmClientState := tendermint.ClientState{ + tmClientState := tmclient.ClientState{ ChainId: dstChainID, TrustLevel: tmclient.NewFractionFromTm(light.DefaultTrustLevel), TrustingPeriod: dstTrustingPeriod, From 60f088022c2c07f7fa1af3fd8148a302b2abd8c2 Mon Sep 17 00:00:00 2001 From: sherpalden Date: Mon, 12 Feb 2024 20:07:42 +0545 Subject: [PATCH 25/35] chore: log messages properly while sending to mempool in cosmos --- relayer/chains/cosmos/tx.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 1b32b0fcc..82599a8b4 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -146,10 +146,8 @@ func (cc *CosmosProvider) SendMessagesToMempool( defer cc.txMu.Unlock() for _, m := range msgs { - fmt.Println("[cosmos] from mempool messageType:", m.Type()) - b, _ := m.MsgBytes() - fmt.Printf("[cosmos] message %x \n ", b) - + msgbytes, _ := m.MsgBytes() + cc.log.Info("sending msg to mempool", zap.String("message-type", m.Type()), zap.Binary("message-bytes", msgbytes)) } txBytes, sequence, fees, err := cc.buildMessages(ctx, msgs, memo) From 021289605cbd2d5ae5c9b9e1f85f98699f144af6 Mon Sep 17 00:00:00 2001 From: sherpalden Date: Mon, 12 Feb 2024 20:12:40 +0545 Subject: [PATCH 26/35] chore: log messages properly while sending to icon --- relayer/chains/icon/tx.go | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/relayer/chains/icon/tx.go b/relayer/chains/icon/tx.go index cee10be8b..950cba506 100644 --- a/relayer/chains/icon/tx.go +++ b/relayer/chains/icon/tx.go @@ -834,29 +834,9 @@ func (icp *IconProvider) SendIconTransaction( } msgByte, _ := msg.MsgBytes() - fmt.Printf("[icon] messagebyte %x \n", msgByte) - - // txParamEst := &types.TransactionParamForEstimate{ - // Version: types.NewHexInt(types.JsonrpcApiVersion), - // FromAddress: types.Address(wallet.Address().String()), - // ToAddress: types.Address(icp.PCfg.IbcHandlerAddress), - // NetworkID: types.NewHexInt(icp.PCfg.ICONNetworkID), - // DataType: "call", - // Data: types.CallData{ - // Method: m.Method, - // Params: m.Params, - // }, - // } - - // step, err := icp.client.EstimateStep(txParamEst) - // if err != nil { - // return fmt.Errorf("failed estimating step: %w", err) - // } - // stepVal, err := step.Int() - // if err != nil { - // return err - // } - // stepLimit := types.NewHexInt(int64(stepVal + 200_000)) + + icp.log.Info("sending msg to icon", zap.Binary("message-bytes", msgByte)) + stepLimit := types.NewHexInt(int64(20_000_000)) txParam := &types.TransactionParam{ From f2704f914ffd8b1eb197d3e970f1388d47b25ca2 Mon Sep 17 00:00:00 2001 From: sherpalden Date: Mon, 12 Feb 2024 20:20:42 +0545 Subject: [PATCH 27/35] chore: ensure non empty proof in cosmos --- relayer/chains/cosmos/tx.go | 18 +++++++++--------- relayer/common/utils.go | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 82599a8b4..1c4c10572 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -587,7 +587,7 @@ func (cc *CosmosProvider) MsgRecvPacket( } msg := &chantypes.MsgRecvPacket{ Packet: msgTransfer.Packet(), - ProofCommitment: common.ChangeProof(proof.Proof, true), + ProofCommitment: common.EnsureNonEmptyProof(proof.Proof), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -625,7 +625,7 @@ func (cc *CosmosProvider) MsgAcknowledgement( msg := &chantypes.MsgAcknowledgement{ Packet: msgRecvPacket.Packet(), Acknowledgement: msgRecvPacket.Ack, - ProofAcked: common.ChangeProof(proof.Proof, true), + ProofAcked: common.EnsureNonEmptyProof(proof.Proof), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -677,7 +677,7 @@ func (cc *CosmosProvider) MsgTimeout(msgTransfer provider.PacketInfo, proof prov } assembled := &chantypes.MsgTimeout{ Packet: msgTransfer.Packet(), - ProofUnreceived: common.ChangeProof(proof.Proof, true), + ProofUnreceived: common.EnsureNonEmptyProof(proof.Proof), ProofHeight: proof.ProofHeight, NextSequenceRecv: msgTransfer.Sequence, Signer: signer, @@ -697,7 +697,7 @@ func (cc *CosmosProvider) MsgTimeoutOnClose(msgTransfer provider.PacketInfo, pro } assembled := &chantypes.MsgTimeoutOnClose{ Packet: msgTransfer.Packet(), - ProofUnreceived: common.ChangeProof(proof.Proof, true), + ProofUnreceived: common.EnsureNonEmptyProof(proof.Proof), ProofHeight: proof.ProofHeight, NextSequenceRecv: msgTransfer.Sequence, Signer: signer, @@ -848,7 +848,7 @@ func (cc *CosmosProvider) MsgConnectionOpenConfirm(msgOpenAck provider.Connectio } msg := &conntypes.MsgConnectionOpenConfirm{ ConnectionId: msgOpenAck.CounterpartyConnID, - ProofAck: common.ChangeProof(proof.ConnectionStateProof, true), + ProofAck: common.EnsureNonEmptyProof(proof.ConnectionStateProof), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -918,7 +918,7 @@ func (cc *CosmosProvider) MsgChannelOpenTry(msgOpenInit provider.ChannelInfo, pr Version: proof.Version, }, CounterpartyVersion: proof.Version, - ProofInit: common.ChangeProof(proof.Proof, true), + ProofInit: common.EnsureNonEmptyProof(proof.Proof), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -936,7 +936,7 @@ func (cc *CosmosProvider) MsgChannelOpenAck(msgOpenTry provider.ChannelInfo, pro ChannelId: msgOpenTry.CounterpartyChannelID, CounterpartyChannelId: msgOpenTry.ChannelID, CounterpartyVersion: proof.Version, - ProofTry: common.ChangeProof(proof.Proof, true), + ProofTry: common.EnsureNonEmptyProof(proof.Proof), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -952,7 +952,7 @@ func (cc *CosmosProvider) MsgChannelOpenConfirm(msgOpenAck provider.ChannelInfo, msg := &chantypes.MsgChannelOpenConfirm{ PortId: msgOpenAck.CounterpartyPortID, ChannelId: msgOpenAck.CounterpartyChannelID, - ProofAck: common.ChangeProof(proof.Proof, true), + ProofAck: common.EnsureNonEmptyProof(proof.Proof), ProofHeight: proof.ProofHeight, Signer: signer, } @@ -982,7 +982,7 @@ func (cc *CosmosProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelIn msg := &chantypes.MsgChannelCloseConfirm{ PortId: msgCloseInit.CounterpartyPortID, ChannelId: msgCloseInit.CounterpartyChannelID, - ProofInit: common.ChangeProof(proof.Proof, true), + ProofInit: common.EnsureNonEmptyProof(proof.Proof), ProofHeight: proof.ProofHeight, Signer: signer, } diff --git a/relayer/common/utils.go b/relayer/common/utils.go index c659e5091..d3478dd4c 100644 --- a/relayer/common/utils.go +++ b/relayer/common/utils.go @@ -59,8 +59,8 @@ func LoadSnapshotHeight(chain_id string) (int64, error) { return strconv.ParseInt(strings.TrimSuffix(string(content), "\n"), 10, 64) } -func ChangeProof(proof []byte, shouldNeverBeEmpty bool) []byte { - if proof == nil && shouldNeverBeEmpty { +func EnsureNonEmptyProof(proof []byte) []byte { + if proof == nil { return EmptyProofConst } return proof From f5cb2390b90fbd43185af887a17bb26eff849a68 Mon Sep 17 00:00:00 2001 From: sherpalden Date: Mon, 12 Feb 2024 20:33:24 +0545 Subject: [PATCH 28/35] chore: update comments and variable names --- relayer/chains/cosmos/tx.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 1c4c10572..d3069cae2 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -801,15 +801,14 @@ func (cc *CosmosProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInf return nil, err } - // if msgOpenTry client is wasm client then we need to incorporate it - + //TODO if msgOpenTry client is wasm client then we need to incorporate it msg := &conntypes.MsgConnectionOpenAck{ ConnectionId: msgOpenTry.CounterpartyConnID, CounterpartyConnectionId: msgOpenTry.ConnID, Version: conntypes.DefaultIBCVersion, ClientState: csAny, ProofHeight: clienttypes.Height{ - RevisionNumber: proof.ProofHeight.RevisionNumber, + RevisionNumber: proof.ProofHeight.GetRevisionNumber(), RevisionHeight: proof.ProofHeight.GetRevisionHeight(), }, ProofTry: proof.ConnectionStateProof, @@ -1029,7 +1028,7 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, if clientType == exported.Wasm { - tmClientHeaderBz, err := cc.Cdc.Marshaler.MarshalInterface(clientHeader) + clientHeaderData, err := cc.Cdc.Marshaler.MarshalInterface(clientHeader) if err != nil { return &wasmclient.Header{}, nil } @@ -1038,7 +1037,7 @@ func (cc *CosmosProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, return &wasmclient.Header{}, fmt.Errorf("error converting tm client header height") } clientHeader = &wasmclient.Header{ - Data: tmClientHeaderBz, + Data: clientHeaderData, Height: height, } } @@ -1273,8 +1272,7 @@ func (cc *CosmosProvider) InjectTrustedFields(ctx context.Context, header ibcexp return h, nil } -// queryTMClientState retrieves the latest consensus state for a client in state at a given height -// and unpacks/cast it to tendermint clientstate +// queryProviderClientState retrieves the clientState of cosmos chain func (cc *CosmosProvider) queryProviderClientState(ctx context.Context, srch int64, srcClientId string) (provider.ClientState, error) { clientStateRes, err := cc.QueryClientStateResponse(ctx, srch, srcClientId) if err != nil { From 4d15911480102683eef0e30c4fb4dc7e83502287 Mon Sep 17 00:00:00 2001 From: sherpalden Date: Mon, 12 Feb 2024 20:35:28 +0545 Subject: [PATCH 29/35] chore: remove unnecessary comments --- relayer/chains/icon/provider.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index 65539b291..5a8fcc29d 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -26,7 +26,6 @@ import ( commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" wasmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" - // integration_types "github.com/icon-project/ibc-integration/libraries/go/common/icon" ) var ( @@ -580,7 +579,6 @@ func (icp *IconProvider) MsgRegisterCounterpartyPayee(portID, channelID, relayer panic(fmt.Sprintf("%s%s", icp.ChainName(), NOT_IMPLEMENTED)) } -// TODO: revisionNumber cannot be zero func (icp *IconProvider) RevisionNumber() uint64 { if icp.PCfg.RevisionNumber != 0 { return icp.PCfg.RevisionNumber From a73500fa99cbaf99c78bf6f2fa39ee6ef3bf7df1 Mon Sep 17 00:00:00 2001 From: sherpalden Date: Tue, 13 Feb 2024 19:37:18 +0545 Subject: [PATCH 30/35] fix: relay start not working when more than two chains are in the config file --- cmd/start.go | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/cmd/start.go b/cmd/start.go index c2cdf9406..8d2a614fc 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -45,19 +45,16 @@ $ %s start demo-path --max-msgs 3 $ %s start demo-path2 --max-tx-size 10`, appName, appName, appName, appName)), RunE: func(cmd *cobra.Command, args []string) error { chains := make(map[string]*relayer.Chain) - paths := make([]relayer.NamedPath, len(args)) + + var paths []relayer.NamedPath if len(args) > 0 { - for i, pathName := range args { + for _, pathName := range args { path := a.config.Paths.MustGet(pathName) - paths[i] = relayer.NamedPath{ + paths = append(paths, relayer.NamedPath{ Name: pathName, Path: path, - } - - // collect unique chain IDs - chains[path.Src.ChainID] = nil - chains[path.Dst.ChainID] = nil + }) } } else { for n, path := range a.config.Paths { @@ -65,22 +62,27 @@ $ %s start demo-path2 --max-tx-size 10`, appName, appName, appName, appName)), Name: n, Path: path, }) - - // collect unique chain IDs - chains[path.Src.ChainID] = nil - chains[path.Dst.ChainID] = nil } } - chainIDs := make([]string, 0, len(chains)) - for chainID := range chains { - chainIDs = append(chainIDs, chainID) - } + for _, p := range paths { + srcChainID := p.Path.Src.ChainID + if _, ok := chains[srcChainID]; !ok { + chain, err := a.config.Chains.Get(srcChainID) + if err != nil { + return err + } + chains[srcChainID] = chain + } - // get chain configurations - chains, err := a.config.Chains.Gets(chainIDs...) - if err != nil { - return err + dstChainID := p.Path.Dst.ChainID + if _, ok := chains[dstChainID]; !ok { + chain, err := a.config.Chains.Get(dstChainID) + if err != nil { + return err + } + chains[dstChainID] = chain + } } if err := ensureKeysExist(chains); err != nil { From 8b96fec26c14fed3480e22603934da8f4c068f22 Mon Sep 17 00:00:00 2001 From: sherpalden Date: Tue, 13 Feb 2024 22:00:12 +0545 Subject: [PATCH 31/35] feat: add method to check for invalid path --- cmd/start.go | 24 ++++++++++++++++-------- relayer/path.go | 7 +++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/cmd/start.go b/cmd/start.go index 8d2a614fc..4edc4d675 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -51,17 +51,25 @@ $ %s start demo-path2 --max-tx-size 10`, appName, appName, appName, appName)), if len(args) > 0 { for _, pathName := range args { path := a.config.Paths.MustGet(pathName) - paths = append(paths, relayer.NamedPath{ - Name: pathName, - Path: path, - }) + if err := path.IsInvalid(); err != nil { + a.log.Warn(fmt.Sprintf("Skipping invalid path: %s", err.Error())) + } else { + paths = append(paths, relayer.NamedPath{ + Name: pathName, + Path: path, + }) + } } } else { for n, path := range a.config.Paths { - paths = append(paths, relayer.NamedPath{ - Name: n, - Path: path, - }) + if err := path.IsInvalid(); err != nil { + a.log.Warn(fmt.Sprintf("Skipping invalid path: %s", err.Error())) + } else { + paths = append(paths, relayer.NamedPath{ + Name: n, + Path: path, + }) + } } } diff --git a/relayer/path.go b/relayer/path.go index 228544c4b..bd81c88a4 100644 --- a/relayer/path.go +++ b/relayer/path.go @@ -173,6 +173,13 @@ func (p *Path) String() string { return fmt.Sprintf("%s -> %s", p.Src.String(), p.Dst.String()) } +func (p *Path) IsInvalid() error { + if p.Src.ChainID == "" || p.Src.ClientID == "" || p.Src.ConnectionID == "" || p.Dst.ChainID == "" || p.Dst.ClientID == "" || p.Dst.ConnectionID == "" { + return fmt.Errorf("chain-id, client-id and connection-id for src and dst cannot be empty for path") + } + return nil +} + // GenPath generates a path with unspecified client, connection and channel identifiers // given chainIDs and portIDs. func GenPath(srcChainID, dstChainID string) *Path { From 26691feefd7126d363c49cac4e6a4f10a55fc52f Mon Sep 17 00:00:00 2001 From: sherpalden Date: Wed, 14 Feb 2024 12:22:40 +0545 Subject: [PATCH 32/35] chore: add pathname while logging invaid path --- cmd/start.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/start.go b/cmd/start.go index 4edc4d675..f506d3bb1 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -52,7 +52,7 @@ $ %s start demo-path2 --max-tx-size 10`, appName, appName, appName, appName)), for _, pathName := range args { path := a.config.Paths.MustGet(pathName) if err := path.IsInvalid(); err != nil { - a.log.Warn(fmt.Sprintf("Skipping invalid path: %s", err.Error())) + a.log.Warn(fmt.Sprintf("Skipping invalid path: [%s] : %s", pathName, err.Error())) } else { paths = append(paths, relayer.NamedPath{ Name: pathName, @@ -63,7 +63,7 @@ $ %s start demo-path2 --max-tx-size 10`, appName, appName, appName, appName)), } else { for n, path := range a.config.Paths { if err := path.IsInvalid(); err != nil { - a.log.Warn(fmt.Sprintf("Skipping invalid path: %s", err.Error())) + a.log.Warn(fmt.Sprintf("Skipping invalid path: [%s] : %s", n, err.Error())) } else { paths = append(paths, relayer.NamedPath{ Name: n, From bf34eeaf3020b5b4b513b6eece7acd957dcdaffe Mon Sep 17 00:00:00 2001 From: sherpalden Date: Fri, 23 Feb 2024 15:37:50 +0545 Subject: [PATCH 33/35] fix: recover from panic while waiting for tx result in cosmos chain --- relayer/chains/cosmos/tx.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index d3069cae2..075d3bf5b 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -8,6 +8,7 @@ import ( "math" "math/big" "regexp" + "runtime/debug" "strconv" "strings" "sync" @@ -249,6 +250,12 @@ func (cc *CosmosProvider) waitForTx( waitTimeout time.Duration, callback func(*provider.RelayerTxResponse, error), ) { + defer func() { + if r := recover(); r != nil { + cc.log.Error("Panic occurred", zap.Any("panic", r), zap.Any("trace", string(debug.Stack()))) + } + }() + res, err := cc.waitForBlockInclusion(ctx, txHash, waitTimeout) if err != nil { cc.log.Error("Failed to wait for block inclusion", zap.Error(err)) From 6bdecff25fb373762e8f97623d2bbd4c71ec7c3e Mon Sep 17 00:00:00 2001 From: sherpalden Date: Sun, 25 Feb 2024 08:14:43 +0545 Subject: [PATCH 34/35] chore: add event detection log in cosmos provider & invalidate packet when both timeout height and timestamp is zero in icon provider --- relayer/chains/cosmos/cosmos_chain_processor.go | 1 + relayer/chains/icon/provider.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/relayer/chains/cosmos/cosmos_chain_processor.go b/relayer/chains/cosmos/cosmos_chain_processor.go index 079882224..427e09ca8 100644 --- a/relayer/chains/cosmos/cosmos_chain_processor.go +++ b/relayer/chains/cosmos/cosmos_chain_processor.go @@ -441,6 +441,7 @@ func (ccp *CosmosChainProcessor) queryCycle(ctx context.Context, persistence *qu messages := ibcMessagesFromEvents(ccp.log, tx.Events, chainID, heightUint64, base64Encoded) for _, m := range messages { + ccp.log.Info("Detected eventlog", zap.String("eventlog", m.eventType), zap.Uint64("height", heightUint64)) ccp.handleMessage(ctx, m, ibcMessagesCache) } } diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index 5a8fcc29d..401d62b2b 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -321,7 +321,7 @@ func (icp *IconProvider) ValidatePacket(msgTransfer provider.PacketInfo, latestB return fmt.Errorf("refuse to relay packet with empty data") } // This should not be possible, as it violates IBC spec - if msgTransfer.TimeoutHeight.IsZero() { + if msgTransfer.TimeoutHeight.IsZero() && msgTransfer.TimeoutTimestamp == 0 { return fmt.Errorf("refusing to relay packet without a timeout (height or timestamp must be set)") } From 3ea6855fa2e9e719bf57f8d76e015523e1a8e8f2 Mon Sep 17 00:00:00 2001 From: sherpalden Date: Wed, 20 Mar 2024 13:17:49 +0545 Subject: [PATCH 35/35] fix: improper error handling while broadcasting tx in cosmos --- relayer/chains/cosmos/tx.go | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 075d3bf5b..7a7a4f83a 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -3,7 +3,6 @@ package cosmos import ( "context" "encoding/hex" - "errors" "fmt" "math" "math/big" @@ -44,6 +43,7 @@ import ( strideicqtypes "github.com/cosmos/relayer/v2/relayer/chains/cosmos/stride" "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/pkg/errors" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -200,13 +200,12 @@ func (cc *CosmosProvider) broadcastTx( asyncCallback func(*provider.RelayerTxResponse, error), // callback for success/fail of the wait for block inclusion ) error { res, err := cc.RPCClient.BroadcastTxSync(ctx, tx) - isErr := err != nil - isFailed := res != nil && res.Code != 0 - if isErr || isFailed { - if isErr && res == nil { - // There are some cases where BroadcastTxSync will return an error but the associated - // ResultBroadcastTx will be nil. - return err + + if res != nil && res.Code != 0 { + if err == nil { + err = errors.New(res.Log) + } else { + err = errors.Wrap(err, res.Log) } rlyResp := &provider.RelayerTxResponse{ TxHash: res.Hash.String(), @@ -214,16 +213,14 @@ func (cc *CosmosProvider) broadcastTx( Code: res.Code, Data: res.Data.String(), } - if isFailed { - err = cc.sdkError(res.Codespace, res.Code) - if err == nil { - err = fmt.Errorf("transaction failed to execute") - } - } - cc.LogFailedTx(rlyResp, err, msgs) return err } + + if res == nil { + return err + } + address, err := cc.Address() if err != nil { cc.log.Error(