Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit f5e035e
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 17 09:05:28 2023 -0500

    Remove DSStore

commit eff85c7
Merge: f1ead43 236ef8c
Author: Reece Williams <31943163+Reecepbcups@users.noreply.github.com>
Date:   Tue May 16 18:36:09 2023 -0500

    Merge pull request #676 from CosmosContracts/reece/v47-fixes-test-check

    Fix v47 IBC test

commit 236ef8c
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Tue May 16 18:19:18 2023 -0500

    Add back PFM but use ChannelKeeper instead of IBCFeeKeeper

commit 250b715
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Tue May 16 17:32:45 2023 -0500

    remove buildx context

commit 2491a44
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Tue May 16 17:19:04 2023 -0500

    Remove buildx cache

commit 05ac719
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Tue May 16 17:10:02 2023 -0500

    Add back IBCHooks

commit 6c710f4
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Tue May 16 16:49:33 2023 -0500

    Docker with cache

commit 9eea99c
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Tue May 16 16:36:28 2023 -0500

    Force Flush IBC Packets to Ack

commit c58c1c5
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 15 15:03:13 2023 -0500

    Remove ibchooks & PFM fully

commit 1fbc827
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 15 13:59:01 2023 -0500

    Remove PFM for debugging

commit e05632f
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 15 13:58:20 2023 -0500

    Re-enable v47 GRPC

commit 4a9cfb9
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 15 13:49:56 2023 -0500

    Use rly

commit 0af3267
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 15 13:16:26 2023 -0500

    go mod tidy

commit 5fc2290
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 15 13:13:36 2023 -0500

    Use rly instead of hermes

commit 026f50b
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 15 13:01:30 2023 -0500

    Fix ictest to use local image

commit 9870e28
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 15 12:58:40 2023 -0500

    Only build docker on merge to main branch

commit 9bea7be
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 15 12:53:58 2023 -0500

    See if this fixes v47 test

commit f1ead43
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Sun May 14 12:01:04 2023 -0500

    workflow tweaks

commit e0f0548
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Sun May 14 11:57:59 2023 -0500

    Empty-Commit

commit a185c67
Merge: e060d98 cdaf3ff
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Sun May 14 11:52:34 2023 -0500

    Merge branch '47-upgrade' of github.com:CosmosContracts/juno into 47-upgrade

commit e060d98
Merge: c2465cc 8e2efdf
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Sun May 14 11:52:28 2023 -0500

    merge main

