Merge pull request #503 from dOrgTech/dev

xdai support
dOrgTech · Jun 2, 2020 · 09db2fd · 09db2fd
2 parents ac657d8 + 6ef7285
commit 09db2fd
Show file tree

Hide file tree

Showing 176 changed files with 1,484 additions and 29,592 deletions.
diff --git a/packages/lib/package.json b/packages/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dorgtech/daocreator-lib",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "dist/index.js",
   "license": "MIT",
   "scripts": {
@@ -18,7 +18,7 @@
     "jsonschema": "^1.2.5"
   },
   "devDependencies": {
-    "@daostack/migration": "0.0.1-rc.36-v5",
+    "@daostack/migration": "0.0.1-rc.41-v7",
     "@types/bn.js": "^4.11.5",
     "@types/node": "^10.12.18",
     "@types/web3": "1.0.19",

diff --git a/packages/lib/scripts/prepArc.js b/packages/lib/scripts/prepArc.js
@@ -16,7 +16,7 @@ async function copyMigrationScript() {
     "utils.js",
     "sanitize.js",
     "migration.json",
-    "contracts-optimized/0.0.1-rc.33"
+    "contracts-optimized/0.0.1-rc.41"
   ];
   const baseDir = path.dirname(require.resolve("@daostack/migration"));
   const destDir = path.join(__dirname, "../src/dependency/arc/src");

diff --git a/packages/lib/src/dependency/arc/migration.ts b/packages/lib/src/dependency/arc/migration.ts
@@ -15,7 +15,15 @@ export const migrateDAO = async (
   try {
     const web3 = await getWeb3();
     const opts = await getDefaultOpts();
-    const network = await getNetworkName();
+    let network = await getNetworkName();
+
+    if (network === 'private') {
+      if (await web3.eth.net.getId() === 100) {
+        network = 'xdai'
+      } else if (await web3.eth.net.getId() === 77) {
+        network = 'sokol'
+      }
+    }
 
     const logTx = async ({ transactionHash, gasUsed }: any, msg: string) => {
       const tx = await web3.eth.getTransaction(transactionHash);
@@ -65,7 +73,7 @@ export const migrateDAO = async (
       return { receipt, result };
     };
 
-    const arcVersion = "0.0.1-rc.33";
+    const arcVersion = "0.0.1-rc.41";
     const getArcVersionNumber = (ver: string) => Number(ver.slice(-2));
 
     // If the user doesn't have a supported network chosen, abort

diff --git a/packages/lib/src/dependency/arc/src/contracts-optimized/0.0.1-rc.33/ARCDebug.json b/packages/lib/src/dependency/arc/src/contracts-optimized/0.0.1-rc.33/ARCDebug.json
diff --git a/...src/dependency/arc/src/contracts-optimized/0.0.1-rc.33/ARCVotingMachineCallbacksMock.json b/...src/dependency/arc/src/contracts-optimized/0.0.1-rc.33/ARCVotingMachineCallbacksMock.json