-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: update x/stakingplus to use Finschia/cosmos-sdk (#1225)
* Copy stakingplus module * Use [email protected] * Replace address with validator * Remove authz test * Fill description * Update go.mod * Update CHANGELOG * Update scripts * Proto gen * Add registration of app module * Update go mod * Update simapp * Update go.work.example * Fix struct name * Reorder package * Fix spec docs * Update x/stakingplus/README.md Co-authored-by: Jayden Lee <[email protected]> * move test settings * Fix package order * Remove global codec * Remove unused code * Make test slim * Fix a little * change to validator * Add e2e test * Use keeper codec * Fix test * Fix labeler * Fix checking tx result * Update x/stakingplus/README.md Co-authored-by: Youngtaek Yoon <[email protected]> --------- Co-authored-by: Jayden Lee <[email protected]> Co-authored-by: Youngtaek Yoon <[email protected]>
- Loading branch information
3 people
authored
Feb 16, 2024
1 parent
35e6c72
commit 2cc0f1b
Showing
29 changed files
with
2,899 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,3 +15,5 @@ | |
| # - docs/architecture/**/* | ||
| "C:x/foundation": | ||
| - x/foundation/**/* | ||
| "C:x/stakingplus": | ||
| - x/stakingplus/**/* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -323,3 +323,34 @@ jobs: | |
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | ||
| with: | ||
| projectBaseDir: x/foundation/ | ||
|
|
||
| test-x-stakingplus: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version: "1.21" | ||
| check-latest: true | ||
| cache: true | ||
| cache-dependency-path: x/stakingplus/go.sum | ||
| - uses: technote-space/[email protected] | ||
| id: git_diff | ||
| with: | ||
| PATTERNS: | | ||
| x/stakingplus/**/*.go | ||
| x/stakingplus/go.mod | ||
| x/stakingplus/go.sum | ||
| - name: tests | ||
| if: env.GIT_DIFF | ||
| run: | | ||
| cd x/stakingplus | ||
| go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb_build' ./... | ||
| - name: sonarcloud | ||
| if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }} | ||
| uses: SonarSource/sonarcloud-github-action@master | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | ||
| with: | ||
| projectBaseDir: x/stakingplus/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,4 +8,5 @@ use ( | |
| ./simapp | ||
| ./tests | ||
| ./x/foundation | ||
| ./x/stakingplus | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| //go:build e2e | ||
| // +build e2e | ||
|
|
||
| package stakingplus | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| "github.com/stretchr/testify/suite" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/testutil/network" | ||
| "github.com/cosmos/go-bip39" | ||
|
|
||
| "github.com/Finschia/finschia-sdk/simapp" | ||
| ) | ||
|
|
||
| func TestIntegrationTestSuite(t *testing.T) { | ||
| cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) | ||
|
|
||
| cfg.NumValidators = 1 | ||
|
|
||
| entropySeed, err := bip39.NewEntropy(256) | ||
| require.NoError(t, err) | ||
| mnemonic, err := bip39.NewMnemonic(entropySeed) | ||
| require.NoError(t, err) | ||
| cfg.Mnemonics = []string{mnemonic} | ||
|
|
||
| suite.Run(t, NewE2ETestSuite(cfg)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "pubkey": { | ||
| "@type": "/cosmos.crypto.ed25519.PubKey", | ||
| "key": "l3eo4WwjQBtK1TrxPSXPs8mNUofgZm3XX+G2UOSWqq4=" | ||
| }, | ||
| "amount": "100stake", | ||
| "moniker": "grantee", | ||
| "identity": "optional identity signature (ex. UPort or Keybase)", | ||
| "website": "validator's (optional) website", | ||
| "security": "validator's (optional) security contact email", | ||
| "details": "validator's (optional) details", | ||
| "commission-rate": "0.1", | ||
| "commission-max-rate": "0.2", | ||
| "commission-max-change-rate": "0.01", | ||
| "min-self-delegation": "1" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "pubkey": { | ||
| "@type": "/cosmos.crypto.ed25519.PubKey", | ||
| "key": "4wf9IfLAIjtTFNEsBWLmzGFAhtw5w4FKsPJn4Dk2XPg=" | ||
| }, | ||
| "amount": "100stake", | ||
| "moniker": "stranger", | ||
| "identity": "optional identity signature (ex. UPort or Keybase)", | ||
| "website": "validator's (optional) website", | ||
| "security": "validator's (optional) security contact email", | ||
| "details": "validator's (optional) details", | ||
| "commission-rate": "0.1", | ||
| "commission-max-rate": "0.2", | ||
| "commission-max-change-rate": "0.01", | ||
| "min-self-delegation": "1" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| package stakingplus | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/suite" | ||
|
|
||
| "cosmossdk.io/core/address" | ||
| "cosmossdk.io/math" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/client/flags" | ||
| addresscodec "github.com/cosmos/cosmos-sdk/codec/address" | ||
| "github.com/cosmos/cosmos-sdk/crypto/hd" | ||
| "github.com/cosmos/cosmos-sdk/crypto/keyring" | ||
| clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" | ||
| "github.com/cosmos/cosmos-sdk/testutil/network" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| bankcli "github.com/cosmos/cosmos-sdk/x/bank/client/cli" | ||
| stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" | ||
|
|
||
| "github.com/Finschia/finschia-sdk/x/foundation" | ||
| "github.com/Finschia/finschia-sdk/x/stakingplus" | ||
| ) | ||
|
|
||
| type E2ETestSuite struct { | ||
| suite.Suite | ||
|
|
||
| cfg network.Config | ||
| network *network.Network | ||
|
|
||
| grantee sdk.AccAddress | ||
| permanentMember sdk.AccAddress | ||
| stranger sdk.AccAddress | ||
|
|
||
| addressCodec address.Codec | ||
| valAddressCodec address.Codec | ||
| } | ||
|
|
||
| func NewE2ETestSuite(cfg network.Config) *E2ETestSuite { | ||
| return &E2ETestSuite{cfg: cfg} | ||
| } | ||
|
|
||
| func (s *E2ETestSuite) SetupSuite() { | ||
| s.T().Log("setting up e2e test suite") | ||
|
|
||
| s.addressCodec = addresscodec.NewBech32Codec("link") | ||
| s.valAddressCodec = addresscodec.NewBech32Codec("linkvaloper") | ||
|
|
||
| genesisState := s.cfg.GenesisState | ||
|
|
||
| var foundationData foundation.GenesisState | ||
| s.Require().NoError(s.cfg.Codec.UnmarshalJSON(genesisState[foundation.ModuleName], &foundationData)) | ||
|
|
||
| // enable foundation tax | ||
| params := foundation.Params{ | ||
| FoundationTax: math.LegacyMustNewDecFromStr("0.2"), | ||
| } | ||
| foundationData.Params = params | ||
|
|
||
| var strangerMnemonic string | ||
| var granteeMnemonic string | ||
| var permanentMemberMnemonic string | ||
| granteeMnemonic, s.grantee = s.createMnemonic("grantee") | ||
| strangerMnemonic, s.stranger = s.createMnemonic("stranger") | ||
| permanentMemberMnemonic, s.permanentMember = s.createMnemonic("permanentmember") | ||
|
|
||
| foundationData.Members = []foundation.Member{ | ||
| { | ||
| Address: s.bytesToString(s.permanentMember), | ||
| Metadata: "permanent member", | ||
| }, | ||
| } | ||
|
|
||
| info := foundation.DefaultFoundation() | ||
| info.TotalWeight = math.LegacyNewDecFromInt(math.NewInt(int64(len(foundationData.Members)))) | ||
| err := info.SetDecisionPolicy(&foundation.ThresholdDecisionPolicy{ | ||
| Threshold: math.LegacyOneDec(), | ||
| Windows: &foundation.DecisionPolicyWindows{ | ||
| VotingPeriod: 7 * 24 * time.Hour, | ||
| }, | ||
| }) | ||
| s.Require().NoError(err) | ||
| foundationData.Foundation = info | ||
|
|
||
| // enable censorship | ||
| censorships := []foundation.Censorship{ | ||
| { | ||
| MsgTypeUrl: sdk.MsgTypeURL((*stakingtypes.MsgCreateValidator)(nil)), | ||
| Authority: foundation.CensorshipAuthorityFoundation, | ||
| }, | ||
| } | ||
| foundationData.Censorships = censorships | ||
|
|
||
| val1 := getValidator(s.T(), s.T().TempDir(), s.cfg, 0) | ||
| for _, grantee := range []sdk.AccAddress{s.grantee, val1} { | ||
| ga := foundation.GrantAuthorization{ | ||
| Grantee: s.bytesToString(grantee), | ||
| }.WithAuthorization(&stakingplus.CreateValidatorAuthorization{ | ||
| ValidatorAddress: s.bytesToValString(grantee), | ||
| }) | ||
| s.Require().NotNil(ga) | ||
| foundationData.Authorizations = append(foundationData.Authorizations, *ga) | ||
| } | ||
|
|
||
| foundationDataBz, err := s.cfg.Codec.MarshalJSON(&foundationData) | ||
| s.Require().NoError(err) | ||
| genesisState[foundation.ModuleName] = foundationDataBz | ||
| s.cfg.GenesisState = genesisState | ||
|
|
||
| s.network, err = network.New(s.T(), s.T().TempDir(), s.cfg) | ||
| s.Require().NoError(err) | ||
|
|
||
| _, err = s.network.WaitForHeight(1) | ||
| s.Require().NoError(err) | ||
|
|
||
| s.createAccount("grantee", granteeMnemonic) | ||
| s.createAccount("stranger", strangerMnemonic) | ||
| s.createAccount("permanentmember", permanentMemberMnemonic) | ||
| } | ||
|
|
||
| func (s *E2ETestSuite) TearDownSuite() { | ||
| s.T().Log("tearing down e2e test suite") | ||
| s.network.Cleanup() | ||
| } | ||
|
|
||
| func (s *E2ETestSuite) bytesToString(addr sdk.AccAddress) string { | ||
| str, err := s.addressCodec.BytesToString(addr) | ||
| s.Require().NoError(err) | ||
| return str | ||
| } | ||
|
|
||
| func (s *E2ETestSuite) bytesToValString(addr sdk.AccAddress) string { | ||
| str, err := s.valAddressCodec.BytesToString(addr) | ||
| s.Require().NoError(err) | ||
| return str | ||
| } | ||
|
|
||
| // creates an account | ||
| func (s *E2ETestSuite) createMnemonic(uid string) (string, sdk.AccAddress) { | ||
| cstore := keyring.NewInMemory(s.cfg.Codec) | ||
| info, mnemonic, err := cstore.NewMnemonic(uid, keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, hd.Secp256k1) | ||
| s.Require().NoError(err) | ||
|
|
||
| addr, err := info.GetAddress() | ||
| s.Require().NoError(err) | ||
|
|
||
| return mnemonic, addr | ||
| } | ||
|
|
||
| // creates an account and send some coins to it for the future transactions. | ||
| func (s *E2ETestSuite) createAccount(uid, mnemonic string) { | ||
| commonArgs := []string{ | ||
| fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), | ||
| fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), | ||
| fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(100)))), | ||
| } | ||
|
|
||
| val := s.network.Validators[0] | ||
| info, err := val.ClientCtx.Keyring.NewAccount(uid, mnemonic, keyring.DefaultBIP39Passphrase, sdk.FullFundraiserPath, hd.Secp256k1) | ||
| s.Require().NoError(err) | ||
|
|
||
| addr, err := info.GetAddress() | ||
| s.Require().NoError(err) | ||
|
|
||
| fee := sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(1000))) | ||
| args := append([]string{ | ||
| s.bytesToString(val.Address), | ||
| s.bytesToString(addr), | ||
| fee.String(), | ||
| fmt.Sprintf("--%s=%s", flags.FlagFrom, s.bytesToString(val.Address)), | ||
| }, commonArgs...) | ||
| out, err := clitestutil.ExecTestCLICmd(val.ClientCtx, bankcli.NewSendTxCmd(s.addressCodec), args) | ||
| s.Require().NoError(err) | ||
|
|
||
| var res sdk.TxResponse | ||
| s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &res), out.String()) | ||
| s.Require().Zero(res.Code, out.String()) | ||
|
|
||
| s.Require().NoError(clitestutil.CheckTxCode(s.network, val.ClientCtx, res.TxHash, 0)) | ||
| } |
Oops, something went wrong.