upgrade dependencies

Author: Antony Jones

config/rollup.config.js

@@ -9,19 +9,23 @@ const copy = require('rollup-plugin-copy')
 const css = require('rollup-plugin-postcss')
 const serve = require('rollup-plugin-serve')
 const liveReload = require('rollup-plugin-livereload')
+const builtins = require('rollup-plugin-node-builtins')
+const globals = require('rollup-plugin-node-globals')
 
 const watch = process.env.WATCH
 
 const plugins = [
   copy({
     'src/index.html': 'build/index.html',
-    'node_modules/web3/dist/web3.min.js': 'build/js/web3.min.js'
+    // 'node_modules/web3/dist/web3.min.js': 'build/js/web3.min.js'
   }),
   css(),
   json(),
   commonjs({
     ignore: [ 'crypto', 'xmlhttprequest', 'xhr2' ]
   }),
+  builtins(),
+  globals(),
   resolve(),
   svelte({
     include: 'src/components/**/*.html'
@@ -31,12 +35,14 @@ const plugins = [
   })
 ]
 
-const devPlugins = [
-  serve('build'),
-  liveReload({
-    watch: 'build'
-  })
-]
+function getDevPlugins () {
+  return [
+    serve('build'),
+    liveReload({
+      watch: 'build'
+    })
+  ]
+}
 
 module.exports = [
   {
@@ -45,7 +51,7 @@ module.exports = [
       file: 'build/js/dapp.js',
       format: 'iife'  
     },
-    plugins: watch ? plugins.concat(devPlugins) : plugins,
+    plugins: watch ? plugins.concat(getDevPlugins()) : plugins,
     external: ['web3']
   }
 ]

contracts/Migrations.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.4;
+pragma solidity ^0.4.2;
 
 contract Migrations {
   address public owner;
@@ -8,16 +8,16 @@ contract Migrations {
     if (msg.sender == owner) _;
   }
 
-  function Migrations() {
+  function Migrations() public {
     owner = msg.sender;
   }
 
-  function setCompleted(uint completed) restricted {
+  function setCompleted(uint completed) public restricted {
     last_completed_migration = completed;
   }
 
-  function upgrade(address new_address) restricted {
+  function upgrade(address new_address) public restricted {
     Migrations upgraded = Migrations(new_address);
     upgraded.setCompleted(last_completed_migration);
   }
-}
+}

contracts/SimpleStorage.sol

@@ -1,13 +1,13 @@
-pragma solidity ^0.4.2;
+pragma solidity ^0.4.18;
 
 contract SimpleStorage {
   uint storedData;
 
-  function set(uint x) {
+  function set(uint x) public {
     storedData = x;
   }
 
-  function get() constant returns (uint) {
+  function get() public view returns (uint) {
     return storedData;
   }
-}
+}