fluencelabs/marine
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine.git synced 2025-06-22 11:11:37 +00:00
Code Issues Projects Releases Wiki Activity

Update all non-major Rust dependencies (#189)

Browse Source 
* Update all non-major Rust dependencies

* fix tokio features

* add rt tokio feature

* bump bytes crate version to keep up with reqwest

* update tokio to 1.21.0

* bump crate versions

* use latest rust toolchain always

* update wasm-bindgen generated and patched code

* revert toolchaijn version change

* revert toolchaijn version change

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Valery Antopol <valery.antopol@gmail.com>
This commit is contained in:
renovate[bot]
2022-09-02 18:48:25 +03:00
committed by GitHub
parent 71b5953c22
commit b3a8898893
15 changed files with 540 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

896
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

40
core/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-core" name = "marine-core"
description = "Core of Marine, the Fluence Wasm Runtime" description = "Core of Marine, the Fluence Wasm Runtime"
version = "0.16.1" version = "0.16.2"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,13 +11,13 @@ name = "marine_core"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-module-info-parser = { path = "../crates/module-info-parser", version = "0.3.0" } marine-module-info-parser = { path = "../crates/module-info-parser", version = "0.3.1" }
marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.1" } marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.2" }
marine-it-parser = { path = "../crates/it-parser", version = "0.9.1" } marine-it-parser = { path = "../crates/it-parser", version = "0.9.2" }
marine-it-generator = { path = "../crates/it-generator", version = "0.9.0" } marine-it-generator = { path = "../crates/it-generator", version = "0.9.1" }
marine-module-interface = { path = "../crates/module-interface", version = "0.4.1" } marine-module-interface = { path = "../crates/module-interface", version = "0.4.2" }
marine-utils = { path = "../crates/utils", version = "0.4.0" } marine-utils = { path = "../crates/utils", version = "0.4.0" }
marine-min-it-version = { path = "../crates/min-it-version", version = "0.1.0"} marine-min-it-version = { path = "../crates/min-it-version", version = "0.1.1"}
wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" } wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc # dynamicfunc-fat-closures allows using state inside DynamicFunc
@ -28,22 +28,22 @@ it-lilo = "0.4.0"
it-memory-traits = "0.3.0" it-memory-traits = "0.3.0"
bytesize = "1.1.0" bytesize = "1.1.0"
multimap = "0.8.1" multimap = "0.8.3"
boolinator = "2.4.0" boolinator = "2.4.0"
parity-wasm = "0.42.2" parity-wasm = "0.45.0"
pwasm-utils = "0.18.2" pwasm-utils = "0.19.0"
once_cell = "1.7.2" once_cell = "1.13.1"
semver = "0.11.0" semver = "0.11.0"
serde = "1.0.118" serde = "1.0.144"
log = "0.4.8" log = "0.4.17"
paste = "1.0.5" paste = "1.0.9"
anyhow = "1.0.31" anyhow = "1.0.63"
thiserror = "1.0.24" thiserror = "1.0.33"
[dev-dependencies] [dev-dependencies]
reqwest = "0.10.4" reqwest = "0.11.11"
bytes = "0.5.4" bytes = "1.2.1"
tokio = { version = "0.2.20", features = ["blocking", "macros"] } tokio = { version = "1.21.0", features = ["rt", "macros"] }
once_cell = "1.4.0" once_cell = "1.13.1"

16
crates/fluence-app-service/Cargo.toml
View File

@ -1,21 +1,21 @@
[package] [package]
name = "fluence-app-service" name = "fluence-app-service"
description = "Fluence Application Service" description = "Fluence Application Service"
version = "0.20.0" version = "0.20.1"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
marine-runtime = { path = "../../marine", version = "0.20.0" } marine-runtime = { path = "../../marine", version = "0.20.1" }
marine-min-it-version = { path = "../../crates/min-it-version", version = "0.1.0" } marine-min-it-version = { path = "../../crates/min-it-version", version = "0.1.1" }
maplit = "1.0.2" maplit = "1.0.2"
log = "0.4.8" log = "0.4.17"
serde = "1.0.118" serde = "1.0.144"
serde_derive = "1.0.118" serde_derive = "1.0.144"
serde_json = "1.0.57" serde_json = "1.0.85"
toml = "0.5.6" toml = "0.5.9"
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }
[features] [features]

