DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Pull in upstream npsv updates from jl777/komodo@1f874d46c5

Browse Source
This commit is contained in:
Duke Leto
2019-12-08 20:37:59 -05:00
parent 32258ee7ed
commit 10be224558
7 changed files with 461 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/komodo_nSPV_wallet.h
View File

@@ -388,8 +388,13 @@ UniValue NSPV_spend(char *srcaddr,char *destaddr,int64_t satoshis) // what its a
mtx.nExpiryHeight = 0;
mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID;
mtx.nVersion = SAPLING_TX_VERSION;
if ( ASSETCHAINS_SYMBOL[0] == 0 )
mtx.nLockTime = (uint32_t)time(NULL) - 777;
if ( ASSETCHAINS_SYMBOL[0] == 0 ) {
if ( !komodo_hardfork_active((uint32_t)chainActive.LastTip()->nTime) )
mtx.nLockTime = (uint32_t)time(NULL) - 777;
else
mtx.nLockTime = (uint32_t)chainActive.Tip()->GetMedianTimePast();
}
memset(used,0,sizeof(used));
if ( NSPV_addinputs(used,mtx,satoshis+txfee,64,NSPV_utxosresult.utxos,NSPV_utxosresult.numutxos) > 0 )