Merge branch 'master' into aleem/update-swagger-docs

.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

.gitignore

@@ -195,3 +195,6 @@ dist/
 
 # pre-commit
 .pre-commit-config.yaml
+
+# Data - ideally these don't exist
+.testnets

CHANGELOG.md

@@ -6,20 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [v2.1.0](https://github.com/regen-network/regen-ledger/releases/tag/v2.1.0) - 2021-11-23
-
 ### General
 
 #### Fixed
 
-* [#654](https://github.com/regen-network/regen-ledger/pull/654) Add patch for IBC connection parameter
-
-#### Changed
-
-* [#657](https://github.com/regen-network/regen-ledger/pull/657) Update go.mod & imports to adhere to golang semver guidelines for regen-ledger/v2
-* [#658](https://github.com/regen-network/regen-ledger/pull/658) Upgrade `ibc-go` to v2.0.0
+* [#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](https://github.com/regen-network/regen-ledger/releases/tag/v2.0.0) - 2021-10-29
+## [v2.0.0-beta1](https://github.com/regen-network/regen-ledger/releases/tag/v2.0.0-beta1) - 2021-08-19
 
 ### General
 

Makefile

@@ -12,6 +12,7 @@ MOCKS_DIR = $(CURDIR)/tests/mocks
 HTTPS_GIT := https://github.com/regen-network/regen-ledger.git
 DOCKER_BUF := docker run -v $(shell pwd):/workspace --workdir /workspace bufbuild/buf
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
+DOCKER := $(shell which docker)
 
 export GO111MODULE = on
 
@@ -392,20 +393,20 @@ proto-update-deps:
 ###                                Localnet                                 ###
 ###############################################################################
 
-# Run a 4-node testnet locally
+# Run a 4-node testnet locally via docker compose
 localnet-start: build-linux localnet-stop
-	$(if $(shell docker inspect -f '{{ .Id }}' tendermint/xrnnode 2>/dev/null),$(info found image tendermint/xrnnode),$(MAKE) -C contrib/images xrnnode)
-	if ! [ -f build/node0/simd/config/genesis.json ]; then docker run --rm \
+	$(if $(shell $(DOCKER) inspect -f '{{ .Id }}' regenledger/regen-env 2>/dev/null),$(info found image regenledger/regen-env),$(MAKE) -C contrib/images regen-env)
+	if ! test -f build/node0/regen/config/genesis.json; then $(DOCKER) run --rm \
 		--user $(shell id -u):$(shell id -g) \
-		-v $(BUILDDIR):/simd:Z \
+		-v $(BUILDDIR):/regen:Z \
 		-v /etc/group:/etc/group:ro \
 		-v /etc/passwd:/etc/passwd:ro \
 		-v /etc/shadow:/etc/shadow:ro \
-		tendermint/xrnnode testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi
+		regenledger/regen-env testnet init-files --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi
 	docker-compose up -d
 
 localnet-stop:
-	docker-compose down
+	docker-compose down -v 
 
 .PHONY: localnet-start localnet-stop
 

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
 

app/app.go

@@ -79,7 +79,6 @@ import (
 	ibc "github.com/cosmos/ibc-go/v2/modules/core"
 	ibcclient "github.com/cosmos/ibc-go/v2/modules/core/02-client"
 	ibcclienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
-	ibcconnectiontypes "github.com/cosmos/ibc-go/v2/modules/core/03-connection/types"
 	porttypes "github.com/cosmos/ibc-go/v2/modules/core/05-port/types"
 	ibchost "github.com/cosmos/ibc-go/v2/modules/core/24-host"
 	ibckeeper "github.com/cosmos/ibc-go/v2/modules/core/keeper"

app/regen/cmd/root.go

@@ -145,6 +145,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		genutilcli.ValidateGenesisCmd(app.ModuleBasics),
 		AddGenesisAccountCmd(app.DefaultNodeHome),
 		tmcli.NewCompletionCmd(rootCmd, true),
+		NewTestnetCmd(app.ModuleBasics, banktypes.GenesisBalancesIterator{}),
 		debug.Cmd(),
 		config.Cmd(),
 	)