Merge branch 'master' into aaronc/505-credit-store

regen-network · Oct 28, 2021 · bee78fb · bee78fb
2 parents ad1a770 + 53b6f00
commit bee78fb
Show file tree

Hide file tree

Showing 85 changed files with 6,393 additions and 1,841 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Display go version

diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -32,7 +32,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.17
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

diff --git a/.github/workflows/mergify.yml b/.github/workflows/mergify.yml
@@ -0,0 +1,17 @@
+pull_request_rules:
+  - name: backport patches to v1.0.x branch
+    conditions:
+      - base=master
+      - label=backport/v1.0.x
+    actions:
+      backport:
+        branches:
+          - release/v1.0.x
+  - name: backport patches to v2.0.x branch
+    conditions:
+      - base=master
+      - label=backport/v2.0.x
+    actions:
+      backport:
+        branches:
+          - release/v2.0.x
diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - run: make build
@@ -34,7 +34,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - name: Install runsim
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -82,7 +82,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -112,7 +112,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -142,7 +142,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -174,7 +174,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -202,7 +202,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -232,7 +232,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4
@@ -262,7 +262,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Display go version
         run: go version
       - uses: technote-space/get-diff-action@v4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Checkout code
         uses: actions/checkout@v2
       - name: run tests
@@ -35,7 +35,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Checkout code
         uses: actions/checkout@v2
       - name: run experimental test cover

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### General
+
+#### Fixed
+
+* [#591](https://github.com/regen-network/regen-ledger/pull/591) Set credit class fee in upgrade handler
+* [#592](https://github.com/regen-network/regen-ledger/pull/592) fixed `undefined` error msg for creating class
+
 ## [v2.0.0-beta1](https://github.com/regen-network/regen-ledger/releases/tag/v2.0.0-beta1) - 2021-08-19
 
 ### General

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Regen Ledger
-![banner](docs/regen-network-image.jpg)
+
+![banner](docs/regen_ledger.png)
 
 [![Build status](https://github.com/regen-network/regen-ledger/workflows/Build/badge.svg)](https://github.com/regen-network/regen-ledger/commits/master)
 [![Tests status](https://github.com/regen-network/regen-ledger/workflows/Tests/badge.svg)](https://github.com/regen-network/regen-ledger/commits/master)
@@ -11,14 +12,12 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/regen-network/regen-ledger)](https://goreportcard.com/report/github.com/regen-network/regen-ledger)
 [![Gitter chat](https://badges.gitter.im/regen-network/regen-ledger.png)](https://gitter.im/regen-network/regen-ledger "Gitter chat")
 
-
 A distributed ledger for ecology built on top of the
 [cosmos-sdk](http://github.com/cosmos/cosmos-sdk).
 
 ## Getting Started
 
-
-See [Getting Started](docs/getting-started/README.md) for instructions how to install and run the blockchain.
+See [Get Started](https://docs.regen.network/getting-started) for instructions on how to run a single node network on your local machine. For instructions on how to run a full node or validator node on a live network, see [Running a Full Node](https://docs.regen.network/getting-started/running-a-full-node) or [Running a Validator](https://docs.regen.network/getting-started/running-a-validator).
 
 ## Core Features
 

diff --git a/app/app.go b/app/app.go
@@ -610,9 +610,6 @@ func (app *RegenApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIC
 	ModuleBasics.RegisterRESTRoutes(clientCtx, apiSvr.Router)
 	ModuleBasics.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
 
-	// Register `server.Manager` modules grpc-gateway routes with API server.
-	app.smm.RegisterGRPCGatewayRoutes(apiSvr)
-
 	// register swagger API from root so that other applications can override easily
 	if apiConfig.Swagger {
 		RegisterSwaggerAPI(clientCtx, apiSvr.Router)

diff --git a/app/experimental_appconfig.go b/app/experimental_appconfig.go
@@ -1,4 +1,6 @@
+//go:build experimental
 // +build experimental
+
 // DONTCOVER
 
 package app

diff --git a/app/stable_appconfig.go b/app/stable_appconfig.go
@@ -1,4 +1,6 @@
+//go:build !experimental
 // +build !experimental
+
 // DONTCOVER
 
 package app
@@ -76,6 +78,7 @@ func (app *RegenApp) registerUpgradeHandlers() {
 
 		gen := ecocredittypes.DefaultGenesisState()
 		gen.Params.AllowlistEnabled = true
+		gen.Params.CreditClassFee = sdk.NewCoins(sdk.NewCoin("uregen", ecocredittypes.DefaultCreditClassFeeTokens))
 
 		modules := make(map[string]json.RawMessage)
 		modules[ecocredittypes.ModuleName] = app.cdc.MustMarshalJSON(gen)

diff --git a/app/testsuite/modules_test.go b/app/testsuite/modules_test.go
@@ -1,13 +1,13 @@
 package testsuite
 
 import (
-	ecocredit "github.com/regen-network/regen-ledger/x/ecocredit/client/testsuite"
-	"github.com/stretchr/testify/suite"
 	"testing"
+
+	ecocredit "github.com/regen-network/regen-ledger/x/ecocredit/client/testsuite"
 )
 
 func TestEcocreditIntegration(t *testing.T) {
 	cfg := DefaultConfig()
 
-	suite.Run(t, ecocredit.NewIntegrationTestSuite(cfg))
+	ecocredit.RunCLITests(t, cfg)
 }
diff --git a/app/testsuite/network_test.go b/app/testsuite/network_test.go
@@ -1,3 +1,4 @@
+//go:build norace
 // +build norace
 
 package testsuite_test

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go