Merge pull request #620 from fix/consumer-section-v4

neutron-org · Jul 16, 2024 · 683e736 · 683e736
2 parents fb37a4c + b039189
commit 683e736
Show file tree

Hide file tree

Showing 70 changed files with 278 additions and 267 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,6 +2,8 @@ name: CI
 
 on:
   push:
+    tags:
+      - "*"
     branches:
       - "main"
       - "releases/v3.x"
@@ -11,6 +13,12 @@ on:
       - "main"
       - "releases/v3.x"
       - "chore/fix-ci"
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to run the workflow for'
+        required: false
+        default: ''
 
 jobs:
   docker:
@@ -23,6 +31,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.event.inputs.tag || github.ref }}
 
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install -y jq curl git
@@ -44,9 +53,15 @@ jobs:
           curl --silent -L --output ~/.docker/cli-plugins/docker-buildx $BUILDX_URL
           chmod a+x ~/.docker/cli-plugins/docker-buildx
 
-      - name: Get version from git tags
+      - name: Get version from git tags or input
         id: get_version
-        run: echo "VERSION=v$(git describe --tags --abbrev=0 | sed 's/^v//')" >> $GITHUB_ENV
+        run: |
+          if [ -n "${{ github.event.inputs.tag }}" ]; then
+            VERSION=${{ github.event.inputs.tag }}
+          else
+            VERSION=$(git describe --tags --abbrev=0)
+          fi
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Log in to Docker Hub
         run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
@@ -60,16 +75,6 @@ jobs:
           endpoint: "neutronorg/neutron"
           install: true
 
-#      - name: Build and push
-#        uses: docker/build-push-action@v5
-#        with:
-#          context: .
-#          file: Dockerfile.builder
-#          tags: "${{ env.VERSION }}"
-#          # For pull requests, export results to the build cache.
-#          # Otherwise, push to a registry.
-#          outputs: ${{ github.event_name == 'pull_request' && 'type=cacheonly' || 'type=registry,push=true' }}
-
       - name: Build and push Docker image
         env:
           VERSION: ${{ env.VERSION }}
@@ -82,4 +87,3 @@ jobs:
 
       - name: Cleanup temporary container
         run: docker rm -f neutronbinary || true
-
diff --git a/Makefile b/Makefile
@@ -202,15 +202,14 @@ test-sim-multi-seed-short: runsim
 ###############################################################################
 
 lint:
-	golangci-lint run
-	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "*_test.go" | xargs gofmt -d -s
+	golangci-lint run --skip-files ".*.pb.go"
+	find . -name '*.go' -not -name "*.pb.go" -type f -not -path "./vendor*" -not -path "*.git*" -not -path "*_test.go" | xargs gofmt -d -s
 
 format:
 	@go install mvdan.cc/gofumpt@latest
 	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
-	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name "*.pb.go" -not -name "*.pb.gw.go" -not -name "*.pulsar.go" -not -path "./crypto/keys/secp256k1/*" | xargs gofumpt -w -l
-	golangci-lint run --fix
-	goimports -w -local github.com/neutron-org .
+	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name "*.pb.go" -not -name "*.pb.gw.go" -not -name "*.pulsar.go" -not -path "./crypto/keys/secp256k1/*" | xargs -I % sh -c 'gofumpt -w -l % && goimports -w -local github.com/neutron-org %'
+	golangci-lint run --fix --skip-files ".*.pb.go"
 
 .PHONY: format
 

