Merge pull request #26 from status-im/deployment

update contracts config

.gitignore

@@ -44,3 +44,4 @@ __pycache__
 .idea
 *.iml
 
+.secret.json

embarkConfig/contracts.js

@@ -1,3 +1,10 @@
+let secret = {};
+try {
+  secret = require('../.secret.json');
+} catch(err) {
+  console.dir("warning: .secret.json file not found; this is only needed to deploy to testnet or livenet etc..");
+}
+
 module.exports = {
   // default applies to all environments
   default: {
@@ -110,24 +117,32 @@ module.exports = {
 
   rinkeby: {
     enabled: true,
+    deployment: {
+      accounts: [
+        {
+          mnemonic: secret.mnemonic,
+          hdpath: "m/44'/1'/0'/0/",
+          numAddresses: "10"
+        }
+      ],
+      host: `rinkeby.infura.io/${secret.infuraKey}`,
+      port: false,
+      protocol: 'https',
+      type: "rpc"
+    },
     dappConnection: [
-      '$WEB3', // uses pre existing web3 object if available (e.g in Mist)
-      'ws://localhost:8546',
-      'http://localhost:8545',
+      '$WEB3'
     ],
     strategy: 'explicit',
+    tracking: './testnet.chains.json',
     contracts: {
       LPVault: {
-        address: "0xa25AB823c5A79941a8a9d0ab525D888cA1513419"
       },
       LiquidPledging: {
-        address: "0x07E92635AF5e524C20B20F2770aE0E0Ef597eD07"
       },
       RecoveryVault: {
-        address: "0x835c1ab7CB9f0545164D7fE9827C5e43E3476809"
       },
       LPFactory: {
-        address: "0x968F0a788F29b5B33296C61cEB34F1c40C55e52c",
         args: {
           _vaultBase: '$LPVault',
           _lpBase: '$LiquidPledging',
@@ -135,18 +150,14 @@ module.exports = {
       },
       // contracts for testing
       StandardToken: {
-        address: "0x6732c6Cd8DA14C7E065b51689410058815657427"
       },
       SNT: {
         // minting address: 0xEdEB948dE35C6ac414359f97329fc0b4be70d3f1
-        address: "0x43d5adC3B49130A575ae6e4b00dFa4BC55C71621"
       },
       Kernel: {
-        address: "0x6Fc67b94c1431EC423D6598b092F2a8bCcD4e698",
         file: "@aragon/os/contracts/kernel/Kernel.sol"
       },
       ACL: {
-        address: "0xEb14c564dfA6ac88d28087138Dde59c8888bF928",
         file: "@aragon/os/contracts/acl/ACL.sol"
       }
     }

package.json

@@ -12,7 +12,6 @@
     "compile:sol": "solcpiler --solc-version v0.4.18+commit.9cf6e910 -i './contracts/**/*.sol' ./node_modules/@aragon/os/contracts/{kernel/Kernel.sol,acl/ACL.sol,apps/AppProxyUpgradeable.sol} --output-sol-dir build/contracts",
     "compile:js": "babel -d lib/ js/",
     "compile": "npm run compile:sol &&  npm run compile:js",
-    "prepublish": "npm run build",
     "lint": "eslint src",
     "start": "node scripts/start.js",
     "build": "node scripts/build.js"

testnet.chains.json

@@ -0,0 +1,38 @@
+{
+  "0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177": {
+    "contracts": {
+      "0x337d95c008d3141f2f5e95c8fb3bad19740c79e7764cace727e7c8dbd48c5e7d": {
+        "name": "RecoveryVault",
+        "address": "0x835c1ab7CB9f0545164D7fE9827C5e43E3476809"
+      },
+      "0x7a0ab6d93a816579b7dd3d4891d20948d89376edb70b4e9e35984081e97dc23d": {
+        "name": "StandardToken",
+        "address": "0x6732c6Cd8DA14C7E065b51689410058815657427"
+      },
+      "0x106543bd4016aaa1c014e64ec41526991b2419349aca5672ce23308937475494": {
+        "name": "LPVault",
+        "address": "0xa25AB823c5A79941a8a9d0ab525D888cA1513419"
+      },
+      "0xa9bac214a330fe3f2048f91b805d227afa147021ef497936a65911400cc3bdd5": {
+        "name": "SNT",
+        "address": "0x43d5adC3B49130A575ae6e4b00dFa4BC55C71621"
+      },
+      "0xa605098a7f3f555ac77465159ade581ab416b5cd511f7385a77140c677bfc005": {
+        "name": "Kernel",
+        "address": "0x6Fc67b94c1431EC423D6598b092F2a8bCcD4e698"
+      },
+      "0xb8119021b52618e8e3395164320ffcdb253dcbdb7e47dfb5e4b92e01cef00bc1": {
+        "name": "ACL",
+        "address": "0xEb14c564dfA6ac88d28087138Dde59c8888bF928"
+      },
+      "0x0d46f0491387471c715abfda03087d386047c88e523e55d9fd64ede4fd9401e4": {
+        "name": "LiquidPledging",
+        "address": "0x07E92635AF5e524C20B20F2770aE0E0Ef597eD07"
+      },
+      "0xd42f3405d01b0371fa87477111523fa9cd442b42055a5ce08991d20203cf909c": {
+        "name": "LPFactory",
+        "address": "0x968F0a788F29b5B33296C61cEB34F1c40C55e52c"
+      }
+    }
+  }
+}