[future] Move core-1 vesting -> contracts

.github/workflows/interchaintest-E2E.yaml → .github/workflows/interchaintest-E2E.yml

@@ -7,16 +7,19 @@ on:
     branches:
       - '**'
     paths:
+      - '**.yml'
       - '**.go'
       - 'go.sum'
 
 env:
   REGISTRY: ghcr.io  
   IMAGE_NAME: ${{ github.repository }}-e2e
+  GO_VERSION: 1.19
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
+
 
 jobs:
   build-and-push-image:
@@ -31,6 +34,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      # We setup go & cache dependencies here. This way each child job
+      # does not have to reinstall all dependencies individually.
+      - name: Setup Golang with cache
+        uses: magnetikonline/action-golang-cache@v4
+        with:
+          go-version: ${{ env.GO_VERSION }}
+        id: go
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -60,16 +71,16 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max        
 
   test-juno-basic:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v3
+      - name: Setup Golang with cache
+        uses: magnetikonline/action-golang-cache@v4
         with:
-          go-version: 1.19
+          go-version: ${{ env.GO_VERSION }}
         id: go
 
       - name: checkout chain
@@ -83,10 +94,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v3
+      - name: Setup Golang with cache
+        uses: magnetikonline/action-golang-cache@v4
         with:
-          go-version: 1.19
+          go-version: ${{ env.GO_VERSION }}
         id: go
 
       - name: checkout chain
@@ -100,10 +111,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v3
+      - name: Setup Golang with cache
+        uses: magnetikonline/action-golang-cache@v4
         with:
-          go-version: 1.19
+          go-version: ${{ env.GO_VERSION }}
         id: go
 
       - name: checkout chain

ROADMAP.md

