From 933e1a4c5a356a1d49880f023a3ce942f3a7e41a Mon Sep 17 00:00:00 2001 From: Yao Date: Wed, 26 Sep 2018 19:04:29 +0800 Subject: [PATCH] update: update and lock pkg version, --- .gitignore | 1 + compiled/hellowroldCompiled.js | 4 --- package.json | 4 ++- yarn.lock | 49 +++++++++++++++++++--------------- 4 files changed, 31 insertions(+), 27 deletions(-) delete mode 100644 compiled/hellowroldCompiled.js diff --git a/.gitignore b/.gitignore index 5b4cae0..e08662e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ build yarn-error.log truffle-appchain.private.js contracts +compiled/* \ No newline at end of file diff --git a/compiled/hellowroldCompiled.js b/compiled/hellowroldCompiled.js deleted file mode 100644 index c5d11b6..0000000 --- a/compiled/hellowroldCompiled.js +++ /dev/null @@ -1,4 +0,0 @@ -const address = "0x6bFfADB9AdD1Fc47631a26FBf1ad180ba303300C" -const abi = [{"inputs":[{"name":"_name","type":"string"}],"payable":false,"stateMutability":"nonpayable","type":"constructor","signature":"constructor"},{"constant":true,"inputs":[],"name":"sayHi","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x0c49c36c"},{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"changeName","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x5353a2d8"}] - -export {address, abi} diff --git a/package.json b/package.json index c588c36..eb565bd 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,11 @@ "license": "MIT", "dependencies": {}, "scripts": { + "dev": "node /Users/yao/_cryptape/cita-truffle-migrate/dist/cli.js migrate", + "dev2": "truffle migrate --network ganache", "migrate": "appchain-migrate migrate" }, "devDependencies": { - "@nervos/appchain-truffle-migrate": "^0.1.5" + "@nervos/appchain-truffle-migrate": "0.1.9" } } diff --git a/yarn.lock b/yarn.lock index 10b0b3e..54f674a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,11 +2,11 @@ # yarn lockfile v1 -"@nervos/appchain-truffle-migrate@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@nervos/appchain-truffle-migrate/-/appchain-truffle-migrate-0.1.5.tgz#babdb3f6bdc06d0f2196a46f6f62be7b2f4fed72" +"@nervos/appchain-truffle-migrate@0.1.9": + version "0.1.9" + resolved "https://registry.yarnpkg.com/@nervos/appchain-truffle-migrate/-/appchain-truffle-migrate-0.1.9.tgz#4a24bbe83f549e5784fa2f3486b0ae46599a7065" dependencies: - "@nervos/chain" "^0.17.22" + "@nervos/chain" "0.17.22" colors "^1.3.2" cpr "^3.0.1" ethjs-abi "^0.2.1" @@ -22,10 +22,9 @@ truffle-provider "^0.0.6" truffle-require "^1.0.7" utf8 "3.0.0" - web3 "0.20.6" yargs "^12.0.1" -"@nervos/chain@^0.17.22": +"@nervos/chain@0.17.22": version "0.17.22" resolved "https://registry.yarnpkg.com/@nervos/chain/-/chain-0.17.22.tgz#1afa41277ee1905eb02053dc606b4e13022ef9ab" dependencies: @@ -33,8 +32,8 @@ web3 "^1.0.0-beta.34" "@nervos/signer@^1.0.36": - version "1.0.36" - resolved "https://registry.yarnpkg.com/@nervos/signer/-/signer-1.0.36.tgz#63902e281749cf49429584d51a8ef09611622ae1" + version "1.0.37" + resolved "https://registry.yarnpkg.com/@nervos/signer/-/signer-1.0.37.tgz#41bb9ddada54f54dd6cd33bb6dc3b31c91ac07d5" dependencies: ec "^0.0.1" elliptic "^6.4.0" @@ -42,8 +41,8 @@ web3 "^1.0.0-beta.34" "@types/node@^10.3.2": - version "10.10.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.10.1.tgz#d5c96ca246a418404914d180b7fdd625ad18eca6" + version "10.11.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.0.tgz#ddd0d67a3b6c3810dd1a59e36675fa82de5e19ae" accepts@~1.3.5: version "1.3.5" @@ -270,7 +269,7 @@ buffer-alloc-unsafe@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" -buffer-alloc@^1.1.0: +buffer-alloc@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" dependencies: @@ -363,9 +362,15 @@ colors@^1.1.2, colors@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b" -combined-stream@1.0.6, combined-stream@~1.0.6: +combined-stream@1.0.6: version "1.0.6" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" + resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" + dependencies: + delayed-stream "~1.0.0" + +combined-stream@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" dependencies: delayed-stream "~1.0.0" @@ -1156,7 +1161,7 @@ is-arrayish@^0.2.1: is-builtin-module@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" + resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" dependencies: builtin-modules "^1.0.0" @@ -1611,7 +1616,7 @@ p-finally@^1.0.0: p-is-promise@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" + resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" p-limit@^1.1.0: version "1.3.0" @@ -1709,8 +1714,8 @@ path-type@^1.0.0: pinkie-promise "^2.0.0" pbkdf2@^3.0.3: - version "3.0.16" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c" + version "3.0.17" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6" dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -2195,15 +2200,15 @@ swarm-js@0.1.37: xhr-request-promise "^0.1.2" tar-stream@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395" + version "1.6.2" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" dependencies: bl "^1.0.0" - buffer-alloc "^1.1.0" + buffer-alloc "^1.2.0" end-of-stream "^1.0.0" fs-constants "^1.0.0" readable-stream "^2.3.0" - to-buffer "^1.1.0" + to-buffer "^1.1.1" xtend "^4.0.0" tar.gz@^1.0.5: @@ -2251,7 +2256,7 @@ timed-out@^4.0.0, timed-out@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" -to-buffer@^1.1.0: +to-buffer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"