sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-12-27 02:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add option to strip sensitive info from psbt serialization

Browse source
This commit is contained in:
Craig Raw 2021-04-12 13:42:11 +02:00
parent 428054d375
commit b7038b19f9
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -31,8 +31,8 @@ tasks.withType(AbstractArchiveTask) {
group 'com.sparrowwallet' group 'com.sparrowwallet'
version '0.9' version '0.9'
sourceCompatibility = 1.9 sourceCompatibility = 11
targetCompatibility = 1.9 targetCompatibility = 11
repositories { repositories {
mavenCentral() mavenCentral()

24
src/main/java/com/sparrowwallet/drongo/psbt/PSBT.java
View file

@ -16,6 +16,8 @@ import java.nio.ByteBuffer;
import java.util.*; import java.util.*;
import static com.sparrowwallet.drongo.psbt.PSBTEntry.*; import static com.sparrowwallet.drongo.psbt.PSBTEntry.*;
import static com.sparrowwallet.drongo.psbt.PSBTInput.PSBT_IN_BIP32_DERIVATION;
import static com.sparrowwallet.drongo.psbt.PSBTOutput.*;
public class PSBT { public class PSBT {
public static final byte PSBT_GLOBAL_UNSIGNED_TX = 0x00; public static final byte PSBT_GLOBAL_UNSIGNED_TX = 0x00;
@ -432,6 +434,10 @@ public class PSBT {
} }
public byte[] serialize() { public byte[] serialize() {
return serialize(true);
}
public byte[] serialize(boolean includeXpubs) {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
baos.writeBytes(Utils.hexToBytes(PSBT_MAGIC_HEX)); baos.writeBytes(Utils.hexToBytes(PSBT_MAGIC_HEX));
@ -439,14 +445,18 @@ public class PSBT {
List<PSBTEntry> globalEntries = getGlobalEntries(); List<PSBTEntry> globalEntries = getGlobalEntries();
for(PSBTEntry entry : globalEntries) { for(PSBTEntry entry : globalEntries) {
entry.serializeToStream(baos); if(includeXpubs || (entry.getKeyType() != PSBT_GLOBAL_BIP32_PUBKEY && entry.getKeyType() != PSBT_GLOBAL_PROPRIETARY)) {
entry.serializeToStream(baos);
}
} }
baos.writeBytes(new byte[] {(byte)0x00}); baos.writeBytes(new byte[] {(byte)0x00});
for(PSBTInput psbtInput : getPsbtInputs()) { for(PSBTInput psbtInput : getPsbtInputs()) {
List<PSBTEntry> inputEntries = psbtInput.getInputEntries(); List<PSBTEntry> inputEntries = psbtInput.getInputEntries();
for(PSBTEntry entry : inputEntries) { for(PSBTEntry entry : inputEntries) {
entry.serializeToStream(baos); if(includeXpubs || entry.getKeyType() != PSBT_IN_BIP32_DERIVATION) {
entry.serializeToStream(baos);
}
} }
baos.writeBytes(new byte[] {(byte)0x00}); baos.writeBytes(new byte[] {(byte)0x00});
} }
@ -454,7 +464,9 @@ public class PSBT {
for(PSBTOutput psbtOutput : getPsbtOutputs()) { for(PSBTOutput psbtOutput : getPsbtOutputs()) {
List<PSBTEntry> outputEntries = psbtOutput.getOutputEntries(); List<PSBTEntry> outputEntries = psbtOutput.getOutputEntries();
for(PSBTEntry entry : outputEntries) { for(PSBTEntry entry : outputEntries) {
entry.serializeToStream(baos); if(includeXpubs || (entry.getKeyType() != PSBT_OUT_REDEEM_SCRIPT && entry.getKeyType() != PSBT_OUT_WITNESS_SCRIPT && entry.getKeyType() != PSBT_OUT_BIP32_DERIVATION && entry.getKeyType() != PSBT_OUT_PROPRIETARY)) {
entry.serializeToStream(baos);
}
} }
baos.writeBytes(new byte[] {(byte)0x00}); baos.writeBytes(new byte[] {(byte)0x00});
} }
@ -584,7 +596,11 @@ public class PSBT {
} }
public String toBase64String() { public String toBase64String() {
return Base64.toBase64String(serialize()); return toBase64String(true);
}
public String toBase64String(boolean includeXpubs) {
return Base64.toBase64String(serialize(includeXpubs));
} }
public static boolean isPSBT(byte[] b) { public static boolean isPSBT(byte[] b) {