-
Notifications
You must be signed in to change notification settings - Fork 1
feat(ift): extend catalyst to support IFT messages #63
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
johnnylarner
wants to merge
13
commits into
main
Choose a base branch
from
plat-374/extended-ift-transfer-integration-test
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
62f2a27
feat(ift): extend catalyst to support IFT messages
johnnylarner bf98281
feat(ift): add evm -> cosmos and evm -> evm to ift
johnnylarner 543ac95
refactor: implement review comments
johnnylarner e8e6322
add relayer submission retry logic and some bug fixes around timestam…
dhfang 5d8a031
refactor: replace SentTx.Err with derived Failed()/Error() methods
dhfang 2ee5c35
refactor: remove txMode, integrate IFT into TxFactory, add explicit r…
dhfang e3d3e83
refactor: rename SentTx error fields and clean up evm relay flow
dhfang fd35a75
increase relay timeout
dhfang 11bf984
remove unused Failed/Error methods on ethereum SentTx
dhfang a389c92
merge main into plat-374/extended-ift-transfer-integration-test
dhfang 0335731
fix lint issues
dhfang 8e4be5b
fix struct tag formatting in ChainConfig
dhfang 426d986
relayer failures are surfaced as a separate metric in stats
dhfang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| version: v2 | ||
| inputs: | ||
| - git_repo: https://github.com/cosmos/platform.git | ||
| subdir: apps/relayer/proto | ||
| paths: | ||
| - relayerapi/service.proto | ||
| plugins: | ||
| - remote: buf.build/protocolbuffers/go | ||
| out: ift/relayer/pb | ||
| opt: | ||
| - paths=source_relative | ||
| - remote: buf.build/grpc/go | ||
| out: ift/relayer/pb | ||
| opt: | ||
| - paths=source_relative |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| version: v2 | ||
| modules: | ||
| - path: . | ||
| lint: | ||
| use: | ||
| - STANDARD | ||
| breaking: | ||
| use: | ||
| - FILE |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| package ift | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
| "sync" | ||
|
|
||
| codectypes "github.com/cosmos/cosmos-sdk/codec/types" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| gogoproto "github.com/cosmos/gogoproto/proto" | ||
| ) | ||
|
|
||
| const DefaultMsgIFTTransferTypeURL = "catalyst.ift.v1.MsgIFTTransfer" | ||
|
|
||
| var ( | ||
| typeRegistrationMu sync.Mutex | ||
| registeredTypeURLs = map[string]struct{}{} | ||
| ) | ||
|
|
||
| type MsgIFTTransfer struct { | ||
| Signer string `protobuf:"bytes,1,opt,name=signer,proto3" json:"signer,omitempty"` | ||
| Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` | ||
| ClientID string `protobuf:"bytes,3,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` | ||
| Receiver string `protobuf:"bytes,4,opt,name=receiver,proto3" json:"receiver,omitempty"` | ||
| Amount string `protobuf:"bytes,5,opt,name=amount,proto3" json:"amount,omitempty"` | ||
| TimeoutTimestamp uint64 `protobuf:"varint,6,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty"` | ||
| } | ||
|
|
||
| func (m *MsgIFTTransfer) Reset() { *m = MsgIFTTransfer{} } | ||
| func (m *MsgIFTTransfer) String() string { return gogoproto.CompactTextString(m) } | ||
| func (*MsgIFTTransfer) ProtoMessage() {} | ||
|
|
||
| // Descriptor satisfies the descriptorIface the cosmos-sdk tx decoder uses | ||
| // (codec/unknownproto/unknown_fields.go). Path index 4 corresponds to | ||
| // MsgIFTTransfer's position within wfchain/ift/tx.proto. | ||
| func (*MsgIFTTransfer) Descriptor() ([]byte, []int) { | ||
| return fileDescriptor, []int{4} | ||
| } | ||
|
|
||
| // fileDescriptor is the gzipped FileDescriptorProto for wfchain/ift/tx.proto, | ||
| // copied verbatim from github.com/cosmos/wfchain/x/ift/types/tx.pb.go. | ||
| var fileDescriptor = []byte{ | ||
| // 721 bytes of a gzipped FileDescriptorProto | ||
| 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xc1, 0x4e, 0xdb, 0x4a, | ||
| 0x14, 0x8d, 0x49, 0xc8, 0x83, 0x9b, 0x27, 0x78, 0xf8, 0x05, 0x30, 0x06, 0x25, 0xbc, 0xbc, 0x56, | ||
| 0xa5, 0x20, 0x92, 0x42, 0x51, 0xd5, 0xb2, 0xa9, 0x9a, 0x48, 0x48, 0x59, 0x44, 0xad, 0x4c, 0xba, | ||
| 0x69, 0x17, 0x91, 0xb1, 0xc7, 0xce, 0xa8, 0xf1, 0x4c, 0x3a, 0x33, 0xa1, 0xb0, 0xab, 0xba, 0xe8, | ||
| 0xaa, 0x0b, 0x3e, 0x85, 0x05, 0xea, 0x37, 0xb0, 0x44, 0xac, 0xaa, 0xaa, 0x42, 0x15, 0x2c, 0xf8, | ||
| 0x8a, 0x4a, 0x95, 0xed, 0x89, 0x89, 0x43, 0x4a, 0xa4, 0xaa, 0x62, 0x95, 0xdc, 0x7b, 0xce, 0xbd, | ||
| 0x73, 0xe6, 0xcc, 0x1d, 0x0f, 0x64, 0xdf, 0x39, 0x56, 0xd3, 0xc4, 0xa4, 0x84, 0x1d, 0x51, 0x12, | ||
| 0x7b, 0xc5, 0x36, 0xa3, 0x82, 0xaa, 0x19, 0x99, 0x2d, 0x62, 0x47, 0xe8, 0xb3, 0x16, 0xe5, 0x1e, | ||
| 0xe5, 0x25, 0x8f, 0xbb, 0xa5, 0xdd, 0x35, 0xff, 0x27, 0x64, 0xe9, 0x73, 0x21, 0xd0, 0x08, 0xa2, | ||
| 0x52, 0x18, 0x48, 0x28, 0xeb, 0x52, 0x97, 0x86, 0x79, 0xff, 0x9f, 0xcc, 0x4e, 0xf7, 0x2e, 0x86, | ||
| 0x1d, 0x11, 0xa6, 0x0b, 0x3f, 0x14, 0xc8, 0xd6, 0xb8, 0x6b, 0x20, 0x17, 0x73, 0x81, 0x58, 0x75, | ||
| 0xab, 0x5e, 0x66, 0xd8, 0x76, 0x91, 0xfa, 0x00, 0xd2, 0x1c, 0xbb, 0x04, 0x31, 0x4d, 0x59, 0x54, | ||
| 0x96, 0xc6, 0xcb, 0xda, 0xe9, 0xd1, 0x6a, 0x56, 0xae, 0xf3, 0xcc, 0xb6, 0x19, 0xe2, 0x7c, 0x5b, | ||
| 0x30, 0x4c, 0x5c, 0x43, 0xf2, 0xd4, 0x2c, 0x8c, 0xda, 0x88, 0x50, 0x4f, 0x1b, 0xf1, 0x0b, 0x8c, | ||
| 0x30, 0x50, 0xe7, 0x61, 0xdc, 0x6a, 0x61, 0x44, 0x44, 0x03, 0xdb, 0x5a, 0x32, 0x40, 0xc6, 0xc2, | ||
| 0x44, 0xd5, 0x56, 0x1f, 0x83, 0x66, 0xd1, 0x0e, 0x11, 0x88, 0xb5, 0x4d, 0x26, 0xf6, 0x1b, 0xd8, | ||
| 0x11, 0x0d, 0x33, 0x6c, 0xae, 0xa5, 0x02, 0xee, 0x4c, 0x2f, 0x5e, 0x75, 0x84, 0x5c, 0x5a, 0x7d, | ||
| 0x02, 0x73, 0x3e, 0x99, 0x23, 0x62, 0x37, 0x2c, 0xb3, 0xd5, 0x6a, 0x58, 0x94, 0x70, 0xc1, 0x3a, | ||
| 0x96, 0xa0, 0x4c, 0x1b, 0x0d, 0x4b, 0xb1, 0x23, 0xb6, 0x11, 0xb1, 0x2b, 0x66, 0xab, 0x55, 0xb9, | ||
| 0x42, 0x37, 0x33, 0x1f, 0x2e, 0x0f, 0x97, 0xa5, 0xe8, 0x42, 0x0e, 0x16, 0x06, 0x6d, 0xdf, 0x40, | ||
| 0xbc, 0x4d, 0x09, 0x47, 0x85, 0x8f, 0x0a, 0xa8, 0x01, 0xc1, 0xa3, 0xbb, 0xe8, 0x76, 0xdd, 0x89, | ||
| 0x0b, 0x5d, 0x00, 0xfd, 0xba, 0x8e, 0x48, 0xe6, 0xc1, 0x08, 0x4c, 0xd4, 0xb8, 0x5b, 0xdd, 0xaa, | ||
| 0xd7, 0x99, 0x49, 0xb8, 0x83, 0xd8, 0xed, 0x1c, 0xa0, 0x0e, 0x63, 0x0c, 0x59, 0x08, 0xef, 0x22, | ||
| 0x26, 0x0f, 0x2c, 0x8a, 0xd5, 0x0a, 0xa4, 0x4d, 0xcf, 0x3f, 0xbd, 0xf0, 0x3c, 0xca, 0x2b, 0xc7, | ||
| 0x67, 0xf9, 0xc4, 0xd7, 0xb3, 0xfc, 0x74, 0x28, 0x82, 0xdb, 0x6f, 0x8a, 0x98, 0x96, 0x3c, 0x53, | ||
| 0x34, 0x8b, 0x55, 0x22, 0x4e, 0x8f, 0x56, 0x41, 0xaa, 0xab, 0x12, 0x61, 0xc8, 0x52, 0x75, 0x05, | ||
| 0xa6, 0x04, 0xf6, 0x10, 0xed, 0x88, 0x86, 0xff, 0xcb, 0x85, 0xe9, 0xb5, 0xb5, 0xf4, 0xa2, 0xb2, | ||
| 0x94, 0x32, 0xfe, 0x91, 0x40, 0xbd, 0x9b, 0x8f, 0x1b, 0xb6, 0x01, 0x33, 0x71, 0x47, 0xba, 0x66, | ||
| 0xf9, 0xa2, 0x39, 0x7a, 0xdb, 0x41, 0xc4, 0x42, 0x81, 0x37, 0x29, 0x23, 0x8a, 0x0b, 0xdf, 0x14, | ||
| 0x80, 0xb0, 0xac, 0x86, 0x89, 0xf8, 0x63, 0x26, 0x6e, 0xf4, 0xf8, 0x94, 0x1c, 0xd2, 0x69, 0x90, | ||
| 0x83, 0xa9, 0xdf, 0x76, 0x30, 0x6e, 0x4a, 0x36, 0x98, 0x66, 0xb9, 0xbb, 0x68, 0x7a, 0x3e, 0x29, | ||
| 0x30, 0x59, 0xe3, 0xee, 0xcb, 0xb6, 0x6d, 0x0a, 0xf4, 0xc2, 0x64, 0xa6, 0xc7, 0xd5, 0x47, 0x30, | ||
| 0x6e, 0x76, 0x44, 0x93, 0x32, 0x2c, 0xf6, 0x87, 0x6e, 0xfe, 0x8a, 0xaa, 0xae, 0x41, 0xba, 0x1d, | ||
| 0x74, 0x08, 0x0c, 0xc8, 0xac, 0xff, 0x5b, 0xec, 0xf9, 0x9e, 0x15, 0xc3, 0xe6, 0xe5, 0x94, 0xbf, | ||
| 0x11, 0x43, 0x12, 0x37, 0x27, 0x7c, 0x85, 0x57, 0x2d, 0x0a, 0x73, 0x30, 0xdb, 0xa7, 0xa6, 0xab, | ||
| 0x74, 0xfd, 0x73, 0x12, 0x92, 0x35, 0xee, 0xaa, 0x26, 0x4c, 0x5d, 0xff, 0x64, 0xfd, 0x17, 0x5b, | ||
| 0x6a, 0xd0, 0xb5, 0xd6, 0xef, 0x0f, 0xa5, 0x44, 0x53, 0xf2, 0x1a, 0x26, 0xfb, 0x6f, 0x7d, 0xfe, | ||
| 0x7a, 0x75, 0x8c, 0xa0, 0xdf, 0x1b, 0x42, 0x88, 0x9a, 0x3f, 0x87, 0x4c, 0xef, 0x5d, 0x9d, 0xef, | ||
| 0xaf, 0xeb, 0x01, 0xf5, 0xff, 0x6f, 0x00, 0xa3, 0x86, 0x15, 0xf8, 0xab, 0x3b, 0xb3, 0xb3, 0x03, | ||
| 0xf8, 0x3e, 0xa0, 0xe7, 0x7f, 0x01, 0x44, 0x4d, 0x0c, 0xf8, 0x3b, 0x36, 0x03, 0x0b, 0xfd, 0x05, | ||
| 0xbd, 0xa8, 0x7e, 0xe7, 0x26, 0xb4, 0xdb, 0x53, 0x1f, 0x7d, 0x7f, 0x79, 0xb8, 0xac, 0x94, 0x9f, | ||
| 0x1e, 0x9f, 0xe7, 0x94, 0x93, 0xf3, 0x9c, 0xf2, 0xfd, 0x3c, 0xa7, 0x1c, 0x5c, 0xe4, 0x12, 0x27, | ||
| 0x17, 0xb9, 0xc4, 0x97, 0x8b, 0x5c, 0xe2, 0xd5, 0x5d, 0x17, 0x8b, 0x66, 0x67, 0xa7, 0x68, 0x51, | ||
| 0x4f, 0xbe, 0x63, 0xa5, 0xee, 0x53, 0xb5, 0x17, 0xbe, 0x8c, 0xfb, 0x6d, 0xc4, 0x77, 0xd2, 0xc1, | ||
| 0x7b, 0xf5, 0xf0, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x90, 0x20, 0x0a, 0x35, 0x07, 0x00, | ||
| 0x00, | ||
| } | ||
|
|
||
| func RegisterTypeURL(typeURL string) { | ||
| if typeURL == "" { | ||
| typeURL = DefaultMsgIFTTransferTypeURL | ||
| } | ||
| typeURL = strings.TrimPrefix(typeURL, "/") | ||
|
|
||
| typeRegistrationMu.Lock() | ||
| defer typeRegistrationMu.Unlock() | ||
|
|
||
| if _, exists := registeredTypeURLs[typeURL]; exists { | ||
| return | ||
| } | ||
|
|
||
| gogoproto.RegisterType((*MsgIFTTransfer)(nil), typeURL) | ||
| registeredTypeURLs[typeURL] = struct{}{} | ||
| } | ||
|
|
||
| func RegisterInterfaces(registry codectypes.InterfaceRegistry) { | ||
| registry.RegisterImplementations((*sdk.Msg)(nil), &MsgIFTTransfer{}) | ||
| } | ||
|
|
||
| func (m *MsgIFTTransfer) GetSigners() []sdk.AccAddress { | ||
| if m.Signer == "" { | ||
| return []sdk.AccAddress{} | ||
| } | ||
|
|
||
| return []sdk.AccAddress{sdk.MustAccAddressFromBech32(m.Signer)} | ||
| } | ||
|
|
||
| func (m *MsgIFTTransfer) ValidateBasic() error { | ||
| if m.Signer == "" { | ||
| return fmt.Errorf("signer must be specified") | ||
| } | ||
| if m.Denom == "" { | ||
| return fmt.Errorf("denom must be specified") | ||
| } | ||
| if m.ClientID == "" { | ||
| return fmt.Errorf("client_id must be specified") | ||
| } | ||
| if m.Receiver == "" { | ||
| return fmt.Errorf("receiver must be specified") | ||
| } | ||
| if m.Amount == "" { | ||
| return fmt.Errorf("amount must be specified") | ||
| } | ||
| if m.TimeoutTimestamp == 0 { | ||
| return fmt.Errorf("timeout_timestamp must be specified") | ||
| } | ||
| return nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package ift | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| codectypes "github.com/cosmos/cosmos-sdk/codec/types" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestMsgIFTTransferPacksWithConfiguredTypeURL(t *testing.T) { | ||
| const typeURL = "example.ift.v1.MsgIFTTransfer" | ||
|
|
||
| RegisterTypeURL(typeURL) | ||
|
|
||
| msg := &MsgIFTTransfer{ | ||
| Signer: "cosmos1deadbeefdeadbeefdeadbeefdeadbeef00", | ||
| Denom: "stake", | ||
| ClientID: "client-0", | ||
| Receiver: "0x1234567890123456789012345678901234567890", | ||
| Amount: "100", | ||
| TimeoutTimestamp: 123, | ||
| } | ||
|
|
||
| anyMsg, err := codectypes.NewAnyWithValue(msg) | ||
| require.NoError(t, err) | ||
| require.Equal(t, "/"+typeURL, anyMsg.TypeUrl) | ||
| } | ||
|
|
||
| func TestMsgIFTTransferPacksWithConfiguredTypeURLLeadingSlash(t *testing.T) { | ||
| const typeURL = "/example.ift.v1.MsgIFTTransfer" | ||
|
|
||
| RegisterTypeURL(typeURL) | ||
|
|
||
| msg := &MsgIFTTransfer{ | ||
| Signer: "cosmos1deadbeefdeadbeefdeadbeefdeadbeef00", | ||
| Denom: "stake", | ||
| ClientID: "client-0", | ||
| Receiver: "0x1234567890123456789012345678901234567890", | ||
| Amount: "100", | ||
| TimeoutTimestamp: 123, | ||
| } | ||
|
|
||
| anyMsg, err := codectypes.NewAnyWithValue(msg) | ||
| require.NoError(t, err) | ||
| require.Equal(t, "/example.ift.v1.MsgIFTTransfer", anyMsg.TypeUrl) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Our test chain did not have max gas configured causing catalyst to fail on the maxGas check below in lin 196