浏览代码

Update to truffle 4.0.0

had to up the gasLimit in test.sh to avoid an out of gas error when deploying the scripts
Alejandro Santander 7 年之前
父节点
当前提交
f28c245a3c
共有 3 个文件被更改,包括 42 次插入35 次删除
  1. 40 33
      package-lock.json
  2. 1 1
      package.json
  3. 1 1
      scripts/test.sh

+ 40 - 33
package-lock.json

@@ -2704,6 +2704,12 @@
         "secp256k1": "3.3.0"
       }
     },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -5281,14 +5287,14 @@
       "dev": true
     },
     "truffle": {
-      "version": "3.4.8",
-      "resolved": "https://registry.npmjs.org/truffle/-/truffle-3.4.8.tgz",
-      "integrity": "sha512-UeMrofHcguSwfAa5Oy3+arWPWb5zd28stySKIanNhzByV1rcUy3WhxE5up4LBOxAPz+OsH1nQ02kqIcBZDwxIw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/truffle/-/truffle-4.0.1.tgz",
+      "integrity": "sha512-PybO+GMq3AvsfCWfEx4sbuaJlDL19iR8Ff20cO0TtP599N5JbMLlhwlffvVInPgFjP+F11vjSOYj3hT8fONs5A==",
       "dev": true,
       "requires": {
-        "mocha": "3.5.0",
+        "mocha": "3.5.3",
         "original-require": "1.0.1",
-        "solc": "0.4.13"
+        "solc": "0.4.18"
       },
       "dependencies": {
         "commander": {
@@ -5321,9 +5327,9 @@
           }
         },
         "mocha": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz",
-          "integrity": "sha512-pIU2PJjrPYvYRqVpjXzj76qltO9uBYI7woYAMoxbSefsa+vqAfptjoeevd6bUgwD0mPIO+hv9f7ltvsNreL2PA==",
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
+          "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
           "dev": true,
           "requires": {
             "browser-stdout": "1.3.0",
@@ -5333,6 +5339,7 @@
             "escape-string-regexp": "1.0.5",
             "glob": "7.1.1",
             "growl": "1.9.2",
+            "he": "1.1.1",
             "json3": "3.3.2",
             "lodash.create": "3.1.1",
             "mkdirp": "0.5.1",
@@ -5340,9 +5347,9 @@
           }
         },
         "solc": {
-          "version": "0.4.13",
-          "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.13.tgz",
-          "integrity": "sha1-qly9zOPmrjwZDSD1/fi8iAcC7HU=",
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.18.tgz",
+          "integrity": "sha512-Kq+O3PNF9Pfq7fB+lDYAuoqRdghLmZyfngsg0h1Hj38NKAeVHeGPOGeZasn5KqdPeCzbMFvaGyTySxzGv6aXCg==",
           "dev": true,
           "requires": {
             "fs-extra": "0.30.0",
@@ -5360,28 +5367,6 @@
           "requires": {
             "has-flag": "1.0.0"
           }
-        },
-        "yargs": {
-          "version": "4.8.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
-          "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
-          "dev": true,
-          "requires": {
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "lodash.assign": "4.2.0",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "window-size": "0.2.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "2.4.1"
-          }
         }
       }
     },
@@ -6019,6 +6004,28 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
+    "yargs": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
+      "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
+      "dev": true,
+      "requires": {
+        "cliui": "3.2.0",
+        "decamelize": "1.2.0",
+        "get-caller-file": "1.0.2",
+        "lodash.assign": "4.2.0",
+        "os-locale": "1.4.0",
+        "read-pkg-up": "1.0.1",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "1.0.2",
+        "which-module": "1.0.0",
+        "window-size": "0.2.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "2.4.1"
+      }
+    },
     "yargs-parser": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz",

+ 1 - 1
package.json

@@ -39,7 +39,7 @@
     "ethereumjs-testrpc": "^4.1.1",
     "mocha-lcov-reporter": "^1.3.0",
     "solidity-coverage": "^0.2.2",
-    "truffle": "^3.4.6",
+    "truffle": "^4.0.0",
     "truffle-hdwallet-provider": "0.0.3"
   }
 }

+ 1 - 1
scripts/test.sh

@@ -41,7 +41,7 @@ start_testrpc() {
   if [ "$SOLIDITY_COVERAGE" = true ]; then
     node_modules/.bin/testrpc-sc --gasLimit 0xfffffffffff --port "$testrpc_port" "${accounts[@]}" > /dev/null &
   else
-    node_modules/.bin/testrpc "${accounts[@]}" > /dev/null &
+    node_modules/.bin/testrpc --gasLimit 0xfffffffffff "${accounts[@]}" > /dev/null &
   fi
 
   testrpc_pid=$!