diff --git a/cmd/neutrond/consumer.go b/cmd/neutrond/consumer.go
@@ -57,6 +57,7 @@ func AddConsumerSectionCmd(defaultNodeHome string) *cobra.Command {
 
 				genesisState.Provider.InitialValSet = initialValset
 				genesisState.Provider.ConsensusState.NextValidatorsHash = tmtypes.NewValidatorSet(vals).Hash()
+				state.AppGenesis.Consensus.Validators = []tmtypes.GenesisValidator{{Address: pk.Address(), PubKey: pk, Power: 100}}
 
 				state.ConsumerModuleState = genesisState
 

diff --git a/contracts/neutron_chain_manager.wasm b/contracts/neutron_chain_manager.wasm
diff --git a/contrib/statesync.bash b/contrib/statesync.bash
@@ -70,4 +70,4 @@ NEUTROND_P2P_SEEDS=$(curl -s https://raw.githubusercontent.com/cosmos/chain-regi
 export NEUTROND_P2P_SEEDS
 
 # Start chain.
-neutrond start --x-crisis-skip-assert-invariants --iavl-disable-fastnode false 
+neutrond start --x-crisis-skip-assert-invariants --iavl-disable-fastnode false --minimum-gas-prices 0untrn
diff --git a/go.mod b/go.mod
@@ -14,14 +14,14 @@ require (
 	cosmossdk.io/x/tx v0.13.3
 	cosmossdk.io/x/upgrade v0.1.3
 	github.com/CosmWasm/wasmd v0.51.0
-	github.com/CosmWasm/wasmvm/v2 v2.0.0
+	github.com/CosmWasm/wasmvm/v2 v2.0.1
 	github.com/cometbft/cometbft v0.38.7
 	github.com/cosmos/admin-module/v2 v2.0.0-20240430142959-8b3328d1b1a2
 	github.com/cosmos/cosmos-db v1.0.2
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5
 	github.com/cosmos/cosmos-sdk v0.50.7
 	github.com/cosmos/gogoproto v1.5.0
-	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.1
+	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2
 	github.com/cosmos/ibc-go/modules/capability v1.0.0
 	github.com/cosmos/ibc-go/v8 v8.2.1
 	github.com/cosmos/ics23/go v0.10.0

diff --git a/go.sum b/go.sum
@@ -227,8 +227,8 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/CosmWasm/wasmvm/v2 v2.0.0 h1:IqNCI2G0mvs7K6ej17/I28805rVqnu+Y1cWDqIdwb08=
-github.com/CosmWasm/wasmvm/v2 v2.0.0/go.mod h1:su9lg5qLr7adV95eOfzjZWkGiky8WNaNIHDr7Fpu7Ck=
+github.com/CosmWasm/wasmvm/v2 v2.0.1 h1:0YCQ7MKGNri7NFeRp75erPJXrqyCtH4gdc9jMstyMzk=
+github.com/CosmWasm/wasmvm/v2 v2.0.1/go.mod h1:su9lg5qLr7adV95eOfzjZWkGiky8WNaNIHDr7Fpu7Ck=
 github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ=
@@ -396,8 +396,8 @@ github.com/cosmos/gogoproto v1.5.0 h1:SDVwzEqZDDBoslaeZg+dGE55hdzHfgUA40pEanMh52
 github.com/cosmos/gogoproto v1.5.0/go.mod h1:iUM31aofn3ymidYG6bUR5ZFrk+Om8p5s754eMUcyp8I=
 github.com/cosmos/iavl v1.2.0 h1:kVxTmjTh4k0Dh1VNL046v6BXqKziqMDzxo93oh3kOfM=
 github.com/cosmos/iavl v1.2.0/go.mod h1:HidWWLVAtODJqFD6Hbne2Y0q3SdxByJepHUOeoH4LiI=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.1 h1:BHn+JWZILxkUT9IrlP1ctUfo9ENGi+EmiZ9om1XSHIw=
-github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.1/go.mod h1:82hPO/tRawbuFad2gPwChvpZ0JEIoNi91LwVneAYCeM=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2 h1:dyLNlDElY6+5zW/BT/dO/3Ad9FpQblfh+9dQpYQodbA=
+github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2/go.mod h1:82hPO/tRawbuFad2gPwChvpZ0JEIoNi91LwVneAYCeM=
 github.com/cosmos/ibc-go/modules/capability v1.0.0 h1:r/l++byFtn7jHYa09zlAdSeevo8ci1mVZNO9+V0xsLE=
 github.com/cosmos/ibc-go/modules/capability v1.0.0/go.mod h1:D81ZxzjZAe0ZO5ambnvn1qedsFQ8lOwtqicG6liLBco=
 github.com/cosmos/ibc-go/v8 v8.2.1 h1:MTsnZZjxvGD4Fv5pYyx5UkELafSX0rlPt6IfsE2BpTQ=

diff --git a/testutil/tokenfactory/keeper/tokenfactory.go b/testutil/tokenfactory/keeper/tokenfactory.go
@@ -14,6 +14,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
+	"github.com/neutron-org/neutron/v4/testutil"
 	"github.com/neutron-org/neutron/v4/x/tokenfactory/keeper"
 	"github.com/neutron-org/neutron/v4/x/tokenfactory/types"
 )
@@ -43,7 +44,7 @@ func TokenFactoryKeeper(
 		accountKeeper,
 		bankKeeper,
 		contractKeeper,
-		"authority",
+		testutil.TestOwnerAddress,
 	)
 
 	ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger())

diff --git a/x/contractmanager/types/failure.pb.go b/x/contractmanager/types/failure.pb.go
diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go
diff --git a/x/contractmanager/types/params.pb.go b/x/contractmanager/types/params.pb.go
diff --git a/x/contractmanager/types/query.pb.go b/x/contractmanager/types/query.pb.go
diff --git a/x/contractmanager/types/tx.pb.go b/x/contractmanager/types/tx.pb.go
diff --git a/x/contractmanager/types/v1/failure.pb.go b/x/contractmanager/types/v1/failure.pb.go
diff --git a/x/cron/types/genesis.pb.go b/x/cron/types/genesis.pb.go
diff --git a/x/cron/types/params.pb.go b/x/cron/types/params.pb.go
diff --git a/x/cron/types/query.pb.go b/x/cron/types/query.pb.go
diff --git a/x/cron/types/schedule.pb.go b/x/cron/types/schedule.pb.go
diff --git a/x/cron/types/tx.pb.go b/x/cron/types/tx.pb.go
diff --git a/x/dex/types/deposit_record.pb.go b/x/dex/types/deposit_record.pb.go
diff --git a/x/dex/types/genesis.pb.go b/x/dex/types/genesis.pb.go
diff --git a/x/dex/types/limit_order_expiration.pb.go b/x/dex/types/limit_order_expiration.pb.go