diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7a5e68..09ea071 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,6 @@ jobs: release: name: "Publish" runs-on: builder - container: rust defaults: run: shell: bash @@ -60,13 +59,17 @@ jobs: ~/.cargo/bin key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: Install Rust - working-directory: ./service - run: | - rustup toolchain install nightly-2022-01-16-x86_64-unknown-linux-gnu - rustup default nightly-2022-01-16-x86_64-unknown-linux-gnu - rustup override set nightly-2022-01-16-x86_64-unknown-linux-gnu - rustup target add wasm32-wasi --toolchain nightly-2022-01-16-x86_64-unknown-linux-gnu + - name: Install toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: nightly + override: true + target: wasm32-wasi + + # - name: Install wasm32-wasi target + # working-directory: ./service + # run: rustup target add wasm32-wasi ### Build - name: Build trust-graph diff --git a/.github/workflows/rust_ci.yml b/.github/workflows/rust_ci.yml index e2c31d9..2be9fd3 100644 --- a/.github/workflows/rust_ci.yml +++ b/.github/workflows/rust_ci.yml @@ -11,7 +11,6 @@ jobs: check: name: cargo nextest runs-on: builder - container: rust defaults: run: working-directory: service @@ -30,13 +29,14 @@ jobs: - run: mkdir -p ~/.bin - run: echo "~/.bin" >> $GITHUB_PATH - - name: Install Rust - working-directory: ./service - run: | - rustup toolchain install nightly-2022-01-16-x86_64-unknown-linux-gnu - rustup default nightly-2022-01-16-x86_64-unknown-linux-gnu - rustup override set nightly-2022-01-16-x86_64-unknown-linux-gnu - rustup target add wasm32-wasi --toolchain nightly-2022-01-16-x86_64-unknown-linux-gnu + - name: Install toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: nightly + + - name: Add wasm32-wasi target + run: rustup target add wasm32-wasi - name: Download jq run: | diff --git a/Cargo.lock b/Cargo.lock index 0fe71dd..caf8c75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -269,6 +269,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + [[package]] name = "cmd_lib" version = "0.7.8" @@ -281,6 +290,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + [[package]] name = "cpufeatures" version = "0.2.1" @@ -761,7 +779,7 @@ dependencies = [ [[package]] name = "fluence-keypair" -version = "0.6.0" +version = "0.7.0" dependencies = [ "asn1_der 0.6.3", "bs58 0.3.1", @@ -1001,6 +1019,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1201,9 +1225,9 @@ checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" [[package]] name = "libp2p-core" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24250cce58fb6ccb32e26647c1c25b48b6f7bd2d6fb3d6dba72001a6694b385" +checksum = "42d46fca305dee6757022e2f5a4f6c023315084d0ed7441c3ab244e76666d979" dependencies = [ "asn1_der 0.7.5", "bs58 0.4.0", @@ -1219,8 +1243,8 @@ dependencies = [ "multiaddr", "multihash", "multistream-select", - "parking_lot 0.11.2", - "pin-project 1.0.10", + "parking_lot 0.12.1", + "pin-project", "prost", "prost-build", "rand 0.8.4", @@ -1621,9 +1645,9 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" +checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" dependencies = [ "arrayref", "bs58 0.4.0", @@ -1639,22 +1663,22 @@ dependencies = [ [[package]] name = "multihash" -version = "0.14.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" +checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" dependencies = [ - "digest 0.9.0", - "generic-array 0.14.5", + "core2", + "digest 0.10.1", "multihash-derive", - "sha2 0.9.9", + "sha2 0.10.1", "unsigned-varint", ] [[package]] name = "multihash-derive" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" +checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ "proc-macro-crate", "proc-macro-error", @@ -1682,7 +1706,7 @@ dependencies = [ "bytes", "futures", "log", - "pin-project 1.0.10", + "pin-project", "smallvec", "unsigned-varint", ] @@ -1810,6 +1834,16 @@ dependencies = [ "parking_lot_core 0.8.5", ] +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api 0.4.6", + "parking_lot_core 0.9.3", +] + [[package]] name = "parking_lot_core" version = "0.7.2" @@ -1838,6 +1872,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.10", + "smallvec", + "windows-sys", +] + [[package]] name = "paste" version = "1.0.6" @@ -1869,33 +1916,13 @@ dependencies = [ "indexmap", ] -[[package]] -name = "pin-project" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" -dependencies = [ - "pin-project-internal 0.4.29", -] - [[package]] name = "pin-project" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal 1.0.10", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "pin-project-internal", ] [[package]] @@ -1989,9 +2016,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" dependencies = [ "bytes", "prost-derive", @@ -1999,12 +2026,14 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" dependencies = [ "bytes", - "heck", + "cfg-if 1.0.0", + "cmake", + "heck 0.4.0", "itertools 0.10.3", "lazy_static", "log", @@ -2019,9 +2048,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", "itertools 0.10.3", @@ -2032,9 +2061,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" dependencies = [ "bytes", "prost", @@ -2226,9 +2255,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -2237,9 +2266,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "remove_dir_all" @@ -2324,12 +2353,12 @@ checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" [[package]] name = "rw-stream-sink" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" +checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ "futures", - "pin-project 0.4.29", + "pin-project", "static_assertions", ] @@ -2838,7 +2867,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c2bb690b44cb1b0fdcc54d4998d21f8bdaf706b93775425e440b174f39ad16" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "syn", @@ -3150,6 +3179,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "zeroize" version = "1.5.1" diff --git a/Cargo.toml b/Cargo.toml index da10001..88a80c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,10 +8,10 @@ license = "Apache-2.0" repository = "https://github.com/fluencelabs/trust-graph" [dependencies] -libp2p-core = { version = "0.31", default-features = false, features = [ "secp256k1" ] } +libp2p-core = { version = "0.33", default-features = false, features = [ "secp256k1" ] } serde = { version = "1.0.118", features = ["derive"] } -fluence-keypair = { path = "./keypair", version = "0.6.0" } +fluence-keypair = { path = "./keypair", version = "0.7.0" } serde_json = "1.0.58" bs58 = "0.3.1" failure = "0.1.6" diff --git a/keypair/Cargo.toml b/keypair/Cargo.toml index 7b994b8..0b233f1 100644 --- a/keypair/Cargo.toml +++ b/keypair/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluence-keypair" -version = "0.6.0" +version = "0.7.0" authors = ["Fluence Labs"] edition = "2018" description = "identity" @@ -23,7 +23,7 @@ asn1_der = "0.6.1" sha2 = "0.9.1" zeroize = "1" serde_bytes = "0.11" -libp2p-core = { version = "0.31", default-features = false, features = [ "secp256k1" ] } +libp2p-core = { version = "0.33.0", default-features = false, features = [ "secp256k1" ] } eyre = "0.6.5" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] diff --git a/keypair/rust-toolchain.toml b/keypair/rust-toolchain.toml index b4ed1ec..d5886f9 100644 --- a/keypair/rust-toolchain.toml +++ b/keypair/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2022-01-16" -targets = [ "x86_64-apple-darwin", "x86_64-unknown-linux-gnu" ] \ No newline at end of file +channel = "nightly-2022-08-30" +targets = [ "x86_64-apple-darwin", "x86_64-unknown-linux-gnu" ] diff --git a/service/Cargo.toml b/service/Cargo.toml index 0f65c41..7324ee2 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -12,11 +12,11 @@ path = "src/main.rs" [dependencies] trust-graph = { version = "0.3.0", path = "../." } -fluence-keypair = { version = "0.6.0", path = "../keypair" } +fluence-keypair = { version = "0.7.0", path = "../keypair" } marine-rs-sdk = { version = "0.6.14", features = ["logger"] } marine-sqlite-connector = "0.5.2" -libp2p-core = { version = "0.31", default-features = false, features = [ "secp256k1" ] } +libp2p-core = { version = "0.33", default-features = false, features = [ "secp256k1" ] } log = "0.4.8" anyhow = "1.0.31"