14
crates/it-generator/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-it-generator" name = "marine-it-generator"
description = "Fluence Marine interface types generator" description = "Fluence Marine interface types generator"
version = "0.9.1" version = "0.9.2"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,14 +11,14 @@ name = "marine_it_generator"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-it-parser = { path = "../it-parser", version = "0.9.1"} marine-it-parser = { path = "../it-parser", version = "0.9.2"}
marine-macro-impl = "0.7.0" marine-macro-impl = "0.7.0"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" }
it-lilo = "0.4.0" it-lilo = "0.4.0"
thiserror = "1.0.24" thiserror = "1.0.33"
walrus = "0.18.0" walrus = "0.19.0"
once_cell = "1.4.0" once_cell = "1.13.1"
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.56" serde_json = "1.0.85"

4
crates/it-interfaces/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-it-interfaces" name = "marine-it-interfaces"
description = "Fluence Marine interface types helper crate" description = "Fluence Marine interface types helper crate"
version = "0.7.1" version = "0.7.2"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -12,4 +12,4 @@ path = "src/lib.rs"
[dependencies] [dependencies]
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" }
multimap = "0.8.1" multimap = "0.8.3"

12
crates/it-json-serde/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "it-json-serde" name = "it-json-serde"
description = "Fluence Marine interface-types serde tools" description = "Fluence Marine interface-types serde tools"
version = "0.3.1" version = "0.3.2"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -13,8 +13,8 @@ path = "src/lib.rs"
[dependencies] [dependencies]
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" }
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.53" serde_json = "1.0.85"
serde_derive = "1.0.118" serde_derive = "1.0.144"
serde_with = "1.11.0" serde_with = "1.14.0"
thiserror = "1.0.23" thiserror = "1.0.33"

16
crates/it-parser/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-it-parser" name = "marine-it-parser"
description = "Fluence Marine interface types parser" description = "Fluence Marine interface types parser"
version = "0.9.1" version = "0.9.2"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,16 +11,16 @@ name = "marine_it_parser"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-it-interfaces = { path = "../it-interfaces", version = "0.7.1" } marine-it-interfaces = { path = "../it-interfaces", version = "0.7.2" }
marine-module-interface = { path = "../module-interface", version = "0.4.1" } marine-module-interface = { path = "../module-interface", version = "0.4.2" }
anyhow = "1.0.31" anyhow = "1.0.63"
walrus = "0.18.0" walrus = "0.19.0"
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"} wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"}
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.0"} wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.0"}
nom = "5.1" nom = "5.1"
itertools = "0.10.0" itertools = "0.10.3"
semver = "0.11.0" semver = "0.11.0"
serde = "1.0.118" serde = "1.0.144"
thiserror = "1.0.24" thiserror = "1.0.33"

4
crates/min-it-version/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "marine-min-it-version" name = "marine-min-it-version"
version = "0.1.0" version = "0.1.1"
description = "Fluence Marine interface types minimum supported version checker" description = "Fluence Marine interface types minimum supported version checker"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
@ -11,5 +11,5 @@ name = "marine_min_it_version"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
once_cell = "1.7.2" once_cell = "1.13.1"
semver = "0.11.0" semver = "0.11.0"

