update to latest embark

.gitignore

@@ -4,10 +4,12 @@ __pycache__/
 *$py.class
 
 # embark
-.embark/
+.embark
 chains.json
-config/production/password
 config/livenet/password
+config/production/password
+embarkArtifacts
+.password
 
 # egg-related
 viper.egg-info/
@@ -40,3 +42,4 @@ npm-debug.log
 # other
 .vs/
 bin/
+.trash

config/blockchain.js

@@ -1,54 +1,59 @@
 module.exports = {
-  development: {
+  default: {
     enabled: true,
-    networkType: "custom", // Can be: testnet, rinkeby, livenet or custom, in which case, it will use the specified networkId
+    rpcHost: "localhost", 
-    networkId: "1337", // Network id used when networkType is custom
+    rpcPort: 8545, 
-    isDev: true, // Uses and ephemeral proof-of-authority network with a pre-funded developer account, mining enabled
+    rpcCorsDomain: {
-    genesisBlock: "config/development/genesis.json", // Genesis block to initiate on first creation of a development node
+      auto: true,
-    datadir: ".embark/development/datadir", // Data directory for the databases and keystore
+      additionalCors: []
-    mineWhenNeeded: true, // Uses our custom script (if isDev is false) to mine only when needed
-    nodiscover: true, // Disables the peer discovery mechanism (manual peer addition)
-    maxpeers: 0, // Maximum number of network peers (network disabled if set to 0) (default: 25)
-    rpcHost: "localhost", // HTTP-RPC server listening interface (default: "localhost")
-    rpcPort: 8545, // HTTP-RPC server listening port (default: 8545)
-    rpcCorsDomain: "*",  // Comma separated list of domains from which to accept cross origin requests (browser enforced)
-                            // When set to "auto", Embark will automatically set the cors to the address of the webserver
-    proxy: true, // Proxy is used to present meaningful information about transactions
-    account: {
-      // "address": "", // When specified, uses that address instead of the default one for the network
-      password: "config/development/password" // Password to unlock the account
     },
-    targetGasLimit: 8000000, // Target gas limit sets the artificial target gas floor for the blocks to mine
+    wsRPC: true,
-    wsRPC: true, // Enable the WS-RPC server
+    wsOrigins: { 
-    wsOrigins: "*",  // Origins from which to accept websockets requests
+      auto: true,
-                        // When set to "auto", Embark will automatically set the cors to the address of the webserver
+      additionalCors: []
-    wsHost: "localhost", // WS-RPC server listening interface (default: "localhost")
+    },
-    wsPort: 8546, // WS-RPC server listening port (default: 8546)
+    wsHost: "localhost",
-    simulatorMnemonic: "example exile argue silk regular smile grass bomb merge arm assist farm", // Mnemonic  used by the simulator to generate a wallet
+    wsPort: 8546 
-    simulatorBlocktime: 0 // Specify blockTime in seconds for automatic mining. Default is 0 and no auto-mining.
   },
+
+  development: {
+    ethereumClientName: "geth", 
+    networkType: "custom", 
+    networkId: 1337,
+    isDev: true,
+    datadir: ".embark/development/datadir",
+    mineWhenNeeded: true, 
+    nodiscover: true, 
+    maxpeers: 0, 
+    proxy: true, 
+    targetGasLimit: 8000000, 
+    simulatorBlocktime: 0
+  },
+
   testnet: {
-    enabled: true,
     networkType: "testnet",
     syncMode: "light",
-    rpcHost: "localhost",
+    accounts: [
-    rpcPort: 8545,
+      {
-    rpcCorsDomain: "http://localhost:8000",
+        nodeAccounts: true,
-    account: {
+        password: "config/testnet/.password"
-      password: "config/testnet/.password"
+      }
-    }
+    ]
   },
+
   livenet: {
-    enabled: false,
     networkType: "livenet",
     syncMode: "light",
-    rpcHost: "localhost",
-    rpcPort: 8545,
     rpcCorsDomain: "http://localhost:8000",
-    account: {
+    wsOrigins: "http://localhost:8000",
-      password: "config/livenet/.password"
+    accounts: [
-    }
+      {
-  },  
+        nodeAccounts: true,
+        password: "config/livenet/.password"
+      }
+    ]
+  },
+  
   rinkeby: {
     enabled: true,
     networkType: "rinkeby",
@@ -56,8 +61,12 @@ module.exports = {
     rpcHost: "localhost",
     rpcPort: 8545,
     rpcCorsDomain: "http://localhost:8000",
-    account: {
+    accounts: [
-      password: "config/rinkeby/.password"
+      {
-    }
+        nodeAccounts: true,
+        password: "config/rinkeby/.password"
+      }
+    ],
   }
+ 
 };

config/communication.js

@@ -1,13 +1,22 @@
 module.exports = {
   default: {
     enabled: true,
-    provider: "whisper", // Communication provider. Currently, Embark only supports whisper
+    provider: "whisper", 
-    available_providers: ["whisper"], // Array of available providers
+    available_providers: ["whisper"], 
-    connection: {
+  },
-      host: "localhost", // Host of the blockchain node
-      port: 8546, // Port of the blockchain node
-      type: "ws" // Type of connection (ws or rpc)
-    }
-  }
-};
 
+  development: {
+    connection: {
+      host: "localhost",
+      port: 8546, 
+      type: "ws" 
+    }
+  },
+  testnet: {
+  },
+  livenet: {
+  },
+  rinkeby: {
+  }
+  
+};

