Merge pull request #9 from aeternity/GH-8-update-parity
Update parity to latest version from upstream
This commit is contained in:
commit
c67464c35c
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,6 +1,5 @@
|
|||||||
/target
|
/target
|
||||||
**/*.rs.bk
|
**/*.rs.bk
|
||||||
Cargo.lock
|
|
||||||
**/*~
|
**/*~
|
||||||
/parity-ethereum
|
/parity-ethereum
|
||||||
/_build
|
/_build
|
||||||
|
1979
Cargo.lock
generated
Normal file
1979
Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -9,7 +9,7 @@ edition = "2018"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
base64 = "0.10.1"
|
base64 = "0.10.1"
|
||||||
c_vec = "1.3.3"
|
c_vec = "1.3.3"
|
||||||
ethcore-builtin = { path = "parity-ethereum/ethcore/builtin" }
|
ethcore-builtin = { git = "https://github.com/paritytech/parity-ethereum.git", rev = "acf7c48" }
|
||||||
lazy_static = "1.3.0"
|
lazy_static = "1.3.0"
|
||||||
libc = "0.2.60"
|
libc = "0.2.60"
|
||||||
parity-bytes = "0.1.0"
|
parity-bytes = "0.1.0"
|
||||||
|
5
Makefile
5
Makefile
@ -19,13 +19,10 @@ all: priv/$(nif_lib) compile
|
|||||||
compile:
|
compile:
|
||||||
./rebar3 compile
|
./rebar3 compile
|
||||||
|
|
||||||
priv/$(nif_lib): src/lib.rs parity-ethereum/
|
priv/$(nif_lib): src/lib.rs
|
||||||
cargo build --release
|
cargo build --release
|
||||||
cp target/release/$(nif_lib_src) $@
|
cp target/release/$(nif_lib_src) $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f priv/$(nif_lib) target/release/$(nif_lib_src)
|
rm -f priv/$(nif_lib) target/release/$(nif_lib_src)
|
||||||
./rebar3 clean
|
./rebar3 clean
|
||||||
|
|
||||||
parity-ethereum/:
|
|
||||||
git clone https://github.com/aeternity/parity-ethereum.git
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user