fix p2wpkh for bitcoind

WebOfTrustInfo · May 13, 2020 · 2641188 · 2641188
1 parent f12cd20
commit 2641188
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -142,7 +142,11 @@
 			<version>1.13</version>
 			<scope>compile</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.10.4</version>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/...main/java/info/weboftrust/btctxlookup/bitcoinconnection/BitcoindRPCBitcoinConnection.java b/...main/java/info/weboftrust/btctxlookup/bitcoinconnection/BitcoindRPCBitcoinConnection.java
@@ -1,31 +1,32 @@
 package info.weboftrust.btctxlookup.bitcoinconnection;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import info.weboftrust.btctxlookup.Chain;
 import info.weboftrust.btctxlookup.ChainAndLocationData;
 import info.weboftrust.btctxlookup.ChainAndTxid;
 import info.weboftrust.btctxlookup.DidBtcrData;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import wf.bitcoin.javabitcoindrpcclient.BitcoinJSONRPCClient;
 import wf.bitcoin.javabitcoindrpcclient.BitcoindRpcClient;
 import wf.bitcoin.javabitcoindrpcclient.BitcoindRpcClient.Block;
 import wf.bitcoin.javabitcoindrpcclient.BitcoindRpcClient.RawTransaction;
 import wf.bitcoin.javabitcoindrpcclient.BitcoindRpcClient.RawTransaction.In;
 import wf.bitcoin.javabitcoindrpcclient.BitcoindRpcClient.RawTransaction.Out;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class BitcoindRPCBitcoinConnection extends AbstractBitcoinConnection implements BitcoinConnection {
 
 	private static final BitcoindRPCBitcoinConnection instance = new BitcoindRPCBitcoinConnection();
@@ -107,6 +108,8 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 		RawTransaction rawTransaction = bitcoindRpcClient.getRawTransaction(chainAndTxid.getTxid());
 		if (rawTransaction == null) return null;
 
+		final ObjectMapper mapper = new ObjectMapper();
+
 		// find input script pub key
 
 		String inputScriptPubKey = null;
@@ -120,7 +123,9 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 			if (scriptSig == null) continue;
 
 			String asm = (String) scriptSig.get("asm");
-			List<String> txinwitness = null;	// TODO: How to get this with bitcoind ?
+
+			Map<String, Object> mIn = mapper.convertValue(in, new TypeReference<Map<String, Object>>() {});
+			List<String> txinwitness = (List<String>) ((Map) mIn.get("m")).get("txinwitness");
 
 			if (asm != null && ! asm.trim().isEmpty()) {
 
@@ -135,8 +140,9 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 					inputScriptPubKey = matcher.group(1);
 					break;
 				}
-			} else if (txinwitness != null && txinwitness.size() > 0) {
+			} else if (txinwitness != null && txinwitness.size() == 2) {
 
+				//Get the second witness push -> pubKey
 				inputScriptPubKey = txinwitness.get(1);
 				break;
 			} else {