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.

Sign up for GitHub

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

Jump to bottom

Add an IBC prefix to transfer escrow addresses #7967

Merged
merged 22 commits into from
Nov 26, 2020
Merged

Add an IBC prefix to transfer escrow addresses #7967

merged 22 commits into from
Nov 26, 2020

Commits on Nov 18, 2020

  1. add IBC prefix to escrow addresses

    @colin-axner
    colin-axner committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    bb7498f View commit details
    Browse the repository at this point in the history

  2. fix merge conflict

    @colin-axner
    colin-axner committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    b7227b4 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2020

  1. use ADR 028 AddressHash construction

    @colin-axner
    colin-axner committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    6e4d099 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into colin/7737-prefix-escrow-addr

    @colin-axner
    colin-axner authored Nov 19, 2020
    Configuration menu
    Copy the full SHA
    b090898 View commit details
    Browse the repository at this point in the history

  3. remove extra space

    @colin-axner
    colin-axner committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    af76261 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'colin/7737-prefix-escrow-addr' of github.com:cosmos/cos… 

    …mos-sdk into colin/7737-prefix-escrow-addr
    @colin-axner
    colin-axner committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    8cb1fee View commit details
    Browse the repository at this point in the history

  5. apply @AdityaSripal suggestion; prefix from ibc -> ibc-transfer-escro… 

    …w-prefix
    @colin-axner
    colin-axner committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    5fce47d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into colin/7737-prefix-escrow-addr

    @colin-axner
    colin-axner authored Nov 19, 2020
    Configuration menu
    Copy the full SHA
    7bffc31 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2020

  1. Use alternative 1 proposed by @andrey-kuprianov

    @colin-axner
    colin-axner committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    91b68dd View commit details
    Browse the repository at this point in the history

  2. anticpate necessary build fix

    @colin-axner
    colin-axner committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    ab19a4a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'colin/7737-prefix-escrow-addr' of github.com:cosmos/cos… 

    …mos-sdk into colin/7737-prefix-escrow-addr
    @colin-axner
    colin-axner committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    c57493b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into colin/7737-prefix-escrow-addr

    @colin-axner
    colin-axner authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    6731918 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into colin/7737-prefix-escrow-addr

    @colin-axner
    colin-axner authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    e366e9c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into colin/7737-prefix-escrow-addr

    @colin-axner
    colin-axner authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    111ed79 View commit details
    Browse the repository at this point in the history

  7. add escrow address issue link into module.go

    @colin-axner
    colin-axner committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    d730ae2 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'colin/7737-prefix-escrow-addr' of github.com:cosmos/cos… 

    …mos-sdk into colin/7737-prefix-escrow-addr
    @colin-axner
    colin-axner committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    3559e72 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2020

  1. Merge branch 'master' into colin/7737-prefix-escrow-addr

    @colin-axner
    colin-axner authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    c697887 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into colin/7737-prefix-escrow-addr

    @colin-axner
    colin-axner authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    c5ef4f9 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2020

  1. Update x/ibc/applications/transfer/types/keys.go 

    Co-authored-by: Andrey Kuprianov <[email protected]>
    @colin-axner @andrey-kuprianov
    colin-axner and andrey-kuprianov authored Nov 26, 2020
    Configuration menu
    Copy the full SHA
    c9e3a18 View commit details
    Browse the repository at this point in the history

  2. Update x/ibc/applications/transfer/types/keys.go 

    Co-authored-by: Andrey Kuprianov <[email protected]>
    @colin-axner @andrey-kuprianov
    colin-axner and andrey-kuprianov authored Nov 26, 2020
    Configuration menu
    Copy the full SHA
    272dd2a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:cosmos/cosmos-sdk into colin/7737… 

    …-prefix-escrow-addr
    @colin-axner
    colin-axner committed Nov 26, 2020
    Configuration menu
    Copy the full SHA
    8a99065 View commit details
    Browse the repository at this point in the history

  4. apply @andrey-kuprianov review suggestions 

    Deduplicate code into a helper function as suggested. Add unit tests for max transfer channels test.
    @colin-axner
    colin-axner committed Nov 26, 2020
    Configuration menu
    Copy the full SHA
    0677e09 View commit details
    Browse the repository at this point in the history