Merge pull request OpenEmojiBattler#3 from tash-2s/set-endpoint

Set endpoint and add message
tash-2s · Mar 24, 2021 · 71b053d · 71b053d
2 parents 1be5dc1 + dada2e6
commit 71b053d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/chain/scripts/package.json b/chain/scripts/package.json
@@ -5,8 +5,8 @@
   "license": "Apache-2.0",
   "scripts": {
     "set-code:dev": "ts-node setCode.ts local",
-    "set-code:staging": "ts-node setCode.ts staging \"$OEB_STAGING_ADMIN_MNEMONIC\"",
-    "set-code:production": "ts-node setCode.ts production \"$OEB_PRODUCTION_ADMIN_MNEMONIC\"",
+    "set-code:staging": "ts-node setCode.ts staging \"$OEB_STAGING_ADMIN\"",
+    "set-code:production": "ts-node setCode.ts production \"$OEB_PRODUCTION_ADMIN\"",
     "check-ts": "tsc -p . --noEmit"
   },
   "dependencies": {

diff --git a/chain/scripts/setCode.ts b/chain/scripts/setCode.ts
@@ -8,15 +8,17 @@ import { tx, query, connected, getEnv } from "common"
 
 const main = async () => {
   const envName = process.argv[2]
-  const adminMnemonic = process.argv[3]
+  const admin = process.argv[3]
 
   await cryptoWaitReady()
 
   const keyring = new Keyring({ ss58Format: 42, type: "sr25519" })
 
-  const adminPair = adminMnemonic
-    ? keyring.addFromMnemonic(adminMnemonic)
-    : keyring.addFromUri("//Alice")
+  if (!admin) {
+    console.log("Use Alice")
+  }
+
+  const adminPair = admin ? keyring.addFromMnemonic(admin) : keyring.addFromUri("//Alice")
 
   const code = fs
     .readFileSync(

diff --git a/common/js/src/envs.json b/common/js/src/envs.json
@@ -6,6 +6,6 @@
     "endpoint": "wss://node-6769173380176625664.jm.onfinality.io/ws"
   },
   "production": {
-    "endpoint": "wss://node-6769103523900899328.jm.onfinality.io/ws"
+    "endpoint": "wss://node-6780467208130813952.jm.onfinality.io/ws"
   }
 }
diff --git a/data/package.json b/data/package.json
@@ -5,8 +5,8 @@
   "license": "Apache-2.0",
   "scripts": {
     "seed:dev": "ts-node ./seed.ts local",
-    "seed:staging": "ts-node ./seed.ts staging \"$OEB_STAGING_ADMIN_MNEMONIC\"",
-    "seed:production": "ts-node ./seed.ts production \"$OEB_PRODUCTION_ADMIN_MNEMONIC\"",
+    "seed:staging": "ts-node ./seed.ts staging \"$OEB_STAGING_ADMIN\"",
+    "seed:production": "ts-node ./seed.ts production \"$OEB_PRODUCTION_ADMIN\"",
     "lint": "prettier --write '*.{ts,json}'",
     "check-ts": "tsc -p . --noEmit"
   },

diff --git a/data/seed.ts b/data/seed.ts
@@ -8,7 +8,7 @@ import availableEmoBaseIds from "./availableEmoBaseIds.json"
 
 const main = async () => {
   const envName = process.argv[2]
-  const adminMnemonic = process.argv[3]
+  const admin = process.argv[3]
 
   await connected(getEnv(envName).endpoint, async () => {
     const basesMap = new Map()
@@ -23,9 +23,11 @@ const main = async () => {
     await cryptoWaitReady()
     const keyring = new Keyring({ ss58Format: 42, type: "sr25519" })
 
-    const adminPair = adminMnemonic
-      ? keyring.addFromMnemonic(adminMnemonic)
-      : keyring.addFromUri("//Alice")
+    if (!admin) {
+      console.log("Use Alice")
+    }
+
+    const adminPair = admin ? keyring.addFromMnemonic(admin) : keyring.addFromUri("//Alice")
 
     const h = await sudo(
       (t) => t.game.updateEmoBases(bases, fixedBaseIds, builtBaseIds, true),