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

fix input vbytes type from int to double

Browse source
This commit is contained in:
Craig Raw 2023-07-11 11:24:07 +02:00
parent 8484dd397b
commit 38b04b8e0b
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/sparrowwallet/drongo/protocol/ScriptType.java
View file

@ -1320,7 +1320,7 @@ public enum ScriptType {
//Start with length of output //Start with length of output
int outputVbytes = output.getLength(); int outputVbytes = output.getLength();
//Add length of spending input (with or without discount depending on script type) //Add length of spending input (with or without discount depending on script type)
int inputVbytes = getInputVbytes(); double inputVbytes = getInputVbytes();
//Return fee rate in sats/vByte multiplied by the calculated output and input vByte lengths //Return fee rate in sats/vByte multiplied by the calculated output and input vByte lengths
return (long)(feeRate * outputVbytes + longTermFeeRate * inputVbytes); return (long)(feeRate * outputVbytes + longTermFeeRate * inputVbytes);
@ -1333,17 +1333,17 @@ public enum ScriptType {
* *
* @return The number of vBytes required for an input of this script type * @return The number of vBytes required for an input of this script type
*/ */
public int getInputVbytes() { public double getInputVbytes() {
if(P2SH_P2WPKH.equals(this)) { if(P2SH_P2WPKH.equals(this)) {
return (32 + 4 + 1 + 13 + (107 / WITNESS_SCALE_FACTOR) + 4); return (32 + 4 + 1 + 13 + ((double)107 / WITNESS_SCALE_FACTOR) + 4);
} else if(P2SH_P2WSH.equals(this)) { } else if(P2SH_P2WSH.equals(this)) {
return (32 + 4 + 1 + 35 + (107 / WITNESS_SCALE_FACTOR) + 4); return (32 + 4 + 1 + 35 + ((double)107 / WITNESS_SCALE_FACTOR) + 4);
} else if(P2TR.equals(this)) { } else if(P2TR.equals(this)) {
//Assume a default keypath spend //Assume a default keypath spend
return (32 + 4 + 1 + (66 / WITNESS_SCALE_FACTOR) + 4); return (32 + 4 + 1 + ((double)66 / WITNESS_SCALE_FACTOR) + 4);
} else if(Arrays.asList(WITNESS_TYPES).contains(this)) { } else if(Arrays.asList(WITNESS_TYPES).contains(this)) {
//Return length of spending input with 75% discount to script size //Return length of spending input with 75% discount to script size
return (32 + 4 + 1 + (107 / WITNESS_SCALE_FACTOR) + 4); return (32 + 4 + 1 + ((double)107 / WITNESS_SCALE_FACTOR) + 4);
} else if(Arrays.asList(NON_WITNESS_TYPES).contains(this)) { } else if(Arrays.asList(NON_WITNESS_TYPES).contains(this)) {
//Return length of spending input with no discount //Return length of spending input with no discount
return (32 + 4 + 1 + 107 + 4); return (32 + 4 + 1 + 107 + 4);

7
src/main/java/com/sparrowwallet/drongo/wallet/PresetUtxoSelector.java
View file

@ -59,6 +59,13 @@ public class PresetUtxoSelector extends SingleSetUtxoSelector {
return excludedUtxos; return excludedUtxos;
} }
public TxoFilter asExcludeTxoFilter() {
List<BlockTransactionHashIndex> utxos = new ArrayList<>();
utxos.addAll(presetUtxos);
utxos.addAll(excludedUtxos);
return new ExcludeTxoFilter(utxos);
}
@Override @Override
public boolean shuffleInputs() { public boolean shuffleInputs() {
return !maintainOrder; return !maintainOrder;