Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python-bitcointx backend for jmbitcoin + bip78 and snicker. #536

Merged
merged 15 commits into from
Jul 10, 2020
Merged

python-bitcointx backend for jmbitcoin + bip78 and snicker. #536

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
de3ad53
Support output of PSBT instead of broadcast in direct_send
AdamISZ Apr 23, 2020
037a2c1
Adds full payjoin workflow test
AdamISZ Apr 25, 2020
070c5bf
python-bitcointx backend for jmbitcoin.
AdamISZ Feb 17, 2020
22ed0e0
Adds psbt creation and signing support in JM wallet.
AdamISZ Apr 21, 2020
f060781
Add SNICKER support to wallets.
AdamISZ Apr 23, 2020
03a1359
Adds libsecp256k1 installation and addresses reviews
AdamISZ Apr 28, 2020
ad459d2
Add human readable representations of txs and PSBTs
AdamISZ May 1, 2020
ca0de5c
Add bip78 payjoin module and client-server test:
AdamISZ May 4, 2020
4cf77ed
Various bugfixes:
AdamISZ May 6, 2020
53ef79b
Updates to account for code changes in #544
AdamISZ Jun 6, 2020
d34c53b
Various fixups:
AdamISZ Jun 9, 2020
55295e8
first waypoint on bip78
AdamISZ Jun 29, 2020
6e6bf0a
Use VERIFY_STRICTENC flag for Script verification
AdamISZ Jul 7, 2020
3ed4e88
Search for correct library extension on mac os
Jul 8, 2020
41540ab
Modify Payjoin code for BIP78 changes.
AdamISZ Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions jmbitcoin/jmbitcoin/secp256k1_transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
from bitcointx.wallet import (P2WPKHCoinAddress, CCoinAddress, P2PKHCoinAddress,
CCoinAddressError)
from bitcointx.core.scripteval import (VerifyScript, SCRIPT_VERIFY_WITNESS,
SCRIPT_VERIFY_P2SH, SIGVERSION_WITNESS_V0)
SCRIPT_VERIFY_P2SH,
SCRIPT_VERIFY_STRICTENC,
SIGVERSION_WITNESS_V0)

def human_readable_transaction(tx, jsonified=True):
""" Given a CTransaction object, output a human
Expand Down Expand Up @@ -203,7 +205,7 @@ def sign(tx, i, priv, hashcode=SIGHASH_ALL, amount=None, native=False):
or: (None, errormsg) in case of failure
"""
# script verification flags
flags = set()
flags = set([SCRIPT_VERIFY_STRICTENC])
AdamISZ marked this conversation as resolved.
Show resolved Hide resolved

def return_err(e):
return None, "Error in signing: " + repr(e)
Expand Down Expand Up @@ -320,7 +322,7 @@ def make_shuffled_tx(ins, outs, version=1, locktime=0):

def verify_tx_input(tx, i, scriptSig, scriptPubKey, amount=None,
witness=None, native=False):
flags = set()
flags = set([SCRIPT_VERIFY_STRICTENC])
if witness:
flags.add(SCRIPT_VERIFY_P2SH)
if native:
Expand Down