From 7922f1aefd19800f8651c524d2db55cd2017bd1b Mon Sep 17 00:00:00 2001 From: boneyard93501 <4523011+boneyard93501@users.noreply.github.com> Date: Thu, 29 Apr 2021 16:05:49 -0500 Subject: [PATCH] update to 0.6.2 --- echo-greeter/secure-greeter/Cargo.lock | 105 ++++++++++++++++-- echo-greeter/secure-greeter/Cargo.toml | 2 +- .../secure-greeter/local_service_info.txt | 12 -- echo-greeter/secure-greeter/src/auth.rs | 2 +- 4 files changed, 96 insertions(+), 25 deletions(-) delete mode 100644 echo-greeter/secure-greeter/local_service_info.txt diff --git a/echo-greeter/secure-greeter/Cargo.lock b/echo-greeter/secure-greeter/Cargo.lock index e5980d6..cdfc3f5 100644 --- a/echo-greeter/secure-greeter/Cargo.lock +++ b/echo-greeter/secure-greeter/Cargo.lock @@ -1,5 +1,11 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + [[package]] name = "cfg-if" version = "1.0.0" @@ -7,29 +13,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "fluence" -version = "0.5.0" +name = "chrono" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342831732a977f13220ecd6f25c7e6b6127af8d3794d42e3c880b05e457a0484" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi", +] + +[[package]] +name = "fce-timestamp-macro" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c59a6302902583b2c84e87de9d72b949da4396a369baf0aaa49e97021600bb0" +dependencies = [ + "chrono", + "quote", +] + +[[package]] +name = "fluence" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b731bd4a69a3945186f2ff96ff753908939c8a2debd60e1f0e8edb6a28757f8" +dependencies = [ + "fce-timestamp-macro", "fluence-sdk-macro", "fluence-sdk-main", + "serde", ] [[package]] name = "fluence-sdk-macro" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c840552e5e58b62d4a272e3e4aabd548e1a4519df629a51d42157c7ecbe653" +checksum = "cb43d2f51f1becb70e2125ef8ca9759597900f95cc22ce7dca981a7d6ccd7dde" dependencies = [ "fluence-sdk-wit", ] [[package]] name = "fluence-sdk-main" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f1d126f05a798c8f812fbe47a42145478ce8029e00411b04d1c5194ab368313" +checksum = "a78910d85e3cdcb9c2baf56144f20a99925c67ac445d4156220c005bfd2f9604" dependencies = [ "fluence-sdk-macro", "log", @@ -38,9 +69,9 @@ dependencies = [ [[package]] name = "fluence-sdk-wit" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ac71e8d48a8e2bdaccf59572dc7a8e8a1ad0de512fc452107756e37ac0bf752" +checksum = "eab3ed39703b72e0e52bce9e1760746c73f65a5694c8da4dec751d3bfdec15b8" dependencies = [ "proc-macro2", "quote", @@ -82,6 +113,25 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + [[package]] name = "proc-macro2" version = "1.0.26" @@ -156,6 +206,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi", + "winapi", +] + [[package]] name = "unicode-xid" version = "0.2.1" @@ -173,6 +234,28 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/echo-greeter/secure-greeter/Cargo.toml b/echo-greeter/secure-greeter/Cargo.toml index 2a356fb..f357332 100644 --- a/echo-greeter/secure-greeter/Cargo.toml +++ b/echo-greeter/secure-greeter/Cargo.toml @@ -9,5 +9,5 @@ name = "secure_greeter" path = "src/main.rs" [dependencies] -fluence = { version="0.5.0", feature=["log"]} +fluence = { version="0.6.2", feature=["log"]} log = "0.4.14" diff --git a/echo-greeter/secure-greeter/local_service_info.txt b/echo-greeter/secure-greeter/local_service_info.txt deleted file mode 100644 index 71df8c9..0000000 --- a/echo-greeter/secure-greeter/local_service_info.txt +++ /dev/null @@ -1,12 +0,0 @@ - ./deploy.sh -secure greeter new service: -client seed: 6waFrz5AtYFetZvaKHwv94KtLjyQzXwcdDMacaS69GCQ -client peerId: 12D3KooWQt8imsDnzigvv6RYFDCEU5JDApRjfrGnBLxahRM24XMD -relay peerId: 12D3KooWQYAEG4LJCUYZtnGAxjsDnkfnKSxfrML2RrTLY63dd33U -service id: a3a5c871-7be2-4b8f-ae6e-e14410df7184 -service created successfully - - -fldist --node 12D3KooWQYAEG4LJCUYZtnGAxjsDnkfnKSxfrML2RrTLY63dd33U --node-addr /ip4/127.0.0.1/tcp/9999/ws/p2p/12D3KooWQYAEG4LJCUYZtnGAxjsDnkfnKSxfrML2RrTLY63dd33U run_air -p air-scripts/air_greet.clj -d '{"node":"12D3KooWQYAEG4LJCUYZtnGAxjsDnkfnKSxfrML2RrTLY63dd33U", "greeter":"a3a5c871-7be2-4b8f-ae6e-e14410df7184", "name":"boo yah"}' - -fldist --node 12D3KooWQYAEG4LJCUYZtnGAxjsDnkfnKSxfrML2RrTLY63dd33U --node-addr /ip4/127.0.0.1/tcp/9999/ws/p2p/12D3KooWQYAEG4LJCUYZtnGAxjsDnkfnKSxfrML2RrTLY63dd33U run_air -p air-scripts/air_greet.clj -d '{"node":"12D3KooWQYAEG4LJCUYZtnGAxjsDnkfnKSxfrML2RrTLY63dd33U", "greeter":"a3a5c871-7be2-4b8f-ae6e-e14410df7184", "name":"boo yah"}' --s 6waFrz5AtYFetZvaKHwv94KtLjyQzXwcdDMacaS69GCQ diff --git a/echo-greeter/secure-greeter/src/auth.rs b/echo-greeter/secure-greeter/src/auth.rs index 4d0a1ed..82c7ff6 100644 --- a/echo-greeter/secure-greeter/src/auth.rs +++ b/echo-greeter/secure-greeter/src/auth.rs @@ -15,7 +15,7 @@ */ use ::fluence; -use fluence::{fce, CallParameters}; +use fluence::fce; pub fn is_owner() -> bool { let meta = fluence::get_call_parameters();