diff --git a/core/src/main/java/org/bitcoinj/script/Script.java b/core/src/main/java/org/bitcoinj/script/Script.java index 38c9a1f9a..9db3abd2e 100644 --- a/core/src/main/java/org/bitcoinj/script/Script.java +++ b/core/src/main/java/org/bitcoinj/script/Script.java @@ -566,19 +566,6 @@ public class Script { } } - public TransactionWitness createEmptyWitness(ECKey key) { - if (ScriptPattern.isP2WPKH(this)) { - checkArgument(key != null, () -> - "key required to create P2WPKH witness"); - return TransactionWitness.EMPTY; - } else if (ScriptPattern.isP2PK(this) || ScriptPattern.isP2PKH(this) - || ScriptPattern.isP2SH(this)) { - return null; // no witness - } else { - throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Do not understand script type: " + this); - } - } - /** * Returns a copy of the given scriptSig with the signature inserted in the given position. */ diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java index b671c380e..a30b500e1 100644 --- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java +++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java @@ -4579,7 +4579,6 @@ public class Wallet extends BaseTaggableObject Objects.requireNonNull(redeemData, () -> "Transaction exists in wallet that we cannot redeem: " + txIn.getOutpoint().hash()); txIn.setScriptSig(scriptPubKey.createEmptyInputScript(redeemData.keys.get(0), redeemData.redeemScript)); - txIn.setWitness(scriptPubKey.createEmptyWitness(redeemData.keys.get(0))); } TransactionSigner.ProposedTransaction proposal = new TransactionSigner.ProposedTransaction(tx);