LaconicNetwork/cosmjs-util
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #325 from CosmWasm/upgrade-wasmd

Browse Source 
Upgrade wasmd to v0.10.0-beta2
This commit is contained in:
Simon Warta 2020-07-30 11:32:15 +02:00 committed by GitHub
commit 73d57035d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 570 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/examples/delegate.ts
View File

@ -11,7 +11,7 @@ const msg: MsgDelegate = {
delegator_address: senderAddress,
// To get the proper validator address, start the demo chain (./scripts/wasmd/start.sh), then run:
// curl http://localhost:1317/staking/validators | jq '.result[0].operator_address'
validator_address: "cosmosvaloper1fa7hj49pf8uzc4m0lw5swjhhl5th2484gvnlpv",
validator_address: "cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5",
amount: coin(300000, "ustake"),
},
};

2
packages/cosmwasm/src/testutils.spec.ts
View File

@ -48,7 +48,7 @@ export const wasmd = {
chainId: "testing",
};
export const validatorAddress = "cosmosvaloper1fa7hj49pf8uzc4m0lw5swjhhl5th2484gvnlpv";
export const validatorAddress = "cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5";
export const alice = {
mnemonic: "enlist hip relief stomach skate base shallow young switch frequent cry park",

2
packages/demo-staking/src/index.spec.ts
View File

@ -31,7 +31,7 @@ const params = {
name: "Bounty",
symbol: "BOUNTY",
decimals: 3,
validator: "cosmosvaloper1fa7hj49pf8uzc4m0lw5swjhhl5th2484gvnlpv",
validator: "cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5",
exitTax: "0.005", // 0.5 %
minWithdrawal: "700",
};

2
packages/launchpad/src/lcdapi/slashing.spec.ts
View File

@ -17,7 +17,7 @@ describe("SlashingExtension", () => {
height: jasmine.stringMatching(nonNegativeIntegerMatcher),
result: [
{
address: "cosmosvalcons1cw2p365mwycxuy89ml3crg96tqen7vvm0xgujv",
address: "cosmosvalcons14dsaw6zrrk3zugfgwwhmwap8p5cxsemfesgcaw",
start_height: "0",
index_offset: jasmine.stringMatching(nonNegativeIntegerMatcher),
jailed_until: "1970-01-01T00:00:00Z",

33
packages/launchpad/src/lcdapi/staking.spec.ts
View File

@ -30,9 +30,6 @@ describe("StakingExtension", () => {
amount: coins(25000, "ucosm"),
gas: "1500000", // 1.5 million
};
const consensusPubkey =
"cosmosvalconspub1zcjduepq4stq4qg03lj68gx2lh2rpmnlcjtt0ejk0n6y3fv8kdkftcg79tmqkj9lqs";
const commissionUpdateTime = "2020-07-23T15:05:47.5072591Z";
beforeAll(async () => {
if (wasmdEnabled()) {
@ -153,13 +150,13 @@ describe("StakingExtension", () => {
result: [
{
operator_address: validatorAddress,
consensus_pubkey: consensusPubkey,
consensus_pubkey: wasmd.consensusPubkey,
jailed: false,
status: BondStatus.Bonded,
tokens: jasmine.stringMatching(nonNegativeIntegerMatcher),
delegator_shares: jasmine.stringMatching(bigDecimalMatcher),
description: {
moniker: "testing",
moniker: wasmd.moniker,
identity: "",
website: "",
security_contact: "",
@ -173,7 +170,7 @@ describe("StakingExtension", () => {
max_rate: "0.200000000000000000",
max_change_rate: "0.010000000000000000",
},
update_time: commissionUpdateTime,
update_time: wasmd.commissionUpdateTime,
},
min_self_delegation: "1",
},
@ -191,13 +188,13 @@ describe("StakingExtension", () => {
height: jasmine.stringMatching(nonNegativeIntegerMatcher),
result: {
operator_address: validatorAddress,
consensus_pubkey: consensusPubkey,
consensus_pubkey: wasmd.consensusPubkey,
jailed: false,
status: BondStatus.Bonded,
tokens: jasmine.stringMatching(nonNegativeIntegerMatcher),
delegator_shares: jasmine.stringMatching(bigDecimalMatcher),
description: {
moniker: "testing",
moniker: wasmd.moniker,
identity: "",
website: "",
security_contact: "",
@ -211,7 +208,7 @@ describe("StakingExtension", () => {
max_rate: "0.200000000000000000",
max_change_rate: "0.010000000000000000",
},
update_time: commissionUpdateTime,
update_time: wasmd.commissionUpdateTime,
},
min_self_delegation: "1",
},
@ -281,13 +278,13 @@ describe("StakingExtension", () => {
result: [
{
operator_address: validatorAddress,
consensus_pubkey: consensusPubkey,
consensus_pubkey: wasmd.consensusPubkey,
jailed: false,
status: BondStatus.Bonded,
tokens: jasmine.stringMatching(nonNegativeIntegerMatcher),
delegator_shares: jasmine.stringMatching(bigDecimalMatcher),
description: {
moniker: "testing",
moniker: wasmd.moniker,
identity: "",
website: "",
security_contact: "",
@ -301,7 +298,7 @@ describe("StakingExtension", () => {
max_rate: "0.200000000000000000",
max_change_rate: "0.010000000000000000",
},
update_time: commissionUpdateTime,
update_time: wasmd.commissionUpdateTime,
},
min_self_delegation: "1",
},
@ -328,13 +325,13 @@ describe("StakingExtension", () => {
result: [
{
operator_address: validatorAddress,
consensus_pubkey: consensusPubkey,
consensus_pubkey: wasmd.consensusPubkey,
jailed: false,
status: BondStatus.Bonded,
tokens: jasmine.stringMatching(nonNegativeIntegerMatcher),
delegator_shares: jasmine.stringMatching(bigDecimalMatcher),
description: {
moniker: "testing",
moniker: wasmd.moniker,
identity: "",
website: "",
security_contact: "",
@ -348,7 +345,7 @@ describe("StakingExtension", () => {
max_rate: "0.200000000000000000",
max_change_rate: "0.010000000000000000",
},
update_time: commissionUpdateTime,
update_time: wasmd.commissionUpdateTime,
},
min_self_delegation: "1",
},
@ -366,13 +363,13 @@ describe("StakingExtension", () => {
height: jasmine.stringMatching(nonNegativeIntegerMatcher),
result: {
operator_address: validatorAddress,
consensus_pubkey: consensusPubkey,
consensus_pubkey: wasmd.consensusPubkey,
jailed: false,
status: BondStatus.Bonded,
tokens: jasmine.stringMatching(nonNegativeIntegerMatcher),
delegator_shares: jasmine.stringMatching(bigDecimalMatcher),
description: {
moniker: "testing",
moniker: wasmd.moniker,
identity: "",
website: "",
security_contact: "",
@ -386,7 +383,7 @@ describe("StakingExtension", () => {
max_rate: "0.200000000000000000",
max_change_rate: "0.010000000000000000",
},
update_time: commissionUpdateTime,
update_time: wasmd.commissionUpdateTime,
},
min_self_delegation: "1",
},

7
packages/launchpad/src/testutils.spec.ts
View File

@ -29,6 +29,9 @@ export const bech32AddressMatcher = /^[\x21-\x7e]{1,83}1[02-9ac-hj-np-z]{38}$/;
export const wasmd = {
endpoint: "http://localhost:1317",
chainId: "testing",
moniker: "node001",
commissionUpdateTime: "2020-07-30T07:56:51.316162Z",
consensusPubkey: "cosmosvalconspub1zcjduepquk9s489p8l40yvq9er07tfjzkpm4ku4wphhz6567793dsjmdec4suucg87",
};
export const faucet = {
@ -41,8 +44,8 @@ export const faucet = {
address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
};
export const validatorAddress = "cosmosvaloper1fa7hj49pf8uzc4m0lw5swjhhl5th2484gvnlpv";
export const delegatorAddress = "cosmos1fa7hj49pf8uzc4m0lw5swjhhl5th2484dc82dl";
export const validatorAddress = "cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5";
export const delegatorAddress = "cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8";
/** Unused account */
export const unused = {

2
scripts/wasmd/deploy_staking.js
View File

@ -24,7 +24,7 @@ const bounty = {
name: "Bounty",
symbol: "BOUNTY",
decimals: 3,
validator: "cosmosvaloper1fa7hj49pf8uzc4m0lw5swjhhl5th2484gvnlpv",
validator: "cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5",
exit_tax: "0.005", // 0.5 %
min_withdrawal: "7",
},

2
scripts/wasmd/env
View File

@ -1,5 +1,5 @@
# Choose from https://hub.docker.com/r/cosmwasm/wasmd/tags
REPOSITORY="cosmwasm/wasmd"
VERSION="v0.10.0-beta1"
VERSION="v0.10.0-beta2"
CONTAINER_NAME="wasmd"

14
scripts/wasmd/generate_template.sh
View File

@ -27,3 +27,17 @@ docker run --rm \
if [ ! -x "$SCRIPT_DIR/template/.wasmd/config/gentx" ]; then
sudo chown -R "$(id -u):$(id -g)" "$SCRIPT_DIR/template"
fi
function inline_jq() {
IN_OUT_PATH="$1"
shift
TMP_DIR=$(mktemp -d "${TMPDIR:-/tmp}/inline_jq.XXXXXXXXX")
TMP_FILE="$TMP_DIR/$(basename "$IN_OUT_PATH")"
jq "$@" < "$IN_OUT_PATH" > "$TMP_FILE"
if ! mv "$TMP_FILE" "$IN_OUT_PATH" ; then
>&2 echo "Temp file '$TMP_FILE' could not be deleted. If it contains sensitive data, you might want to delete it manually."
exit 3
fi
}
inline_jq "$SCRIPT_DIR/template/.wasmd/config/genesis.json" -S

1
scripts/wasmd/template/.wasmcli/cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8.address Normal file
View File

@ -0,0 +1 @@
eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0zMCAwNzo1Njo1MS43OTEzNjc1ICswMDAwIFVUQyBtPSswLjI0MDQ0ODAwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6ImZESXRfb3IxSWNydVpDN0IifQ.eGSywRlJkns3c49LaAbGjW0DAqgAbhcvhusx0PM-LayR5AKhfsLPkg.q7KaHLvxwE43qqKU.R-1VrfIvrGmC4Dom3zQRjtEdW6yIh84GmvPdUyTa7eshvvi84ci7tbIWS9e4ef44IwY1HZftEdc065dTd2_L9NpdT2em9mluLSQc1qNm5ZohhvGWHnvDso1dhl_KzRh4YWWdVCatz__rCc-bGU8sGM4zcGZOtYjsWGhdoiubeVRGVjtSr9VP4b1VxIB8LAHdt0KB8TsnRKLCnffKVV7CUcMMlHE8BH7cnW-lsj-sDN3FdoKA_ZYzpqP0I2swzFc.sPUiV4zk2Osr5LjFzMHJ_w

1
scripts/wasmd/template/.wasmcli/cosmos1fa7hj49pf8uzc4m0lw5swjhhl5th2484dc82dl.address
View File

@ -1 +0,0 @@
eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0yMyAxNTowNTo0OC4yMDIyMjEgKzAwMDAgVVRDIG09KzAuNDA3MTQ2NDAxIiwiZW5jIjoiQTI1NkdDTSIsInAyYyI6ODE5MiwicDJzIjoiZXhEVEM1dGVraTVyMDg4ZyJ9.AluhnvIPJAJZZIUwCATLZ2eQNBy-bqUMOwa1QVokRPU4MWOsuxx-TQ.3vXpP5cMQEXdSBko.l5BzPkI5_DUm-iUBM9T9po-9YXYmGK62eieeFVA_WzESZPYxk51fQq_8DCdhh6Y6DhmmvQXPv3hjqQgIgdxPRBFlJwNawrqLElWIVuiS02tAjwQXAw6to0sdNtJc5r8Fzr82aD_lRMDiJ5ZoJ6i3wHLgmfwtOH0JdGwGFwiEQYuWX0SK0Ms2LHUydmsriX6MbHik24R061Qc3dR0GfclCb9dP_jRvXBhen8EJyt3cM3opYZ5lqDcLv_OQnDaFb4.Ctl177TJVkOiSYSaG3IBBg

2
scripts/wasmd/template/.wasmcli/keyhash
View File

@ -1 +1 @@
$2a$10$abqhPxzHS1zZtl8I9L7bLuwABtXPoXqU1TV8h9JOcb.8m1C7qkvi2
$2a$10$KtOhQS95EYj2VjXQumLH..sav7xhFXhWASW54wVIorrZf7N/KhGDa

2
scripts/wasmd/template/.wasmcli/validator.info
View File

@ -1 +1 @@
eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0yMyAxNTowNTo0OC4xODMyNTc4ICswMDAwIFVUQyBtPSswLjM4ODE4MTkwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6ImxLY1drcHN2cVYwWVYxQksifQ.a9_6WjbE5TSQIcEdUMO9WczzYwzxYPsij9eAo86HwjcpJItnf20uzQ.aYpAcsXC26TMcQaq.DWnCBJPsWe_RVjABxT7PS6CKK2H5v0WHUAMpth8BH6xVh46Sy1JANjkZpBxtqXjNPcl1r_9hQ_lKDtqwEWybgqOxBLamvLXYV2k8FiF-_dd1uhFbSx3YPTLZSQRfI2cBm-IG275SO-FrbTN7Gsdm1nVbJ_Dyoz4wAAayDoPPOsOiezn2PDDqYdI2oMf6IzP92MF6bmIsUn2KPcxtEQZOnk3BiWoKDg6zR4VOCaRyDbKZH6B7lMV0k_Rud9WkLsLh-00vGOs5HRutAm820fe1DOcuS0EwA13mCjuELKodba5tgKnmEhoX8LYCMIrohklVEnZx3CvP0WL2b55ckMsJUapY52CIW9laYsdLyWD_-8EcqIcN.jSj6pS9fZsP240PRkNdkcA
eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0zMCAwNzo1Njo1MS43NzM4NjgyICswMDAwIFVUQyBtPSswLjIyMjk1MTIwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6IlpRSlZTYUh2SEJGMlBYZkwifQ.vAgHHBe4gxjcog1OpZMrwEwmqOg8FkBQQRiKX949hjUCMHLoTyR3Ig.TMsgWFpwxLd7N4Hk.wz2mhNPjqecTmcek2AODgYxU7kS1_Nxnn0vpcmxHRwxH1PnlTVY9AKEiOTHzA_V0deuLODe549mryw8ZFJITRI6DJAAVlluBiajOle2vvFnVSI9Toive7AzAU4yj8nH-TcvD8tTT5uT_L2EjUGfz_EMec0P8ynYLn8ociDDv_RqBAkFlvvJmXN2mo_cjY01Ocv7R97Wf7w3t3ppyG5s_guWMOUeUk59PWziksBec5HgUOnDZs6y_RKXRHqJ0U68RJ1m8SGHCpXpCqtx9j6XGofr3otxhIKwfyLsVcU_I73YaKMriy0JO8FQROXb6tQWDIy5hn4uqX5o-TOcZZyx55S6FyJV06vhWl_sV3jTD7LF_yY-y.p4fVYwIvJelEXpoFM7yKzg

2
scripts/wasmd/template/.wasmd/config/config.toml
View File

@ -13,7 +13,7 @@
proxy_app = "tcp://127.0.0.1:26658"
# A custom human readable name for this node
moniker = "testing"
moniker = "node001"
# If this node is many blocks behind the tip of the chain, FastSync
# allows them to catchup quickly by downloading blocks in parallel

1042
scripts/wasmd/template/.wasmd/config/genesis.json
View File

File diff suppressed because it is too large Load Diff

1
scripts/wasmd/template/.wasmd/config/gentx/gentx-63e5ed7f6afb5c13f0f3b72c40a9625cfe2367cc.json
View File

@ -1 +0,0 @@
{"type":"cosmos-sdk/StdTx","value":{"msg":[{"type":"cosmos-sdk/MsgCreateValidator","value":{"description":{"moniker":"testing","identity":"","website":"","security_contact":"","details":""},"commission":{"rate":"0.100000000000000000","max_rate":"0.200000000000000000","max_change_rate":"0.010000000000000000"},"min_self_delegation":"1","delegator_address":"cosmos1fa7hj49pf8uzc4m0lw5swjhhl5th2484dc82dl","validator_address":"cosmosvaloper1fa7hj49pf8uzc4m0lw5swjhhl5th2484gvnlpv","pubkey":"cosmosvalconspub1zcjduepq4stq4qg03lj68gx2lh2rpmnlcjtt0ejk0n6y3fv8kdkftcg79tmqkj9lqs","value":{"denom":"ustake","amount":"250000000"}}}],"fee":{"amount":[],"gas":"200000"},"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A86IqNk0TzElybtbOZvBzSBWHCXqyiwpeGue3urj7htq"},"signature":"1B0LMHhTYx8TjYLTYHEWsScwNsmuYhGW1drBjHIAcK1I7lDPsS7j6mR4zi8h60pA8o3dntd4QyaAKrkkeso0nw=="}],"memo":"63e5ed7f6afb5c13f0f3b72c40a9625cfe2367cc@172.17.0.2:26656"}}

1
scripts/wasmd/template/.wasmd/config/gentx/gentx-edd6e4f7ff8ce0ebfd3a88f76d996a2b3adb786b.json Normal file
View File

@ -0,0 +1 @@
{"type":"cosmos-sdk/StdTx","value":{"msg":[{"type":"cosmos-sdk/MsgCreateValidator","value":{"description":{"moniker":"node001","identity":"","website":"","security_contact":"","details":""},"commission":{"rate":"0.100000000000000000","max_rate":"0.200000000000000000","max_change_rate":"0.010000000000000000"},"min_self_delegation":"1","delegator_address":"cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8","validator_address":"cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5","pubkey":"cosmosvalconspub1zcjduepquk9s489p8l40yvq9er07tfjzkpm4ku4wphhz6567793dsjmdec4suucg87","value":{"denom":"ustake","amount":"250000000"}}}],"fee":{"amount":[],"gas":"200000"},"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6DsnJxw+OqoKXTT9DPV+h258al6Ct8gdvxXf4WWPYOs"},"signature":"Tz843oatU3VdE959b4+VRQQNhqH7Na+tS8rhnbJ6Xgglm0LboI/Q1Qh38OF070HYVn3Qu89nKTPPUOlf6GejIQ=="}],"memo":"edd6e4f7ff8ce0ebfd3a88f76d996a2b3adb786b@172.17.0.2:26656"}}

2
scripts/wasmd/template/.wasmd/config/node_key.json
View File

@ -1 +1 @@
{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"QEVb0Y11/d99W33tpsUxsuqrDeU6m66k8Ljua8SUCT6TAnr7Ek0Hlosqsb0b3ZcTUHEmfNz7Dc/VbsGcePb8jw=="}}
{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"AS08VgOfDWn4R1OCS5Gpp/vBjJXYaD63hjHWaVh7qVYjiGK/2HtkUCcEI1op/2isQOc8PJT/HJyll8w4QCxG0w=="}}

6
scripts/wasmd/template/.wasmd/config/priv_validator_key.json
View File

@ -1,11 +1,11 @@
{
"address": "C39418EA9B71306E10E5DFE381A0BA58333F319B",
"address": "AB61D768431DA22E212873AFB774270D30686769",
"pub_key": {
"type": "tendermint/PubKeyEd25519",
"value": "rBYKgQ+P5aOgyv3UMO5/xJa35lZ89Eilh7NsleEeKvY="
"value": "5YsKnKE/6vIwBcjf5aZCsHdbcq4N7i1TXvFi2Ettzis="
},
"priv_key": {
"type": "tendermint/PrivKeyEd25519",
"value": "uNoZu7I9SlFjxKE5W2YtjGoWNz6Qv2hzAXkkgmIQn5usFgqBD4/lo6DK/dQw7n/ElrfmVnz0SKWHs2yV4R4q9g=="
"value": "yVOwXtMbtltErHRISdaKa7mXqKR1Lfp9ZjpOgpP0JFjliwqcoT/q8jAFyN/lpkKwd1tyrg3uLVNe8WLYS23OKw=="
}
}