Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@Reecepbcups
Reecepbcups committed May 10, 2023
1 parent d0b4503 commit 623074d
Show file tree
Hide file tree
Showing 26 changed files with 634 additions and 85 deletions.
31 changes: 26 additions & 5 deletions .github/workflows/interchaintest-E2E.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Create Docker Image + E2E Tests
name: ictest E2E

on:
push:
Expand All @@ -21,6 +21,7 @@ concurrency:
cancel-in-progress: true



jobs:
build-and-push-image:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -73,19 +74,22 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max

# make juno:branchname here for all needs.build-and-push-image.outputs.branchTag
# then upload to github. Then download for each as a cache. This way its only built once

test-juno-basic:
runs-on: ubuntu-latest
needs: build-and-push-image
steps:
- name: checkout chain
uses: actions/checkout@v2

- name: Setup Golang with cache
uses: magnetikonline/action-golang-cache@v4
with:
go-version: ${{ env.GO_VERSION }}
id: go

- name: checkout chain
uses: actions/checkout@v2

- run: make ictest-basic
env:
BRANCH_CI: ${{needs.build-and-push-image.outputs.branchTag}}
Expand All @@ -111,15 +115,32 @@ jobs:
runs-on: ubuntu-latest
needs: build-and-push-image
steps:
- name: checkout chain
uses: actions/checkout@v2

- name: Setup Golang with cache
uses: magnetikonline/action-golang-cache@v4
with:
go-version: ${{ env.GO_VERSION }}
id: go

- run: make ictest-upgrade
env:
BRANCH_CI: ${{needs.build-and-push-image.outputs.branchTag}}

test-juno-tokenfactory:
runs-on: ubuntu-latest
needs: build-and-push-image
steps:
- name: checkout chain
uses: actions/checkout@v2

- run: make ictest-upgrade
- name: Setup Golang with cache
uses: magnetikonline/action-golang-cache@v4
with:
go-version: ${{ env.GO_VERSION }}
id: go

- run: make ictest-tokenfactory
env:
BRANCH_CI: ${{needs.build-and-push-image.outputs.branchTag}}
12 changes: 9 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ install: go.sum
build:
go build $(BUILD_FLAGS) -o bin/junod ./cmd/junod

test-node:
CHAIN_ID="local-1" HOME_DIR="~/.juno1" TIMEOUT_COMMIT="500ms" CLEAN=true sh scripts/test_node.sh

###############################################################################
### Testing ###
###############################################################################
Expand All @@ -120,18 +123,21 @@ benchmark:

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

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

# Executes a basic chain upgrade test via interchaintest
ictest-upgrade:
cd tests/interchaintest && go test -race -v -run TestBasicJunoUpgrade .
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:
cd tests/interchaintest && go test -race -v -run TestJunoGaiaIBCTransfer .
cd interchaintest && go test -race -v -run TestJunoGaiaIBCTransfer .

# Executes all tests via interchaintest after compling a local image as juno:local
ictest-all: local-image ictest-basic ictest-upgrade ictest-ibc
Expand Down
14 changes: 14 additions & 0 deletions app/params/weights.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package params

// Simulation parameter constants
const (
StakePerAccount = "stake_per_account"
InitiallyBondedValidators = "initially_bonded_validators"

DefaultWeightMsgCreateDenom int = 100
DefaultWeightMsgMint int = 100
DefaultWeightMsgBurn int = 100
DefaultWeightMsgChangeAdmin int = 100
DefaultWeightMsgSetDenomMetadata int = 100
DefaultWeightMsgForceTransfer int = 100
)
0 tests/interchaintest/chain_start_test.go → interchaintest/chain_start_test.go
View file
File renamed without changes.
0 tests/interchaintest/chain_upgrade_test.go → interchaintest/chain_upgrade_test.go
View file
File renamed without changes.
0 tests/interchaintest/ci_integration.go → interchaintest/ci_integration.go
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions interchaintest/contracts/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Contracts

A list of the contracts here which are pre-compiled in other repos.

> tokenfactory_core.wasm -> <https://github.com/CosmosContracts/tokenfactory-contracts> (PR 8).
Binary file added interchaintest/contracts/tokenfactory_core.wasm
View file
Binary file not shown.
25 changes: 22 additions & 3 deletions tests/interchaintest/go.mod → interchaintest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@ module github.com/CosmosContracts/juno/tests/interchaintest

go 1.19

replace (
github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0

// For this nested module, you always want to replace the parent reference with the current worktree.
github.com/CosmosContracts/juno => ../
github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.2 //indirect

// interchaintest supports ICS features so we need this for now
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.15-ics
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.17
github.com/tendermint/tendermint => github.com/skip-mev/mev-cometbft v0.34.27-mev.18

github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7
)

require (
cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462
github.com/cosmos/ibc-go/v7 v7.0.0
Expand Down Expand Up @@ -51,6 +69,7 @@ require (
github.com/cometbft/cometbft-db v0.7.0 // indirect
github.com/confio/ics23/go v0.9.0 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
github.com/cosmos/cosmos-sdk v0.47.1 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
Expand All @@ -73,14 +92,14 @@ require (
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/docker v20.10.19+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
github.com/ethereum/go-ethereum v1.10.20 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/getsentry/sentry-go v0.17.0 // indirect
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
Expand Down Expand Up @@ -161,7 +180,7 @@ require (
github.com/pierrec/xxHash v0.1.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_golang v1.15.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.40.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
Expand Down Expand Up @@ -232,7 +251,7 @@ require (
replace (

// interchaintest supports ICS features so we need this for now
// github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.13-ics
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.15-ics
github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0
// For this nested module, you always want to replace the parent reference with the current worktree.
Expand Down
Loading

0 comments on commit 623074d

Please sign in to comment.