Skip to content
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

sean/resolve merge conflicts ica #407

Merged
merged 35 commits into from
Sep 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cde1e0c
Bump github.com/cosmos/cosmos-sdk from 0.43.0-rc1 to 0.43.0-rc2 (#269)
dependabot[bot] Jul 19, 2021
c92e0d6
generate swagger files (#267)
colin-axner Jul 19, 2021
76ad03e
Reject Redundant Tx Antedecorator (#235)
AdityaSripal Jul 19, 2021
4a83b05
perform a no-op on redundant relay messages (#268)
colin-axner Jul 20, 2021
c623ad7
Bump codecov/codecov-action from 1.5.2 to 2.0.1 (#273)
dependabot[bot] Jul 20, 2021
0afa15a
remove ChanCloseInit function from transfer keeper (#275)
colin-axner Jul 20, 2021
6f10a68
Bump codecov/codecov-action from 2.0.1 to 2.0.2 (#296)
dependabot[bot] Jul 26, 2021
da40d55
Bump github.com/spf13/cast from 1.3.1 to 1.4.0 (#301)
dependabot[bot] Jul 27, 2021
11da3d7
Bump technote-space/get-diff-action from 4.2 to 5 (#306)
dependabot[bot] Aug 2, 2021
bf508c6
bump to SDK v0.43.0-rc3 (#308)
colin-axner Aug 5, 2021
3642983
add @seantking as codeowner to interchain accounts (#309)
colin-axner Aug 5, 2021
6c3b582
Bump google.golang.org/grpc from 1.39.0 to 1.39.1 (#320)
dependabot[bot] Aug 9, 2021
1160f56
Bump github.com/cosmos/cosmos-sdk from 0.43.0-rc3 to 0.43.0 (#325)
dependabot[bot] Aug 10, 2021
3dade92
module: improve 04-channel logging (#323)
alexanderbez Aug 10, 2021
632d71f
update changelog (#326)
colin-axner Aug 11, 2021
2c5ea11
Bump google.golang.org/grpc from 1.39.1 to 1.40.0 (#332)
dependabot[bot] Aug 12, 2021
f6eb414
Bump github.com/spf13/cast from 1.4.0 to 1.4.1 (#338)
dependabot[bot] Aug 23, 2021
f4a017e
Bump github.com/tendermint/tendermint from 0.34.11 to 0.34.12 (#341)
dependabot[bot] Aug 23, 2021
7b5a19f
fix broken links in integration.md (#340)
crodriguezvega Aug 23, 2021
e86cdbe
Created helper functions for emitting packet events (#343)
lukerhoads Aug 24, 2021
ae36ab5
Merge pull request from GHSA-qrhq-96mh-q8jv
colin-axner Aug 25, 2021
662f4dd
Bump codecov/codecov-action from 2.0.2 to 2.0.3 (#346)
dependabot[bot] Aug 26, 2021
950b92d
Bump actions/setup-go from 2.1.3 to 2.1.4 (#349)
dependabot[bot] Aug 26, 2021
358bfa5
increase port identifier limit to 128 characters (#344)
colin-axner Aug 26, 2021
9d5da17
update codeowners to include new team members and granular ownership …
colin-axner Aug 27, 2021
a6bf50d
bump SDK dependency (#367)
colin-axner Sep 2, 2021
74182d8
adding client status cli query (#372)
damiannolan Sep 3, 2021
90ce97e
adding markdown link checker to ci workflows (#377)
damiannolan Sep 6, 2021
760d15a
packet acknowledgment filtering (#375)
damiannolan Sep 7, 2021
a647546
Bump github.com/tendermint/tendermint from 0.34.12 to 0.34.13 (#386)
dependabot[bot] Sep 9, 2021
06c2d76
Change ICS 20 packet data amount to be string (#350)
colin-axner Sep 10, 2021
2fbe682
fix: ibc build docs (#361)
charleenfei Sep 13, 2021
85b4383
feat: scalable version queries (#384)
damiannolan Sep 13, 2021
7a6507b
Bump codecov/codecov-action from 2.0.3 to 2.1.0 (#399)
dependabot[bot] Sep 13, 2021
b5ad323
Merge branch 'main' into interchain-accounts
seantking Sep 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion proto/ibc/applications/transfer/v1/transfer.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ option go_package = "github.com/cosmos/ibc-go/modules/apps/transfer/types";

import "gogoproto/gogo.proto";


// DenomTrace contains the base denomination for ICS20 fungible tokens and the
// source tracing information path.
message DenomTrace {
Expand Down
1 change: 0 additions & 1 deletion proto/ibc/applications/transfer/v2/packet.proto
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ message FungibleTokenPacketData {
// the recipient address on the destination chain
string receiver = 4;
}