Remove calls to zcashd
This commit is contained in:
parent
e6cb6764ae
commit
7e39d8a48b
|
@ -48,8 +48,8 @@ class bitcoinProxy():
|
||||||
return
|
return
|
||||||
|
|
||||||
def parse_secret(self, txid):
|
def parse_secret(self, txid):
|
||||||
raw = zcashd.gettransaction(txid, True)['hex']
|
raw = self.bitcoind.call('gettransaction', txid, True)['hex']
|
||||||
decoded = zcashd.call('decoderawtransaction', raw)
|
decoded = self.bitcoind.call('decoderawtransaction', raw)
|
||||||
scriptSig = decoded['vin'][0]['scriptSig']
|
scriptSig = decoded['vin'][0]['scriptSig']
|
||||||
asm = scriptSig['asm'].split(" ")
|
asm = scriptSig['asm'].split(" ")
|
||||||
pubkey = asm[1]
|
pubkey = asm[1]
|
||||||
|
@ -125,11 +125,8 @@ class bitcoinProxy():
|
||||||
print("txs", txs)
|
print("txs", txs)
|
||||||
for tx in txs:
|
for tx in txs:
|
||||||
txhex = b2x(tx.serialize())
|
txhex = b2x(tx.serialize())
|
||||||
# Using my fork of python-zcashlib to get result of decoderawtransaction
|
|
||||||
txhex = txhex + '00'
|
txhex = txhex + '00'
|
||||||
rawtx = zcashd.decoderawtransaction(txhex)
|
rawtx = self.bitcoind.call('decoderawtransaction', txhex)
|
||||||
# print('rawtx', rawtx)
|
|
||||||
print(rawtx)
|
|
||||||
for vout in rawtx['vout']:
|
for vout in rawtx['vout']:
|
||||||
if 'addresses' in vout['scriptPubKey']:
|
if 'addresses' in vout['scriptPubKey']:
|
||||||
for addr in vout['scriptPubKey']['addresses']:
|
for addr in vout['scriptPubKey']['addresses']:
|
||||||
|
@ -163,7 +160,7 @@ class bitcoinProxy():
|
||||||
print("Found {0} in p2sh {1}, redeeming...".format(amount, p2sh))
|
print("Found {0} in p2sh {1}, redeeming...".format(amount, p2sh))
|
||||||
|
|
||||||
blockcount = self.bitcoind.getblockcount()
|
blockcount = self.bitcoind.getblockcount()
|
||||||
print("\nCurrent blocknum at time of redeem on Zcash:", blockcount)
|
print("\nCurrent blocknum at time of redeem on Bitcoin:", blockcount)
|
||||||
if blockcount < int(redeemblocknum):
|
if blockcount < int(redeemblocknum):
|
||||||
return self.redeem(contract, fundtx, secret)
|
return self.redeem(contract, fundtx, secret)
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue