Update bootstrap to Embark 3.1

config/blockchain.js

@@ -0,0 +1,62 @@
+module.exports = {
+  development: {
+    enabled: true,
+    networkType: "custom", // Can be: testnet, rinkeby, livenet or custom, in which case, it will use the specified networkId
+    networkId: "1337", // Network id used when networkType is custom
+    isDev: true, // Uses and ephemeral proof-of-authority network with a pre-funded developer account, mining enabled
+    genesisBlock: "config/development/genesis.json", // Genesis block to initiate on first creation of a development node
+    datadir: ".embark/development/datadir", // Data directory for the databases and keystore
+    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: "auto",  // 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, // Enable the WS-RPC server
+    wsOrigins: "auto",  // Origins from which to accept websockets requests
+                        // When set to "auto", Embark will automatically set the cors to the address of the webserver
+    wsHost: "localhost", // WS-RPC server listening interface (default: "localhost")
+    wsPort: 8546, // WS-RPC server listening port (default: 8546)
+    simulatorMnemonic: "example exile argue silk regular smile grass bomb merge arm assist farm", // Mnemonic  used by the simulator to generate a wallet
+    simulatorBlocktime: 0 // Specify blockTime in seconds for automatic mining. Default is 0 and no auto-mining.
+  },
+  testnet: {
+    enabled: true,
+    networkType: "testnet",
+    light: true,
+    rpcHost: "localhost",
+    rpcPort: 8545,
+    rpcCorsDomain: "http://localhost:8000",
+    account: {
+      password: "config/testnet/password"
+    }
+  },
+  livenet: {
+    enabled: true,
+    networkType: "livenet",
+    light: true,
+    rpcHost: "localhost",
+    rpcPort: 8545,
+    rpcCorsDomain: "http://localhost:8000",
+    account: {
+      password: "config/livenet/password"
+    }
+  },
+  privatenet: {
+    enabled: true,
+    networkType: "custom",
+    rpcHost: "localhost",
+    rpcPort: 8545,
+    rpcCorsDomain: "http://localhost:8000",
+    datadir: "yourdatadir",
+    networkId: "123",
+    bootnodes: ""
+  }
+};

config/communication.js

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

config/contracts.js

@@ -0,0 +1,33 @@
+module.exports = {
+  // default applies to all environments
+  default: {
+    // Blockchain node to deploy the contracts
+    deployment: {
+      host: "localhost", // Host of the blockchain node
+      port: 8545, // Port of the blockchain node
+      type: "rpc" // Type of connection (ws or rpc),
+    },
+    // order of connections the dapp should connect to
+    dappConnection: [
+      "$WEB3",  // uses pre existing web3 object if available (e.g in Mist)
+      "ws://localhost:8546",
+      "http://localhost:8545"
+    ],
+    gas: "auto",
+    contracts: {
+      TestToken: {
+        deploy: false
+      },
+      ERC20Receiver: {
+        deploy: false
+      }
+    }
+  },
+  development: {
+    contracts: {
+      TestToken: {
+        deploy: true
+      }
+    }
+  }
+};

config/namesystem.js

@@ -0,0 +1,6 @@
+module.exports = {
+  default: {
+    available_providers: ["ens"],
+    provider: "ens"
+  }
+};

config/storage.js

@@ -0,0 +1,35 @@
+module.exports = {
+  default: {
+    enabled: true,
+    ipfs_bin: "ipfs",
+    provider: "ipfs",
+    available_providers: ["ipfs"],
+    upload: {
+      host: "localhost",
+      port: 5001
+    },
+    dappConnection: [
+      {
+        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: {
+      host: "localhost",
+      port: 5001,
+      getUrl: "http://localhost:8080/ipfs/"
+    }
+  }
+};

config/webserver.js

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

test/abstract/controlled.js

@@ -0,0 +1,31 @@
+
+exports.Test = (Controlled) => {
+    describe("Controlled", async function() {
+        this.timeout(0);
+        var accounts;
+        before(function(done) {
+            web3.eth.getAccounts().then(function (res) {
+                accounts = res;
+                done();
+            });
+        });
+
+
+        it("should start with msg.sender as controller", async function() {
+            var controller = await Controlled.methods.controller().call();
+            assert(controller, accounts[0]);
+        });
+
+        it("should allow controller to set new controller", async function() {
+            await Controlled.methods.changeController(accounts[1]).send({from: accounts[0]});
+            var controller = await Controlled.methods.controller().call();
+            assert(controller, accounts[1]);
+        });
+
+        it("should set back to original controller", async function() {
+            await Controlled.methods.changeController(accounts[0]).send({from: accounts[1]});
+            var controller = await Controlled.methods.controller().call();
+            assert(controller, accounts[0]);
+        });
+    }); 
+}