Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.45.x #176

Closed
wants to merge 45 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
7ef483e
fix: types/errors Wrap and Wrapf (backport #10674) (#10676)
mergify[bot] Dec 6, 2021
d404619
fix: Charge gas even when there are no entries in gaskv (backport #10…
mergify[bot] Dec 8, 2021
e01217c
feat: add configurable iavl cache size (backport #10561) (#10698)
mergify[bot] Dec 8, 2021
b9250f3
feat: Add `HasSupply` method to bank keeper (backport #10393) (#10699)
mergify[bot] Dec 9, 2021
16da4a4
fix!: Charge gas for key length in gas meter (backport #10247) (#10697)
mergify[bot] Dec 10, 2021
a8a1101
build(deps): upgrade rosetta to 0.7.0 (backport #10432) (#10716)
mergify[bot] Dec 10, 2021
ad443cb
perf: Speedup cachekv iterator on large deletions & IBC v2 upgrade lo…
mergify[bot] Dec 13, 2021
51f7d31
fix: populate ctx.ConsensusParams for begin blockers (backport #10725…
mergify[bot] Dec 16, 2021
f67928a
fix: nil pointer panic on `NewIntFromBigInt` (backport #9627) (#10845)
mergify[bot] Dec 29, 2021
8ad8d5d
perf: Improve the speed of coins.String() (backport #10076) (#10850)
mergify[bot] Dec 30, 2021
1321bc1
perf!: Add HasAccount to the AuthKeeper to save protobuf decoding tim…
mergify[bot] Dec 31, 2021
7115d3b
fix: enable setting sequence (nonce) for module account (backport #10…
mergify[bot] Jan 3, 2022
14cd943
perf: store/cachekv: avoid a map lookup if unnecessary, clear maps fa…
mergify[bot] Jan 3, 2022
19e924d
fix: adding checks to ensure coin denoms are sorted in `Balance` duri…
mergify[bot] Jan 3, 2022
44d3f4d
fix: register evidence regression (backport #10595) (#10775)
mergify[bot] Jan 3, 2022
a0503e5
fix: Panic if SetOrder* functions forgot modules (backport #10711) (#…
mergify[bot] Jan 3, 2022
0be9863
fix: create query context with requested block height (#10827) (#10866)
mergify[bot] Jan 4, 2022
71a168d
fix: recreate compat field, of null pubkeys in multisig (backport #10…
mergify[bot] Jan 5, 2022
6d44d71
fix!: tx result don't report block gas used as tx gas used (#10833)
yihuang Jan 5, 2022
8932338
feat: support in-place migration ordering (backport #10614) (#10890)
mergify[bot] Jan 6, 2022
05656a2
fix: use full gas on overflow (backport #10897) (#10912)
mergify[bot] Jan 7, 2022
a5c60b7
feat!: x/gov: raise max description length to 10k chars (backport #10…
mergify[bot] Jan 10, 2022
ba1e099
fix: revert tx when block gas limit exceeded (backport: #10770) (#10814)
yihuang Jan 12, 2022
c1c1ad7
chore: v0.45.0 Release Notes (#10760)
amaury1093 Jan 12, 2022
90ffbce
feat: support custom mnemonics in in-process testing network (backpor…
mergify[bot] Jan 13, 2022
8236b26
chore: move server.GenerateCoinKey and server.GenerateSaveCoinKey to …
robert-zaremba Jan 18, 2022
b6c77e6
chore: release v0.45 changelog (#10964)
robert-zaremba Jan 18, 2022
ced57ea
docs: guidelines for ValidateBasic (#10983) (#11001)
mergify[bot] Jan 23, 2022
7ecf4d4
fix: return 404 on non-existing tx (backport #10992) (#11014)
mergify[bot] Jan 25, 2022
dfd47f5
chore: update 0.45 migration and support notes (backport #10973) (#10…
mergify[bot] Jan 26, 2022
985d221
feat!: add protection against accidental downgrades (backport #10407)…
mergify[bot] Jan 27, 2022
0c9bbbc
fix: add iavl-cache-size config parsing to GetConfig (backport #10990…
mergify[bot] Jan 29, 2022
f69c82f
feat: extra logging in in-place store migrations (backport #10768) (#…
mergify[bot] Feb 3, 2022
2646b47
chore: 0.45.1 Release Notes (#11109)
robert-zaremba Feb 3, 2022
9bf8c9a
fix: add concurrency fence on traceContext to avoid data races (backp…
mergify[bot] Feb 8, 2022
4161d2b
feat: add get all versions (backport #11124) (#11144)
mergify[bot] Feb 9, 2022
7f949c0
support debug trace QueryResult (#11148)
yihuang Feb 18, 2022
4368a18
disable url parameter in swagger-ui page (backport #11202) (#11207)
mergify[bot] Feb 21, 2022
d862c66
feat: Allow to restrict MintCoins from app.go (backport #10771) (#11227)
mergify[bot] Feb 21, 2022
febcb92
refactor: prune everything (backport #11177) (#11258)
mergify[bot] Feb 23, 2022
147720c
feat: min and max operators on coins (backport #11200) (#11249)
mergify[bot] Feb 23, 2022
c7ddf4d
feat: include transactions in QueryBlockByHeight (backport #10880) (…
mergify[bot] Feb 24, 2022
d69a7b6
chore: fix changelog entry for #11177 (backport #11263) (#11264)
mergify[bot] Feb 24, 2022
12fffc1
fix: reject query with block height in the future (backport #11222) (…
mergify[bot] Feb 25, 2022
01711d9
Merge branch 'release/v0.45.x' of https://github.com/cosmos/cosmos-sd…
faddat Feb 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: support custom mnemonics in in-process testing network (backport
  • Loading branch information
mergify[bot] committed Jan 13, 2022
commit 90ffbce4107e29969314a36ac98b750f29cdce1e
55 changes: 43 additions & 12 deletions server/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,28 @@ import (
// phrase to recover the private key.
func GenerateCoinKey(algo keyring.SignatureAlgo) (sdk.AccAddress, string, error) {
// generate a private key, with recovery phrase
info, secret, err := keyring.NewInMemory().NewMnemonic("name", keyring.English, sdk.GetConfig().GetFullBIP44Path(), keyring.DefaultBIP39Passphrase, algo)
info, secret, err := keyring.NewInMemory().NewMnemonic(
"name",
keyring.English,
sdk.GetConfig().GetFullBIP44Path(),
keyring.DefaultBIP39Passphrase,
algo,
)
if err != nil {
return sdk.AccAddress([]byte{}), "", err
return sdk.AccAddress{}, "", err
}

return sdk.AccAddress(info.GetPubKey().Address()), secret, nil
}

// GenerateSaveCoinKey returns the address of a public key, along with the secret
// phrase to recover the private key.
func GenerateSaveCoinKey(keybase keyring.Keyring, keyName string, overwrite bool, algo keyring.SignatureAlgo) (sdk.AccAddress, string, error) {
func GenerateSaveCoinKey(
keybase keyring.Keyring,
keyName, mnemonic string,
overwrite bool,
algo keyring.SignatureAlgo,
) (sdk.AccAddress, string, error) {
exists := false
_, err := keybase.Key(keyName)
if err == nil {
Expand All @@ -30,22 +42,41 @@ func GenerateSaveCoinKey(keybase keyring.Keyring, keyName string, overwrite bool

// ensure no overwrite
if !overwrite && exists {
return sdk.AccAddress([]byte{}), "", fmt.Errorf(
"key already exists, overwrite is disabled")
return sdk.AccAddress{}, "", fmt.Errorf("key already exists, overwrite is disabled")
}

// generate a private key, with recovery phrase
// remove the old key by name if it exists
if exists {
err = keybase.Delete(keyName)
if err != nil {
return sdk.AccAddress([]byte{}), "", fmt.Errorf(
"failed to overwrite key")
if err := keybase.Delete(keyName); err != nil {
return sdk.AccAddress{}, "", fmt.Errorf("failed to overwrite key")
}
}

info, secret, err := keybase.NewMnemonic(keyName, keyring.English, sdk.GetConfig().GetFullBIP44Path(), keyring.DefaultBIP39Passphrase, algo)
var (
info keyring.Info
secret string
)

if mnemonic != "" {
secret = mnemonic
info, err = keybase.NewAccount(
keyName,
mnemonic,
keyring.DefaultBIP39Passphrase,
sdk.GetConfig().GetFullBIP44Path(),
algo,
)
} else {
info, secret, err = keybase.NewMnemonic(
keyName,
keyring.English,
sdk.GetConfig().GetFullBIP44Path(),
keyring.DefaultBIP39Passphrase,
algo,
)
}
if err != nil {
return sdk.AccAddress([]byte{}), "", err
return sdk.AccAddress{}, "", err
}

return sdk.AccAddress(info.GetPubKey().Address()), secret, nil
Expand Down
8 changes: 4 additions & 4 deletions server/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestGenerateSaveCoinKey(t *testing.T) {
kb, err := keyring.New(t.Name(), "test", t.TempDir(), nil)
require.NoError(t, err)

addr, mnemonic, err := server.GenerateSaveCoinKey(kb, "keyname", false, hd.Secp256k1)
addr, mnemonic, err := server.GenerateSaveCoinKey(kb, "keyname", "", false, hd.Secp256k1)
require.NoError(t, err)

// Test key was actually saved
Expand All @@ -49,15 +49,15 @@ func TestGenerateSaveCoinKeyOverwriteFlag(t *testing.T) {
require.NoError(t, err)

keyname := "justakey"
addr1, _, err := server.GenerateSaveCoinKey(kb, keyname, false, hd.Secp256k1)
addr1, _, err := server.GenerateSaveCoinKey(kb, keyname, "", false, hd.Secp256k1)
require.NoError(t, err)

// Test overwrite with overwrite=false
_, _, err = server.GenerateSaveCoinKey(kb, keyname, false, hd.Secp256k1)
_, _, err = server.GenerateSaveCoinKey(kb, keyname, "", false, hd.Secp256k1)
require.Error(t, err)

// Test overwrite with overwrite=true
addr2, _, err := server.GenerateSaveCoinKey(kb, keyname, true, hd.Secp256k1)
addr2, _, err := server.GenerateSaveCoinKey(kb, keyname, "", true, hd.Secp256k1)
require.NoError(t, err)

require.NotEqual(t, addr1, addr2)
Expand Down
2 changes: 1 addition & 1 deletion simapp/simd/cmd/testnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func InitTestnet(
return err
}

addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, true, algo)
addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, "", true, algo)
if err != nil {
_ = os.RemoveAll(outputDir)
return err
Expand Down
9 changes: 8 additions & 1 deletion testutil/network/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ type Config struct {
TimeoutCommit time.Duration // the consensus commitment timeout
ChainID string // the network chain-id
NumValidators int // the total number of validators to create and bond
Mnemonics []string // custom user-provided validator operator mnemonics
BondDenom string // the staking bond denomination
MinGasPrices string // the minimum gas prices each validator will accept
AccountTokens sdk.Int // the amount of unique validator tokens (e.g. 1000node0)
Expand Down Expand Up @@ -265,6 +266,7 @@ func New(t *testing.T, cfg Config) *Network {

p2pAddr, _, err := server.FreeTCPAddr()
require.NoError(t, err)

tmCfg.P2P.ListenAddress = p2pAddr
tmCfg.P2P.AddrBookStrict = false
tmCfg.P2P.AllowDuplicateIP = true
Expand All @@ -281,7 +283,12 @@ func New(t *testing.T, cfg Config) *Network {
algo, err := keyring.NewSigningAlgoFromString(cfg.SigningAlgo, keyringAlgos)
require.NoError(t, err)

addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, true, algo)
var mnemonic string
if i < len(cfg.Mnemonics) {
mnemonic = cfg.Mnemonics[i]
}

addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, mnemonic, true, algo)
require.NoError(t, err)

info := map[string]string{"secret": secret}
Expand Down