From f8302d7cb5cc22ef34ef277eb77edce5e431dd1e Mon Sep 17 00:00:00 2001 From: junderw Date: Sat, 31 Jan 2026 22:04:39 +0900 Subject: [PATCH] Use deprecated is_provably_unspendable() --- src/elements/asset.rs | 6 ++++-- src/rest.rs | 4 ++-- src/util/mod.rs | 4 +++- src/util/script.rs | 35 +++++++++++++++++++++++++++++++++++ src/util/transaction.rs | 6 +++--- 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/elements/asset.rs b/src/elements/asset.rs index 4c5b1fe..7b89822 100644 --- a/src/elements/asset.rs +++ b/src/elements/asset.rs @@ -13,7 +13,9 @@ use crate::elements::registry::{AssetMeta, AssetRegistry}; use crate::errors::*; use crate::new_index::schema::{Operation, TxHistoryInfo, TxHistoryKey, TxHistoryRow}; use crate::new_index::{db::DBFlush, ChainQuery, DBRow, Mempool, Query}; -use crate::util::{bincode_util, full_hash, Bytes, FullHash, TransactionStatus, TxInput}; +use crate::util::{ + bincode_util, full_hash, Bytes, FullHash, IsProvablyUnspendable, TransactionStatus, TxInput, +}; lazy_static! { pub static ref NATIVE_ASSET_ID: AssetId = @@ -261,7 +263,7 @@ fn index_tx_assets( value: pegout.value, }), )); - } else if txo.script_pubkey.is_op_return() && !txo.is_fee() { + } else if txo.script_pubkey.is_provably_unspendable_() && !txo.is_fee() { if let (Asset::Explicit(asset_id), Value::Explicit(value)) = (txo.asset, txo.value) { if value > 0 { history.push(( diff --git a/src/rest.rs b/src/rest.rs index 4662331..93f18af 100644 --- a/src/rest.rs +++ b/src/rest.rs @@ -10,7 +10,7 @@ use crate::new_index::{compute_script_hash, Query, SpendingInput, Utxo}; use crate::util::{ create_socket, electrum_merkle, extract_tx_prevouts, full_hash, get_innerscripts, get_tx_fee, has_prevout, is_coinbase, transaction_sigop_count, BlockHeaderMeta, BlockId, FullHash, - ScriptToAddr, ScriptToAsm, SegwitDetection, TransactionStatus, + IsProvablyUnspendable, ScriptToAddr, ScriptToAsm, SegwitDetection, TransactionStatus, }; #[cfg(not(feature = "liquid"))] @@ -369,7 +369,7 @@ impl TxOutValue { "fee" } else if script.is_empty() { "empty" - } else if script.is_op_return() { + } else if script.is_provably_unspendable_() { "op_return" } else if script.is_p2pk() { "p2pk" diff --git a/src/util/mod.rs b/src/util/mod.rs index 9e4bf65..def76a2 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -8,7 +8,9 @@ pub mod fees; pub use self::block::{BlockHeaderMeta, BlockId, BlockMeta, BlockStatus, HeaderEntry, HeaderList}; pub use self::fees::get_tx_fee; -pub use self::script::{get_innerscripts, ScriptToAddr, ScriptToAsm, SegwitDetection}; +pub use self::script::{ + get_innerscripts, IsProvablyUnspendable, ScriptToAddr, ScriptToAsm, SegwitDetection, +}; pub use self::transaction::{ extract_tx_prevouts, has_prevout, is_coinbase, is_spendable, serialize_outpoint, sigops::transaction_sigop_count, TransactionStatus, TxInput, diff --git a/src/util/script.rs b/src/util/script.rs index 498041f..5cd61be 100644 --- a/src/util/script.rs +++ b/src/util/script.rs @@ -9,6 +9,41 @@ pub struct InnerScripts { pub witness_script: Option