commit cdaf3ff
Author: Reece Williams <31943163+Reecepbcups@users.noreply.github.com>
Date:   Fri May 12 22:08:20 2023 -0500

    Download dependencies (#673)

commit c2465cc
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 12 21:42:38 2023 -0500

    Fix upgrade test (SDK 45 genesis + longer height delta)

commit fc3b870
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 12 16:09:12 2023 -0500

    If mod files are edited, ICtest

commit ea26513
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 12 16:05:44 2023 -0500

    mod tidy

commit d7570f3
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 12 15:56:05 2023 -0500

    new Cmds: rosetta & AuxToFee

commit 64383e6
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 12 15:55:49 2023 -0500

    setPostHandler & configurator

commit bdb8ca2
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 12 11:15:03 2023 -0500

    Remove duplicate arg

commit 99cc71a
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 12 11:10:43 2023 -0500

    MsgSudoContract govv1 proposal ictest

commit aa085d6
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 12 09:53:20 2023 -0500

    Use ictest IBC conformance for v47

commit 10f1282
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 12 09:25:12 2023 -0500

    add IBC + wasm upgrade handler param keys

commit cdfaf6f
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 23:46:49 2023 -0500

    gomod tidy ictest

commit e0ee77a
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 23:31:10 2023 -0500

    Cleanup node, dep bump, reuse initParamsKeeper

commit a15730c
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 21:49:26 2023 -0500

    We do wasm integration CI elsewhere now

commit 48a209f
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 14:52:15 2023 -0500

    Use CreateThisBranchChain for all test (excl IBC)

commit 7e54dbb
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 14:51:27 2023 -0500

    fix ictest gas issues (my fork)

commit c5c5faf
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 13:34:20 2023 -0500

    lint

commit 1c3bac7
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 13:33:26 2023 -0500

    Add rough outline for v47 upgrade handler + hide paramsKeeper.Subspace

commit 64f29cd
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 13:33:01 2023 -0500

    remove broadcastest events which are now in baseapp

commit e6836c9
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 13:32:43 2023 -0500

    Remove staking subspace, hardcode ujuno for now

commit d729914
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 13:32:18 2023 -0500

    Add newer gRPC service support

commit fe1792a
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 13:31:51 2023 -0500

    remove ante gov filter (v47 does in gov mod)

commit d82d468
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 13:31:36 2023 -0500

    comments

commit 62c7e74
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 12:06:55 2023 -0500

    linter linter linter linter

commit 14cf293
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Thu May 11 12:00:55 2023 -0500

    FIXES ALL TEST OH MY GOSH FINALLY WOW MUCH FUN

commit ed74b32
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 21:37:26 2023 -0500

    Fix some ictest (new genesis) & crisis upgrade store key

commit c37f4fb
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 20:59:04 2023 -0500

    Fix x/mint MOduleAccount test

commit 41bbab5
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 20:53:13 2023 -0500

    Fixes a lot of test (Tokenfactory & some mint/feeshare still broken)

commit 4ab7b21
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 16:22:01 2023 -0500

    fix version complaints from dep review

commit 822f4ff
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 16:16:27 2023 -0500

    initial ICTest conversion (v7 main)

commit e1183eb
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 15:26:30 2023 -0500

    modified v15 upgrade handler (ICQ + consensus modules). Normal block times

commit 64b40e9
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 15:18:14 2023 -0500

    lint

commit e7813b6
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 09:50:09 2023 -0500

    Remove old debug code for gov test

commit d65da17
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 09:39:31 2023 -0500

    Unity contract CI in house (ictest)

commit e3e2279
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Tue May 9 16:40:03 2023 -0500

    only test simulate on merge of PR

commit d4bf9d6
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Tue May 9 16:39:42 2023 -0500

    cleanup old comments

commit 060512a
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Tue May 9 16:21:05 2023 -0500

    Adds FeeShare interchain test

commit 66ca9d2
Merge: eccf42a cc2988b
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 15:07:06 2023 -0500

    Merge branch 'reece/gov-feeshare' into 47-upgrade

commit eccf42a
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 15:05:44 2023 -0500

    Fix imported tokenfactory minor touchup

commit 623074d
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Wed May 10 15:01:31 2023 -0500

    Squashed commit of the following:

    commit 641c831
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Fri May 5 19:08:20 2023 -0500

        Patch swagger gen bash file for new TF location (local repo)

    commit 3e70212
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Fri May 5 18:28:40 2023 -0500

        Add Tokenfactory Bindings test (contract)

    commit c4aadbe
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Fri May 5 18:28:17 2023 -0500

        remove duplicaet go.mod replace

    commit e8af80c
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Fri May 5 16:18:08 2023 -0500

        mod tidy ictest

    commit 354d952
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Fri May 5 16:11:15 2023 -0500

        ictest: checkout before go install (use cache)

    commit 74c306c
    Merge: 72f387a ae4319e
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Fri May 5 16:09:47 2023 -0500

        Merge branch 'main' into reece/v15-tokenfactory

    commit 72f387a
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Fri May 5 16:03:40 2023 -0500

        Squashed commit of the following:

        commit ae4319e
        Merge: 9f115e0 1dd7111
        Author: Jacob Gadikian <jacobgadikian@gmail.com>
        Date:   Sat May 6 03:20:25 2023 +0700

            Merge pull request #634 from CosmosContracts/reece/v15-initial

            [v15] Upgrade, Faster Blocks, TF ConsumeGas

        commit 1dd7111
        Merge: b2d2b40 9f115e0
        Author: Jacob Gadikian <jacobgadikian@gmail.com>
        Date:   Fri May 5 23:05:45 2023 +0700

            Merge branch 'main' into reece/v15-initial

        commit b2d2b40
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Mon May 1 21:38:59 2023 -0500

            Run ictest file on yml changes

        commit e057943
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Mon May 1 21:37:04 2023 -0500

            Speed up ICtest with parent go cache

        commit 19e774a
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Mon May 1 21:29:59 2023 -0500

            gomod: minor version bumps

        commit a657696
        Merge: 99ec351 e3fed4d
        Author: Reece Williams <31943163+Reecepbcups@users.noreply.github.com>
        Date:   Fri Apr 28 10:06:52 2023 -0500

            Merge branch 'main' into reece/v15-initial

        commit 99ec351
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Mon Apr 24 19:28:11 2023 -0500

            Cleanup v15 Upgrade handler

        commit fe1f6ad
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Mon Apr 24 18:05:00 2023 -0500

            timeoutCommit := 2 seconds

        commit 0f024c9
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Mon Apr 24 17:42:53 2023 -0500

            fix test to use defaults

        commit f52495c
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Mon Apr 24 15:08:15 2023 -0500

            Double slashing window to 20,000 blocks

        commit a400d8c
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 22 12:13:16 2023 -0500

            Be explicit with enabled TF Capabilities

        commit 1ace8d1
        Merge: 86ca361 e57bc00
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 22 08:11:28 2023 -0500

            Merge branch 'main' into reece/v15-initial

        commit 86ca361
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 22 08:10:33 2023 -0500

            bump token-factory to better create_denom logic

        commit f8596ea
        Merge: c49e1e8 9885a8c
        Author: Jacob Gadikian <jacobgadikian@gmail.com>
        Date:   Wed Apr 12 02:19:24 2023 +0700

            Merge branch 'main' into reece/v15-initial

        commit c49e1e8
        Merge: 286849a 7033eb5
        Author: Jacob Gadikian <jacobgadikian@gmail.com>
        Date:   Mon Apr 10 22:30:46 2023 +0700

            Merge pull request #635 from CosmosContracts/reece/v15-upgraded-tf

            [v15] TokenFactory DenomCreation: GasConsume

        commit 7033eb5
        Merge: b27e762 286849a
        Author: Jacob Gadikian <jacobgadikian@gmail.com>
        Date:   Mon Apr 10 22:25:46 2023 +0700

            Merge branch 'reece/v15-initial' into reece/v15-upgraded-tf

        commit 286849a
        Merge: 9aa1bca 5d5160a
        Author: Jacob Gadikian <jacobgadikian@gmail.com>
        Date:   Mon Apr 10 22:20:53 2023 +0700

            Merge pull request #637 from CosmosContracts/reece/v15-faster-block-times

            [v15] Forced Faster Block Times (3 seconds)

        commit 5d5160a
        Merge: d187c49 9aa1bca
        Author: Jacob Gadikian <jacobgadikian@gmail.com>
        Date:   Mon Apr 10 22:19:01 2023 +0700

            Merge branch 'reece/v15-initial' into reece/v15-faster-block-times

        commit 9aa1bca
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sun Apr 9 17:29:16 2023 -0500

            Updates v15 ROADMAP

        commit b27e762
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 8 18:04:13 2023 -0500

            Auto bumps swagger version based off go.mod (v15)

        commit 792661c
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 8 18:03:35 2023 -0500

            Adds protoc swagger install instructions

        commit 9478c16
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 8 17:45:47 2023 -0500

            regen swagger

        commit 86db854
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 8 13:03:16 2023 -0500

            Switch back to osmosis proto schem for `osmosisstd` lib

        commit 0e5c437
        Merge: 9ddc12f 0b27af1
        Author: Reece Williams <31943163+Reecepbcups@users.noreply.github.com>
        Date:   Sat Apr 8 12:10:48 2023 -0500

            Merge branch 'reece/v15-initial' into reece/v15-upgraded-tf

        commit d187c49
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 8 12:10:03 2023 -0500

            remove testing

        commit 44f889d
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 8 12:07:29 2023 -0500

            Ignore lint for pulled out SDK func errcheck

        commit a0c6584
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 8 12:02:40 2023 -0500

            Forces 3 second block timeout. `Not pretty but its honest work`

        commit 0b27af1
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 8 11:49:35 2023 -0500

            minor: fix test_node script

        commit 38ba7b5
        Merge: 2a91d0f cd0e46c
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Sat Apr 8 09:13:11 2023 -0500

            Merge branch 'main' into reece/v15-initial

        commit 9ddc12f
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Fri Apr 7 10:26:10 2023 -0500

            Add tokenFactoryCapabilities (all enabled)

        commit 8a7f77c
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Fri Apr 7 01:07:50 2023 -0500

            set DenomCreationGasConsume param directly

        commit d3e3137
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Apr 5 21:45:22 2023 -0500

            mod tidy

        commit 932919d
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Apr 5 21:41:51 2023 -0500

            Regen swagger

        commit 65d1ec8
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Apr 5 21:41:45 2023 -0500

            Migrates to CosmosTokenFactory/token-factory

        commit 595249d
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Apr 5 21:34:05 2023 -0500

            Uses new shared repo for tokenfactory. Adds gas cost

        commit 2a91d0f
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Apr 5 21:01:27 2023 -0500

            lint upgrades.go

        commit e51ca82
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Apr 5 21:00:41 2023 -0500

            Modify chain test to ensure we 2x blocks per year

        commit ac38446
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Apr 5 21:00:04 2023 -0500

            v15 upgrade handler

        commit dd43d70
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Apr 5 20:59:43 2023 -0500

            bump vers

        commit 0b3ad3f
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Apr 5 20:34:38 2023 -0500

            bump to v15

        commit b357073
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Mon Apr 3 12:19:50 2023 -0500

            Remove temp upgradeHandler for Uni

        commit 84a10e3
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Fri Mar 31 20:46:06 2023 -0500

            Move univ14part2 before v14, is it incorrectly applying in ictest?

        commit f6078af
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Fri Mar 31 20:30:29 2023 -0500

            Adds temp Uni-6 v14 part 2 upgrade handler (for safety)

        commit b7ac1a8
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Fri Mar 31 20:12:29 2023 -0500

            Cancel ictest on new commit push

        commit 2ab8b83
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Fri Mar 31 09:29:42 2023 -0500

            bump gogoproto

        commit 86a1a83
        Author: Barry Plunkett <barry@skip.money>
        Date:   Fri Mar 31 10:26:49 2023 -0400

            (chore): bump mev-tendermint version (#630)

        commit 1cf03bc
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Thu Mar 30 16:06:11 2023 -0500

            GlobalFee Bypass: MsgTimeout & MsgTimeoutOnClose

        commit dc98b61
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Mar 29 14:05:47 2023 -0500

            Revert "Fix ibchooks to use its correct ModuleName. How did this get past CI until now??"

            This reverts commit 0820813.

        commit 0820813
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Mar 29 13:31:44 2023 -0500

            Fix ibchooks to use its correct ModuleName. How did this get past CI until now??

        commit c2382d9
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Mar 29 13:31:25 2023 -0500

            remove old temp things

        commit 0b6f96c
        Author: Nikhil Vasan <97126437+nivasan1@users.noreply.github.com>
        Date:   Wed Mar 29 13:59:49 2023 -0400

            include mev-cometbft instead of tendermint (#627)

        commit 618db4a
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Mar 29 12:55:12 2023 -0500

            Fix TestBasicJunoStart

        commit f403b58
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Mar 29 12:34:04 2023 -0500

            uni do empty upgrades

        commit 039b17c
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Mar 29 12:33:00 2023 -0500

            lint && gofmt

        commit 434303e
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Mar 29 11:40:10 2023 -0500

            Adds a Uni-6 part2 upgrade handler

        commit 51ec752
        Author: Reece Williams <reecepbcups@gmail.com>
        Date:   Wed Mar 29 11:19:45 2023 -0500

            Adds cosmwasm_1_2 wasmd feature

    commit 350a172
    Merge: 0df4b1d 9f115e0
    Author: Jacob Gadikian <jacobgadikian@gmail.com>
    Date:   Fri May 5 23:06:37 2023 +0700

        Merge branch 'main' into reece/v15-tokenfactory

    commit 0df4b1d
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Thu May 4 16:09:42 2023 -0500

        rename ictest e2e name

    commit fa06165
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Thu May 4 16:06:29 2023 -0500

        mod tidy

    commit 5835368
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Thu May 4 16:03:02 2023 -0500

        Add Tokenfactory e2e CI

    commit e711d40
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Thu May 4 11:03:43 2023 -0500

        ictest: tokenfactory initial

    commit 8126994
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Thu May 4 09:50:30 2023 -0500

        move CosmosTokenFactory into Juno x/

    commit f335494
    Author: Reece Williams <reecepbcups@gmail.com>
    Date:   Thu May 4 09:24:59 2023 -0500

        Squash Merged 'reece/v15-initial' branch

commit d0b4503
Merge: 2d3c154 ae4319e
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Sat May 6 22:27:08 2023 +0700

    Merge remote-tracking branch 'origin/main' into 47-upgrade

commit cc2988b
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri May 5 15:51:15 2023 -0500

    Allow gov contracts to be self registered

commit 2d3c154
Merge: 0c0c7f0 9f115e0
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Fri May 5 23:07:30 2023 +0700

    Merge branch 'main' into 47-upgrade

commit 0c0c7f0
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Mon May 1 21:24:07 2023 -0500

    Cleanup old comments, Fix make TM_VERSION build flag

commit f428ee4
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Sat Apr 29 12:54:21 2023 +0700

    pass the linter

commit 6fa6429
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Sat Apr 29 12:32:26 2023 +0700

    comply with golangci-lint

commit 8ee0735
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Sat Apr 29 11:35:46 2023 +0700

    golangci-lint run ./... --fix

commit 97e1e09
Merge: d55d91a e3fed4d
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Sat Apr 29 11:22:51 2023 +0700

    Merge branch 'main' into 47-upgrade

commit d55d91a
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 21:07:01 2023 -0500

    Staking WithKeyTable for GlobalFee

commit 5341011
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 21:05:30 2023 -0500

    Add icqtypes to params keeper

commit 149fd5c
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 21:01:51 2023 -0500

    Fix IBC Keeper (ibcexported type)

commit c47ccb6
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 20:58:06 2023 -0500

    Consensus Module, StakingKeeper pointer, test_node genesis cmds

commit 0a475b1
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 20:57:37 2023 -0500

    wasmtypes.WasmConfig

commit e034a2e
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 20:28:47 2023 -0500

    Fix CollectGenTxsCmd (+script), sort keys

commit c833917
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 20:10:55 2023 -0500

    Fix app.go + test-suite stakingHandler

commit 593bfe1
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 19:17:37 2023 -0500

    Upgrade ictest to v7 (main) - WIP

commit a07c1e4
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 18:58:10 2023 -0500

    abci CommitInfo, wasmkeeper.NewMsgServerImpl

commit 42170c1
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 18:57:45 2023 -0500

    Comment out legacy x/mint querier

commit dbe6b10
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 18:49:35 2023 -0500

    Remove Osmo Utils (keeping ibc.go file for ibc-hooks()

commit 320fa68
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 18:38:30 2023 -0500

    fix ibc-hooks wasm keeper + test

commit f8e1309
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 18:23:55 2023 -0500

    Fix gov spam filter

commit 9e7f3f5
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 18:20:06 2023 -0500

    globalfee: rm Route & LegacyQuerierHandler

commit 3aa2c87
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 18:14:53 2023 -0500

    Fix test: encoding, appkeepers + simulation

commit 63b6db1
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 18:02:59 2023 -0500

    fix sim_test

commit 13a5ed4
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 17:54:07 2023 -0500

    Fix maccPerms, appModules&Simulation, ibcexported

commit 2f0866e
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 17:19:17 2023 -0500

    Fix 99% of tokenfactory module

commit af39cfd
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 17:00:21 2023 -0500

    Fix IBC-Hooks to match IBCv7 spec

commit 21f5941
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 16:51:04 2023 -0500

    Fix keepers, add ibchost key

commit 4a164a6
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 15:57:53 2023 -0500

    storetypes, ConsensusParams, test_helpers

commit 62d5df5
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 15:38:42 2023 -0500

    Fix root.go

commit ed18a69
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 15:15:57 2023 -0500

    Fix icagenesistypes

commit d80493c
Author: Reece Williams <reecepbcups@gmail.com>
Date:   Fri Apr 28 15:12:03 2023 -0500

    Fix some test, fix root.go InterceptConfigsPreRunHandler

commit a920127
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Thu Apr 27 13:26:48 2023 +0700

    pre-merge changes

commit d23d590
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Tue Apr 25 12:14:46 2023 +0700

    cleanup of imports

commit 8b935e4
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 15:13:08 2023 +0700

    add simulation params for token factory

commit 269a080
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 15:07:59 2023 +0700

    storetypes for keys

commit 9b6f36d
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 15:06:55 2023 +0700

    remove randomized params for token factory

commit d56bae1
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:59:34 2023 +0700

    use storetypes

commit 4ed89fa
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:57:33 2023 +0700

    errors module

commit 229e327
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:48:24 2023 +0700

    sdkerrors -> errorsmod

commit 4d3d350
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:39:16 2023 +0700

    feeshare

commit bbad07f
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:33:22 2023 +0700

    errorsmod

commit da9ff57
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:31:13 2023 +0700

    errorsmod

commit e11adf9
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:14:55 2023 +0700

    use math.Int

commit d4ec850
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:13:17 2023 +0700

    remove x/mint/simulation/params.go

commit 6068e92
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:12:26 2023 +0700

    remove randomized parameters

commit 0eaa951
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:11:42 2023 +0700

    remove querier

commit b58641e
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:11:01 2023 +0700

    use a global for ModuleManager so we can access it

commit 7ad4ec8
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:06:37 2023 +0700

    nodeservice

commit b9d1cab
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:05:17 2023 +0700

    fix RegisterTendermintService

commit c8bfbe9
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:04:17 2023 +0700

    don't send needless params to setup

commit 37005ad
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:01:57 2023 +0700

    tidy

commit 8f79106
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 14:00:52 2023 +0700

    tidy finally

commit ae0944f
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 13:55:25 2023 +0700

    use ibc-go v7 in osmoutils

commit 3b7701d
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 13:32:01 2023 +0700

    add osmoutils and change import paths

commit c429f1b
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 13:27:58 2023 +0700

    fix simapp import path

commit 48de4c4
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 13:27:04 2023 +0700

    upgrade tests

commit b6efe81
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 13:17:29 2023 +0700

    resolve import of an old juno

commit d490dbb
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 12:57:46 2023 +0700

    module import versioning

commit e2932e2
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 12:51:50 2023 +0700

    tidy

commit ba4623a
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 12:50:17 2023 +0700

    correct the token factory module path

commit ab9580c
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 12:42:17 2023 +0700

    add ibc hooks

commit c5d4aa7
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 12:21:35 2023 +0700

    add modules

commit dd92574
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 12:04:32 2023 +0700

    add global fee module to juno's repository directly

commit 0268fa7
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 11:41:49 2023 +0700

    add token factory

commit 41d65ee
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Mon Apr 24 11:41:22 2023 +0700

    sdk 47 upgrade

commit 3af562b
Merge: 331a47a a400d8c
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Sun Apr 23 21:30:29 2023 +0700

    Merge remote-tracking branch 'origin/reece/v15-initial' into async-icq

commit 331a47a
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Wed Apr 12 03:17:47 2023 +0700

    return the accepted stargate queries for contracts to their correct
    location

commit a431cc3
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Wed Apr 12 02:51:57 2023 +0700

    create icq module, and add to ibc router

commit 2aefeef
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Wed Apr 12 02:49:22 2023 +0700

    save keepers.go

commit 6707a03
Author: Jacob Gadikian <jacobgadikian@gmail.com>
Date:   Wed Apr 12 02:45:20 2023 +0700

    add async-icq support to juno
  • Loading branch information
@Reecepbcups
Reecepbcups committed May 17, 2023
1 parent 6cd8ca8 commit dfb88b2
Show file tree
Hide file tree
Showing 13 changed files with 178 additions and 64 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/build_docker.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ name: Build Docker Image on PR

on:
push:
paths:
- "**docker**"
- "**.sh"
- "**.bash"
branches:
- master
- main

env:
REGISTRY: ghcr.io
Expand Down
20 changes: 10 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,37 +122,37 @@ benchmark:
###############################################################################

# Executes basic chain tests via interchaintest
ictest-basic:
ictest-basic: rm-testcache
cd interchaintest && go test -race -v -run TestBasicJunoStart .

ictest-tokenfactory:
ictest-tokenfactory: rm-testcache
cd interchaintest && go test -race -v -run TestJunoTokenFactory .

ictest-feeshare:
ictest-feeshare: rm-testcache
cd interchaintest && go test -race -v -run TestJunoFeeShare .

# Executes a basic chain upgrade test via interchaintest
ictest-upgrade:
ictest-upgrade: rm-testcache
cd interchaintest && go test -race -v -run TestBasicJunoUpgrade .

# Executes a basic chain upgrade locally via interchaintest after compiling a local image as juno:local
ictest-upgrade-local: local-image ictest-upgrade

# Executes IBC tests via interchaintest
ictest-ibc:
ictest-ibc: rm-testcache
cd interchaintest && go test -race -v -run TestJunoGaiaIBCTransfer .

# Unity contract CI
ictest-unity-deploy:
ictest-unity-deploy: rm-testcache
cd interchaintest && go test -race -v -run TestJunoUnityContractDeploy .

ictest-unity-gov:
ictest-unity-gov: rm-testcache
cd interchaintest && go test -race -v -run TestJunoUnityContractGovSubmit .

# Executes all tests via interchaintest after compling a local image as juno:local
ictest-all: local-image ictest-basic ictest-upgrade ictest-ibc
rm-testcache:
go clean -testcache

.PHONY: test-mutation ictest-basic ictest-upgrade ictest-ibc ictest-all
.PHONY: test-mutation ictest-basic ictest-upgrade ictest-ibc ictest-unity-deploy ictest-unity-gov

###############################################################################
### heighliner ###
Expand Down
3 changes: 2 additions & 1 deletion app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (

autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"

"github.com/CosmosContracts/juno/v15/app/openapiconsole"
"github.com/CosmosContracts/juno/v15/docs"
dbm "github.com/cometbft/cometbft-db"
Expand All @@ -25,7 +27,6 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/runtime"
runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"
"github.com/cosmos/cosmos-sdk/server/api"
"github.com/cosmos/cosmos-sdk/server/config"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
Expand Down
62 changes: 38 additions & 24 deletions app/keepers/keepers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ package keepers
import (
"path/filepath"

ibchookstypes "github.com/CosmosContracts/juno/v15/x/ibchooks/types"
"github.com/spf13/cast"

sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/CosmWasm/wasmd/x/wasm"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
ibchooks "github.com/CosmosContracts/juno/v15/x/ibchooks"

"github.com/CosmosContracts/juno/v15/x/ibchooks"
ibchookskeeper "github.com/CosmosContracts/juno/v15/x/ibchooks/keeper"
ibchookstypes "github.com/CosmosContracts/juno/v15/x/ibchooks/types"
mintkeeper "github.com/CosmosContracts/juno/v15/x/mint/keeper"
minttypes "github.com/CosmosContracts/juno/v15/x/mint/types"
"github.com/cosmos/cosmos-sdk/baseapp"
Expand All @@ -18,7 +21,6 @@ import (
"github.com/cosmos/cosmos-sdk/server"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
Expand Down Expand Up @@ -360,6 +362,16 @@ func NewAppKeepers(
appKeepers.Ics20WasmHooks,
)

appKeepers.IBCFeeKeeper = ibcfeekeeper.NewKeeper(
appCodec,
appKeepers.keys[ibcfeetypes.StoreKey],
appKeepers.HooksICS4Wrapper, // replaced with IBC middleware
appKeepers.IBCKeeper.ChannelKeeper,
&appKeepers.IBCKeeper.PortKeeper,
appKeepers.AccountKeeper,
appKeepers.BankKeeper,
)

// Initialize packet forward middleware router
appKeepers.PacketForwardKeeper = packetforwardkeeper.NewKeeper(
appCodec, appKeepers.keys[packetforwardtypes.StoreKey],
Expand All @@ -369,17 +381,8 @@ func NewAppKeepers(
appKeepers.DistrKeeper,
appKeepers.BankKeeper,
// The ICS4Wrapper is replaced by the IBCFeeKeeper instead of the channel so that sending can be overridden by the middleware
&appKeepers.IBCFeeKeeper,
)

appKeepers.IBCFeeKeeper = ibcfeekeeper.NewKeeper(
appCodec,
appKeepers.keys[ibcfeetypes.StoreKey],
appKeepers.HooksICS4Wrapper, // replaced with IBC middleware
// &appKeepers.IBCFeeKeeper,
appKeepers.IBCKeeper.ChannelKeeper,
&appKeepers.IBCKeeper.PortKeeper,
appKeepers.AccountKeeper,
appKeepers.BankKeeper,
)

// Create Transfer Keepers
Expand Down Expand Up @@ -410,6 +413,18 @@ func NewAppKeepers(

appKeepers.PacketForwardKeeper.SetTransferKeeper(appKeepers.TransferKeeper)

// ICQ Keeper
appKeepers.ICQKeeper = icqkeeper.NewKeeper(
appCodec,
appKeepers.keys[icqtypes.StoreKey],
appKeepers.GetSubspace(icqtypes.ModuleName),
appKeepers.IBCKeeper.ChannelKeeper, // may be replaced with middleware
appKeepers.IBCKeeper.ChannelKeeper,
&appKeepers.IBCKeeper.PortKeeper,
scopedICQKeeper,
NewQuerierWrapper(bApp),
)

appKeepers.ICAHostKeeper = icahostkeeper.NewKeeper(
appCodec,
appKeepers.keys[icahosttypes.StoreKey],
Expand All @@ -430,13 +445,6 @@ func NewAppKeepers(
scopedICAControllerKeeper, bApp.MsgServiceRouter(),
)

icaHostIBCModule := icahost.NewIBCModule(appKeepers.ICAHostKeeper)

// initialize ICA module with mock module as the authentication module on the controller side
var icaControllerStack porttypes.IBCModule
icaControllerStack = icacontroller.NewIBCMiddleware(icaControllerStack, appKeepers.ICAControllerKeeper)
icaControllerStack = ibcfee.NewIBCMiddleware(icaControllerStack, appKeepers.IBCFeeKeeper)

// Create evidence Keeper for to register the IBC light client misbehaviour evidence route
evidenceKeeper := evidencekeeper.NewKeeper(
appCodec, appKeepers.keys[evidencetypes.StoreKey], appKeepers.StakingKeeper, appKeepers.SlashingKeeper,
Expand Down Expand Up @@ -538,19 +546,26 @@ func NewAppKeepers(
// Create Transfer Stack
var transferStack porttypes.IBCModule
transferStack = transfer.NewIBCModule(appKeepers.TransferKeeper)
transferStack = ibcfee.NewIBCMiddleware(transferStack, appKeepers.IBCFeeKeeper)
transferStack = ibchooks.NewIBCMiddleware(transferStack, &appKeepers.HooksICS4Wrapper)
transferStack = packetforward.NewIBCMiddleware(
transferStack,
appKeepers.PacketForwardKeeper,
0,
packetforwardkeeper.DefaultForwardTransferPacketTimeoutTimestamp,
packetforwardkeeper.DefaultRefundTransferPacketTimeoutTimestamp,
)
transferStack = ibcfee.NewIBCMiddleware(transferStack, appKeepers.IBCFeeKeeper)
transferStack = ibchooks.NewIBCMiddleware(transferStack, &appKeepers.HooksICS4Wrapper)

// initialize ICA module with mock module as the authentication module on the controller side
var icaControllerStack porttypes.IBCModule
icaControllerStack = icacontroller.NewIBCMiddleware(icaControllerStack, appKeepers.ICAControllerKeeper)
icaControllerStack = ibcfee.NewIBCMiddleware(icaControllerStack, appKeepers.IBCFeeKeeper)

// RecvPacket, message that originates from core IBC and goes down to app, the flow is:
// channel.RecvPacket -> fee.OnRecvPacket -> icaHost.OnRecvPacket
icaHostStack := ibcfee.NewIBCMiddleware(icaHostIBCModule, appKeepers.IBCFeeKeeper)
var icaHostStack porttypes.IBCModule
icaHostStack = icahost.NewIBCModule(appKeepers.ICAHostKeeper)
icaHostStack = ibcfee.NewIBCMiddleware(icaHostStack, appKeepers.IBCFeeKeeper)

// Create fee enabled wasm ibc Stack
var wasmStack porttypes.IBCModule
Expand All @@ -567,7 +582,6 @@ func NewAppKeepers(
AddRoute(icacontrollertypes.SubModuleName, icaControllerStack).
AddRoute(icahosttypes.SubModuleName, icaHostStack).
AddRoute(icqtypes.ModuleName, icqModule)

appKeepers.IBCKeeper.SetRouter(ibcRouter)

appKeepers.ScopedIBCKeeper = scopedIBCKeeper
Expand Down
5 changes: 4 additions & 1 deletion app/keepers/keys.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ func (appKeepers *AppKeepers) GenerateKeys() {
// non sdk store keys
ibcexported.StoreKey, ibctransfertypes.StoreKey, ibcfeetypes.StoreKey,
wasm.StoreKey, icahosttypes.StoreKey,
icacontrollertypes.StoreKey, icqtypes.StoreKey, packetforwardtypes.StoreKey, ibchookstypes.StoreKey, tokenfactorytypes.StoreKey, feesharetypes.StoreKey,
icacontrollertypes.StoreKey, icqtypes.StoreKey,
packetforwardtypes.StoreKey,
ibchookstypes.StoreKey,
tokenfactorytypes.StoreKey, feesharetypes.StoreKey,
)

appKeepers.tkeys = sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
Expand Down
11 changes: 6 additions & 5 deletions app/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
feeshare "github.com/CosmosContracts/juno/v15/x/feeshare"
feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types"
"github.com/CosmosContracts/juno/v15/x/globalfee"
ibchooks "github.com/CosmosContracts/juno/v15/x/ibchooks"
"github.com/CosmosContracts/juno/v15/x/ibchooks"
ibchookstypes "github.com/CosmosContracts/juno/v15/x/ibchooks/types"
"github.com/CosmosContracts/juno/v15/x/mint"
minttypes "github.com/CosmosContracts/juno/v15/x/mint/types"
Expand Down Expand Up @@ -58,6 +58,7 @@ import (
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
icq "github.com/strangelove-ventures/async-icq/v7"
icqtypes "github.com/strangelove-ventures/async-icq/v7/types"

packetforward "github.com/strangelove-ventures/packet-forward-middleware/v7/router"
packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types"
)
Expand Down Expand Up @@ -135,9 +136,9 @@ func appModules(
feeshare.NewAppModule(app.AppKeepers.FeeShareKeeper, app.AppKeepers.AccountKeeper),
wasm.NewAppModule(appCodec, &app.AppKeepers.WasmKeeper, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)),
ica.NewAppModule(&app.AppKeepers.ICAControllerKeeper, &app.AppKeepers.ICAHostKeeper),
ibchooks.NewAppModule(app.AppKeepers.AccountKeeper),
crisis.NewAppModule(app.AppKeepers.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)),
// IBC modules
ibchooks.NewAppModule(app.AppKeepers.AccountKeeper),
icq.NewAppModule(app.AppKeepers.ICQKeeper),
packetforward.NewAppModule(app.AppKeepers.PacketForwardKeeper),
}
Expand Down Expand Up @@ -195,8 +196,8 @@ func orderBeginBlockers() []string {
vestingtypes.ModuleName,
consensusparamtypes.ModuleName,
// additional modules
ibcexported.ModuleName,
ibctransfertypes.ModuleName,
ibcexported.ModuleName,
icatypes.ModuleName,
packetforwardtypes.ModuleName,
ibcfeetypes.ModuleName,
Expand Down Expand Up @@ -229,8 +230,8 @@ func orderEndBlockers() []string {
vestingtypes.ModuleName,
consensusparamtypes.ModuleName,
// additional non simd modules
ibcexported.ModuleName,
ibctransfertypes.ModuleName,
ibcexported.ModuleName,
icatypes.ModuleName,
packetforwardtypes.ModuleName,
ibcfeetypes.ModuleName,
Expand Down Expand Up @@ -263,8 +264,8 @@ func orderInitBlockers() []string {
feegrant.ModuleName,
consensusparamtypes.ModuleName,
// additional non simd modules
ibcexported.ModuleName,
ibctransfertypes.ModuleName,
ibcexported.ModuleName,
icatypes.ModuleName,
packetforwardtypes.ModuleName,
ibcfeetypes.ModuleName,
Expand Down
1 change: 0 additions & 1 deletion app/upgrades/v13/upgrades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
tokenfactorytypes "github.com/CosmosContracts/juno/v15/x/tokenfactory/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"

packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types"
)

Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
cosmossdk.io/errors v1.0.0-beta.7
cosmossdk.io/math v1.0.0
cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462
github.com/CosmWasm/wasmd v0.40.0-rc.2
github.com/CosmWasm/wasmd v0.40.0-rc.2.0.20230515091654-e36611aa22b6
github.com/cometbft/cometbft v0.37.1
github.com/cometbft/cometbft-db v0.7.0
github.com/cosmos/cosmos-sdk v0.47.2
Expand Down Expand Up @@ -100,7 +100,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/felixge/httpsnoop v1.0.2 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
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=
github.com/CosmWasm/wasmd v0.40.0-rc.2 h1:UgOr8CaitJ8C8Y80viKLT6mL2Xh4yg2X4szCdTVr6xg=
github.com/CosmWasm/wasmd v0.40.0-rc.2/go.mod h1:l2s42GHKp1CHcR0N6J8P6p02b5RMWFCpcmRjyKMtqqg=
github.com/CosmWasm/wasmd v0.40.0-rc.2.0.20230515091654-e36611aa22b6 h1:rnnnJQ14eZrfCCf4rauWasHQulv3dtGkynIisz9HDB8=
github.com/CosmWasm/wasmd v0.40.0-rc.2.0.20230515091654-e36611aa22b6/go.mod h1:frHH5xVukE5xRaJcUNjE+TVPzbuHeV7sPnElR5gcA1w=
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=
Expand Down Expand Up @@ -449,8 +449,8 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
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/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=
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ require (
github.com/CosmosContracts/juno/v15 v15.0.0-00010101000000-000000000000
github.com/cosmos/cosmos-sdk v0.47.2
github.com/cosmos/gogoproto v1.4.8
github.com/cosmos/ibc-go/v7 v7.0.0
github.com/docker/docker v20.10.24+incompatible
github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845
github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230508154211-ebc1cbd6d88e
Expand Down Expand Up @@ -80,7 +81,6 @@ require (
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/iavl v0.20.0 // indirect
github.com/cosmos/ibc-go/v7 v7.0.0 // indirect
github.com/cosmos/ics23/go v0.10.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
Expand Down
Loading

0 comments on commit dfb88b2

Please sign in to comment.