From 4a31466843e3107175ca2b054a636aed63dfdbfb Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 16 Mar 2019 12:34:15 +0100
Subject: [PATCH] Shortcut dev keyring creation (#370)

* Shortcut dev key creation

* Remove unused import
---
 CHANGELOG.md                    |  5 ++++
 packages/keyring/src/testing.ts | 48 ++++++++++++++++++++++++++++-----
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 417b94088..28987bcc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.38.1
+
+- Align with current substrate master for sr25519 keys and hard/soft derivation
+- Swap default keyring to sr25519
+
 # 0.37.1
 
 - Swap to publishing -beta.x on merge (non-breaking testing)
diff --git a/packages/keyring/src/testing.ts b/packages/keyring/src/testing.ts
index d81adf357..62edcc743 100644
--- a/packages/keyring/src/testing.ts
+++ b/packages/keyring/src/testing.ts
@@ -4,13 +4,45 @@
 
 import { KeyringInstance, KeyringOptions } from './types';
 
+import { hexToU8a } from '@polkadot/util';
+
+import createPair from './pair';
 import Keyring from '.';
 
 // As per substrate
 // const DEV_PHRASE = 'bottom drive obey lake curtain smoke basket hold race lonely fit walk';
 // created from the above
-const DEV_SEED = '0xfac7959dbfe72f052e5a0c3c8d6530f202b02fd8f9f5ca3580ec8deb7797479e';
+// const DEV_SEED = '0xfac7959dbfe72f052e5a0c3c8d6530f202b02fd8f9f5ca3580ec8deb7797479e';
 const SEEDS = ['Alice', 'Bob', 'Charlie', 'Dave', 'Eve', 'Ferdie'];
+// NOTE This is not great, but a testing keyring is for testing - what happens is that in most cases
+// the keyring is initialises before anythign else. Since the sr25519 crypto is async, this creates
+// problems with adding the keys
+const PAIRS = [
+  [
+    hexToU8a('0x98319d4ff8a9508c4bb0cf0b5a78d760a0b2082c02775e6e82370816fedfff48925a225d97aa00682d6a59b95b18780c10d7032336e88f3442b42361f4a66011'),
+    hexToU8a('0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d')
+  ],
+  [
+    hexToU8a('0x081ff694633e255136bdb456c20a5fc8fed21f8b964c11bb17ff534ce80ebd5941ae88f85d0c1bfc37be41c904e1dfc01de8c8067b0d6d5df25dd1ac0894a325'),
+    hexToU8a('0x8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48')
+  ],
+  [
+    hexToU8a('0xa8f2d83016052e5d6d77b2f6fd5d59418922a09024cda701b3c34369ec43a7668faf12ff39cd4e5d92bb773972f41a7a5279ebc2ed92264bed8f47d344f8f18c'),
+    hexToU8a('0x90b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22')
+  ],
+  [
+    hexToU8a('0x20e05482ca4677e0edbc58ae9a3a59f6ed3b1a9484ba17e64d6fe8688b2b7b5d108c4487b9323b98b11fe36cb301b084e920f7b7895536809a6d62a451b25568'),
+    hexToU8a('0x306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20')
+  ],
+  [
+    hexToU8a('0x683576abfd5dc35273e4264c23095a1bf21c14517bece57c7f0cc5c0ed4ce06a3dbf386b7828f348abe15d76973a72009e6ef86a5c91db2990cb36bb657c6587'),
+    hexToU8a('0xe659a7a1628cdd93febc04a4e0646ea20e9f5f0ce097d9a05290d4a9e054df4e')
+  ],
+  [
+    hexToU8a('0xb835c20f450079cf4f513900ae9faf8df06ad86c681884122c752a4b2bf74d4303e4f21bc6cc62bb4eeed5a9cce642c25e2d2ac1464093b50f6196d78e3a7426'),
+    hexToU8a('0x1cbd2d43530a44705ad088af313e18f80b53ef16b36177cd4b77b846f2a5f07c')
+  ]
+];
 
 /**
  * @name testKeyring
@@ -23,14 +55,16 @@ export default function testKeyring (options: KeyringOptions = {}, isDerived: bo
 
   const keyring = new Keyring(options);
 
-  SEEDS.forEach((entry) => {
-    const phrase = isDerived
-      ? `${DEV_SEED}//${entry}`
-      : entry;
-    const pair = keyring.addFromUri(phrase, {
+  SEEDS.forEach((entry, index) => {
+    const meta = {
       isTesting: true,
       name: entry.toLowerCase()
-    }, isDerived ? 'sr25519' : options.type);
+    };
+    const pair = !isDerived
+      ? keyring.addFromUri(entry, meta, options.type)
+      : keyring.addPair(
+        createPair('sr25519', { publicKey: PAIRS[index][1], secretKey: PAIRS[index][0] }, meta)
+      );
 
     pair.lock = () => {
       // we don't have lock/unlock functionality here