fix contract config

embarkConfig/contracts.js

@@ -5,6 +5,41 @@ try {
   console.dir("warning: .secret.json file not found; this is only needed to deploy to testnet or livenet etc..");
 }
 
+const rinkebyBase = {
+  enabled: true,
+  dappConnection: [
+    '$WEB3'
+  ],
+  strategy: 'explicit',
+  tracking: './testnet.chains.json',
+  contracts: {
+    LPVault: {
+    },
+    LiquidPledging: {
+    },
+    RecoveryVault: {
+    },
+    LPFactory: {
+      args: {
+        _vaultBase: '$LPVault',
+        _lpBase: '$LiquidPledging',
+      }
+    },
+    // contracts for testing
+    StandardToken: {
+    },
+    SNT: {
+      // minting address: 0xEdEB948dE35C6ac414359f97329fc0b4be70d3f1
+    },
+    Kernel: {
+      file: "@aragon/os/contracts/kernel/Kernel.sol"
+    },
+    ACL: {
+      file: "@aragon/os/contracts/acl/ACL.sol"
+    }
+  }
+};
+
 module.exports = {
   // default applies to all environments
   default: {
@@ -115,13 +150,13 @@ module.exports = {
   // used with "embark run testnet"
   testnet: {},
 
-  rinkeby: {
+  rinkeby: rinkebyBase,
-    enabled: true,
+  rinkebyInfura: Object.assign({}, rinkebyBase, {
     deployment: {
       accounts: [
         {
           mnemonic: secret.mnemonic,
-          hdpath: "m/44'/1'/0'/0/",
+          hdpath: secret.hdpath || "m/44'/1'/0'/0/",
           numAddresses: "10"
         }
       ],
@@ -129,39 +164,8 @@ module.exports = {
       port: false,
       protocol: 'https',
       type: "rpc"
-    },
-    dappConnection: [
-      '$WEB3'
-    ],
-    strategy: 'explicit',
-    tracking: './testnet.chains.json',
-    contracts: {
-      LPVault: {
-      },
-      LiquidPledging: {
-      },
-      RecoveryVault: {
-      },
-      LPFactory: {
-        args: {
-          _vaultBase: '$LPVault',
-          _lpBase: '$LiquidPledging',
-        }
-      },
-      // contracts for testing
-      StandardToken: {
-      },
-      SNT: {
-        // minting address: 0xEdEB948dE35C6ac414359f97329fc0b4be70d3f1
-      },
-      Kernel: {
-        file: "@aragon/os/contracts/kernel/Kernel.sol"
-      },
-      ACL: {
-        file: "@aragon/os/contracts/acl/ACL.sol"
-      }
     }
-  },
+  }),
   // merges with the settings in default
   // used with "embark run livenet"
   livenet: {},

testnet.chains.json

@@ -32,6 +32,14 @@
       "0xd42f3405d01b0371fa87477111523fa9cd442b42055a5ce08991d20203cf909c": {
         "name": "LPFactory",
         "address": "0x968F0a788F29b5B33296C61cEB34F1c40C55e52c"
+      },
+      "0xeced62cc0592a267ecd3b5e79d6e952082577769c26b199299b58c98e9a2bdb8": {
+        "name": "Kernel",
+        "address": "0x49798b01e64295497624645B77004614CC5160c3"
+      },
+      "0xe16a4aaebb3197a14aa5dd3995949f3e44d274fe049caeae225d8fa6068b3ed6": {
+        "name": "LPFactory",
+        "address": "0xBEf1f7D339277Ec3F0ae3BA0b9B04334BA8C2E26"
       }
     }
   }