Skip to content

Commit d9fd49c

Browse files
committed
Downgrade to rust-elements v0.16.0
A regression introduced in v0.17.0 made `Value` incompatible with bincode: ElementsProject/rust-elements#96 This also requires downgrading rust-bitcoin to v0.26, to match the version used by rust-elements. This reverts commit 2759c50.
1 parent 996d869 commit d9fd49c

6 files changed

Lines changed: 49 additions & 164 deletions

File tree

Cargo.lock

Lines changed: 38 additions & 149 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ arraydeque = "0.4"
2222
arrayref = "0.3.6"
2323
base64 = "0.13.0"
2424
bincode = "1.3.1"
25-
bitcoin = { version = "0.27", features = [ "use-serde" ] }
25+
bitcoin = { version = "0.26.0", features = [ "use-serde" ] }
2626
clap = "2.33.3"
2727
crossbeam-channel = "0.5.0"
2828
dirs = "3.0.1"
29-
elements = { version = "0.18", features = [ "serde-feature" ], optional = true }
29+
elements = { version = "0.16.0", features = [ "serde-feature" ], optional = true }
3030
error-chain = "0.12.4"
3131
glob = "0.3"
3232
hex = "0.4.2"

src/elements/asset.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use std::sync::{Arc, RwLock};
44
use bitcoin::hashes::{hex::FromHex, sha256, Hash};
55
use elements::confidential::{Asset, Value};
66
use elements::encode::{deserialize, serialize};
7-
use elements::secp256k1_zkp::ZERO_TWEAK;
87
use elements::{issuance::ContractHash, AssetId, AssetIssuance, OutPoint, Transaction, TxIn};
98

109
use crate::chain::{BNetwork, BlockHash, Network, Txid};
@@ -279,7 +278,7 @@ fn index_tx_assets(
279278
}),
280279
));
281280
} else if txi.has_issuance() {
282-
let is_reissuance = txi.asset_issuance.asset_blinding_nonce != ZERO_TWEAK;
281+
let is_reissuance = txi.asset_issuance.asset_blinding_nonce != [0u8; 32];
283282

284283
let asset_entropy = get_issuance_entropy(txi).expect("invalid issuance");
285284
let asset_id = AssetId::from_entropy(asset_entropy);
@@ -396,7 +395,7 @@ pub fn get_issuance_entropy(txin: &TxIn) -> Result<sha256::Midstate> {
396395
bail!("input has no issuance");
397396
}
398397

399-
let is_reissuance = txin.asset_issuance.asset_blinding_nonce != ZERO_TWEAK;
398+
let is_reissuance = txin.asset_issuance.asset_blinding_nonce != [0u8; 32];
400399

401400
Ok(if !is_reissuance {
402401
let contract_hash = ContractHash::from_slice(&txin.asset_issuance.asset_entropy)

0 commit comments

Comments
 (0)