Merge pull request #6 from cowboy9/fix_reset_script

fix: fixed dashmate reset script

Author: dashameter

scripts/lib/dashmate_temporary_reset_script.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+set -e
 #COLLATERAL_KEY=cSoFoRqFaA7ha2ovL4yeZPmog2CrKfq6WiDXF4CaV3RmCcTGJMGk
 #COLLATERAL_ADDRESS=ySPRMNDVBhZVZvDS4wGn4Ujuq2wP4AcwLK
 
@@ -21,7 +22,7 @@ CONFIG_NAME="local"
 MASTERNODES_COUNT=3
 
 echo "Removing all docker containers and volumes..."
-docker rm -f -v $(docker ps -a -q); docker volume prune -f; rm -rf ~/.dashmate/
+docker stop $(docker ps -a -q) || true; docker system prune --volumes -f; rm -rf ~/.dashmate/
 
 if [ $BUILD_DRIVE == true ]
 then
@@ -39,6 +40,7 @@ dashmate setup ${CONFIG_NAME} --verbose --debug-logs --miner-interval="${MINING_
 
 echo "Sending 1000 tDash to the ${FAUCET_ADDRESS} for tests"
 dashmate wallet:mint 1000 --config=${CONFIG_NAME}_seed --address=${FAUCET_ADDRESS}
+echo $BUILD_DAPI_AFTER_SETUP
 
 if [ $BUILD_DAPI_AFTER_SETUP == true ]
 then

scripts/registerTestUser.js

@@ -92,49 +92,52 @@ const registerName = async ({ client, identity, name }) => {
 //   console.log('done saving vars')
 //   return nameRegistration
 // }
-
-users.forEach(async (user) => {
-  const clientOpts = {
-    dapiAddresses,
-    wallet: {
-      mnemonic: user.mnemonic,
-    },
-    apps: {
-      dpns: {
-        contractId: process.env.NUXT_DPNS_CONTRACT_ID,
-      },
-      primitives: {
-        contractId: process.env.NUXT_PRIMITIVES_CONTRACT_ID_local,
+try {
+  users.forEach(async (user) => {
+    const clientOpts = {
+      dapiAddresses,
+      wallet: {
+        mnemonic: user.mnemonic,
       },
-      jembe: {
-        contractId: process.env.NUXT_JEMBE_CONTRACT_ID_local,
+      apps: {
+        dpns: {
+          contractId: process.env.NUXT_DPNS_CONTRACT_ID,
+        },
+        // primitives: {
+        //   contractId: process.env.NUXT_PRIMITIVES_CONTRACT_ID_local,
+        // },
+        // jembe: {
+        //   contractId: process.env.NUXT_JEMBE_CONTRACT_ID_local,
+        // },
       },
-    },
-  }
+    }
 
-  console.dir(clientOpts, { depth: 100 })
+    console.dir(clientOpts, { depth: 100 })
 
-  const client = new Dash.Client(clientOpts)
+    const client = new Dash.Client(clientOpts)
 
-  try {
-    client.account = await initWalletAccount(client)
+    try {
+      client.account = await initWalletAccount(client)
 
-    const identity = await createIdentity(client)
+      const identity = await createIdentity(client)
 
-    const nameRegistration = await registerName({
-      client,
-      identity,
-      name: `${user.label}.dash`,
-    })
+      const nameRegistration = await registerName({
+        client,
+        identity,
+        name: `${user.label}.dash`,
+      })
 
-    console.log('nameRegistration :>> ', nameRegistration)
+      console.log('nameRegistration :>> ', nameRegistration)
 
-    // await saveNameVars({ identity, nameRegistration })
-  } catch (e) {
-    console.error('Something went wrong:\n', e)
-    console.dir(e, { depth: 100 })
-    console.dir(e.metadata, { depth: 100 })
-  } finally {
-    client.disconnect()
-  }
-})
+      // await saveNameVars({ identity, nameRegistration })
+    } catch (e) {
+      console.error('Something went wrong:\n', e)
+      console.dir(e, { depth: 100 })
+      console.dir(e.metadata, { depth: 100 })
+    } finally {
+      client.disconnect()
+    }
+  })
+} catch (e) {
+  console.log('Error message:', e);
+}

scripts/resetDashmate.sh

@@ -10,6 +10,7 @@
 
 # Remove stale contractIds
 rm env/registeredContracts_local.json 
+rm -rf ~/.evoenv
 
 
 # Fund service account to register contracts