diff --git a/btc-p2sh-htlc.py b/btc-p2sh-htlc.py index 056f395..d1b12d3 100755 --- a/btc-p2sh-htlc.py +++ b/btc-p2sh-htlc.py @@ -11,7 +11,7 @@ if sys.version_info.major < 3: import bitcoin import bitcoin.rpc from bitcoin import SelectParams -from bitcoin.core import b2x, lx, COIN, COutPoint, CMutableTxOut, CMutableTxIn, CMutableTransaction, Hash160 +from bitcoin.core import b2x, lx, b2lx, COIN, COutPoint, CMutableTxOut, CMutableTxIn, CMutableTransaction, Hash160 from bitcoin.core.script import CScript, OP_DUP, OP_IF, OP_ELSE, OP_ENDIF, OP_HASH160, OP_EQUALVERIFY, OP_CHECKSIG, SignatureHash, SIGHASH_ALL from bitcoin.core.script import OP_DROP, OP_CHECKLOCKTIMEVERIFY, OP_SHA256, OP_TRUE from bitcoin.core.scripteval import VerifyScript, SCRIPT_VERIFY_P2SH @@ -56,8 +56,10 @@ print('Pay to:', p2sh) # AUTOMATE Send funds to p2sh amount = 1.0*COIN +# sendtoaddress return the id of the created tx fund_tx = proxy.sendtoaddress(txin_p2sh_address, amount) +print('fund tx sent. It\'s id is:', b2x(lx(b2x(fund_tx)))) print('Now redeeming.........') # AUTOMATE getting vout of funding tx @@ -95,4 +97,4 @@ VerifyScript(txin.scriptSig, txin_scriptPubKey, tx, 0, (SCRIPT_VERIFY_P2SH,)) print("Now sending redeem transaction.......") txid = proxy.sendrawtransaction(tx) -print("Txid of submitted redeem tx: ", b2x(txid)) +print("Txid of submitted redeem tx: ", b2x(lx(b2x(txid)))) diff --git a/htlc-redeemAfterTimeLock.py b/htlc-redeemAfterTimeLock.py index 04c3ae6..5505d24 100644 --- a/htlc-redeemAfterTimeLock.py +++ b/htlc-redeemAfterTimeLock.py @@ -33,7 +33,7 @@ recipientpubkey = proxy.getnewaddress() senderpubkey = proxy.getnewaddress() # privkey of the recipient, used to sign the redeemTx seckey = proxy.dumpprivkey(senderpubkey) - +#proxy.importprivkey(seckey) lockduration = 10 blocknum = proxy.getblockcount() print("current block num:", blocknum) @@ -78,7 +78,7 @@ txin.nSequence = 0 # Create the txout. Pays out to recipient, so uses recipient's pubkey # Withdraw full amount minus fee default_fee = 0.001*COIN -txout = CMutableTxOut(amount - default_fee, recipientpubkey.to_scriptPubKey()) +txout = CMutableTxOut(amount - default_fee, senderpubkey.to_scriptPubKey()) # Create the unsigned raw transaction. tx = CMutableTransaction([txin], [txout]) @@ -103,4 +103,4 @@ VerifyScript(txin.scriptSig, txin_scriptPubKey, tx, 0, (SCRIPT_VERIFY_P2SH,)) print("Now sending redeem transaction.......") txid = proxy.sendrawtransaction(tx) -print("Txid of submitted redeem tx: ", b2x(txid)) +print("Txid of submitted redeem tx: ", b2x(lx(b2x(txid))))