-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(client/v2/autocli): add CoinDec flag (#22817)
Co-authored-by: Marko <marko@baricevic.me> Co-authored-by: Julien Robert <julien@rbrt.fr> (cherry picked from commit 57b4d30) # Conflicts: # client/v2/go.mod # client/v2/go.sum # client/v2/internal/coins/format.go # client/v2/internal/coins/format_test.go # go.mod # go.sum # indexer/postgres/go.mod # indexer/postgres/tests/go.mod # runtime/v2/go.mod # runtime/v2/go.sum # schema/testing/go.mod # server/v2/cometbft/go.mod # server/v2/cometbft/go.sum # server/v2/go.mod # server/v2/go.sum # server/v2/stf/go.mod # server/v2/stf/go.sum # simapp/go.mod # simapp/go.sum # simapp/v2/go.mod # simapp/v2/go.sum # tests/go.mod # tests/go.sum # x/accounts/defaults/base/go.mod # x/accounts/defaults/base/go.sum # x/accounts/defaults/lockup/go.mod # x/accounts/defaults/lockup/go.sum # x/accounts/defaults/multisig/go.mod # x/accounts/defaults/multisig/go.sum # x/accounts/go.mod # x/accounts/go.sum # x/authz/go.mod # x/authz/go.sum # x/bank/go.mod # x/bank/go.sum # x/circuit/go.mod # x/circuit/go.sum # x/consensus/go.mod # x/consensus/go.sum # x/distribution/go.mod # x/distribution/go.sum # x/epochs/go.mod # x/epochs/go.sum # x/evidence/go.mod # x/evidence/go.sum # x/feegrant/go.mod # x/feegrant/go.sum # x/gov/go.mod # x/gov/go.sum # x/group/go.mod # x/group/go.sum # x/mint/go.mod # x/mint/go.sum # x/nft/go.mod # x/nft/go.sum # x/params/go.mod # x/params/go.sum # x/protocolpool/go.mod # x/protocolpool/go.sum # x/slashing/go.mod # x/slashing/go.sum # x/staking/go.mod # x/staking/go.sum # x/upgrade/go.mod # x/upgrade/go.sum
- Loading branch information
1 parent
96a3016
commit f11f58a
Showing
69 changed files
with
18,509 additions
and
0 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
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,58 @@ | ||
| package flag | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "strings" | ||
|
|
||
| "google.golang.org/protobuf/reflect/protoreflect" | ||
|
|
||
| basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1" | ||
| "cosmossdk.io/client/v2/internal/coins" | ||
| ) | ||
|
|
||
| type decCoinType struct{} | ||
|
|
||
| type decCoinValue struct { | ||
| value *basev1beta1.DecCoin | ||
| } | ||
|
|
||
| func (c decCoinType) NewValue(*context.Context, *Builder) Value { | ||
| return &decCoinValue{} | ||
| } | ||
|
|
||
| func (c decCoinType) DefaultValue() string { | ||
| return "zero" | ||
| } | ||
|
|
||
| func (c *decCoinValue) Get(protoreflect.Value) (protoreflect.Value, error) { | ||
| if c.value == nil { | ||
| return protoreflect.Value{}, nil | ||
| } | ||
| return protoreflect.ValueOfMessage(c.value.ProtoReflect()), nil | ||
| } | ||
|
|
||
| func (c *decCoinValue) String() string { | ||
| if c.value == nil { | ||
| return "" | ||
| } | ||
|
|
||
| return c.value.String() | ||
| } | ||
|
|
||
| func (c *decCoinValue) Set(stringValue string) error { | ||
| if strings.Contains(stringValue, ",") { | ||
| return errors.New("coin flag must be a single coin, specific multiple coins with multiple flags or spaces") | ||
| } | ||
|
|
||
| coin, err := coins.ParseDecCoin(stringValue) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| c.value = coin | ||
| return nil | ||
| } | ||
|
|
||
| func (c *decCoinValue) Type() string { | ||
| return "cosmos.base.v1beta1.DecCoin" | ||
| } |
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,62 @@ | ||
| package coins | ||
|
|
||
| import ( | ||
| "errors" | ||
| "regexp" | ||
| "strings" | ||
|
|
||
| basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1" | ||
| ) | ||
|
|
||
| // Amount can be a whole number or a decimal number. Denominations can be 3 ~ 128 | ||
| // characters long and support letters, followed by either a letter, a number or | ||
| // a separator ('/', ':', '.', '_' or '-'). | ||
| var coinRegex = regexp.MustCompile(`^(\d+(\.\d+)?)([a-zA-Z][a-zA-Z0-9\/\:\._\-]{2,127})$`) | ||
|
|
||
| // ParseCoin parses a coin from a string. The string must be in the format | ||
| // <amount><denom>, where <amount> is a number and <denom> is a valid denom. | ||
| func ParseCoin(input string) (*basev1beta1.Coin, error) { | ||
| amount, denom, err := parseCoin(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &basev1beta1.Coin{ | ||
| Amount: amount, | ||
| Denom: denom, | ||
| }, nil | ||
| } | ||
|
|
||
| // ParseDecCoin parses a decCoin from a string. The string must be in the format | ||
| // <amount><denom>, where <amount> is a number and <denom> is a valid denom. | ||
| func ParseDecCoin(input string) (*basev1beta1.DecCoin, error) { | ||
| amount, denom, err := parseCoin(input) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &basev1beta1.DecCoin{ | ||
| Amount: amount, | ||
| Denom: denom, | ||
| }, nil | ||
| } | ||
|
|
||
| // parseCoin parses a coin string into its amount and denom components. | ||
| // The input string must be in the format <amount><denom>. | ||
| // It returns the amount string, denom string, and any error encountered. | ||
| // Returns an error if the input is empty or doesn't match the expected format. | ||
| func parseCoin(input string) (amount, denom string, err error) { | ||
| input = strings.TrimSpace(input) | ||
|
|
||
| if input == "" { | ||
| return "", "", errors.New("empty input when parsing coin") | ||
| } | ||
|
|
||
| matches := coinRegex.FindStringSubmatch(input) | ||
|
|
||
| if len(matches) == 0 { | ||
| return "", "", errors.New("invalid input format") | ||
| } | ||
|
|
||
| return matches[1], matches[3], nil | ||
| } |
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,73 @@ | ||
| package coins | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func Test_parseCoin(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| input string | ||
| amount string | ||
| denom string | ||
| err string | ||
| }{ | ||
| { | ||
| name: "ok", | ||
| input: "1000stake", | ||
| amount: "1000", | ||
| denom: "stake", | ||
| }, | ||
| { | ||
| name: "empty", | ||
| input: "", | ||
| err: "empty input when parsing coin", | ||
| }, | ||
| { | ||
| name: "empty denom", | ||
| input: "1000", | ||
| err: "invalid input format", | ||
| }, | ||
| { | ||
| name: "empty amount", | ||
| input: "stake", | ||
| err: "invalid input format", | ||
| }, | ||
| { | ||
| name: "<denom><amount> format", | ||
| input: "stake1000", | ||
| err: "invalid input format", | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| amount, denom, err := parseCoin(tt.input) | ||
| if tt.err != "" { | ||
| require.Error(t, err) | ||
| require.Contains(t, err.Error(), tt.err) | ||
| } else { | ||
| require.NoError(t, err) | ||
| require.Equal(t, tt.amount, amount) | ||
| require.Equal(t, tt.denom, denom) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestParseCoin(t *testing.T) { | ||
| encodedCoin := "1000000000foo" | ||
| coin, err := ParseCoin(encodedCoin) | ||
| require.NoError(t, err) | ||
| require.Equal(t, "1000000000", coin.Amount) | ||
| require.Equal(t, "foo", coin.Denom) | ||
| } | ||
|
|
||
| func TestParseDecCoin(t *testing.T) { | ||
| encodedCoin := "1000000000foo" | ||
| coin, err := ParseDecCoin(encodedCoin) | ||
| require.NoError(t, err) | ||
| require.Equal(t, "1000000000", coin.Amount) | ||
| require.Equal(t, "foo", coin.Denom) | ||
| } |
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,13 @@ | ||
| module cosmossdk.io/indexer/postgres | ||
|
|
||
| // NOTE: we are staying on an earlier version of golang to avoid problems building | ||
| // with older codebases. | ||
| go 1.12 | ||
|
|
||
| // NOTE: cosmossdk.io/schema should be the only dependency here | ||
| // so there are no problems building this with any version of the SDK. | ||
| // This module should only use the golang standard library (database/sql) | ||
| // and cosmossdk.io/indexer/base. | ||
| require cosmossdk.io/schema v0.4.0 | ||
|
|
||
| replace cosmossdk.io/schema => ../../schema |
Oops, something went wrong.