Skip to content

Commit

Permalink
Merge pull request #24 from cryptape/develop
Browse files Browse the repository at this point in the history
update: update and lock pkg version,
  • Loading branch information
Keith-CY authored Sep 26, 2018
2 parents 7634209 + 933e1a4 commit 672d486
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 27 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ build
yarn-error.log
truffle-appchain.private.js
contracts
compiled/*
4 changes: 0 additions & 4 deletions compiled/hellowroldCompiled.js

This file was deleted.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
49 changes: 27 additions & 22 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].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"
Expand All @@ -22,28 +22,27 @@
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/[email protected]":
version "0.17.22"
resolved "https://registry.yarnpkg.com/@nervos/chain/-/chain-0.17.22.tgz#1afa41277ee1905eb02053dc606b4e13022ef9ab"
dependencies:
"@nervos/signer" "^1.0.36"
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"
google-protobuf "^3.5.0"
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"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"

[email protected], combined-stream@~1.0.6:
[email protected]:
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"

Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2195,15 +2200,15 @@ [email protected]:
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:
Expand Down Expand Up @@ -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"

Expand Down

0 comments on commit 672d486

Please sign in to comment.