@@ -10,12 +10,28 @@ This document contains the roadmap for the Juno project. It is a living document
 - SDK v0.47, Tendermint 0.37
 - IBC v5/6, ICA v3 (optional)
 - [Native Liquid Staking](https://github.com/iqlusioninc/liquidity-staking-module)
-- Faster Block times
 - [Improving the Nakamoto Coefficient](https://github.com/CosmosContracts/juno/issues/474)
 - Wasm based oracle
 
-## V14 - Q2/3 2023
-<!-- - [Medium Blog](https://medium.com/@reecepbcups/juno-v12-update-4bab64640a62) -->
+---
+
+## V15 - End of Q2 2023
+
+<!-- - [Medium Blog](...) -->
+
+<!-- - [V15 Tracking Issue](...) -->
+
+This upgrade focuses entirely on moving Juno's block times from 6 seconds to 3 seconds.
+
+## Features
+
+- 3 second block times (from 6 seconds)
+
+---
+
+## V14 (Aurora) - Early Q2 2023
+
+- [Medium Blog](https://medium.com/@JunoNetwork/jun%C3%B8-aurora-ac67a8143e22)
 
 - [V14 Tracking Issue](https://github.com/CosmosContracts/juno/issues/548)
 
@@ -26,10 +42,11 @@ This update will focus more on upgrading the base layer of the Juno stack, bring
 - IBC-Hooks
 - CosmWasm v0.31
 - WasmVM v1.2.1
-- Global Minimum Fees (governance set)
+- Global Minimum Fees (governance controlled)
+- Feeless IBC Relaying
 - TokenFactory: burnFrom, burnTo, ForceTransfer
 - [Interchain test](https://github.com/strangelove-ventures/interchaintest)
-- Using [Skip's MEV Tendermint fork](https://github.com/skip-mev/mev-tendermint) by default
+- Using [Skip's MEV Tendermint fork](https://github.com/skip-mev/mev-cometbft) by default
 
 ---
 

app/ante.go

@@ -14,10 +14,10 @@ import (
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 
 	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	decorators "github.com/CosmosContracts/juno/v14/app/decorators"
+	decorators "github.com/CosmosContracts/juno/v15/app/decorators"
 
-	feeshareante "github.com/CosmosContracts/juno/v14/x/feeshare/ante"
-	feesharekeeper "github.com/CosmosContracts/juno/v14/x/feeshare/keeper"
+	feeshareante "github.com/CosmosContracts/juno/v15/x/feeshare/ante"
+	feesharekeeper "github.com/CosmosContracts/juno/v15/x/feeshare/keeper"
 
 	gaiafeeante "github.com/cosmos/gaia/v9/x/globalfee/ante"
 )

app/app.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/CosmosContracts/juno/v14/app/openapiconsole"
-	"github.com/CosmosContracts/juno/v14/docs"
+	"github.com/CosmosContracts/juno/v15/app/openapiconsole"
+	"github.com/CosmosContracts/juno/v15/docs"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
@@ -55,14 +55,15 @@ import (
 
 	"github.com/cosmos/gaia/v9/x/globalfee"
 
-	"github.com/CosmosContracts/juno/v14/app/keepers"
-	encparams "github.com/CosmosContracts/juno/v14/app/params"
-	upgrades "github.com/CosmosContracts/juno/v14/app/upgrades"
-	v10 "github.com/CosmosContracts/juno/v14/app/upgrades/v10"
-	v11 "github.com/CosmosContracts/juno/v14/app/upgrades/v11"
-	v12 "github.com/CosmosContracts/juno/v14/app/upgrades/v12"
-	v13 "github.com/CosmosContracts/juno/v14/app/upgrades/v13"
-	v14 "github.com/CosmosContracts/juno/v14/app/upgrades/v14"
+	"github.com/CosmosContracts/juno/v15/app/keepers"
+	encparams "github.com/CosmosContracts/juno/v15/app/params"
+	upgrades "github.com/CosmosContracts/juno/v15/app/upgrades"
+	v10 "github.com/CosmosContracts/juno/v15/app/upgrades/v10"
+	v11 "github.com/CosmosContracts/juno/v15/app/upgrades/v11"
+	v12 "github.com/CosmosContracts/juno/v15/app/upgrades/v12"
+	v13 "github.com/CosmosContracts/juno/v15/app/upgrades/v13"
+	v14 "github.com/CosmosContracts/juno/v15/app/upgrades/v14"
+	v15 "github.com/CosmosContracts/juno/v15/app/upgrades/v15"
 )
 
 const (
@@ -83,7 +84,7 @@ var (
 	// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
 	EnableSpecificProposals = ""
 
-	Upgrades = []upgrades.Upgrade{v10.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade, v14.Upgrade}
+	Upgrades = []upgrades.Upgrade{v10.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade, v14.Upgrade, v15.Upgrade}
 )
 
 // These constants are derived from the above variables.

app/encoding.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"github.com/CosmosContracts/juno/v14/app/params"
+	"github.com/CosmosContracts/juno/v15/app/params"
 
 	"github.com/cosmos/cosmos-sdk/std"
 )

app/keepers/keepers.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
-	mintkeeper "github.com/CosmosContracts/juno/v14/x/mint/keeper"
-	minttypes "github.com/CosmosContracts/juno/v14/x/mint/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"
 	"github.com/cosmos/cosmos-sdk/codec"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
@@ -61,16 +61,16 @@ import (
 	packetforwardkeeper "github.com/strangelove-ventures/packet-forward-middleware/v4/router/keeper"
 	packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
 
-	"github.com/CosmWasm/token-factory/x/tokenfactory/bindings"
-	tokenfactorykeeper "github.com/CosmWasm/token-factory/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/CosmWasm/token-factory/x/tokenfactory/types"
+	"github.com/CosmosTokenFactory/token-factory/x/tokenfactory/bindings"
+	tokenfactorykeeper "github.com/CosmosTokenFactory/token-factory/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/CosmosTokenFactory/token-factory/x/tokenfactory/types"
 
 	icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host"
 	icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper"
 	icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
 
-	feesharekeeper "github.com/CosmosContracts/juno/v14/x/feeshare/keeper"
-	feesharetypes "github.com/CosmosContracts/juno/v14/x/feeshare/types"
+	feesharekeeper "github.com/CosmosContracts/juno/v15/x/feeshare/keeper"
+	feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types"
 
 	// ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts"
 	icacontroller "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller"
@@ -80,6 +80,16 @@ import (
 	"github.com/cosmos/gaia/v9/x/globalfee"
 )
 
+var (
+	wasmCapabilities = "iterator,staking,stargate,token_factory,cosmwasm_1_1,cosmwasm_1_2"
+
+	tokenFactoryCapabilities = []string{
+		tokenfactorytypes.EnableBurnFrom,
+		tokenfactorytypes.EnableForceTransfer,
+		tokenfactorytypes.EnableSetMetadata,
+	}
+)
+
 type AppKeepers struct {
 	// keys to access the substores
 	keys    map[string]*sdk.KVStoreKey
@@ -357,6 +367,7 @@ func NewAppKeepers(
 		appKeepers.AccountKeeper,
 		appKeepers.BankKeeper,
 		appKeepers.DistrKeeper,
+		tokenFactoryCapabilities,
 	)
 
 	wasmDir := filepath.Join(homePath, "data")
@@ -366,8 +377,6 @@ func NewAppKeepers(
 		panic("error while reading wasm config: " + err.Error())
 	}
 
-	// Setup wasm bindings
-	supportedFeatures := "iterator,staking,stargate,cosmwasm_1_1,cosmwasm_1_2,token_factory"
 	// Move custom query of token factory to stargate, still use custom msg which is tfOpts[1]
 	tfOpts := bindings.RegisterCustomPlugins(&appKeepers.BankKeeper, &appKeepers.TokenFactoryKeeper)
 	wasmOpts = append(wasmOpts, tfOpts...)
@@ -418,7 +427,7 @@ func NewAppKeepers(
 		bApp.GRPCQueryRouter(),
 		wasmDir,
 		wasmConfig,
-		supportedFeatures,
+		wasmCapabilities,
 		wasmOpts...,
 	)
 

app/keepers/keys.go

@@ -1,10 +1,10 @@
 package keepers
 
 import (
-	tokenfactorytypes "github.com/CosmWasm/token-factory/x/tokenfactory/types"
 	"github.com/CosmWasm/wasmd/x/wasm"
-	feesharetypes "github.com/CosmosContracts/juno/v14/x/feeshare/types"
-	minttypes "github.com/CosmosContracts/juno/v14/x/mint/types"
+	feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types"
+	minttypes "github.com/CosmosContracts/juno/v15/x/mint/types"
+	tokenfactorytypes "github.com/CosmosTokenFactory/token-factory/x/tokenfactory/types"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"

app/modules.go

@@ -1,14 +1,14 @@
 package app
 
 import (
-	"github.com/CosmWasm/token-factory/x/tokenfactory"
-	tokenfactorytypes "github.com/CosmWasm/token-factory/x/tokenfactory/types"
 	"github.com/CosmWasm/wasmd/x/wasm"
-	encparams "github.com/CosmosContracts/juno/v14/app/params"
-	feeshare "github.com/CosmosContracts/juno/v14/x/feeshare"
-	feesharetypes "github.com/CosmosContracts/juno/v14/x/feeshare/types"
-	"github.com/CosmosContracts/juno/v14/x/mint"
-	minttypes "github.com/CosmosContracts/juno/v14/x/mint/types"
+	encparams "github.com/CosmosContracts/juno/v15/app/params"
+	feeshare "github.com/CosmosContracts/juno/v15/x/feeshare"
+	feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types"
+	"github.com/CosmosContracts/juno/v15/x/mint"
+	minttypes "github.com/CosmosContracts/juno/v15/x/mint/types"
+	"github.com/CosmosTokenFactory/token-factory/x/tokenfactory"
+	tokenfactorytypes "github.com/CosmosTokenFactory/token-factory/x/tokenfactory/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation"

app/test_helpers.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/CosmWasm/wasmd/x/wasm"
 	"github.com/CosmWasm/wasmd/x/wasm/keeper"
-	apphelpers "github.com/CosmosContracts/juno/v14/app/helpers"
-	appparams "github.com/CosmosContracts/juno/v14/app/params"
+	apphelpers "github.com/CosmosContracts/juno/v15/app/helpers"
+	appparams "github.com/CosmosContracts/juno/v15/app/params"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"

app/upgrades/types.go

@@ -3,7 +3,7 @@ package upgrades
 import (
 	"strings"
 
-	"github.com/CosmosContracts/juno/v14/app/keepers"
+	"github.com/CosmosContracts/juno/v15/app/keepers"
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"

app/upgrades/v10/constants.go

@@ -1,7 +1,7 @@
 package v10
 
 import (
-	"github.com/CosmosContracts/juno/v14/app/upgrades"
+	"github.com/CosmosContracts/juno/v15/app/upgrades"
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types"
 	icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"

app/upgrades/v10/upgrades.go

@@ -2,7 +2,7 @@ package v10
 
 import (
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	"github.com/CosmosContracts/juno/v14/app/keepers"
+	"github.com/CosmosContracts/juno/v15/app/keepers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/authz"

app/upgrades/v11/constants.go

@@ -1,7 +1,7 @@
 package v11
 
 import (
-	"github.com/CosmosContracts/juno/v14/app/upgrades"
+	"github.com/CosmosContracts/juno/v15/app/upgrades"
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types"
 	icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"

app/upgrades/v11/upgrades.go

@@ -2,7 +2,7 @@ package v11
 
 import (
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	"github.com/CosmosContracts/juno/v14/app/keepers"
+	"github.com/CosmosContracts/juno/v15/app/keepers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/authz"

app/upgrades/v12/constants.go

@@ -1,7 +1,7 @@
 package v12
 
 import (
-	"github.com/CosmosContracts/juno/v14/app/upgrades"
+	"github.com/CosmosContracts/juno/v15/app/upgrades"
 	store "github.com/cosmos/cosmos-sdk/store/types"
 )
 

app/upgrades/v12/upgrades.go

@@ -1,7 +1,7 @@
 package v12
 
 import (
-	"github.com/CosmosContracts/juno/v14/app/keepers"
+	"github.com/CosmosContracts/juno/v15/app/keepers"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"

app/upgrades/v13/constants.go

@@ -1,9 +1,9 @@
 package v13
 
 import (
-	tokenfactorytypes "github.com/CosmWasm/token-factory/x/tokenfactory/types"
-	"github.com/CosmosContracts/juno/v14/app/upgrades"
-	feesharetypes "github.com/CosmosContracts/juno/v14/x/feeshare/types"
+	"github.com/CosmosContracts/juno/v15/app/upgrades"
+	feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types"
+	tokenfactorytypes "github.com/CosmosTokenFactory/token-factory/x/tokenfactory/types"
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types"
 	ibcfeetypes "github.com/cosmos/ibc-go/v4/modules/apps/29-fee/types"