diff --git a/Cargo.lock b/Cargo.lock
index 858903e22f2d0276c99221cc59f0d650b2ba5d6a..221be3944b67ee3177da0a048f2b199318ba6021 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -958,9 +958,9 @@ checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
[[package]]
name = "dubp"
-version = "0.32.3"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc9edc056137805e63c68584a3066ff3ad83e00e434a2bfcbac8b5160decc5ac"
+checksum = "f2a6192b0248f4b198e9193a59ee73e26ee2feba9b7c4995e628d11d2c19448a"
dependencies = [
"dubp-block",
"dubp-common",
@@ -972,9 +972,9 @@ dependencies = [
[[package]]
name = "dubp-block"
-version = "0.32.3"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9bad4399d077e9d85c6dba2d8f69b7b0088ca3b52564ccc9593ccf8b34f1878"
+checksum = "4f59b0253ba66aee87741603f20bab7d67e2ebe11f2bbff58bbc08486b132bb2"
dependencies = [
"dubp-documents",
"dubp-documents-parser",
@@ -987,9 +987,9 @@ dependencies = [
[[package]]
name = "dubp-common"
-version = "0.32.3"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5079ffa4de9355caa45f098d6a8f92c9dc3df595ba1460a0ceca73b950f626"
+checksum = "a927b5f18b8d5f04b6d1ca179a5678f5f559140844268f78c6872d20fd6f6178"
dependencies = [
"dup-crypto",
"serde",
@@ -1000,9 +1000,9 @@ dependencies = [
[[package]]
name = "dubp-documents"
-version = "0.32.3"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03f03022e76dc830f125ec2983ec8e580c6f46dd005473f182ae71b2cd905af5"
+checksum = "7ccce9aabcb92de2befbbd4360fc73d806df63dce414274bef427de2a7acb725"
dependencies = [
"beef",
"dubp-wallet",
@@ -1014,9 +1014,9 @@ dependencies = [
[[package]]
name = "dubp-documents-parser"
-version = "0.32.3"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c812d14ad4df502f96d0f32e7459588314791dd2d04640c4102793f2844c04"
+checksum = "abaa735586c05cc4cd1f240eb9531a9762d97e0f55a335e6e11658f4b10f29af"
dependencies = [
"dubp-documents",
"json-pest-parser",
@@ -1028,9 +1028,9 @@ dependencies = [
[[package]]
name = "dubp-wallet"
-version = "0.32.3"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b03ead2777d7845c0e1fc9aa8b5f71c71a31e90e37189c4b515bd21635acf64"
+checksum = "0b73e3ae439e2eba8048ca9830a821cd6cbb51010e0049efc72e201433e6a61d"
dependencies = [
"byteorder",
"dubp-common",
@@ -1292,9 +1292,9 @@ dependencies = [
[[package]]
name = "dup-crypto"
-version = "0.32.3"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64160d6011423b13588070b6cd58325536eec930c816ebc367e662bfbd4e23d2"
+checksum = "3e577ae936c53b85818749d1eefedf1d1afd6e0a8286b88543cb068396c16069"
dependencies = [
"base64",
"bs58",
diff --git a/Cargo.toml b/Cargo.toml
index 01a1412185546d1a02bc718e877c3ca0f0fe9399..382b772910494dbb654ef39156bb3162ac2428d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,9 +50,7 @@ members = [
[patch.crates-io]
#dubp = { git = "https://git.duniter.org/libs/dubp-rs-libs" }
-#dubp-common = { git = "https://git.duniter.org/libs/dubp-rs-libs" }
#dubp = { path = "../dubp-rs-libs" }
-#dubp-common = { path = "../dubp-rs-libs/common" }
#leveldb_minimal = { path = "../../../../rust/leveldb_minimal" }
diff --git a/neon/native/Cargo.toml b/neon/native/Cargo.toml
index 3d6cb41f161438162b9d866fdbe11fa1a4a28bd7..569c57566f66f1602be278f5ff7a0e5e5e15d058 100644
--- a/neon/native/Cargo.toml
+++ b/neon/native/Cargo.toml
@@ -17,7 +17,7 @@ neon-build = "0.4.0"
[dependencies]
bincode = "1.2.1"
bs58 = "0.3.0"
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
dubp-wot = { path = "../../rust-libs/dubp-wot" }
duniter-server = { path = "../../rust-libs/duniter-server" }
flate2 = "1.0.16"
diff --git a/neon/native/src/transaction.rs b/neon/native/src/transaction.rs
index 628b32199f59b03c1a1d309b692d2d16c7704521..5206c3491f0deac01f97acad4c26cecf779a4231 100644
--- a/neon/native/src/transaction.rs
+++ b/neon/native/src/transaction.rs
@@ -34,7 +34,7 @@ pub fn raw_tx_parse_and_verify(mut cx: FunctionContext) -> JsResult<JsValue> {
match TransactionDocumentV10::parse_from_raw_text(&raw_tx) {
Ok(tx) => {
- if let Err(e) = tx.verify(currency_opt) {
+ if let Err(e) = tx.verify(currency_opt.as_deref()) {
cx.throw_error(format!("{}", e))
} else {
let tx_stringified = tx.to_string_object();
@@ -57,7 +57,7 @@ pub fn tx_verify(mut cx: FunctionContext) -> JsResult<JsUndefined> {
neon_serde::from_value(&mut cx, tx_obj)?;
match TransactionDocumentV10::from_string_object(&tx_stringified) {
Ok(tx) => {
- if let Err(e) = tx.verify(currency_opt) {
+ if let Err(e) = tx.verify(currency_opt.as_deref()) {
cx.throw_error(format!("{}", e))
} else {
Ok(cx.undefined())
diff --git a/rust-bins/duniter-dbex/Cargo.toml b/rust-bins/duniter-dbex/Cargo.toml
index 4ca70ed24751d9afb73d678624bb5451ea6e0731..ec9a940846e2423dcd66bb12472cdd1e5197557a 100644
--- a/rust-bins/duniter-dbex/Cargo.toml
+++ b/rust-bins/duniter-dbex/Cargo.toml
@@ -22,7 +22,7 @@ anyhow = "1.0.33"
arrayvec = "0.5.1"
comfy-table = "1.0.0"
dirs = "3.0.1"
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
duniter-dbs = { path = "../../rust-libs/duniter-dbs", default-features = false, features = ["explorer", "leveldb_backend", "sled_backend"] }
duniter-dbs-write-ops = { path = "../../rust-libs/duniter-dbs-write-ops", default-features = false, features = ["explorer", "leveldb_backend", "sled_backend"] }
duniter-gva = { path = "../../rust-libs/modules/gva" }
diff --git a/rust-libs/duniter-conf/Cargo.toml b/rust-libs/duniter-conf/Cargo.toml
index 350c3b2dfc8b1a3cfef9ea21a05d744fcfe81db7..86b76c3a50053786f372914b9edc5f679a79bc2d 100644
--- a/rust-libs/duniter-conf/Cargo.toml
+++ b/rust-libs/duniter-conf/Cargo.toml
@@ -6,5 +6,5 @@ license = "AGPL-3.0"
edition = "2018"
[dependencies]
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
serde = { version = "1.0.105", features = ["derive"] }
diff --git a/rust-libs/duniter-dbs-read-ops/Cargo.toml b/rust-libs/duniter-dbs-read-ops/Cargo.toml
index 68ce948f3e89ab5c541d903adb7e8ca0daefbc8e..908c5339c73bd43396304308ddc871932ed3ae97 100644
--- a/rust-libs/duniter-dbs-read-ops/Cargo.toml
+++ b/rust-libs/duniter-dbs-read-ops/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/lib.rs"
[dependencies]
anyhow = "1.0.34"
duniter-dbs = { path = "../duniter-dbs" }
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
resiter = "0.4.0"
[dev-dependencies]
diff --git a/rust-libs/duniter-dbs-write-ops/Cargo.toml b/rust-libs/duniter-dbs-write-ops/Cargo.toml
index 6d448f290e5e541b3629c31651ca55b9d0938d22..387bc8c97a597fc17be7f85dc642efabd9eec316 100644
--- a/rust-libs/duniter-dbs-write-ops/Cargo.toml
+++ b/rust-libs/duniter-dbs-write-ops/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/lib.rs"
[dependencies]
chrono = "0.4.19"
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
duniter-dbs = { path = "../duniter-dbs" }
fast-threadpool = "0.2.2"
log = "0.4.11"
diff --git a/rust-libs/duniter-dbs/Cargo.toml b/rust-libs/duniter-dbs/Cargo.toml
index eaefccf0fc5754bf04b885b9ba8e6acf5271c550..813fd38fd28b22e9e5c872cd4b137f079e10df61 100644
--- a/rust-libs/duniter-dbs/Cargo.toml
+++ b/rust-libs/duniter-dbs/Cargo.toml
@@ -16,7 +16,7 @@ arrayvec = "0.5.1"
bincode = "1.2.1"
byteorder = "1.3.4"
chrono = { version = "0.4.15", optional = true }
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
kv_typed = { path = "../tools/kv_typed", default-features = false }
log = "0.4.8"
mockall = { version = "0.8.0", optional = true }
diff --git a/rust-libs/duniter-mempools/Cargo.toml b/rust-libs/duniter-mempools/Cargo.toml
index 9f1d70838e0d682682b1aeb94a783bace0076ae6..c5bacfe9581594d5eaaacc788da0d0dd56248946 100644
--- a/rust-libs/duniter-mempools/Cargo.toml
+++ b/rust-libs/duniter-mempools/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
path = "src/lib.rs"
[dependencies]
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
duniter-dbs = { path = "../duniter-dbs" }
duniter-dbs-read-ops = { path = "../duniter-dbs-read-ops" }
duniter-dbs-write-ops = { path = "../duniter-dbs-write-ops" }
diff --git a/rust-libs/duniter-module/Cargo.toml b/rust-libs/duniter-module/Cargo.toml
index bfb85b0a4c6774d4061f07e9981a73388b824ee6..a664eada89ac041861eb647ef6abfb166ff09e65 100644
--- a/rust-libs/duniter-module/Cargo.toml
+++ b/rust-libs/duniter-module/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0.34"
async-trait = "0.1.41"
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
duniter-conf = { path = "../duniter-conf" }
duniter-dbs = { path = "../duniter-dbs" }
duniter-mempools = { path = "../duniter-mempools" }
diff --git a/rust-libs/duniter-server/Cargo.toml b/rust-libs/duniter-server/Cargo.toml
index 6a608039f0ea2c3ef7189a408a949910e9b17113..408ceeb1a5ac77bf560ade73dbabeb924223ce26 100644
--- a/rust-libs/duniter-server/Cargo.toml
+++ b/rust-libs/duniter-server/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0.34"
cfg-if = "1.0.0"
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
duniter-conf = { path = "../duniter-conf" }
duniter-dbs = { path = "../duniter-dbs" }
duniter-dbs-read-ops = { path = "../duniter-dbs-read-ops" }
diff --git a/rust-libs/modules/gva/Cargo.toml b/rust-libs/modules/gva/Cargo.toml
index 27bcee0d886cba33604d686985cfb22594e77ac5..965bf4c17511f88a9ae20625ae4de21b136586c3 100644
--- a/rust-libs/modules/gva/Cargo.toml
+++ b/rust-libs/modules/gva/Cargo.toml
@@ -11,7 +11,7 @@ arrayvec = "0.5.1"
async-graphql = "2.0.0"
async-mutex = "1.4.0"
async-trait = "0.1.41"
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
duniter-conf = { path = "../../duniter-conf" }
duniter-dbs = { path = "../../duniter-dbs" }
duniter-dbs-read-ops = { path = "../../duniter-dbs-read-ops" }
diff --git a/rust-libs/modules/gva/db-writer/Cargo.toml b/rust-libs/modules/gva/db-writer/Cargo.toml
index ed15d1068fe96c9f7451d94ae8d12ecf01c439af..424ae6146f438be7bb6740670e971510a886d3e5 100644
--- a/rust-libs/modules/gva/db-writer/Cargo.toml
+++ b/rust-libs/modules/gva/db-writer/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/lib.rs"
[dependencies]
anyhow = "1.0.34"
duniter-dbs = { path = "../../../duniter-dbs" }
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
resiter = "0.4.0"
[dev-dependencies]
diff --git a/rust-libs/modules/gva/dbs-reader/Cargo.toml b/rust-libs/modules/gva/dbs-reader/Cargo.toml
index 50594d8572cfb747fbbc3321edcdcb290903b282..78d4956b29adf9fa0622de59be1dcc61941f4fed 100644
--- a/rust-libs/modules/gva/dbs-reader/Cargo.toml
+++ b/rust-libs/modules/gva/dbs-reader/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/lib.rs"
[dependencies]
anyhow = "1.0.34"
duniter-dbs = { path = "../../../duniter-dbs" }
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
resiter = "0.4.0"
[dev-dependencies]
diff --git a/rust-libs/modules/gva/src/mutations.rs b/rust-libs/modules/gva/src/mutations.rs
index e98e3133d29a9755e48554115ad5354fde7b6322..ce2f1e1c931698abce3916ce4d4df6d27749e6cd 100644
--- a/rust-libs/modules/gva/src/mutations.rs
+++ b/rust-libs/modules/gva/src/mutations.rs
@@ -32,7 +32,7 @@ impl MutationRoot {
let data = ctx.data::<SchemaData>()?;
let expected_currency = data.server_meta_data.currency.clone();
- tx.verify(Some(expected_currency))?;
+ tx.verify(Some(&expected_currency))?;
let server_pubkey = data.server_meta_data.self_pubkey;
let txs_mempool = data.txs_mempool;
@@ -69,7 +69,7 @@ impl MutationRoot {
let mut processed_txs = Vec::with_capacity(txs.len());
for tx in txs {
- tx.verify(Some(expected_currency.clone()))?;
+ tx.verify(Some(&expected_currency))?;
let tx = data
.dbs_pool
.execute(move |dbs| {
diff --git a/rust-libs/tests/duniter-integration-tests/Cargo.toml b/rust-libs/tests/duniter-integration-tests/Cargo.toml
index cf913bcb60047ed426a0e6d5e74222a51f6021d8..355a6a7aa53a9a558aff2928107c1dce567966c1 100644
--- a/rust-libs/tests/duniter-integration-tests/Cargo.toml
+++ b/rust-libs/tests/duniter-integration-tests/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0.34"
-dubp = { version = "0.32.3" }
+dubp = { version = "0.33.0" }
duniter-conf = { path = "../../duniter-conf" }
duniter-dbs = { path = "../../duniter-dbs" }
duniter-dbs-read-ops = { path = "../../duniter-dbs-read-ops" }