From 548f427862430fe158392ff679bec27eddc78603 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 23 Sep 2020 12:20:57 +0200 Subject: [PATCH 1/4] Fix demo link in README --- packages/launchpad-ledger/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/launchpad-ledger/README.md b/packages/launchpad-ledger/README.md index 0d2f1b409b..671258cfa1 100644 --- a/packages/launchpad-ledger/README.md +++ b/packages/launchpad-ledger/README.md @@ -49,7 +49,7 @@ python3 -m http.server ``` Visit the demo page in a browser, for example if using the Python 3 option: -[http://localhost:8000/demo](). +http://localhost:8000/demo. Then follow the instructions on that page. From b46ab541beb8b5867f9943c2f239d632496ae04f Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 23 Sep 2020 12:23:26 +0200 Subject: [PATCH 2/4] Document Ledger demo account --- scripts/wasmd/README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/scripts/wasmd/README.md b/scripts/wasmd/README.md index 2f8721e8c7..1a15100085 100644 --- a/scripts/wasmd/README.md +++ b/scripts/wasmd/README.md @@ -126,3 +126,27 @@ You should get output matching the following: degree tackle suggest window test behind mesh extra cover prepare oak script
Am/+YV0LaeqQPu7BDJuDHV7J8y68ptkGs10YS+9s71Nq
cosmos17d0jcz59jf68g52vq38tuuncmwwjk42u6mcxej +6. **Ledger**: accounts for Ledger based demos and tests
+ example indicate trick cereal hub fix civil host kiss version bird dash
+ Address 0: cosmos1p6xs63q4g7np99ttv5nd3yzkt8n4qxa47w8aea
+ Address 1: cosmos1meeu3jl268txxytwmmrsljk8rawh6n2majstn2
+ Address 2: cosmos1cak6lnpfxs035xd88sq8e4zujsm8g2g97dxu5c
+ Address 3: cosmos1x3x8kyypx8z6q7fx3gw65x29mhl5gg8qp4ynlr
+ Address 4: cosmos18c27m2rj4lg74md03ujralvt562c097n8zpdf9
+ Address 5: cosmos1q2y53e6x7s5mlddtd2qkcjr3nwr4dszv6fr9rt
+ Address 6: cosmos1paa2gstlk7c98n27dw2g6tp6fyqvf32mm67qz3
+ Address 7: cosmos1rvxjd8k6xvssz2eerfzemvat35pttfgr67yyzd
+ Address 8: cosmos12zejt8d9xl70jd2333p4p265m2nr9h8gsaewk0
+ Address 9: cosmos1exctm2036jtwyc9v3ftqfzmgnv9tdhj26v87uh
+ Address 10: cosmos1f3pws3ztnp3s4nn5zxqdrl9vlqv5avkqmlrus4
+ Pubkey 0: A66JoCNaNSXDsyj4qW7JgqXPTz5rOnfE6EKEArf4jJEK
+ Pubkey 1: AtvmGuZvEN3NwL05BQdxl3XygUf+Vl/930fhFMt1HTyU
+ Pubkey 2: A58dfmfVoKoTCteEzTHBC0OLJIBgzejGDVVEb8YW9vtJ
+ Pubkey 3: A1wA01EixwcWJkdhI69ckGuQDX0NimhLCYdrQCegkOJF
+ Pubkey 4: A9juq+VbP26qtVh71ANlwwJQ+ABTWIyHEKYrVwjmbYE6
+ Pubkey 5: Ar4VUqiRYl75+TF3AExX8at3deeLj2O9mNMtBq2aVpym
+ Pubkey 6: Ak/JoSXzu6+Rp2W0wT6CqfZfzlDOwebl7xVF/zmKX99Y
+ Pubkey 7: AtmLZZGHeCiNuroPAzBK2NKeXKT68SwioLj4I8Oj35Mn
+ Pubkey 8: AuaUr9GEMUBKeZrJD/dv9QL/zJmMxX7OA/sjRrvBFXS2
+ Pubkey 9: AiV5uMzvzoD7hlF+GhYuRCnf8tP+0AlPMbtfVoYv3InI
+ Pubkey 10: A2ZnLEcbpyjS30H5UF1vezq29aBcT9oo5EARATIW9Cpj From 12dec1f4dc4cd992ac935138319a3f9757893f98 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 23 Sep 2020 17:13:34 +0200 Subject: [PATCH 3/4] Add funds to Ledger accounts --- packages/cli/examples/delegate.ts | 2 +- packages/cosmwasm/src/testutils.spec.ts | 2 +- packages/launchpad/src/testutils.spec.ts | 4 +- scripts/wasmd/generate_template.sh | 3 +- ...vm0c5mz85ecdy4ldftk4a3ydcyp24yv403.address | 1 + ...2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8.address | 1 - scripts/wasmd/template/.wasmcli/keyhash | 2 +- .../wasmd/template/.wasmcli/validator.info | 2 +- .../wasmd/template/.wasmd/config/genesis.json | 225 +++++++++++++++++- ...53cc5185f6dcfdb2084a6bba902d70b0bbd0d.json | 1 + ...6e4f7ff8ce0ebfd3a88f76d996a2b3adb786b.json | 1 - .../template/.wasmd/config/node_key.json | 2 +- .../.wasmd/config/priv_validator_key.json | 6 +- 13 files changed, 231 insertions(+), 21 deletions(-) create mode 100644 scripts/wasmd/template/.wasmcli/cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403.address delete mode 100644 scripts/wasmd/template/.wasmcli/cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8.address create mode 100644 scripts/wasmd/template/.wasmd/config/gentx/gentx-3d253cc5185f6dcfdb2084a6bba902d70b0bbd0d.json delete mode 100644 scripts/wasmd/template/.wasmd/config/gentx/gentx-edd6e4f7ff8ce0ebfd3a88f76d996a2b3adb786b.json diff --git a/packages/cli/examples/delegate.ts b/packages/cli/examples/delegate.ts index 7055050f49..51892dee3a 100644 --- a/packages/cli/examples/delegate.ts +++ b/packages/cli/examples/delegate.ts @@ -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: "cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5", + validator_address: "cosmosvaloper103c7vm0c5mz85ecdy4ldftk4a3ydcyp2sscqrz", amount: coin(300000, "ustake"), }, }; diff --git a/packages/cosmwasm/src/testutils.spec.ts b/packages/cosmwasm/src/testutils.spec.ts index f52e84b5ae..765d2e8a66 100644 --- a/packages/cosmwasm/src/testutils.spec.ts +++ b/packages/cosmwasm/src/testutils.spec.ts @@ -48,7 +48,7 @@ export const wasmd = { chainId: "testing", }; -export const validatorAddress = "cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5"; +export const validatorAddress = "cosmosvaloper103c7vm0c5mz85ecdy4ldftk4a3ydcyp2sscqrz"; export const alice = { mnemonic: "enlist hip relief stomach skate base shallow young switch frequent cry park", diff --git a/packages/launchpad/src/testutils.spec.ts b/packages/launchpad/src/testutils.spec.ts index 5cb478a14f..bb72d809d1 100644 --- a/packages/launchpad/src/testutils.spec.ts +++ b/packages/launchpad/src/testutils.spec.ts @@ -44,8 +44,8 @@ export const faucet = { address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6", }; -export const validatorAddress = "cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5"; -export const delegatorAddress = "cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8"; +export const validatorAddress = "cosmosvaloper103c7vm0c5mz85ecdy4ldftk4a3ydcyp2sscqrz"; +export const delegatorAddress = "cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403"; /** Unused account */ export const unused = { diff --git a/scripts/wasmd/generate_template.sh b/scripts/wasmd/generate_template.sh index e0b4a53912..b2b981b7fc 100755 --- a/scripts/wasmd/generate_template.sh +++ b/scripts/wasmd/generate_template.sh @@ -20,7 +20,8 @@ docker run --rm \ cosmos14qemq0vw6y3gc3u3e0aty2e764u4gs5le3hada cosmos1hhg2rlu9jscacku2wwckws7932qqqu8x3gfgw0 cosmos1xv9tklw7d82sezh9haa573wufgy59vmwe6xxe5 cosmos17yg9mssjenmc3jkqth6ulcwj9cxujrxxzezwta cosmos1f7j7ryulwjfe9ljplvhtcaxa6wqgula3etktce \ cosmos1lvrwcvrqlc5ktzp2c4t22xgkx29q3y83lktgzl cosmos1vkv9sfwaak76weyamqx0flmng2vuquxqcuqukh cosmos106jwym4s9aujcmes26myzzwqsccw09sdm0v5au cosmos1c7wpeen2uv8thayf7g8q2rgpm29clj0dgrdtzw cosmos1mjxpv9ft30wer7ma7kwfxhm42l379xutplrdk6 \ cosmos1cjsxept9rkggzxztslae9ndgpdyt2408lk850u \ - cosmos17d0jcz59jf68g52vq38tuuncmwwjk42u6mcxej + cosmos17d0jcz59jf68g52vq38tuuncmwwjk42u6mcxej \ + cosmos1p6xs63q4g7np99ttv5nd3yzkt8n4qxa47w8aea cosmos1meeu3jl268txxytwmmrsljk8rawh6n2majstn2 cosmos1cak6lnpfxs035xd88sq8e4zujsm8g2g97dxu5c cosmos1x3x8kyypx8z6q7fx3gw65x29mhl5gg8qp4ynlr cosmos18c27m2rj4lg74md03ujralvt562c097n8zpdf9 cosmos1q2y53e6x7s5mlddtd2qkcjr3nwr4dszv6fr9rt cosmos1paa2gstlk7c98n27dw2g6tp6fyqvf32mm67qz3 cosmos1rvxjd8k6xvssz2eerfzemvat35pttfgr67yyzd cosmos12zejt8d9xl70jd2333p4p265m2nr9h8gsaewk0 cosmos1exctm2036jtwyc9v3ftqfzmgnv9tdhj26v87uh cosmos1f3pws3ztnp3s4nn5zxqdrl9vlqv5avkqmlrus4 # The ./template folder is created by the docker daemon's user (root on Linux, current user # when using Docker Desktop on macOS), let's make it ours if needed diff --git a/scripts/wasmd/template/.wasmcli/cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403.address b/scripts/wasmd/template/.wasmcli/cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403.address new file mode 100644 index 0000000000..fa44883413 --- /dev/null +++ b/scripts/wasmd/template/.wasmcli/cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403.address @@ -0,0 +1 @@ +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wOS0yMyAxNToxMToxNS4zOTU5Nzc5ICswMDAwIFVUQyBtPSswLjM0NjczNjMwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6Im1FYkRfZlZoWjUyR1BYVjIifQ.ZTFudH1lWZFVe_vBBV73K48D5C7nj4D0jI9XIWtHlN28BloP6CWHKw.kdPuBtWiEaw6Q7yF.u5k6dvT1IufD_KzXi6rXAqVU6s5MQ9I5bbi5HRY7Cm3wRDIsWaiAkhMdRCX8l0DYj2MqXH7IzGSWOAsmHw2Xbovwp3_CV0-QZn1ALb8hDuoWAcVat2KQxd2ilmsgPVy2PyUR9g7QJllIBcr-uUfBTp2XoXsmdYClVHS67JVu7EdQ410vDU4gUsOqquNKIqdNP5ZfIH9Sz_TsYckQwQRnqR3sDKUr28uXl2Pqs0G9lVhn1XxlWoUIrPxMsRL5q6M.fBJYWSAGRv1DB4JVBqmbNg \ No newline at end of file diff --git a/scripts/wasmd/template/.wasmcli/cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8.address b/scripts/wasmd/template/.wasmcli/cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8.address deleted file mode 100644 index 6f9626b2b1..0000000000 --- a/scripts/wasmd/template/.wasmcli/cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8.address +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0zMCAwNzo1Njo1MS43OTEzNjc1ICswMDAwIFVUQyBtPSswLjI0MDQ0ODAwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6ImZESXRfb3IxSWNydVpDN0IifQ.eGSywRlJkns3c49LaAbGjW0DAqgAbhcvhusx0PM-LayR5AKhfsLPkg.q7KaHLvxwE43qqKU.R-1VrfIvrGmC4Dom3zQRjtEdW6yIh84GmvPdUyTa7eshvvi84ci7tbIWS9e4ef44IwY1HZftEdc065dTd2_L9NpdT2em9mluLSQc1qNm5ZohhvGWHnvDso1dhl_KzRh4YWWdVCatz__rCc-bGU8sGM4zcGZOtYjsWGhdoiubeVRGVjtSr9VP4b1VxIB8LAHdt0KB8TsnRKLCnffKVV7CUcMMlHE8BH7cnW-lsj-sDN3FdoKA_ZYzpqP0I2swzFc.sPUiV4zk2Osr5LjFzMHJ_w \ No newline at end of file diff --git a/scripts/wasmd/template/.wasmcli/keyhash b/scripts/wasmd/template/.wasmcli/keyhash index cbc8cad15d..517d75d8c8 100755 --- a/scripts/wasmd/template/.wasmcli/keyhash +++ b/scripts/wasmd/template/.wasmcli/keyhash @@ -1 +1 @@ -$2a$10$KtOhQS95EYj2VjXQumLH..sav7xhFXhWASW54wVIorrZf7N/KhGDa \ No newline at end of file +$2a$10$KjCoH2Ogpta5l9JGDwzkkusW9z9NYCv0kFgQXYf8ZpAKgz7ARQwva \ No newline at end of file diff --git a/scripts/wasmd/template/.wasmcli/validator.info b/scripts/wasmd/template/.wasmcli/validator.info index 4f4df5c21f..8f19748b5c 100644 --- a/scripts/wasmd/template/.wasmcli/validator.info +++ b/scripts/wasmd/template/.wasmcli/validator.info @@ -1 +1 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0zMCAwNzo1Njo1MS43NzM4NjgyICswMDAwIFVUQyBtPSswLjIyMjk1MTIwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6IlpRSlZTYUh2SEJGMlBYZkwifQ.vAgHHBe4gxjcog1OpZMrwEwmqOg8FkBQQRiKX949hjUCMHLoTyR3Ig.TMsgWFpwxLd7N4Hk.wz2mhNPjqecTmcek2AODgYxU7kS1_Nxnn0vpcmxHRwxH1PnlTVY9AKEiOTHzA_V0deuLODe549mryw8ZFJITRI6DJAAVlluBiajOle2vvFnVSI9Toive7AzAU4yj8nH-TcvD8tTT5uT_L2EjUGfz_EMec0P8ynYLn8ociDDv_RqBAkFlvvJmXN2mo_cjY01Ocv7R97Wf7w3t3ppyG5s_guWMOUeUk59PWziksBec5HgUOnDZs6y_RKXRHqJ0U68RJ1m8SGHCpXpCqtx9j6XGofr3otxhIKwfyLsVcU_I73YaKMriy0JO8FQROXb6tQWDIy5hn4uqX5o-TOcZZyx55S6FyJV06vhWl_sV3jTD7LF_yY-y.p4fVYwIvJelEXpoFM7yKzg \ No newline at end of file +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wOS0yMyAxNToxMToxNS4zODE4MTAxICswMDAwIFVUQyBtPSswLjMzMjY0MzAwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6Ik5HR0xVeEZ4eHVvUUVBMjcifQ.2pPJONN22K88-ldWr3cLTC1IkTsBumZGn7hzU2FZysQrtfKuUhXopA.7hqZmyPddwRGa4Xg.h29Y4fGduamp6W5IzjRoWNIiyD8n3zsF6t-5t_eK_VEuyQEt0hGrwb3CYEV6g1ld4gF16iqNlzAfWsv-kkREno5_diZZAlLWDgpQDOUhxrQaKZYmrFPU70alpnzOSlFWIsxXG0a-XDsBRq583N-Yfrof_UQWH5dJ4PmLHnlt-dVhM7yPkTF1eRJgN4UnHJid2zaO7zPyzrw_dA76goNRStjfv95W2B8RE8by_2tr_ZIfQWDZv-44tNCgOoUzEFLLW50LJ4FQrS-PL5iJPI4Frp3ExMbSKFqLNw_JGWeYTutY6GrcT_OOGzlYcCouC7HJLONt7IOp-_QVfRb4FEnDkKFggKqpVCoKS4Xa-0b9x8wgIIcp.a_x-yHs1mOdAPRWYIfW8ig \ No newline at end of file diff --git a/scripts/wasmd/template/.wasmd/config/genesis.json b/scripts/wasmd/template/.wasmd/config/genesis.json index 6428c566ee..e426443d18 100644 --- a/scripts/wasmd/template/.wasmd/config/genesis.json +++ b/scripts/wasmd/template/.wasmd/config/genesis.json @@ -7,7 +7,7 @@ "type": "cosmos-sdk/Account", "value": { "account_number": "0", - "address": "cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8", + "address": "cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403", "coins": [ { "amount": "1000000000", @@ -344,6 +344,215 @@ "public_key": null, "sequence": "0" } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos1p6xs63q4g7np99ttv5nd3yzkt8n4qxa47w8aea", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos1meeu3jl268txxytwmmrsljk8rawh6n2majstn2", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos1cak6lnpfxs035xd88sq8e4zujsm8g2g97dxu5c", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos1x3x8kyypx8z6q7fx3gw65x29mhl5gg8qp4ynlr", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos18c27m2rj4lg74md03ujralvt562c097n8zpdf9", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos1q2y53e6x7s5mlddtd2qkcjr3nwr4dszv6fr9rt", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos1paa2gstlk7c98n27dw2g6tp6fyqvf32mm67qz3", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos1rvxjd8k6xvssz2eerfzemvat35pttfgr67yyzd", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos12zejt8d9xl70jd2333p4p265m2nr9h8gsaewk0", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos1exctm2036jtwyc9v3ftqfzmgnv9tdhj26v87uh", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } + }, + { + "type": "cosmos-sdk/Account", + "value": { + "account_number": "0", + "address": "cosmos1f3pws3ztnp3s4nn5zxqdrl9vlqv5avkqmlrus4", + "coins": [ + { + "amount": "1000000000", + "denom": "ucosm" + }, + { + "amount": "1000000000", + "denom": "ustake" + } + ], + "public_key": null, + "sequence": "0" + } } ], "params": { @@ -397,7 +606,7 @@ "amount": [], "gas": "200000" }, - "memo": "edd6e4f7ff8ce0ebfd3a88f76d996a2b3adb786b@172.17.0.2:26656", + "memo": "3d253cc5185f6dcfdb2084a6bba902d70b0bbd0d@172.17.0.5:26656", "msg": [ { "type": "cosmos-sdk/MsgCreateValidator", @@ -407,7 +616,7 @@ "max_rate": "0.200000000000000000", "rate": "0.100000000000000000" }, - "delegator_address": "cosmos1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7rrqns8", + "delegator_address": "cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403", "description": { "details": "", "identity": "", @@ -416,8 +625,8 @@ "website": "" }, "min_self_delegation": "1", - "pubkey": "cosmosvalconspub1zcjduepquk9s489p8l40yvq9er07tfjzkpm4ku4wphhz6567793dsjmdec4suucg87", - "validator_address": "cosmosvaloper1e9zn2ueue2m0edjhmsgsf03yfcmeg7m7xh5xu5", + "pubkey": "cosmosvalconspub1zcjduepq2dayuk3xq8rxqq6lyw6aqp2jaywdr8d855g09jf9h527zqwhqxgq7vf6kf", + "validator_address": "cosmosvaloper103c7vm0c5mz85ecdy4ldftk4a3ydcyp2sscqrz", "value": { "amount": "250000000", "denom": "ustake" @@ -429,9 +638,9 @@ { "pub_key": { "type": "tendermint/PubKeySecp256k1", - "value": "A6DsnJxw+OqoKXTT9DPV+h258al6Ct8gdvxXf4WWPYOs" + "value": "Aw/GXguVCZWw03ADgT0n0RdYChOId8TJxzrmvDJzhhJQ" }, - "signature": "Tz843oatU3VdE959b4+VRQQNhqH7Na+tS8rhnbJ6Xgglm0LboI/Q1Qh38OF070HYVn3Qu89nKTPPUOlf6GejIQ==" + "signature": "fHFXV5EdCw9uRC1Abk+slDHrXB3l25iKCDfp5+rVhm5M1/KiHD4prKq/2hru4l3hHVm+UkfK0TxYGiz8J4TEJQ==" } ] } @@ -533,5 +742,5 @@ ] } }, - "genesis_time": "2020-07-30T07:56:51.316162Z" + "genesis_time": "2020-09-23T15:11:14.6660427Z" } diff --git a/scripts/wasmd/template/.wasmd/config/gentx/gentx-3d253cc5185f6dcfdb2084a6bba902d70b0bbd0d.json b/scripts/wasmd/template/.wasmd/config/gentx/gentx-3d253cc5185f6dcfdb2084a6bba902d70b0bbd0d.json new file mode 100644 index 0000000000..03f3dbbfdc --- /dev/null +++ b/scripts/wasmd/template/.wasmd/config/gentx/gentx-3d253cc5185f6dcfdb2084a6bba902d70b0bbd0d.json @@ -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":"cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403","validator_address":"cosmosvaloper103c7vm0c5mz85ecdy4ldftk4a3ydcyp2sscqrz","pubkey":"cosmosvalconspub1zcjduepq2dayuk3xq8rxqq6lyw6aqp2jaywdr8d855g09jf9h527zqwhqxgq7vf6kf","value":{"denom":"ustake","amount":"250000000"}}}],"fee":{"amount":[],"gas":"200000"},"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Aw/GXguVCZWw03ADgT0n0RdYChOId8TJxzrmvDJzhhJQ"},"signature":"fHFXV5EdCw9uRC1Abk+slDHrXB3l25iKCDfp5+rVhm5M1/KiHD4prKq/2hru4l3hHVm+UkfK0TxYGiz8J4TEJQ=="}],"memo":"3d253cc5185f6dcfdb2084a6bba902d70b0bbd0d@172.17.0.5:26656"}} diff --git a/scripts/wasmd/template/.wasmd/config/gentx/gentx-edd6e4f7ff8ce0ebfd3a88f76d996a2b3adb786b.json b/scripts/wasmd/template/.wasmd/config/gentx/gentx-edd6e4f7ff8ce0ebfd3a88f76d996a2b3adb786b.json deleted file mode 100644 index 624d41fc04..0000000000 --- a/scripts/wasmd/template/.wasmd/config/gentx/gentx-edd6e4f7ff8ce0ebfd3a88f76d996a2b3adb786b.json +++ /dev/null @@ -1 +0,0 @@ -{"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"}} diff --git a/scripts/wasmd/template/.wasmd/config/node_key.json b/scripts/wasmd/template/.wasmd/config/node_key.json index 1ea830dcb0..d79ddfd099 100644 --- a/scripts/wasmd/template/.wasmd/config/node_key.json +++ b/scripts/wasmd/template/.wasmd/config/node_key.json @@ -1 +1 @@ -{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"AS08VgOfDWn4R1OCS5Gpp/vBjJXYaD63hjHWaVh7qVYjiGK/2HtkUCcEI1op/2isQOc8PJT/HJyll8w4QCxG0w=="}} \ No newline at end of file +{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"onuFneEXM0vUuxUL8tky4HQ0HE6MYGraDNUugxXWadYWTd8ZkGWUCJA8k1zUCCQ7or51gDByvwHG6a+cR420/w=="}} \ No newline at end of file diff --git a/scripts/wasmd/template/.wasmd/config/priv_validator_key.json b/scripts/wasmd/template/.wasmd/config/priv_validator_key.json index 46e1da9a4d..f144d8675c 100644 --- a/scripts/wasmd/template/.wasmd/config/priv_validator_key.json +++ b/scripts/wasmd/template/.wasmd/config/priv_validator_key.json @@ -1,11 +1,11 @@ { - "address": "AB61D768431DA22E212873AFB774270D30686769", + "address": "119B0D43BBCB98D0A167C38325DA3938DA9568DC", "pub_key": { "type": "tendermint/PubKeyEd25519", - "value": "5YsKnKE/6vIwBcjf5aZCsHdbcq4N7i1TXvFi2Ettzis=" + "value": "U3pOWiYBxmADXyO10AVS6RzRnaelEPLJJb0V4QHXAZA=" }, "priv_key": { "type": "tendermint/PrivKeyEd25519", - "value": "yVOwXtMbtltErHRISdaKa7mXqKR1Lfp9ZjpOgpP0JFjliwqcoT/q8jAFyN/lpkKwd1tyrg3uLVNe8WLYS23OKw==" + "value": "tI5T8cr1zXPo/cRlSSzIT5wS7muXy9Bu6fx0+c6MkfRTek5aJgHGYANfI7XQBVLpHNGdp6UQ8sklvRXhAdcBkA==" } } \ No newline at end of file From a746bc7b1d9f1164c1202127a99b6832e9910e5d Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 23 Sep 2020 17:30:57 +0200 Subject: [PATCH 4/4] Adapt network config --- .../launchpad/src/lcdapi/distribution.spec.ts | 15 +++-- .../launchpad/src/lcdapi/slashing.spec.ts | 2 +- packages/launchpad/src/lcdapi/staking.spec.ts | 57 ++++++++++--------- .../launchpad/src/signingcosmosclient.spec.ts | 4 +- packages/launchpad/src/testutils.spec.ts | 11 ++-- 5 files changed, 45 insertions(+), 44 deletions(-) diff --git a/packages/launchpad/src/lcdapi/distribution.spec.ts b/packages/launchpad/src/lcdapi/distribution.spec.ts index 66e7cd9b26..1f6165dd99 100644 --- a/packages/launchpad/src/lcdapi/distribution.spec.ts +++ b/packages/launchpad/src/lcdapi/distribution.spec.ts @@ -13,7 +13,6 @@ import { faucet, nonNegativeIntegerMatcher, pendingWithoutWasmd, - validatorAddress, wasmd, wasmdEnabled, } from "../testutils.spec"; @@ -40,7 +39,7 @@ describe("DistributionExtension", () => { type: "cosmos-sdk/MsgDelegate", value: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, amount: coin(25000, "ustake"), }, }; @@ -72,7 +71,7 @@ describe("DistributionExtension", () => { result: { rewards: [ { - validator_address: validatorAddress, + validator_address: wasmd.validator.address, reward: null, }, ], @@ -86,7 +85,7 @@ describe("DistributionExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeDistributionClient(wasmd.endpoint); - const response = await client.distribution.delegatorReward(faucet.address, validatorAddress); + const response = await client.distribution.delegatorReward(faucet.address, wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [], @@ -110,12 +109,12 @@ describe("DistributionExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeDistributionClient(wasmd.endpoint); - const response = await client.distribution.validator(validatorAddress); + const response = await client.distribution.validator(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: { // TODO: This smells like a bug in the backend to me - operator_address: Bech32.encode("cosmos", Bech32.decode(validatorAddress).data), + operator_address: Bech32.encode("cosmos", Bech32.decode(wasmd.validator.address).data), self_bond_rewards: [ { denom: "ucosm", amount: jasmine.stringMatching(bigDecimalMatcher) }, { denom: "ustake", amount: jasmine.stringMatching(bigDecimalMatcher) }, @@ -133,7 +132,7 @@ describe("DistributionExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeDistributionClient(wasmd.endpoint); - const response = await client.distribution.validatorRewards(validatorAddress); + const response = await client.distribution.validatorRewards(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ @@ -148,7 +147,7 @@ describe("DistributionExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeDistributionClient(wasmd.endpoint); - const response = await client.distribution.validatorOutstandingRewards(validatorAddress); + const response = await client.distribution.validatorOutstandingRewards(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ diff --git a/packages/launchpad/src/lcdapi/slashing.spec.ts b/packages/launchpad/src/lcdapi/slashing.spec.ts index 48f343d720..574d038cf9 100644 --- a/packages/launchpad/src/lcdapi/slashing.spec.ts +++ b/packages/launchpad/src/lcdapi/slashing.spec.ts @@ -17,7 +17,7 @@ describe("SlashingExtension", () => { height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ { - address: "cosmosvalcons14dsaw6zrrk3zugfgwwhmwap8p5cxsemfesgcaw", + address: "cosmosvalcons1zxds6samewvdpgt8cwpjtk3e8rdf26xu63dlqd", start_height: "0", index_offset: jasmine.stringMatching(nonNegativeIntegerMatcher), jailed_until: "1970-01-01T00:00:00Z", diff --git a/packages/launchpad/src/lcdapi/staking.spec.ts b/packages/launchpad/src/lcdapi/staking.spec.ts index 5127f65e7f..db75603c44 100644 --- a/packages/launchpad/src/lcdapi/staking.spec.ts +++ b/packages/launchpad/src/lcdapi/staking.spec.ts @@ -10,11 +10,9 @@ import { SigningCosmosClient } from "../signingcosmosclient"; import { bigDecimalMatcher, dateTimeStampMatcher, - delegatorAddress, faucet, nonNegativeIntegerMatcher, pendingWithoutWasmd, - validatorAddress, wasmd, wasmdEnabled, } from "../testutils.spec"; @@ -42,7 +40,7 @@ describe("StakingExtension", () => { type: "cosmos-sdk/MsgDelegate", value: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, amount: coin(25000, "ustake"), }, }; @@ -65,7 +63,7 @@ describe("StakingExtension", () => { type: "cosmos-sdk/MsgUndelegate", value: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, amount: coin(100, "ustake"), }, }; @@ -98,7 +96,7 @@ describe("StakingExtension", () => { result: [ { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, shares: jasmine.stringMatching(bigDecimalMatcher), balance: { denom: "ustake", amount: jasmine.stringMatching(nonNegativeIntegerMatcher) }, }, @@ -117,7 +115,7 @@ describe("StakingExtension", () => { expect(result).toEqual([ { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, entries: jasmine.arrayContaining([ { creation_height: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -149,8 +147,8 @@ describe("StakingExtension", () => { height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -183,12 +181,12 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const response = await client.staking.delegatorValidator(faucet.address, validatorAddress); + const response = await client.staking.delegatorValidator(faucet.address, wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -220,12 +218,12 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const response = await client.staking.delegation(faucet.address, validatorAddress); + const response = await client.staking.delegation(faucet.address, wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, shares: jasmine.stringMatching(bigDecimalMatcher), balance: { denom: "ustake", amount: jasmine.stringMatching(nonNegativeIntegerMatcher) }, }, @@ -237,12 +235,15 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const { height, result } = await client.staking.unbondingDelegation(faucet.address, validatorAddress); + const { height, result } = await client.staking.unbondingDelegation( + faucet.address, + wasmd.validator.address, + ); expect(height).toMatch(nonNegativeIntegerMatcher); assert(result); expect(result).toEqual({ delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, entries: jasmine.arrayContaining([ { creation_height: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -277,8 +278,8 @@ describe("StakingExtension", () => { height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -324,8 +325,8 @@ describe("StakingExtension", () => { height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -358,12 +359,12 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const response = await client.staking.validator(validatorAddress); + const response = await client.staking.validator(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -395,19 +396,19 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const response = await client.staking.validatorDelegations(validatorAddress); + const response = await client.staking.validatorDelegations(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: jasmine.arrayContaining([ { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, shares: jasmine.stringMatching(bigDecimalMatcher), balance: { denom: "ustake", amount: jasmine.stringMatching(nonNegativeIntegerMatcher) }, }, { - delegator_address: delegatorAddress, - validator_address: validatorAddress, + delegator_address: wasmd.validator.delegatorAddress, + validator_address: wasmd.validator.address, shares: "250000000.000000000000000000", balance: { denom: "ustake", amount: "250000000" }, }, @@ -420,13 +421,13 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const { height, result } = await client.staking.validatorUnbondingDelegations(validatorAddress); + const { height, result } = await client.staking.validatorUnbondingDelegations(wasmd.validator.address); expect(height).toMatch(nonNegativeIntegerMatcher); assert(result); expect(result).toEqual([ { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, entries: jasmine.arrayContaining([ { creation_height: jasmine.stringMatching(nonNegativeIntegerMatcher), diff --git a/packages/launchpad/src/signingcosmosclient.spec.ts b/packages/launchpad/src/signingcosmosclient.spec.ts index 6ab1c5e991..a6b2d0b6c9 100644 --- a/packages/launchpad/src/signingcosmosclient.spec.ts +++ b/packages/launchpad/src/signingcosmosclient.spec.ts @@ -7,7 +7,7 @@ import { GasPrice } from "./gas"; import { MsgDelegate } from "./msgs"; import { Secp256k1Wallet } from "./secp256k1wallet"; import { PrivateSigningCosmosClient, SigningCosmosClient } from "./signingcosmosclient"; -import { makeRandomAddress, pendingWithoutWasmd, validatorAddress } from "./testutils.spec"; +import { makeRandomAddress, pendingWithoutWasmd, wasmd } from "./testutils.spec"; const httpUrl = "http://localhost:1317"; @@ -160,7 +160,7 @@ describe("SigningCosmosClient", () => { type: "cosmos-sdk/MsgDelegate", value: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, amount: coin(1234, "ustake"), }, }; diff --git a/packages/launchpad/src/testutils.spec.ts b/packages/launchpad/src/testutils.spec.ts index bb72d809d1..2093b56e93 100644 --- a/packages/launchpad/src/testutils.spec.ts +++ b/packages/launchpad/src/testutils.spec.ts @@ -30,8 +30,12 @@ export const wasmd = { endpoint: "http://localhost:1317", chainId: "testing", moniker: "node001", - commissionUpdateTime: "2020-07-30T07:56:51.316162Z", - consensusPubkey: "cosmosvalconspub1zcjduepquk9s489p8l40yvq9er07tfjzkpm4ku4wphhz6567793dsjmdec4suucg87", + commissionUpdateTime: "2020-09-23T15:11:14.6660427Z", + validator: { + pubkey: "cosmosvalconspub1zcjduepq2dayuk3xq8rxqq6lyw6aqp2jaywdr8d855g09jf9h527zqwhqxgq7vf6kf", + address: "cosmosvaloper103c7vm0c5mz85ecdy4ldftk4a3ydcyp2sscqrz", + delegatorAddress: "cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403", + }, }; export const faucet = { @@ -44,9 +48,6 @@ export const faucet = { address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6", }; -export const validatorAddress = "cosmosvaloper103c7vm0c5mz85ecdy4ldftk4a3ydcyp2sscqrz"; -export const delegatorAddress = "cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403"; - /** Unused account */ export const unused = { pubkey: {