Skip to content

Conversation

@instagibbs
Copy link
Contributor

@instagibbs instagibbs commented Apr 11, 2019

resolves #530

@instagibbs instagibbs force-pushed the issuance_pegin_python branch 4 times, most recently from dc6b741 to 97bd312 Compare April 12, 2019 13:13
@instagibbs
Copy link
Contributor Author

mempool_packages.py out of value range error we've had once every blue moon, restarted

@instagibbs instagibbs mentioned this pull request Apr 12, 2019
7 tasks
@instagibbs instagibbs force-pushed the issuance_pegin_python branch from 97bd312 to d5f5579 Compare April 12, 2019 15:05
@instagibbs
Copy link
Contributor Author

instagibbs commented Apr 12, 2019

next failure looks like a silent merge conflict failure in fedpeg test(address update), rebased and pushed

@stevenroose
Copy link
Contributor

Seems like Disallow output witness data in coinbase transactions and Disallow coinbase output witness data, since outputs are explicit anyways are doing the same thing on different levels.

@stevenroose
Copy link
Contributor

Ah nvm, the commit Disallow output witness data in coinbase transactions is checking input witness data. Incorrect commit message, no biggy.

@instagibbs
Copy link
Contributor Author

right, I think I moved half the checks and forgot to rephrase the commit

@stevenroose
Copy link
Contributor

yeah utACK d5f5579
waiting for Travis

@instagibbs
Copy link
Contributor Author

instagibbs commented Apr 12, 2019

we seem to have merge conflicts between changing default prefix and the addition peg-out testing(which tested that data) you recently merged. I'll fix and put at the top of this PR.

@instagibbs instagibbs force-pushed the issuance_pegin_python branch from d5f5579 to d70367b Compare April 12, 2019 15:50
@instagibbs
Copy link
Contributor Author

pushed a couple additional fixes before the changeset here.

@instagibbs instagibbs merged commit d70367b into ElementsProject:master Apr 12, 2019
instagibbs added a commit that referenced this pull request Apr 12, 2019
d70367b Add broken python serialization to always give issuance input, test for decode failure (Gregory Sanders)
2cb47d1 Disallow coinbase output witness data, since outputs are explicit anyways (Gregory Sanders)
8b2e885 Test for block-blinding by txinwit-overstuffed block (Gregory Sanders)
789d4b9 Disallow output witness data in coinbase transactions (Gregory Sanders)
e64324e Test coinbase witness data consensus rules (Gregory Sanders)
ac98ca4 python test support for issuance and peg-in serialization and data (Gregory Sanders)
8140a87 Reject unneeded pegin witness by policy (Gregory Sanders)
97356e8 test_framework: Fix CTxInWitness.is_null with pegin_witness (Gregory Sanders)
2309508 feature_fedpeg.py: change sidechain's parent bech32 prefix to match (Gregory Sanders)

Pull request description:

  resolves #530

Tree-SHA512: 89d78bfe512ba573304e0033798ed1de27decfbdbda78ed158ce1ee205e9f57054bb3c53d7e1e8aba9da2b865c33b9852551b0d4cc1c3c807a0b8dbae130ee86
@stevenroose
Copy link
Contributor

ACK d70367b

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Python framework support for issuance information

2 participants