diff --git a/Cargo.lock.bip39-fix b/Cargo.lock.bip39-fix deleted file mode 100644 index d471b1fd0d..0000000000 --- a/Cargo.lock.bip39-fix +++ /dev/null @@ -1,30 +0,0 @@ -# This file is temporarily used to fix the compilation error due to the version mismatch -# The bug is fixed upstream, but our current revision does not incorporate this fix -# TODO: must be deleted as soon as our version is updated -# and the Makefile also needs to be updated - -[[package]] -name = "substrate-bip39" -version = "0.2.2" -source = "git+https://github.com/paritytech/substrate-bip39#e4ade6da714c836268430bf9b8f1f01c73404003" -dependencies = [ - "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "schnorrkel 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "substrate-bip39" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "schnorrkel 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[metadata] -"checksum substrate-bip39 0.2.2 (git+https://github.com/paritytech/substrate-bip39)" = "" -"checksum substrate-bip39 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d69ace596e9ca97837cc41f8edcfc4e0a997f227d5fc153d1010b60a0fe9acda" diff --git a/Makefile b/Makefile index f81256595b..131226ddbe 100755 --- a/Makefile +++ b/Makefile @@ -171,7 +171,8 @@ $(Worker_Name): $(Worker_Enclave_u_Object) $(Worker_SRC_Files) $(Client_Name): $(Client_SRC_Files) @echo @echo "Building the substraTEE-client" - @cp Cargo.lock.bip39-fix Cargo.lock + # remove next line when https://github.com/libp2p/rust-libp2p/issues/1259 is fixed + @cargo update -p protobuf --precise 2.8.1 @cd $(Client_SRC_Path) && cargo build $(Client_Rust_Flags) @echo "Cargo => $@" cp $(Client_Rust_Path)/$(Client_Binary) ./bin