v2.0.0-rc4 changelog & master merge

CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v2.0.0-rc4](https://github.com/regen-network/regen-ledger/releases/tag/v2.0.0-rc4) - 2021-10-26
+
+### 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) Fix `undefined` error message when creating a credit class
+
 ## [v2.0.0-rc3](https://github.com/regen-network/regen-ledger/releases/tag/v2.0.0-rc3) - 2021-10-19
 
 ### General

app/experimental_appconfig.go

@@ -1,4 +1,6 @@
+//go:build experimental
 // +build experimental
+
 // DONTCOVER
 
 package app

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)

app/testsuite/modules_test.go

@@ -4,11 +4,10 @@ import (
  "testing"
 
  ecocredit "github.com/regen-network/regen-ledger/x/ecocredit/client/testsuite"
- "github.com/stretchr/testify/suite"
 )
 
 func TestEcocreditIntegration(t *testing.T) {
  cfg := DefaultConfig()
 
- suite.Run(t, ecocredit.NewIntegrationTestSuite(cfg))
+ ecocredit.RunCLITests(t, cfg)
 }

app/testsuite/network_test.go

@@ -1,3 +1,4 @@
+//go:build norace
 // +build norace
 
 package testsuite_test

x/ecocredit/client/testsuite/enable_allowed_list.go

@@ -0,0 +1,57 @@
+package testsuite
+
+import (
+ "fmt"
+
+ "github.com/cosmos/cosmos-sdk/client/flags"
+ sdk "github.com/cosmos/cosmos-sdk/types"
+ "github.com/regen-network/regen-ledger/types/testutil/cli"
+ "github.com/regen-network/regen-ledger/types/testutil/network"
+ "github.com/regen-network/regen-ledger/x/ecocredit/client"
+ "github.com/stretchr/testify/suite"
+)
+
+type AllowListEnabledTestSuite struct {
+ suite.Suite
+
+ cfg network.Config
+ network *network.Network
+}
+
+func NewAllowListEnabledTestSuite(cfg network.Config) *AllowListEnabledTestSuite {
+ return &AllowListEnabledTestSuite{cfg: cfg}
+}
+
+func (s *AllowListEnabledTestSuite) SetupSuite() {
+ s.network = network.New(s.T(), s.cfg)
+ _, err := s.network.WaitForHeight(1)
+ s.Require().NoError(err)
+}
+
+func (s *AllowListEnabledTestSuite) TearDownSuite() {
+ s.T().Log("tearing down integration test suite")
+ s.network.Cleanup()
+}
+
+func (s *AllowListEnabledTestSuite) TestCreateClass() {
+ val := s.network.Validators[0]
+
+ out, err := cli.ExecTestCLICmd(val.ClientCtx, client.TxCreateClassCmd(),
+ []string{
+ val.Address.String(),
+ "carbon",
+ "AQ==",
+ fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()),
+ fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
+ fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
+ fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
+ },
+ )
+
+ s.Require().NoError(err, out.String())
+
+ // tx should fail with error unauthorized since we enabled `AllowlistEnabled` param & set `AllowedClassCreators` as `[]`.
+ var res sdk.TxResponse
+ s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &res))
+ s.Require().Contains(res.RawLog, fmt.Sprintf("%s is not allowed to create credit classes", val.Address.String()))
+}

x/ecocredit/client/testsuite/tx.go

@@ -4,6 +4,7 @@ import (
  "encoding/base64"
  "fmt"
  "strings"
+ "testing"
 
  "github.com/cosmos/cosmos-sdk/client/flags"
  "github.com/cosmos/cosmos-sdk/crypto/hd"
@@ -17,6 +18,7 @@ import (
  "github.com/regen-network/regen-ledger/types/testutil/network"
  "github.com/regen-network/regen-ledger/x/ecocredit"
  "github.com/regen-network/regen-ledger/x/ecocredit/client"
+ "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"
  tmcli "github.com/tendermint/tendermint/libs/cli"
 )
@@ -41,6 +43,18 @@ const (
 
 var validMetadataBytes = []byte{0x1}
 
+func RunCLITests(t *testing.T, cfg network.Config) {
+ suite.Run(t, NewIntegrationTestSuite(cfg))
+
+ // setup another cfg for testing ecocredit enabled class creators list.
+ genesisState := ecocredit.DefaultGenesisState()
+ genesisState.Params.AllowlistEnabled = true
+ bz, err := cfg.Codec.MarshalJSON(genesisState)
+ require.NoError(t, err)
+ cfg.GenesisState[ecocredit.ModuleName] = bz
+ suite.Run(t, NewAllowListEnabledTestSuite(cfg))
+}
+
 func NewIntegrationTestSuite(cfg network.Config) *IntegrationTestSuite {
  return &IntegrationTestSuite{cfg: cfg}
 }
@@ -71,26 +85,19 @@ func (s *IntegrationTestSuite) SetupSuite() {
  val.ClientCtx.Keyring.SavePubKey("throwaway", a1pub, hd.Secp256k1Type)
 
  account := sdk.AccAddress(info.GetPubKey().Address())
- _, err = banktestutil.MsgSendExec(
- val.ClientCtx,
- val.Address,
- account,
- sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(2000))), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
- fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
- fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
- )
- s.Require().NoError(err)
+ for _, acc := range []sdk.AccAddress{account, a1} {
+ _, err = banktestutil.MsgSendExec(
+ val.ClientCtx,
+ val.Address,
+ acc,
+ sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(2000))), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
+ fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
+ fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
+ )
+ s.Require().NoError(err)
+ }
 
- _, err = banktestutil.MsgSendExec(
- val.ClientCtx,
- val.Address,
- a1,
- sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(2000))), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
- fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
- fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
- )
- s.Require().NoError(err)
- s.testAccount = a1
+ s.testAccount = account
 
  var commonFlags = []string{
  fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),

x/ecocredit/server/msg_server.go

@@ -2,7 +2,6 @@ package server
 
 import (
  "context"
- "fmt"
 
  sdk "github.com/cosmos/cosmos-sdk/types"
  sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -34,7 +33,7 @@ func (s serverImpl) CreateClass(goCtx context.Context, req *ecocredit.MsgCreateC
  var params ecocredit.Params
  s.paramSpace.GetParamSet(ctx.Context, &params)
  if params.AllowlistEnabled && !s.isCreatorAllowListed(ctx, params.AllowedClassCreators, adminAddress) {
- return nil, fmt.Errorf("%s is not allowed to create credit classes", adminAddress.String())
+ return nil, sdkerrors.ErrUnauthorized.Wrapf("%s is not allowed to create credit classes", adminAddress.String())
  }
 
  err = s.chargeCreditClassFee(ctx.Context, adminAddress)