12
crates/module-info-parser/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-module-info-parser" name = "marine-module-info-parser"
description = "Fluence Marine Wasm module info (manifest and version) parser" description = "Fluence Marine Wasm module info (manifest and version) parser"
version = "0.3.0" version = "0.3.1"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -15,10 +15,10 @@ marine-rs-sdk-main = "0.7.0"
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1" } wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1" }
anyhow = "1.0.31" anyhow = "1.0.63"
chrono = "0.4.19" chrono = "0.4.22"
walrus = "0.18.0" walrus = "0.19.0"
semver = "0.11.0" semver = "0.11.0"
serde = "1.0.118" serde = "1.0.144"
thiserror = "1.0.24" thiserror = "1.0.33"

12
crates/module-interface/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-module-interface" name = "marine-module-interface"
description = "Fluence Marine module interface" description = "Fluence Marine module interface"
version = "0.4.1" version = "0.4.2"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -13,12 +13,12 @@ path = "src/lib.rs"
[dependencies] [dependencies]
marine-it-interfaces = { path = "../it-interfaces", version = "0.7.1" } marine-it-interfaces = { path = "../it-interfaces", version = "0.7.1" }
anyhow = "1.0.31" anyhow = "1.0.63"
walrus = "0.18.0" walrus = "0.19.0"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.0"} wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.0"}
nom = "5.1" nom = "5.1"
itertools = "0.10.0" itertools = "0.10.3"
semver = "0.11.0" semver = "0.11.0"
serde = "1.0.118" serde = "1.0.144"
thiserror = "1.0.24" thiserror = "1.0.33"

36
marine-js/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "marine-js" name = "marine-js"
version = "0.3.0" version = "0.3.1"
edition = "2018" edition = "2018"
description = "Web version of the marine runtime" description = "Web version of the marine runtime"
publish = false publish = false
@ -10,11 +10,11 @@ publish = false
crate-type = ["cdylib"] crate-type = ["cdylib"]
[dependencies] [dependencies]
marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.1" } marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.2" }
marine-module-interface = { path = "../crates/module-interface", version = "0.4.1" } marine-module-interface = { path = "../crates/module-interface", version = "0.4.2" }
marine-utils = { path = "../crates/utils", version = "0.4.0" } marine-utils = { path = "../crates/utils", version = "0.4.0" }
marine-min-it-version = { path = "../crates/min-it-version", version = "0.1.0"} marine-min-it-version = { path = "../crates/min-it-version", version = "0.1.1"}
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.1" } it-json-serde = { path = "../crates/it-json-serde", version = "0.3.2" }
marine-rs-sdk = "0.7.0" marine-rs-sdk = "0.7.0"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" }
@ -24,21 +24,21 @@ it-memory-traits = "0.3.0"
wasm-bindgen = "0.2" wasm-bindgen = "0.2"
nom = "5.1" nom = "5.1"
itertools = "0.10.1" itertools = "0.10.3"
multimap = "0.8.1" multimap = "0.8.3"
boolinator = "2.4.0" boolinator = "2.4.0"
bytesize = {version = "1.1.0", features = ["serde"]} bytesize = {version = "1.1.0", features = ["serde"]}
console_error_panic_hook = "0.1.7" console_error_panic_hook = "0.1.7"
once_cell = "1.7.2" once_cell = "1.13.1"
semver = "0.11.0" semver = "0.11.0"
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.53" serde_json = "1.0.85"
serde_derive = "1.0.118" serde_derive = "1.0.144"
serde_with = "1.11.0" serde_with = "1.14.0"
log = "0.4.8" log = "0.4.17"
toml = "0.5.8" toml = "0.5.9"
paste = "1.0.5" paste = "1.0.9"
anyhow = "1.0.31" anyhow = "1.0.63"
thiserror = "1.0.24" thiserror = "1.0.33"
maplit = "1.0.2" maplit = "1.0.2"
web-sys = {version = "0.3.56", features = ["console"]} web-sys = {version = "0.3.59", features = ["console"]}

155
marine-js/npm-package/src/marine_js.js
View File

