Merge branch 'master' into likhita/add-invariants

CHANGELOG.md

@@ -6,6 +6,62 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.0] - 2021-04-13
+
+This release is the version of regen-ledger that will be used for the mainnet launch of Regen Network's blockchain (chain-id: `regen-1`).
+
+It enables configurable builds for regen ledger (by building with an `EXPERIMENTAL=true/false` build flag). With this new configuration, we've made the following delineation.
+
+* Stable build (EXPERIMENTAL=false) is intended for Regen Network's mainnet, and any testing networks aiming to replicate the mainnet configuration.
+  * Includes all standard modules from the Cosmos SDK (bank/staking/gov/etc.), as well as IBC
+* Experimental builds, are intended to have more experimental features which have not gone through a full internal audit and are intended for devnets and 3rd party developers who want to work on integrating with future features of regen ledger.
+  * In addition to stable build modules, experimental build includes:
+    * Regen specific modules (x/ecocredit, x/data)
+    * CosmWasm
+    * x/group
+
+It is not guaranteed that APIs of features in the experimental build will remain consistent until they are migrated to the stable configuration.
+
+### Added
+* make configurable builds (#256)
+* add remaining group events
+* add group module documentation (#314)
+
+### Changed
+* upgrade to Cosmos SDK v0.42.4
+* update group tx commands
+* remove colon from regen addresses
+
+## [0.6.0] - 2021-02-04
+
+This release contains first iterations of the `x/ecocredit` and `x/data` modules which were launched in a Devnet as part of the Open Climate Collabathon in Nov 2020. 
+
+It is more or less a full rewrite of regen-ledger to upgrade it to Stargate (Cosmos SDK v0.40)
+
+It also includes an initial draft of the `x/group` module for on-chain multisig and DAO use cases.
+
+### Added
+
+* Data Module Proof of Consept (#118)
+* Eco-Credit Module Proof of Concept (#119)
+* Addition of vuepress docs site: docs.regen.network (#158)
+* Add CosmWasm module to regen ledger (#148)
+* Add group module (#154)
+
+
+### Changed
+
+* Custom protobuf service codegen (#207)
+* Update to SDK v0.40.0 (#219)
+* Remove usage/naming of `gaia` / `XrnApp` / `simd`
+
+## [0.5.0] - 2019-09-21
+
+This release provides the amazonas test upgrade the regen-test-1001 testnet. Specifically this release packages the following changes to the upgrade module:
+
+when an upgrade is planned, the new binary which contains code for the planned upgrade will panic if it is started too early
+upgrade scripts are disabled because they were glitchy to setup and not recommended
+
 ## [0.4.0] - 2019-06-04
 
 ### Changed

app/experimental_appconfig.go

@@ -109,7 +109,7 @@ func (app *RegenApp) registerUpgradeHandlers() {
 
 func (app *RegenApp) setCustomModuleManager() []module.AppModule {
 	return []module.AppModule{
-		wasm.NewAppModule(&app.wasmKeeper),
+		wasm.NewAppModule(&app.wasmKeeper, app.StakingKeeper),
 	}
 }
 
@@ -121,7 +121,7 @@ func setCustomOrderInitGenesis() []string {
 
 func (app *RegenApp) setCustomSimulationManager() []module.AppModuleSimulation {
 	return []module.AppModuleSimulation{
-		wasm.NewAppModule(&app.wasmKeeper),
+		wasm.NewAppModule(&app.wasmKeeper, app.StakingKeeper),
 	}
 }
 

docs/modules/group/protobuf.md

@@ -7,8 +7,11 @@
 - [regen/group/v1alpha1/events.proto](#regen/group/v1alpha1/events.proto)
     - [EventCreateGroup](#regen.group.v1alpha1.EventCreateGroup)
     - [EventCreateGroupAccount](#regen.group.v1alpha1.EventCreateGroupAccount)
+    - [EventCreateProposal](#regen.group.v1alpha1.EventCreateProposal)
+    - [EventExec](#regen.group.v1alpha1.EventExec)
     - [EventUpdateGroup](#regen.group.v1alpha1.EventUpdateGroup)
     - [EventUpdateGroupAccount](#regen.group.v1alpha1.EventUpdateGroupAccount)
+    - [EventVote](#regen.group.v1alpha1.EventVote)
 
 - [regen/group/v1alpha1/types.proto](#regen/group/v1alpha1/types.proto)
     - [GroupAccountInfo](#regen.group.v1alpha1.GroupAccountInfo)
@@ -100,7 +103,7 @@ EventCreateGroup is an event emitted when a group is created.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| group_id | [string](#string) |  | group_id is the unique ID of the group. |
+| group_id | [uint64](#uint64) |  | group_id is the unique ID of the group. |
 
 
 
@@ -122,6 +125,36 @@ EventCreateGroupAccount is an event emitted when a group account is created.
 
 
 
+<a name="regen.group.v1alpha1.EventCreateProposal"></a>
+
+### EventCreateProposal
+EventCreateProposal is an event emitted when a proposal is created.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| proposal_id | [uint64](#uint64) |  | proposal_id is the unique ID of the proposal. |
+
+
+
+
+
+
+<a name="regen.group.v1alpha1.EventExec"></a>
+
+### EventExec
+EventExec is an event emitted when a proposal is executed.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| proposal_id | [uint64](#uint64) |  | proposal_id is the unique ID of the proposal. |
+
+
+
+
+
+
 <a name="regen.group.v1alpha1.EventUpdateGroup"></a>
 
 ### EventUpdateGroup
@@ -130,7 +163,7 @@ EventUpdateGroup is an event emitted when a group is updated.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| group_id | [string](#string) |  | group_id is the unique ID of the group. |
+| group_id | [uint64](#uint64) |  | group_id is the unique ID of the group. |
 
 
 
@@ -151,6 +184,21 @@ EventUpdateGroupAccount is an event emitted when a group account is updated.
 
 
 
+
+<a name="regen.group.v1alpha1.EventVote"></a>
+
+### EventVote
+EventVote is an event emitted when a voter votes on a proposal.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| proposal_id | [uint64](#uint64) |  | proposal_id is the unique ID of the proposal. |
+
+
+
+
+
  <!-- end messages -->
 
  <!-- end enums -->
@@ -275,7 +323,7 @@ passes as well as some optional metadata associated with the proposal.
 | group_version | [uint64](#uint64) |  | group_version tracks the version of the group that this proposal corresponds to. When group membership is changed, existing proposals from previous group versions will become invalid. |
 | group_account_version | [uint64](#uint64) |  | group_account_version tracks the version of the group account that this proposal corresponds to. When a decision policy is changed, existing proposals from previous policy versions will become invalid. |
 | status | [Proposal.Status](#regen.group.v1alpha1.Proposal.Status) |  | Status represents the high level position in the life cycle of the proposal. Initial value is Submitted. |
-| result | [Proposal.Result](#regen.group.v1alpha1.Proposal.Result) |  | result is the final result based on the votes and election rule. Initial value is Undefined. The result is persisted so that clients can always rely on this state and not have to replicate the logic. |
+| result | [Proposal.Result](#regen.group.v1alpha1.Proposal.Result) |  | result is the final result based on the votes and election rule. Initial value is unfinalized. The result is persisted so that clients can always rely on this state and not have to replicate the logic. |
 | vote_state | [Tally](#regen.group.v1alpha1.Tally) |  | vote_state contains the sums of all weighted votes for this proposal. |
 | timeout | [google.protobuf.Timestamp](#google.protobuf.Timestamp) |  | timeout is the timestamp of the block where the proposal execution times out. Header times of the votes and execution messages must be before this end time to be included in the election. After the timeout timestamp the proposal can not be executed anymore and should be considered pending delete. |
 | executor_result | [Proposal.ExecutorResult](#regen.group.v1alpha1.Proposal.ExecutorResult) |  | executor_result is the final result based on the votes and election rule. Initial value is NotRun. |

go.mod

@@ -3,7 +3,7 @@ module github.com/regen-network/regen-ledger
 go 1.15
 
 require (
-	github.com/CosmWasm/wasmd v0.14.0
+	github.com/CosmWasm/wasmd v0.15.0
 	github.com/btcsuite/btcutil v1.0.2
 	github.com/cockroachdb/apd/v2 v2.0.2
 	github.com/cosmos/cosmos-sdk v0.42.0-rc0
@@ -21,15 +21,16 @@ require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	github.com/tendermint/tendermint v0.34.8
+	github.com/tendermint/tendermint v0.34.9
 	github.com/tendermint/tm-db v0.6.4
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
-	google.golang.org/genproto v0.0.0-20210325141258-5636347f2b14 // indirect
-	google.golang.org/grpc v1.36.0
+	google.golang.org/genproto v0.0.0-20210406143921-e86de6bf7a46 // indirect
+	google.golang.org/grpc v1.36.1
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
 
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
-replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.42.3-regen-1
+
+replace github.com/cosmos/cosmos-sdk => github.com/regen-network/cosmos-sdk v0.42.4-regen-1