midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-06 02:38:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add preparebinonly option to basicswap-prepare,

Browse Source 
Download, verify and extract coin cores only.
This commit is contained in:
tecnovert
2019-07-25 14:06:58 +02:00
parent 9aa7e441ee
commit bd93899066
5 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
basicswap/basicswap.py
View File

@@ -1306,8 +1306,8 @@ class BasicSwap():
else:
# Lock from the height or time of the block containing the initiate txn
coin_from = Coins(offer.coin_from)
initiate_tx_block_hash = self.callcoinrpc(coin_from, 'getblockhash', [bid.initiate_txn_height,])
initiate_tx_block_time = int(self.callcoinrpc(coin_from, 'getblock', [initiate_tx_block_hash,])['time'])
initiate_tx_block_hash = self.callcoinrpc(coin_from, 'getblockhash', [bid.initiate_txn_height, ])
initiate_tx_block_time = int(self.callcoinrpc(coin_from, 'getblock', [initiate_tx_block_hash, ])['time'])
if offer.lock_type == ABS_LOCK_BLOCKS:
# Walk the coin_to chain back until block time matches
blockchaininfo = self.callcoinrpc(coin_to, 'getblockchaininfo')
@@ -1316,7 +1316,7 @@ class BasicSwap():
max_tries = 1000
for i in range(max_tries):
self.log.debug('wtf %d', i)
prev_block = self.callcoinrpc(coin_to, 'getblock', [cblock_hash,])
prev_block = self.callcoinrpc(coin_to, 'getblock', [cblock_hash, ])
self.log.debug('prev_block %s', str(prev_block))
if prev_block['time'] <= initiate_tx_block_time:

2
basicswap/http_server.py
View File

@@ -29,6 +29,8 @@ from .basicswap import (
getBidState,
getTxState,
getLockName,
SEQUENCE_LOCK_TIME,
ABS_LOCK_TIME,
)