From de0f635584ba0e6818367755ce9c5189855a133e Mon Sep 17 00:00:00 2001 From: Arnau Orriols Date: Mon, 4 Oct 2021 21:11:24 +0200 Subject: [PATCH 1/3] Delete leftover files --- package-lock.json | 6 ------ package.json | 1 - 2 files changed, 7 deletions(-) delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 45c88d76..00000000 --- a/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "streams", - "lockfileVersion": 2, - "requires": true, - "packages": {} -} diff --git a/package.json b/package.json deleted file mode 100644 index 0967ef42..00000000 --- a/package.json +++ /dev/null @@ -1 +0,0 @@ -{} From 2b2045ab1ea92af22998f161f4bc776cdc82d488 Mon Sep 17 00:00:00 2001 From: Arnau Orriols Date: Wed, 6 Oct 2021 18:38:23 +0200 Subject: [PATCH 2/3] Rename wasm package to `streams` --- bindings/wasm/Cargo.toml | 10 +++++----- bindings/wasm/build/node.js | 4 ++-- bindings/wasm/build/web.js | 4 ++-- bindings/wasm/examples/node.js | 2 +- bindings/wasm/examples/node.ts | 2 +- bindings/wasm/package.json | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bindings/wasm/Cargo.toml b/bindings/wasm/Cargo.toml index 91f1ddec..2bf171d0 100644 --- a/bindings/wasm/Cargo.toml +++ b/bindings/wasm/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "streams_wasm" -version = "0.0.1" -authors = ["huhn511 ", "Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst "] +name = "streams" +version = "0.1.2" +authors = ["huhn511 ", "Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst ", "Arnau Orriols "] edition = "2018" repository = "https://github.com/iotaledger/streams" -homepage = "https://www.iota.org" +homepage = "https://wiki.iota.org/streams/libraries/wasm/overview" license = "MIT" [lib] @@ -24,4 +24,4 @@ client-wasm = { git = "https://github.com/iotaledger/iota.rs", rev = "ee19ec4", getrandom = {version = "0.2.2", features = ["js"]} [dev-dependencies] -wasm-bindgen-test = "0.3.28" \ No newline at end of file +wasm-bindgen-test = "0.3.28" diff --git a/bindings/wasm/build/node.js b/bindings/wasm/build/node.js index c120a9a0..b7d30afd 100644 --- a/bindings/wasm/build/node.js +++ b/bindings/wasm/build/node.js @@ -2,7 +2,7 @@ const path = require('path') const fs = require('fs') // Add node fetch stuff (https://github.com/seanmonstar/reqwest/issues/910) -const entryFilePathNode = path.join(__dirname, '../node/streams_wasm.js') +const entryFilePathNode = path.join(__dirname, '../node/streams.js') const entryFileNode = fs.readFileSync(entryFilePathNode).toString() let changedFileNode = entryFileNode.replace( "let imports = {};", @@ -12,4 +12,4 @@ let changedFileNode = entryFileNode.replace( fs.writeFileSync( entryFilePathNode, changedFileNode -) \ No newline at end of file +) diff --git a/bindings/wasm/build/web.js b/bindings/wasm/build/web.js index 0f2f3791..2f289174 100644 --- a/bindings/wasm/build/web.js +++ b/bindings/wasm/build/web.js @@ -1,7 +1,7 @@ const path = require('path') const fs = require('fs') -const entryFilePath = path.join(__dirname, '../web/streams_wasm.js') +const entryFilePath = path.join(__dirname, '../web/streams.js') const entryFile = fs.readFileSync(entryFilePath).toString() let changedFile = entryFile // Rename original init function, because we want to use the name for our own function @@ -24,7 +24,7 @@ fs.writeFileSync( changedFile ) -const entryFilePathTs = path.join(__dirname, '../web/streams_wasm.d.ts') +const entryFilePathTs = path.join(__dirname, '../web/streams.d.ts') const entryFileTs = fs.readFileSync(entryFilePathTs).toString() // Replace the init function in the ts file let changedFileTs = entryFileTs.replace( diff --git a/bindings/wasm/examples/node.js b/bindings/wasm/examples/node.js index 9d9f7b2a..546a65dd 100644 --- a/bindings/wasm/examples/node.js +++ b/bindings/wasm/examples/node.js @@ -1,4 +1,4 @@ -const streams = require("../node/streams_wasm"); +const streams = require("../node/streams"); streams.set_panic_hook(); diff --git a/bindings/wasm/examples/node.ts b/bindings/wasm/examples/node.ts index 1bcb084a..e01ab9fb 100644 --- a/bindings/wasm/examples/node.ts +++ b/bindings/wasm/examples/node.ts @@ -1,4 +1,4 @@ -import * as streams from '../node/streams_wasm'; +import * as streams from '../node/streams'; streams.set_panic_hook(); diff --git a/bindings/wasm/package.json b/bindings/wasm/package.json index ff4c6b4f..892dec5e 100644 --- a/bindings/wasm/package.json +++ b/bindings/wasm/package.json @@ -1,6 +1,6 @@ { - "name": "@iota/streams-wasm", - "version": "1.1.0", + "name": "@iota/streams", + "version": "0.1.2", "description": "WASM binding for the IOTA streams library", "repository": { "type": "git", @@ -54,4 +54,4 @@ "dependencies": { "node-fetch": "^2.6.0" } -} \ No newline at end of file +} From e12303fdfe826ce2b48193b2fef0e428863ce8a0 Mon Sep 17 00:00:00 2001 From: Arnau Orriols Date: Wed, 6 Oct 2021 20:22:22 +0200 Subject: [PATCH 3/3] Set version of all crates to 0.1.2 --- Cargo.toml | 16 ++++++++-------- README.md | 2 +- bindings/c/Cargo.toml | 4 ++-- .../docs/libraries/rust/getting_started.md | 2 +- examples/Cargo.toml | 4 ++-- iota-streams-app-channels-example/Cargo.toml | 4 ++-- iota-streams-app-channels/Cargo.toml | 18 +++++++----------- iota-streams-app/Cargo.toml | 14 +++++--------- iota-streams-core-edsig/Cargo.toml | 8 ++------ iota-streams-core-keccak/Cargo.toml | 8 ++------ iota-streams-core/Cargo.toml | 8 ++------ iota-streams-ddml/Cargo.toml | 14 +++++--------- 12 files changed, 39 insertions(+), 63 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dbd5f286..10725261 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,13 +2,13 @@ [package] name = "iota-streams" -version = "1.0.0" +version = "0.1.2" authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst ", "Arnau Orriols ", "Dyrell Chapman ", "Brord van Wierst "] +version = "0.1.2" +authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst ", "Arnau Orriols "] edition = "2018" [features] diff --git a/documentation/docs/libraries/rust/getting_started.md b/documentation/docs/libraries/rust/getting_started.md index 4e3ec3b0..2dcf3244 100644 --- a/documentation/docs/libraries/rust/getting_started.md +++ b/documentation/docs/libraries/rust/getting_started.md @@ -30,7 +30,7 @@ iota-streams = { git = "https://github.com/iotaledger/streams", branch = "maste ```bash [dependencies] - iota-streams = { version = "1.0.0", path = "../streams" } + iota-streams = { version = "0.1.2", path = "../streams" } ``` ## Basic Usage diff --git a/examples/Cargo.toml b/examples/Cargo.toml index afa1284c..1fd97d14 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "iota-streams-basic-scenario" -version = "1.0.0" -authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst "] +version = "0.1.2" +authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst ", "Arnau Orriols "] edition = "2018" license = "Apache-2.0/MIT" readme = "README.md" diff --git a/iota-streams-app-channels-example/Cargo.toml b/iota-streams-app-channels-example/Cargo.toml index 80dc4533..5e557b4e 100644 --- a/iota-streams-app-channels-example/Cargo.toml +++ b/iota-streams-app-channels-example/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iota-streams-app-channels-example" -version = "1.0.0" +version = "0.1.2" authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst "] edition = "2018" @@ -12,7 +12,7 @@ tangle = ["iota-streams/tangle"] [dependencies] wee_alloc = "0.4.5" -iota-streams = { version = "1.0.0", path = "..", default-features = false} +iota-streams = { version = "0.1.2", path = "..", default-features = false} hex = { version = "0.4", default-features = false} #[profile.release] ##inherits = "release" diff --git a/iota-streams-app-channels/Cargo.toml b/iota-streams-app-channels/Cargo.toml index 1233a505..fabceac8 100644 --- a/iota-streams-app-channels/Cargo.toml +++ b/iota-streams-app-channels/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "iota-streams-app-channels" -version = "1.0.1" -authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst "] +version = "0.1.2" +authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst ", "Arnau Orriols "] edition = "2018" license = "Apache-2.0/MIT" readme = "README.md" @@ -15,16 +15,12 @@ std = ["iota-streams-core/std", "iota-streams-core-edsig/std", "iota-streams-ddm tangle = ["iota-streams-app/tangle"] wasm-client = ["iota-streams-app/wasm-client", "tangle", "std"] -[lib] -name = "iota_streams_app_channels" -path = "src/lib.rs" - [dependencies] -iota-streams-core = { version = "0.3.1", path = "../iota-streams-core", default-features = false } -iota-streams-core-edsig = { version = "0.2.1", path = "../iota-streams-core-edsig", default-features = false } -iota-streams-core-keccak = { version = "0.3.1", path = "../iota-streams-core-keccak", default-features = false } -iota-streams-ddml = { version = "0.2.1", path = "../iota-streams-ddml", default-features = false } -iota-streams-app = { version = "1.0.1", path = "../iota-streams-app", default-features = false } +iota-streams-core = { version = "0.1.2", path = "../iota-streams-core", default-features = false } +iota-streams-core-edsig = { version = "0.1.2", path = "../iota-streams-core-edsig", default-features = false } +iota-streams-core-keccak = { version = "0.1.2", path = "../iota-streams-core-keccak", default-features = false } +iota-streams-ddml = { version = "0.1.2", path = "../iota-streams-ddml", default-features = false } +iota-streams-app = { version = "0.1.2", path = "../iota-streams-app", default-features = false } hex = { version = "0.4", default-features = false, optional = false } diff --git a/iota-streams-app/Cargo.toml b/iota-streams-app/Cargo.toml index e5ea749f..ac206b35 100644 --- a/iota-streams-app/Cargo.toml +++ b/iota-streams-app/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "iota-streams-app" -version = "1.0.1" -authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst "] +version = "0.1.2" +authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst ", "Arnau Orriols "] edition = "2018" license = "Apache-2.0/MIT" readme = "README.md" @@ -22,14 +22,10 @@ wasm-client = ["iota-client/wasm", "chrono/wasmbind", "tangle", "std"] sync-parking-lot = ["iota-streams-core/sync-parking-lot"] sync-spin = ["iota-streams-core/sync-spin"] -[lib] -name = "iota_streams_app" -path = "src/lib.rs" - [dependencies] -iota-streams-core = { version = "0.3.1", path = "../iota-streams-core", default-features = false } -iota-streams-core-edsig = { version = "0.2.1", path = "../iota-streams-core-edsig", default-features = false } -iota-streams-ddml = { version = "0.2.1", path = "../iota-streams-ddml", default-features = false } +iota-streams-core = { version = "0.1.2", path = "../iota-streams-core", default-features = false } +iota-streams-core-edsig = { version = "0.1.2", path = "../iota-streams-core-edsig", default-features = false } +iota-streams-ddml = { version = "0.1.2", path = "../iota-streams-ddml", default-features = false } # anyhow and chrono are kept in sync with versions used in iota-client anyhow = { version = "1.0.26", default-features = false } diff --git a/iota-streams-core-edsig/Cargo.toml b/iota-streams-core-edsig/Cargo.toml index 5f6b83ce..85e27e5f 100644 --- a/iota-streams-core-edsig/Cargo.toml +++ b/iota-streams-core-edsig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iota-streams-core-edsig" -version = "0.2.1" +version = "0.1.2" authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst "] edition = "2018" license = "Apache-2.0/MIT" @@ -12,12 +12,8 @@ description = "A rust implementation of the IOTA Streams Ed25519 signature schem default = ["std"] std = ["iota-streams-core/std", "ed25519-dalek/std", "x25519-dalek/std", "curve25519-dalek/std"] -[lib] -name = "iota_streams_core_edsig" -path = "src/lib.rs" - [dependencies] -iota-streams-core = { version = "0.3.1", path = "../iota-streams-core", default-features = false } +iota-streams-core = { version = "0.1.2", path = "../iota-streams-core", default-features = false } # TODO: move to recent versions of ed25519-dalek, x25519-dalek and curve25510-dalek ed25519-dalek = { version = "1.0.0", default-features = false, features = ["u64_backend", "rand_core", "rand"] } x25519-dalek = { version = "1.1.0", default-features = false, features = ["u64_backend"] } diff --git a/iota-streams-core-keccak/Cargo.toml b/iota-streams-core-keccak/Cargo.toml index f5c1b3d2..717a8c9a 100644 --- a/iota-streams-core-keccak/Cargo.toml +++ b/iota-streams-core-keccak/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iota-streams-core-keccak" -version = "0.3.1" +version = "0.1.2" authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst "] edition = "2018" license = "Apache-2.0/MIT" @@ -12,12 +12,8 @@ description = "IOTA Streams Spongos adapter for Keccak" default = ["std"] std = ["iota-streams-core/std"] -[lib] -name = "iota_streams_core_keccak" -path = "src/lib.rs" - [dependencies] -iota-streams-core = { version = "0.3.1", path = "../iota-streams-core", default-features = false } +iota-streams-core = { version = "0.1.2", path = "../iota-streams-core", default-features = false } keccak = "0.1" [dev-dependencies] diff --git a/iota-streams-core/Cargo.toml b/iota-streams-core/Cargo.toml index 10e27c77..be1f31e1 100644 --- a/iota-streams-core/Cargo.toml +++ b/iota-streams-core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "iota-streams-core" -version = "0.3.1" -authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst "] +version = "0.1.2" +authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst ", "Arnau Orriols "] edition = "2018" license = "Apache-2.0/MIT" readme = "README.md" @@ -16,10 +16,6 @@ err-location-log = [] sync-spin = ["spin"] sync-parking-lot = ["parking_lot"] -[lib] -name = "iota_streams_core" -path = "src/lib.rs" - [dependencies] # digest version should correspond to curve25519-dalek's version digest = { version = "0.9", default-features = false } diff --git a/iota-streams-ddml/Cargo.toml b/iota-streams-ddml/Cargo.toml index d30e5721..0cbab936 100644 --- a/iota-streams-ddml/Cargo.toml +++ b/iota-streams-ddml/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "iota-streams-ddml" -version = "0.2.3" -authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst "] +version = "0.1.2" +authors = ["Vlad Semenov ", "Dyrell Chapman ", "Brord van Wierst ", "Arnau Orriols "] edition = "2018" license = "Apache-2.0/MIT" readme = "README.md" @@ -13,16 +13,12 @@ default = ["std"] # enable std std = ["rand/std", "iota-streams-core/std", "iota-streams-core-edsig/std"] -[lib] -name = "iota_streams_ddml" -path = "src/lib.rs" - [dependencies] -iota-streams-core = { version = "0.3.1", path = "../iota-streams-core", default-features = false } -iota-streams-core-edsig = { version = "0.2.1", path = "../iota-streams-core-edsig", default-features = false } +iota-streams-core = { version = "0.1.2", path = "../iota-streams-core", default-features = false } +iota-streams-core-edsig = { version = "0.1.2", path = "../iota-streams-core-edsig", default-features = false } # anyhow version is kept in sync with iota-client rand = { version = "0.7", default-features = false } hashbrown = { version = "0.8.2", default-features = false, optional = false, features = ["ahash"] } [dev-dependencies] -iota-streams-core-keccak = { version = "0.3.1", path = "../iota-streams-core-keccak" } +iota-streams-core-keccak = { version = "0.1.2", path = "../iota-streams-core-keccak" }