From a9ad4af9c81d9895e972af661abdeaa6418ec2d9 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 29 Mar 2019 10:40:38 +0100 Subject: [PATCH] Update Alice & Bob addesses (sr25519, examples) (#810) --- .../promise/01_simple_connect/package.json | 2 +- .../03_listen_to_balance_change/index.js | 2 +- .../03_listen_to_balance_change/package.json | 2 +- docs/examples/promise/05_read_storage/index.js | 2 +- .../promise/05_read_storage/package.json | 2 +- .../examples/promise/06_make_transfer/index.js | 18 +++++++----------- .../promise/06_make_transfer/package.json | 2 +- .../promise/08_system_events/package.json | 2 +- .../promise/09_transfer_events/index.js | 10 +++++----- .../promise/09_transfer_events/package.json | 2 +- .../promise/10_upgrade_chain/package.json | 2 +- .../examples/rx/01_simple_connect/package.json | 3 +-- .../rx/02_listen_to_blocks/package.json | 2 +- .../rx/03_listen_to_balance_change/index.js | 2 +- .../03_listen_to_balance_change/package.json | 2 +- docs/examples/rx/04_unsubscribe/package.json | 2 +- docs/examples/rx/05_read_storage/index.js | 2 +- docs/examples/rx/05_read_storage/package.json | 2 +- docs/examples/rx/06_make_transfer/index.js | 18 ++++++++---------- docs/examples/rx/06_make_transfer/package.json | 2 +- docs/examples/rx/08_system_events/package.json | 2 +- docs/examples/rx/09_transfer_events/index.js | 8 ++++---- .../rx/09_transfer_events/package.json | 2 +- docs/examples/rx/10_upgrade_chain/index.js | 3 +-- docs/examples/rx/10_upgrade_chain/package.json | 2 +- 25 files changed, 45 insertions(+), 53 deletions(-) diff --git a/docs/examples/promise/01_simple_connect/package.json b/docs/examples/promise/01_simple_connect/package.json index 5ab5faf386..f3881045b2 100644 --- a/docs/examples/promise/01_simple_connect/package.json +++ b/docs/examples/promise/01_simple_connect/package.json @@ -11,7 +11,7 @@ }, "dependencies": { - "@polkadot/api": "^0.45.14" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/promise/03_listen_to_balance_change/index.js b/docs/examples/promise/03_listen_to_balance_change/index.js index fb04323f6d..959c612087 100755 --- a/docs/examples/promise/03_listen_to_balance_change/index.js +++ b/docs/examples/promise/03_listen_to_balance_change/index.js @@ -3,7 +3,7 @@ const { ApiPromise } = require('@polkadot/api'); // Known account we want to use (available on dev chain, with funds) -const Alice = '5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaDtZ'; +const Alice = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKv3gB'; async function main () { // Create an await for the API diff --git a/docs/examples/promise/03_listen_to_balance_change/package.json b/docs/examples/promise/03_listen_to_balance_change/package.json index a3c743bb9f..421e9b5111 100644 --- a/docs/examples/promise/03_listen_to_balance_change/package.json +++ b/docs/examples/promise/03_listen_to_balance_change/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.45.14" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/promise/05_read_storage/index.js b/docs/examples/promise/05_read_storage/index.js index 67a2544fcb..52d0aec72f 100755 --- a/docs/examples/promise/05_read_storage/index.js +++ b/docs/examples/promise/05_read_storage/index.js @@ -3,7 +3,7 @@ const { ApiPromise } = require('@polkadot/api'); // Our address for Alice on the dev chain -const Alice = '5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaDtZ'; +const Alice = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKv3gB'; async function main () { // Create our API with a default connection to the local node diff --git a/docs/examples/promise/05_read_storage/package.json b/docs/examples/promise/05_read_storage/package.json index 2135ab5ed1..d116fd051e 100644 --- a/docs/examples/promise/05_read_storage/package.json +++ b/docs/examples/promise/05_read_storage/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.45.14" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/promise/06_make_transfer/index.js b/docs/examples/promise/06_make_transfer/index.js index ac940e2cf5..1995c44042 100755 --- a/docs/examples/promise/06_make_transfer/index.js +++ b/docs/examples/promise/06_make_transfer/index.js @@ -2,23 +2,19 @@ // Import the API, Keyring and some utility functions const { ApiPromise } = require('@polkadot/api'); const { Keyring } = require('@polkadot/keyring'); -const { stringToU8a } = require('@polkadot/util'); -// Important to note that we pad the seed to a length of 32 bytes using ' ' -// The underlying seed needs to be exactly 32 bytes in length -const ALICE_SEED = 'Alice'.padEnd(32, ' '); -const BOB_ADDR = '5Gw3s7q4QLkSWwknsiPtjujPv3XM4Trxi5d4PgKMMk3gfGTE'; +const BOB_ADDR = '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM696e4'; async function main () { - // Create an instance of the keyring - const keyring = new Keyring(); - - // Add Alice to our keyring (with the known seed for the account) - const alice = keyring.addFromSeed(stringToU8a(ALICE_SEED)); - // Instantiate the API const api = await ApiPromise.create(); + // Constuct the keying after the API (crypto has an async init) + const keyring = new Keyring({ type: 'sr25519' }); + + // Add alice to our keyring with a hard-deived path (empty phrase, so uses dev) + const alice = keyring.addFromUri('//Alice'); + // Create a extrinsic, transferring 12345 units to Bob const transfer = api.tx.balances.transfer(BOB_ADDR, 12345); diff --git a/docs/examples/promise/06_make_transfer/package.json b/docs/examples/promise/06_make_transfer/package.json index fe35dda333..367178962a 100644 --- a/docs/examples/promise/06_make_transfer/package.json +++ b/docs/examples/promise/06_make_transfer/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.45.14" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/promise/08_system_events/package.json b/docs/examples/promise/08_system_events/package.json index ee420fcc04..fdb013ebdf 100644 --- a/docs/examples/promise/08_system_events/package.json +++ b/docs/examples/promise/08_system_events/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.45.14" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/promise/09_transfer_events/index.js b/docs/examples/promise/09_transfer_events/index.js index 13bbec4c5b..c52dc271e5 100755 --- a/docs/examples/promise/09_transfer_events/index.js +++ b/docs/examples/promise/09_transfer_events/index.js @@ -9,18 +9,18 @@ const testKeyring = require('@polkadot/keyring/testing'); const { randomAsU8a } = require('@polkadot/util-crypto'); // some constants we are using in this sample -const ALICE = '5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaDtZ'; +const ALICE = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKv3gB'; const AMOUNT = 10000; async function main () { - // create an instance of our testign keyring + // Create the API and wait until ready + const api = await ApiPromise.create(); + + // create an instance of our testing keyring // If you're using ES6 module imports instead of require, just change this line to: // const keyring = testKeyring(); const keyring = testKeyring.default(); - // Create the API and wait until ready - const api = await ApiPromise.create(); - // get the nonce for the admin key const nonce = await api.query.system.accountNonce(ALICE); diff --git a/docs/examples/promise/09_transfer_events/package.json b/docs/examples/promise/09_transfer_events/package.json index 483e77bf25..9b5e968d94 100644 --- a/docs/examples/promise/09_transfer_events/package.json +++ b/docs/examples/promise/09_transfer_events/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.45.14" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/promise/10_upgrade_chain/package.json b/docs/examples/promise/10_upgrade_chain/package.json index 73b58862f5..2f1f06883f 100644 --- a/docs/examples/promise/10_upgrade_chain/package.json +++ b/docs/examples/promise/10_upgrade_chain/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.45.14" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/rx/01_simple_connect/package.json b/docs/examples/rx/01_simple_connect/package.json index e754832f74..3bbfe9c362 100644 --- a/docs/examples/rx/01_simple_connect/package.json +++ b/docs/examples/rx/01_simple_connect/package.json @@ -11,8 +11,7 @@ }, "dependencies": { - "@polkadot/api": "^0.43.6", - "@polkadot/rpc-provider": "^0.43.6" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/rx/02_listen_to_blocks/package.json b/docs/examples/rx/02_listen_to_blocks/package.json index d8dcce992c..2063c451fb 100644 --- a/docs/examples/rx/02_listen_to_blocks/package.json +++ b/docs/examples/rx/02_listen_to_blocks/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.43.6" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/rx/03_listen_to_balance_change/index.js b/docs/examples/rx/03_listen_to_balance_change/index.js index fd030d6424..8693625211 100644 --- a/docs/examples/rx/03_listen_to_balance_change/index.js +++ b/docs/examples/rx/03_listen_to_balance_change/index.js @@ -3,7 +3,7 @@ const { ApiRx } = require('@polkadot/api'); const { pairwise, startWith } = require('rxjs/operators'); // Known account we want to use (available on dev chain, with funds) -const Alice = '5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaDtZ'; +const Alice = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKv3gB'; async function main () { // Create an await for the API diff --git a/docs/examples/rx/03_listen_to_balance_change/package.json b/docs/examples/rx/03_listen_to_balance_change/package.json index 58859f1a80..55cf72927e 100644 --- a/docs/examples/rx/03_listen_to_balance_change/package.json +++ b/docs/examples/rx/03_listen_to_balance_change/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.43.6" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/rx/04_unsubscribe/package.json b/docs/examples/rx/04_unsubscribe/package.json index a8a685fc30..195f6a2ac2 100644 --- a/docs/examples/rx/04_unsubscribe/package.json +++ b/docs/examples/rx/04_unsubscribe/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.43.6" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/rx/05_read_storage/index.js b/docs/examples/rx/05_read_storage/index.js index 642f8a09ea..129057eb53 100644 --- a/docs/examples/rx/05_read_storage/index.js +++ b/docs/examples/rx/05_read_storage/index.js @@ -5,7 +5,7 @@ const { combineLatest, of } = require('rxjs'); const { first, switchMap } = require('rxjs/operators'); // Our address for Alice on the dev chain -const Alice = '5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaDtZ'; +const Alice = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKv3gB'; function main () { // Create our API with a default connection to the local node diff --git a/docs/examples/rx/05_read_storage/package.json b/docs/examples/rx/05_read_storage/package.json index 1486b9ad4a..47a0f436f6 100644 --- a/docs/examples/rx/05_read_storage/package.json +++ b/docs/examples/rx/05_read_storage/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.43.6" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/rx/06_make_transfer/index.js b/docs/examples/rx/06_make_transfer/index.js index 90fd1c1401..5f80573896 100644 --- a/docs/examples/rx/06_make_transfer/index.js +++ b/docs/examples/rx/06_make_transfer/index.js @@ -1,21 +1,19 @@ // Import the API, Keyring and some utility functions -const { ApiPromise } = require('@polkadot/api'); +const { ApiRx } = require('@polkadot/api'); const { Keyring } = require('@polkadot/keyring'); -const { stringToU8a } = require('@polkadot/util'); -const ALICE_SEED = 'Alice'.padEnd(32, ' '); -const BOB_ADDR = '5Gw3s7q4QLkSWwknsiPtjujPv3XM4Trxi5d4PgKMMk3gfGTE'; +const BOB = '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM696e4'; async function main () { - // Create an instance of the keyring - const keyring = new Keyring(); - - // Add Alice to our keyring (with the known seed for the account) - const alice = keyring.addFromSeed(stringToU8a(ALICE_SEED)); - // Instantiate the API const api = await ApiRx.create().toPromise(); + // Create an instance of the keyring + const keyring = new Keyring({ type: 's25519' }); + + // Add Alice to our keyring (with the known seed for the account) + const alice = keyring.addFomUri('//Alice'); + // Create a extrinsic, transferring 12345 units to Bob. api.tx.balances // create transfer diff --git a/docs/examples/rx/06_make_transfer/package.json b/docs/examples/rx/06_make_transfer/package.json index 98958f22a4..fa45b1aaf4 100644 --- a/docs/examples/rx/06_make_transfer/package.json +++ b/docs/examples/rx/06_make_transfer/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.43.6" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/rx/08_system_events/package.json b/docs/examples/rx/08_system_events/package.json index 1e06ff4c38..4ab0361e94 100644 --- a/docs/examples/rx/08_system_events/package.json +++ b/docs/examples/rx/08_system_events/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.43.6" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/rx/09_transfer_events/index.js b/docs/examples/rx/09_transfer_events/index.js index 5a5d197c7c..78fde89c90 100644 --- a/docs/examples/rx/09_transfer_events/index.js +++ b/docs/examples/rx/09_transfer_events/index.js @@ -8,18 +8,18 @@ const testKeyring = require('@polkadot/keyring/testing'); const { randomAsU8a } = require('@polkadot/util-crypto'); // some constants we are using in this sample -const ALICE = '5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaDtZ'; +const ALICE = '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKv3gB'; const AMOUNT = 10000; async function main () { + // Create our API with a connection to the node + const api = await ApiRx.create().toPromise(); + // create an instance of our testign keyring // If you're using ES6 module imports instead of require, just change this line to: // const keyring = testKeyring(); const keyring = testKeyring.default(); - // Create our API with a connection to the node - const api = await ApiRx.create().toPromise(); - // find the actual keypair in the keyring const alicePair = keyring.getPair(ALICE); diff --git a/docs/examples/rx/09_transfer_events/package.json b/docs/examples/rx/09_transfer_events/package.json index 18b64d99a6..dae0152db5 100644 --- a/docs/examples/rx/09_transfer_events/package.json +++ b/docs/examples/rx/09_transfer_events/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.43.6" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2" diff --git a/docs/examples/rx/10_upgrade_chain/index.js b/docs/examples/rx/10_upgrade_chain/index.js index 818756ad9d..62d68947e7 100644 --- a/docs/examples/rx/10_upgrade_chain/index.js +++ b/docs/examples/rx/10_upgrade_chain/index.js @@ -1,6 +1,5 @@ // Import the API & Provider and some utility functions -const { ApiRx } = require('@polkadot/api'); -const { WsProvider } = require('@polkadot/rpc-provider'); +const { ApiRx, WsPovider } = require('@polkadot/api'); // import the test keyring (already has dev keys for Alice, Bob, Charlie, Eve & Ferdie) const testKeyring = require('@polkadot/keyring/testing'); const fs = require('fs'); diff --git a/docs/examples/rx/10_upgrade_chain/package.json b/docs/examples/rx/10_upgrade_chain/package.json index 98db317df4..26bd7c1ba9 100644 --- a/docs/examples/rx/10_upgrade_chain/package.json +++ b/docs/examples/rx/10_upgrade_chain/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "@polkadot/api": "^0.43.6" + "@polkadot/api": "^0.52.1" }, "devDependencies": { "rimraf": "^2.6.2"