@ -32,9 +32,7 @@ export async function init(module) {
heap.push(undefined, null, true, false); heap.push(undefined, null, true, false);
function getObject(idx) { function getObject(idx) { return heap[idx]; }
return heap[idx];
}
let heap_next = heap.length; let heap_next = heap.length;
@ -50,28 +48,37 @@ export async function init(module) {
return ret; return ret;
} }
let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
cachedTextDecoder.decode(); cachedTextDecoder.decode();
let cachegetUint8Memory0 = null; let cachedUint8Memory0 = new Uint8Array();
function getUint8Memory0() { function getUint8Memory0() {
if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) { if (cachedUint8Memory0.byteLength === 0) {
cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer); cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
} }
return cachegetUint8Memory0; return cachedUint8Memory0;
} }
function getStringFromWasm0(ptr, len) { function getStringFromWasm0(ptr, len) {
return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
} }
function addHeapObject(obj) {
if (heap_next === heap.length) heap.push(heap.length + 1);
const idx = heap_next;
heap_next = heap[idx];
heap[idx] = obj;
return idx;
}
let WASM_VECTOR_LEN = 0; let WASM_VECTOR_LEN = 0;
let cachedTextEncoder = new TextEncoder('utf-8'); const cachedTextEncoder = new TextEncoder('utf-8');
const encodeString = const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
typeof cachedTextEncoder.encodeInto === 'function'
? function (arg, view) { ? function (arg, view) {
return cachedTextEncoder.encodeInto(arg, view); return cachedTextEncoder.encodeInto(arg, view);
} }
@ -80,17 +87,16 @@ export async function init(module) {
view.set(buf); view.set(buf);
return { return {
read: arg.length, read: arg.length,
written: buf.length, written: buf.length
};
}; };
});
function passStringToWasm0(arg, malloc, realloc) { function passStringToWasm0(arg, malloc, realloc) {
if (realloc === undefined) { if (realloc === undefined) {
const buf = cachedTextEncoder.encode(arg); const buf = cachedTextEncoder.encode(arg);
const ptr = malloc(buf.length); const ptr = malloc(buf.length);
getUint8Memory0() getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
.subarray(ptr, ptr + buf.length)
.set(buf);
WASM_VECTOR_LEN = buf.length; WASM_VECTOR_LEN = buf.length;
return ptr; return ptr;
} }
@ -104,7 +110,7 @@ export async function init(module) {
for (; offset < len; offset++) { for (; offset < len; offset++) {
const code = arg.charCodeAt(offset); const code = arg.charCodeAt(offset);
if (code > 0x7f) break; if (code > 0x7F) break;
mem[ptr + offset] = code; mem[ptr + offset] = code;
} }
@ -112,7 +118,7 @@ export async function init(module) {
if (offset !== 0) { if (offset !== 0) {
arg = arg.slice(offset); arg = arg.slice(offset);
} }
ptr = realloc(ptr, len, (len = offset + arg.length * 3)); ptr = realloc(ptr, len, len = offset + arg.length * 3);
const view = getUint8Memory0().subarray(ptr + offset, ptr + len); const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
const ret = encodeString(arg, view); const ret = encodeString(arg, view);
@ -123,30 +129,13 @@ export async function init(module) {
return ptr; return ptr;
} }
let cachegetInt32Memory0 = null; let cachedInt32Memory0 = new Int32Array();
function getInt32Memory0() { function getInt32Memory0() {
if (cachegetInt32Memory0 === null || cachegetInt32Memory0.buffer !== wasm.memory.buffer) { if (cachedInt32Memory0.byteLength === 0) {
cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer); cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
} }
return cachegetInt32Memory0; return cachedInt32Memory0;
}
function getArrayU8FromWasm0(ptr, len) {
return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
}
function addHeapObject(obj) {
if (heap_next === heap.length) heap.push(heap.length + 1);
const idx = heap_next;
heap_next = heap[idx];
heap[idx] = obj;
return idx;
}
/**
*/
function main() {
wasm.main();
} }
function passArray8ToWasm0(arg, malloc) { function passArray8ToWasm0(arg, malloc) {
@ -156,7 +145,7 @@ export async function init(module) {
return ptr; return ptr;
} }
/** /**
* Registers a module insite web-runtime. * Registers a module inside web-runtime.
* *
* # Arguments * # Arguments
* *
@ -167,7 +156,7 @@ export async function init(module) {
* # Return value * # Return value
* *
* JSON object with field "error". If error is empty, module is registered. * JSON object with field "error". If error is empty, module is registered.
* otherwise, it contaits error message. * otherwise, it contains error message.
* @param {string} name * @param {string} name
* @param {Uint8Array} wit_section_bytes * @param {Uint8Array} wit_section_bytes
* @param {any} wasm_instance * @param {any} wasm_instance
@ -176,10 +165,10 @@ export async function init(module) {
function register_module(name, wit_section_bytes, wasm_instance) { function register_module(name, wit_section_bytes, wasm_instance) {
try { try {
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
var ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN; const len0 = WASM_VECTOR_LEN;
var ptr1 = passArray8ToWasm0(wit_section_bytes, wasm.__wbindgen_malloc); const ptr1 = passArray8ToWasm0(wit_section_bytes, wasm.__wbindgen_malloc);
var len1 = WASM_VECTOR_LEN; const len1 = WASM_VECTOR_LEN;
wasm.register_module(retptr, ptr0, len0, ptr1, len1, addHeapObject(wasm_instance)); wasm.register_module(retptr, ptr0, len0, ptr1, len1, addHeapObject(wasm_instance));
var r0 = getInt32Memory0()[retptr / 4 + 0]; var r0 = getInt32Memory0()[retptr / 4 + 0];
var r1 = getInt32Memory0()[retptr / 4 + 1]; var r1 = getInt32Memory0()[retptr / 4 + 1];
@ -202,7 +191,7 @@ export async function init(module) {
* # Return value * # Return value
* *
* JSON object with fields "error" and "result". If "error" is empty string, * JSON object with fields "error" and "result". If "error" is empty string,
* "result" contains a function return value. Othervise, "error" contains error message. * "result" contains a function return value. Otherwise, "error" contains error message.
* @param {string} module_name * @param {string} module_name
* @param {string} function_name * @param {string} function_name
* @param {string} args * @param {string} args
@ -211,12 +200,12 @@ export async function init(module) {
function call_module(module_name, function_name, args) { function call_module(module_name, function_name, args) {
try { try {
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
var ptr0 = passStringToWasm0(module_name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); const ptr0 = passStringToWasm0(module_name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN; const len0 = WASM_VECTOR_LEN;
var ptr1 = passStringToWasm0(function_name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); const ptr1 = passStringToWasm0(function_name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len1 = WASM_VECTOR_LEN; const len1 = WASM_VECTOR_LEN;
var ptr2 = passStringToWasm0(args, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); const ptr2 = passStringToWasm0(args, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len2 = WASM_VECTOR_LEN; const len2 = WASM_VECTOR_LEN;
wasm.call_module(retptr, ptr0, len0, ptr1, len1, ptr2, len2); wasm.call_module(retptr, ptr0, len0, ptr1, len1, ptr2, len2);
var r0 = getInt32Memory0()[retptr / 4 + 0]; var r0 = getInt32Memory0()[retptr / 4 + 0];
var r1 = getInt32Memory0()[retptr / 4 + 1]; var r1 = getInt32Memory0()[retptr / 4 + 1];
@ -227,23 +216,13 @@ export async function init(module) {
} }
} }
async function init(wasmModule) { function getArrayU8FromWasm0(ptr, len) {
return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
}
function getImports() {
const imports = {}; const imports = {};
imports.wbg = {}; imports.wbg = {};
imports.wbg.__wbg_writebyterange_33121cbd742d24d5 = function(arg0, arg1, arg2, arg3) {
write_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
imports.wbg.__wbg_readbyte_05537059e1571a32 = function(arg0, arg1) {
const ret = read_byte(getObject(arg0), arg1 >>> 0);
return ret;
};
imports.wbg.__wbg_readbyterange_91eff244947916ea = function(arg0, arg1, arg2, arg3) {
read_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
imports.wbg.__wbg_getmemorysize_dcb79e55e8e082fd = function(arg0) {
const ret = get_memory_size(getObject(arg0));
return ret;
};
imports.wbg.__wbg_new_693216e109162396 = function() { imports.wbg.__wbg_new_693216e109162396 = function() {
const ret = new Error(); const ret = new Error();
return addHeapObject(ret); return addHeapObject(ret);
@ -265,27 +244,57 @@ export async function init(module) {
imports.wbg.__wbindgen_object_drop_ref = function(arg0) { imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
takeObject(arg0); takeObject(arg0);
}; };
imports.wbg.__wbg_writebyte_09f6c71407a5995c = function(arg0, arg1, arg2) { imports.wbg.__wbg_writebyte_2db29ca147d73713 = function(arg0, arg1, arg2) {
write_byte(getObject(arg0), arg1 >>> 0, arg2); write_byte(getObject(arg0), arg1 >>> 0, arg2);
}; };
imports.wbg.__wbg_callexport_abd154eb0f0f3616 = function(arg0, arg1, arg2, arg3, arg4, arg5) { imports.wbg.__wbg_readbyte_bf31b72eaf657d3b = function(arg0, arg1) {
const ret = read_byte(getObject(arg0), arg1 >>> 0);
return ret;
};
imports.wbg.__wbg_callexport_fc48171982906f7d = function(arg0, arg1, arg2, arg3, arg4, arg5) {
const ret = call_export(getObject(arg1), getStringFromWasm0(arg2, arg3), getStringFromWasm0(arg4, arg5)); const ret = call_export(getObject(arg1), getStringFromWasm0(arg2, arg3), getStringFromWasm0(arg4, arg5));
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN; const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0; getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}; };
imports.wbg.__wbg_getmemorysize_b914d0f06873ba6b = function(arg0) {
const ret = get_memory_size(getObject(arg0));
return ret;
};
imports.wbg.__wbg_readbyterange_65c0f6dd901e1610 = function(arg0, arg1, arg2, arg3) {
read_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
imports.wbg.__wbg_writebyterange_2df11ecd1f52ba1e = function(arg0, arg1, arg2, arg3) {
write_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
const instance = await WebAssembly.instantiate(wasmModule, imports); return imports;
}
function initMemory(imports, maybe_memory) {
}
function finalizeInit(instance, module) {
wasm = instance.exports; wasm = instance.exports;
// strange line from autogenerated code. No idea why it's needed
init.__wbindgen_wasm_module = module; init.__wbindgen_wasm_module = module;
cachedInt32Memory0 = new Int32Array();
cachedUint8Memory0 = new Uint8Array();
// calls main() function. Used to set up // calls main() function. Used to set up
wasm.__wbindgen_start(); wasm.__wbindgen_start();
return wasm; return wasm;
} }
async function init(wasmModule) {
const imports = getImports();
initMemory(imports);
const instance = await WebAssembly.instantiate(wasmModule, imports);
return finalizeInit(instance, module);
}
await init(module); await init(module);
return { return {

32
marine/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-runtime" name = "marine-runtime"
description = "The Fluence Wasm Runtime" description = "The Fluence Wasm Runtime"
version = "0.20.0" version = "0.20.1"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,12 +11,12 @@ name = "marine"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-core = { path = "../core", version = "0.16.1" } marine-core = { path = "../core", version = "0.16.2" }
marine-module-interface = { path = "../crates/module-interface", version = "0.4.1" } marine-module-interface = { path = "../crates/module-interface", version = "0.4.2" }
marine-utils = { path = "../crates/utils", version = "0.4.0" } marine-utils = { path = "../crates/utils", version = "0.4.0" }
marine-rs-sdk-main = { version = "0.7.0", features = ["logger"] } marine-rs-sdk-main = { version = "0.7.0", features = ["logger"] }
marine-rs-sdk = { version = "0.7.0", features = ["logger"] } marine-rs-sdk = { version = "0.7.0", features = ["logger"] }
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.1" } it-json-serde = { path = "../crates/it-json-serde", version = "0.3.2" }
wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" } wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc # dynamicfunc-fat-closures allows using state inside DynamicFunc
@ -24,21 +24,21 @@ wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", feature
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" }
toml = "0.5.6" toml = "0.5.9"
serde = { version = "1.0.118", features = ["derive"] } serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.53" serde_json = "1.0.85"
serde_derive = "1.0.118" serde_derive = "1.0.144"
serde_with = "1.11.0" serde_with = "1.14.0"
bytesize = {version = "1.1.0", features = ["serde"]} bytesize = {version = "1.1.0", features = ["serde"]}
itertools = "0.9.0" itertools = "0.10.3"
cmd_lib = "0.7.8" cmd_lib = "0.15.1"
log = "0.4.8" log = "0.4.17"
safe-transmute = "0.11.0" safe-transmute = "0.11.2"
thiserror = "1.0.23" thiserror = "1.0.33"
[dev-dependencies] [dev-dependencies]
once_cell = "1.4.0" once_cell = "1.13.1"
env_logger = "0.7.1" env_logger = "0.9.0"
pretty_assertions = "0.7.2" pretty_assertions = "0.7.2"
[features] [features]

14
tools/cli/Cargo.toml
View File

@ -18,15 +18,15 @@ marine-module-info-parser = { path = "../../crates/module-info-parser", version
cargo_toml = "0.11.5" cargo_toml = "0.11.5"
semver = "0.11.0" semver = "0.11.0"
walrus = "0.18.0" walrus = "0.19.0"
Inflector = "0.11.4" Inflector = "0.11.4"
toml = "0.5.9" toml = "0.5.9"
atty = "0.2.14" atty = "0.2.14"
thiserror = "1.0.24" thiserror = "1.0.33"
anyhow = "1.0.31" anyhow = "1.0.63"
check-latest = "1.0.0" check-latest = "1.0.1"
clap = "2.33.1" clap = "2.34.0"
exitfailure = "0.5.1" exitfailure = "0.5.1"
serde = "1.0.118" serde = "1.0.144"
serde_json = "1.0.56" serde_json = "1.0.85"
termion = "1.5.6" termion = "1.5.6"

24
tools/repl/Cargo.toml
View File

@ -15,18 +15,18 @@ path = "src/main.rs"
fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.20.0", features = ["raw-module-api"] } fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.20.0", features = ["raw-module-api"] }
marine-rs-sdk-main = { version = "0.7.0", features = ["logger"] } marine-rs-sdk-main = { version = "0.7.0", features = ["logger"] }
anyhow = "1.0.31" anyhow = "1.0.63"
clap = "2.33.1" clap = "2.34.0"
serde = "1.0.118" serde = "1.0.144"
serde_json = "1.0.57" serde_json = "1.0.85"
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1"} wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1"}
env_logger = "0.7.1" env_logger = "0.9.0"
check-latest = "1.0.0" check-latest = "1.0.1"
log = "0.4.14" log = "0.4.17"
rustyline = { version = "6.1.2", features = ["with-fuzzy"] } rustyline = { version = "6.3.0", features = ["with-fuzzy"] }
rustyline-derive = "0.3.1" rustyline-derive = "0.7.0"
rustop = "1.1.1" rustop = "1.1.2"
itertools = "0.9.0" itertools = "0.10.3"
uuid = { version = "0.8.1", features = ["v4"] } uuid = { version = "0.8.2", features = ["v4"] }
termion = "1.5.6" termion = "1.5.6"