feat: Move generateRandomKeyPair

Require to use Vendee in web
tvm-contest · Jun 4, 2023 · 20fc962 · 20fc962
1 parent ea33448
commit 20fc962
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 192 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vendee",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "TVM-Solidity contract development framework",
   "scripts": {
     "build": "tsc --build .",
@@ -42,32 +42,32 @@
     "Framework"
   ],
   "dependencies": {
-    "@eversdk/core": "^1.42.1",
-    "@eversdk/lib-node": "^1.42.1",
-    "chai": "^4.3.7",
-    "colors": "^1.4.0",
-    "commander": "^10.0.1",
-    "enquirer": "^2.3.6",
-    "everdev": "^1.7.0",
-    "fs-extra": "^11.1.1",
-    "glob": "^10.2.6",
-    "joi": "^17.9.2",
-    "mocha": "^10.2.0",
-    "ts-mocha": "^10.0.0"
+    "@eversdk/core": "^1.43.1",
+    "everdev": "^1.7.0"
   },
   "devDependencies": {
+    "@eversdk/lib-node": "^1.43.1",
     "@types/chai": "^4.3.5",
     "@types/fs-extra": "^11.0.1",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.5",
-    "dotenv": "^16.0.3",
-    "eslint": "^8.40.0",
-    "eslint-config-standard-with-typescript": "^34.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "chai": "^4.3.7",
+    "colors": "^1.4.0",
+    "commander": "^10.0.1",
+    "dotenv": "^16.1.3",
+    "enquirer": "^2.3.6",
+    "eslint": "^8.42.0",
+    "eslint-config-standard-with-typescript": "^35.0.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^15.7.0",
+    "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-promise": "^6.1.1",
+    "fs-extra": "^11.1.1",
+    "glob": "^10.2.6",
+    "joi": "^17.9.2",
+    "mocha": "^10.2.0",
     "rimraf": "^5.0.0",
-    "typescript": "^5.0.4"
+    "ts-mocha": "^10.0.0",
+    "typescript": "~5.0.4"
   }
 }
diff --git a/src/cli/actions/test.ts b/src/cli/actions/test.ts
@@ -14,6 +14,11 @@ export async function test (
   if (patterns.length === 0)
     patterns = ['']
 
+  ///////////////////
+  // Create global //
+  ///////////////////
+  await createGlobal(config, network)
+
   ///////////
   // Up SE //
   ///////////
@@ -25,11 +30,6 @@ export async function test (
   if (compilation)
     await compile(config)
 
-  ///////////////////
-  // Create global //
-  ///////////////////
-  await createGlobal(config, network)
-
   ////////////////////
   // Read tests set //
   ////////////////////

diff --git a/src/contract/index.ts b/src/contract/index.ts
@@ -8,7 +8,7 @@ import { type Giver } from '../giver'
 import { Global } from '../global'
 import { error } from './constants'
 import { createPayload } from './payload'
-import { generateRandomKeyPair } from '../keys'
+import { generateRandomKeyPair } from '../utils/generateRandomKeyPair'
 
 export enum AccountType {
   notFound = '-1',

diff --git a/src/index.ts b/src/index.ts
@@ -29,15 +29,11 @@ import { SafeMultisigWalletGiver as SafeMultisigWalletGiverGiver } from './giver
 ////////////
 import { type GlobalVendee, Global } from './global'
 
-//////////
-// Keys //
-//////////
-import { generateRandomKeyPair, readKeys, generateOrReadKeys, namedKeys } from './keys'
-
 ///////////
 // Utils //
 ///////////
 import { delay } from './utils/delay'
+import { generateRandomKeyPair } from './utils/generateRandomKeyPair'
 import { x0, abiToHex, stringToHex, stringsToHex, numberToHex } from './utils/hex'
 import { Q, T, B, M, K } from './utils/suffixes'
 
@@ -78,12 +74,7 @@ export { type GiverSendParameters, type Giver, V2Giver, V3Giver, SafeMultisigWal
 ////////////
 export { type GlobalVendee, Global }
 
-//////////
-// Keys //
-//////////
-export { generateRandomKeyPair, readKeys, generateOrReadKeys, namedKeys }
-
 ///////////
 // Utils //
 ///////////
-export { delay, x0, abiToHex, stringToHex, stringsToHex, numberToHex, Q, T, B, M, K }
+export { delay, generateRandomKeyPair, x0, abiToHex, stringToHex, stringsToHex, numberToHex, Q, T, B, M, K }
diff --git a/src/keys/index.ts b/src/keys/index.ts
@@ -3,24 +3,7 @@ import path from 'path'
 import { Global } from '../global'
 import { error } from '../contract/constants'
 import { type KeyPair, type TonClient } from '@eversdk/core'
-
-/**
- * Wrapper for crypto.generate_random_sign_keys()
- * @example
- *   await createRandomKeyPair()
- * @return
- *   {
- *     public: '61d08f0f1aa152095b6b2e19f31bf09d84a5ae6037be9247d0e54a3926d46593',
- *     secret: '2c7645b1201c0dd84dd38c3fe0e3a70e7de0d4ef77333f33a916280d9994205c'
- *   }
- */
-export async function generateRandomKeyPair (client?: TonClient): Promise<KeyPair> {
-  const cl = client ?? Global.client
-  if (cl === undefined)
-    throw error.noClient
-
-  return await cl.crypto.generate_random_sign_keys()
-}
+import { generateRandomKeyPair } from '../utils/generateRandomKeyPair'
 
 /**
  * Read key pair from JSON file

diff --git a/src/utils/generateRandomKeyPair.ts b/src/utils/generateRandomKeyPair.ts
@@ -0,0 +1,21 @@
+import { Global } from '../global'
+import { error } from '../contract/constants'
+import { type KeyPair, type TonClient } from '@eversdk/core'
+
+/**
+ * Wrapper for crypto.generate_random_sign_keys()
+ * @example
+ *   await createRandomKeyPair()
+ * @return
+ *   {
+ *     public: '61d08f0f1aa152095b6b2e19f31bf09d84a5ae6037be9247d0e54a3926d46593',
+ *     secret: '2c7645b1201c0dd84dd38c3fe0e3a70e7de0d4ef77333f33a916280d9994205c'
+ *   }
+ */
+export async function generateRandomKeyPair (client?: TonClient): Promise<KeyPair> {
+  const cl = client ?? Global.client
+  if (cl === undefined)
+    throw error.noClient
+
+  return await cl.crypto.generate_random_sign_keys()
+}