updates marine, marine-sqlite

greeting/Cargo.toml

@@ -3,7 +3,7 @@ name = "wasm-greeting"
 version = "0.1.0"
 authors = ["Fluence Labs"]
 description = "The greeting module for the Fluence network"
-repository = "https://github.com/fluencelabs/fce/tree/master/examples/greeting"
+repository = "https://github.com/fluencelabs/marine/tree/master/examples/greeting"
 edition = "2018"
 publish = false
 

multi-service/ethqlite/Cargo.toml

@@ -11,7 +11,7 @@ path = "src/main.rs"
 [dependencies]
 marine-rs-sdk = { version="0.6.10", features = ["logger"]}
 log = "0.4.8"
-fce-sqlite-connector = "=0.4.0"
+marine-sqlite-connector = "0.5.0"
 serde = {version = "1.0.118",  features=["derive"]}
 serde_json = "1.0.64"
 once_cell = "1.4.1"

multi-service/ethqlite/src/crud.rs

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use fce_sqlite_connector;
-use fce_sqlite_connector::{Connection, Value};
 use marine_rs_sdk::marine;
+use marine_sqlite_connector;
+use marine_sqlite_connector::{Connection, Value};
 
 use crate::auth::is_owner;
 use crate::get_connection;
 
-pub fn create_table(conn: &Connection) -> std::result::Result<(), fce_sqlite_connector::Error> {
+pub fn create_table(conn: &Connection) -> std::result::Result<(), marine_sqlite_connector::Error> {
     let res = conn.execute(
         "
         create table if not exists reward_blocks (

multi-service/ethqlite/src/main.rs

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-use fce_sqlite_connector;
-use fce_sqlite_connector::{Connection, State, Value};
 ///, WasmLoggerBuilder};
 use fluence;
 use marine_rs_sdk::marine;
 use marine_rs_sdk::WasmLoggerBuilder;
+use marine_sqlite_connector;
+use marine_sqlite_connector::{Connection, State, Value};
 
 use serde::Deserialize;
 use serde_json;

multi-service/scripts/deploy.sh

@@ -2,13 +2,13 @@
 set -euo pipefail
 
 # check `fcli` and `fldist` tools are installed or install them
-(command -v fce || cargo install fcli) >/dev/null
+(command -v marine || cargo install marine) >/dev/null
 (command -v fldist || npm install -g @fluencelabs/fldist) >/dev/null
 
 # build .wasm
 (
     cd backend
-    fce build --release
+    marine build --release
 )
 
 # check it .wasm was built

sqlite/Cargo.toml

@@ -11,5 +11,5 @@ path = "src/main.rs"
 
 [dependencies]
 marine-rs-sdk = "0.6.10"
-marine-sqlite-connector = "0.4.1"
+marine-sqlite-connector = "0.5.0"
 

web3-examples/web3-examples/facade/Cargo.lock

@@ -100,9 +100,9 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "ethereum-types",
- "fluence",
  "hex",
  "log",
+ "marine-rs-sdk",
  "marine-sqlite-connector",
  "serde",
  "serde_json",
@@ -121,29 +121,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "fluence"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b09e1cd11a51ba4d169db347d009fe41ece2714eef4d5df720343733a1d5a6"
-dependencies = [
- "fluence-sdk-main",
- "marine-macro",
- "marine-timestamp-macro",
- "serde",
-]
-
-[[package]]
-name = "fluence-sdk-main"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68d93cde99e1494e11755a39b93863333397245c9959c774fe3bebd9e4143879"
-dependencies = [
- "log",
- "marine-macro",
- "serde",
-]
-
 [[package]]
 name = "funty"
 version = "1.1.0"
@@ -217,18 +194,18 @@ dependencies = [
 
 [[package]]
 name = "marine-macro"
-version = "0.6.9"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63d927851847cc3dd9e3bd0f10bdeb313859d4822d5b5f650d9d34d461ed419"
+checksum = "cd64d5febc6b2ed709a4461c510c1429dc6e4cfcbd6ca0d88463911630acd67b"
 dependencies = [
  "marine-macro-impl",
 ]
 
 [[package]]
 name = "marine-macro-impl"
-version = "0.6.9"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb504be4a90e229ab453c7369cc8a9063acec819f3397802eea719cd0a232be1"
+checksum = "c644127c4a9a3345434116f6887f8522c51bddde599b51d7d312aa8b2ecfaa54"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -239,19 +216,42 @@ dependencies = [
 ]
 
 [[package]]
-name = "marine-sqlite-connector"
+name = "marine-rs-sdk"
-version = "0.4.1"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ffc3801a49d91595f2b8a80b4fbef21b15ea84bc69624ba84052a37b3b5b1a5"
+checksum = "fb421eb08e8b8cef726a73a0c10bff45b43c41a85aa965de14487cea373883bb"
 dependencies = [
- "fluence",
+ "marine-macro",
+ "marine-rs-sdk-main",
+ "marine-timestamp-macro",
+ "serde",
+]
+
+[[package]]
+name = "marine-rs-sdk-main"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95c49b5893d8689589219e07cf67421cc415dc5f219ad0e9c197a9a050b5dd4f"
+dependencies = [
+ "log",
+ "marine-macro",
+ "serde",
+]
+
+[[package]]
+name = "marine-sqlite-connector"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7aef66554a852d86eb2ee64fc11651ecb798549d0d8204761866f7fa0a40ebb"
+dependencies = [
+ "marine-rs-sdk",
 ]
 
 [[package]]
 name = "marine-timestamp-macro"
-version = "0.6.9"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5994c7db5567d21609f2a2e5a40d9d4564f86c17ca35b2d77007152619b9d7fc"
+checksum = "29ae1a5630bd9b652a77405750c3c37a5fdcfcdc679818bf7d970871ae28f7e6"
 dependencies = [
  "chrono",
  "quote",

web3-examples/web3-examples/facade/Cargo.toml

@@ -20,4 +20,4 @@ chrono = "0.4.19"
 ethereum-types = "0.11.0"
 hex = "0.4.3"
 tiny-keccak = {version = "2.0.2", features = ["keccak", "sha3"]}
-marine-sqlite-connector = "0.4.1"
+marine-sqlite-connector = "0.5.0"