feat: Partial support for P2WPKH.

Signed-off-by: Markus Sabadello <markus@danubetech.com>
WebOfTrustInfo · May 13, 2020 · b5ce142 · b5ce142
1 parent b45f972
commit b5ce142
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/info/weboftrust/btctxlookup/bitcoinconnection/BTCDRPCBitcoinConnection.java b/src/main/java/info/weboftrust/btctxlookup/bitcoinconnection/BTCDRPCBitcoinConnection.java
@@ -243,7 +243,7 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 				}
 			} else if (txinwitness != null && txinwitness.size() > 0) {
 
-				/* TODO */ inputScriptPubKey = null;
+				inputScriptPubKey = txinwitness.get(1);
 				break;
 			} else {
 

diff --git a/...main/java/info/weboftrust/btctxlookup/bitcoinconnection/BitcoindRPCBitcoinConnection.java b/...main/java/info/weboftrust/btctxlookup/bitcoinconnection/BitcoindRPCBitcoinConnection.java
@@ -120,7 +120,7 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 			if (scriptSig == null) continue;
 
 			String asm = (String) scriptSig.get("asm");
-			List<String> txinwitness = null;
+			List<String> txinwitness = null;	// TODO: How to get this with bitcoind ?
 
 			if (asm != null && ! asm.trim().isEmpty()) {
 
@@ -137,7 +137,7 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 				}
 			} else if (txinwitness != null && txinwitness.size() > 0) {
 
-				/* TODO */ inputScriptPubKey = null;
+				inputScriptPubKey = txinwitness.get(1);
 				break;
 			} else {
 

diff --git a/...n/java/info/weboftrust/btctxlookup/bitcoinconnection/BlockcypherAPIBitcoinConnection.java b/...n/java/info/weboftrust/btctxlookup/bitcoinconnection/BlockcypherAPIBitcoinConnection.java
@@ -119,7 +119,10 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 				break;
 			} else if ("pay-to-witness-pubkey-hash".equals(scriptType.getAsString())) {
 
-				/* TODO */ inputScriptPubKey = null;
+				JsonElement witness = input.get("witness");
+				if (witness == null || ! witness.isJsonArray()) continue;
+
+				inputScriptPubKey = witness.getAsJsonArray().get(1).getAsString();
 				break;
 			} else {