config/contracts.js

@@ -1,94 +1,82 @@
 module.exports = {
-  // default applies to all environments
   default: {
-    // Blockchain node to deploy the contracts
     deployment: {
-      host: "localhost", // Host of the blockchain node
+      host: "localhost", 
-      port: 8545, // Port of the blockchain node
+      port: 8546,
-      type: "rpc" // Type of connection (ws or rpc),
+      type: "ws"
     },
-    // order of connections the dapp should connect to
     dappConnection: [
-      "$WEB3",  // uses pre existing web3 object if available (e.g in Mist)
+      "$WEB3", 
       "ws://localhost:8546",
       "http://localhost:8545"
     ],
     gas: "auto",
+    strategy: 'explicit',
     contracts: {      
-      "ERC20Receiver": {"deploy": false},
+      MiniMeTokenFactory: {},
-      "SafeMath": {"deploy": false},
+      MiniMeToken: {
-      
+        args:["$MiniMeTokenFactory", "0x0", "0x0", "Status Test Token", 18, "STT", true],
-      "MiniMeTokenFactory": {},
-      "MiniMeToken": {
-        "args":["$MiniMeTokenFactory", "0x0", "0x0", "Status Test Token", 18, "STT", true],
       },
-
+      StatusRoot: {
-      "StatusNetwork": {"deploy": false},
+        instanceOf: "TestStatusNetwork",
-      "TestStatusNetwork": {"deploy": false},
+        deploy: true,
-      "StatusRoot": {
+        args: ["0x0", "$MiniMeToken"],
-        "instanceOf": "TestStatusNetwork",
-        "deploy": true,
-        "args": ["0x0", "$MiniMeToken"],
         "onDeploy": [
           "await MiniMeToken.methods.changeController(StatusRoot.address).send()",
           "await StatusRoot.methods.setOpen(true).send()",
         ]
       },  
-
+      VisibilityStake: {
-      "VisibilityStake": {
+        args:["$MiniMeToken", "31104000"],
-        "args":["$MiniMeToken", "31104000"],
       },
-      "GroupAccess": {
+      GroupAccess: {
-        "args":["$MiniMeToken"],
+        args:["$MiniMeToken"],
       },
-      "MessageTribute": {
+      MessageTribute: {
-        "args":["10000000000000000000"],
+        args:["0x"],
       }
     }
   },
-
+  
   development: {
-    deployment: {
+    dappConnection: [
-      accounts: [
+      "ws://localhost:8546",
-        {
+      "http://localhost:8545",
-          privateKey: "b2ab40d549e67ba67f278781fec03b3a90515ad4d0c898a6326dd958de1e46fa",
+      "$WEB3"  // uses pre existing web3 object if available (e.g in Mist)
-          balance: "5 ether"  // You can set the balance of the account in the dev environment
+    ]
-                              // Balances are in Wei, but you can specify the unit with its name
-        }
-      ]
-    }
   },
+
   testnet: {
     contracts: {
       "MiniMeTokenFactory": {
-        "deploy": false,
+        deploy: false,
-        "address": "0x6bFa86A71A7DBc68566d5C741F416e3009804279"
+        address: "0x6bFa86A71A7DBc68566d5C741F416e3009804279"
       },
       "MiniMeToken": {
-        "deploy": false,
+        deploy: false,
-        "address": "0xc55cF4B03948D7EBc8b9E8BAD92643703811d162"
+        address: "0xc55cF4B03948D7EBc8b9E8BAD92643703811d162"
       },
       "StatusRoot": {
-        "instanceOf": "TestStatusNetwork",
+        instanceOf: "TestStatusNetwork",
-        "deploy": false,
+        deploy: false,
-        "address": "0x34358C45FbA99ef9b78cB501584E8cBFa6f85Cef"
+        address: "0x34358C45FbA99ef9b78cB501584E8cBFa6f85Cef"
       }
     }
   },
   rinkeby: {
     contracts: {
       "MiniMeTokenFactory": {
-        "deploy": false,
+        deploy: false,
-        "address": "0x5bA5C786845CaacD45f5952E1135F4bFB8855469"
+        address: "0x5bA5C786845CaacD45f5952E1135F4bFB8855469"
       },
       "MiniMeToken": {
-        "deploy": false,
+        deploy: false,
-        "address": "0x43d5adC3B49130A575ae6e4b00dFa4BC55C71621"
+        address: "0x43d5adC3B49130A575ae6e4b00dFa4BC55C71621"
       },
       "StatusRoot": {
-        "instanceOf": "TestStatusNetwork",
+        instanceOf: "TestStatusNetwork",
-        "deploy": false,
+        deploy: false,
-        "address": "0xEdEB948dE35C6ac414359f97329fc0b4be70d3f1"
+        address: "0xEdEB948dE35C6ac414359f97329fc0b4be70d3f1"
       }
     }
   }

config/development/genesis.json

@@ -1,16 +0,0 @@
-{
-    "config": {
-      "homesteadBlock": 1
-    },
-    "nonce": "0x0000000000000042",
-    "difficulty": "0x0",
-    "alloc": {
-        "0x3333333333333333333333333333333333333333": {"balance": "15000000000000000000"}
-    },
-    "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "coinbase": "0x3333333333333333333333333333333333333333",
-    "timestamp": "0x00",
-    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "extraData": "0x",
-    "gasLimit": "0x7a1200"
-}

config/development/password

@@ -1 +0,0 @@
-dev_password

config/namesystem.js

@@ -1,6 +1,23 @@
 module.exports = {
   default: {
+    enabled: true,
     available_providers: ["ens"],
     provider: "ens"
+  },
+  development: {
+    register: {
+      rootDomain: "eth",
+      subdomains: {
+        'embark': '0x1a2f3b98e434c02363f3dac3174af93c1d690914'
+      }
+    }
+  },
+  testnet: {
+  },
+
+  livenet: {
+  },
+
+  rinkeby: {
   }
 };

config/pipeline.js

@@ -0,0 +1,5 @@
+module.exports = {
+    typescript: false,
+    enabled: true 
+};
+  

config/storage.js

@@ -2,34 +2,37 @@ module.exports = {
   default: {
     enabled: true,
     ipfs_bin: "ipfs",
-    provider: "ipfs",
     available_providers: ["ipfs"],
     upload: {
+      provider: "ipfs",
       host: "localhost",
       port: 5001
     },
     dappConnection: [
       {
-        provider: "ipfs",
+        provider:"ipfs",
         host: "localhost",
         port: 5001,
         getUrl: "http://localhost:8080/ipfs/"
       }
     ]
-    // Configuration to start Swarm in the same terminal as `embark run`
-    /*,account: {
-      address: "YOUR_ACCOUNT_ADDRESS", // Address of account accessing Swarm
-      password: "PATH/TO/PASSWORD/FILE" // File containing the password of the account
-    },
-    swarmPath: "PATH/TO/SWARM/EXECUTABLE" // Path to swarm executable (default: swarm)*/
   },
   development: {
     enabled: true,
-    provider: "ipfs",
     upload: {
+      provider: "ipfs",
       host: "localhost",
       port: 5001,
       getUrl: "http://localhost:8080/ipfs/"
     }
+  },
+
+  testnet: {
+  },
+
+  livenet: {
+  },
+
+  rinkeby: {
   }
 };

config/testnet/password

@@ -1 +0,0 @@
-test_password

config/webserver.js

@@ -1,5 +1,6 @@
 module.exports = {
   enabled: true,
   host: "localhost",
+  openBrowser: true,
   port: 8000
 };

embark.json

@@ -9,5 +9,7 @@
     "ipfs-api": "17.2.4",
     "p-iteration": "1.1.7"
   },
-  "plugins": {}
+  "plugins": {
+    "embarkjs-connector-web3": {}
+  }
 }

package.json

@@ -20,8 +20,8 @@
     "elliptic": "^6.4.0"
   },
   "dependencies": {
+    "embarkjs-connector-web3": "^4.0.0",
     "elliptic-curve": "^0.1.0",
-    "embark": "^3.0.0",
     "ethereumjs-util": "^5.1.5",
     "web3": "^1.0.0-beta.34"
   }