Skip to content

Fix auto-IS and tests#2331

Merged
UdjinM6 merged 5 commits into
dashpay:developfrom
UdjinM6:fixautois
Oct 15, 2018
Merged

Fix auto-IS and tests#2331
UdjinM6 merged 5 commits into
dashpay:developfrom
UdjinM6:fixautois

Conversation

@UdjinM6
Copy link
Copy Markdown

@UdjinM6 UdjinM6 commented Oct 4, 2018

Missed this in #2140

Without this we won't be able to create "normal" IS txes if auto-IS is not yet activated or if it's disabled for some reason (too high mempool usage or spork16 is OFF).

@UdjinM6 UdjinM6 added the bug label Oct 4, 2018
@UdjinM6 UdjinM6 added this to the 12.4 milestone Oct 4, 2018
@gladcow
Copy link
Copy Markdown

gladcow commented Oct 4, 2018

So, there is an error in p2p-autoinstantsend.py? It sends "normal" IS transactions while autoIS is disabled. Should I add some additional checks to this test?

@UdjinM6
Copy link
Copy Markdown
Author

UdjinM6 commented Oct 4, 2018

@gladcow that's an interesting point. Let me check, maybe I'm missing smth..

@UdjinM6 UdjinM6 changed the title Fix CTxLockRequest::GetMinFee() Fix auto-IS and tests Oct 4, 2018
@UdjinM6
Copy link
Copy Markdown
Author

UdjinM6 commented Oct 4, 2018

There indeed were more issues than I initially thought, including tests. Pls see individual commits.

gladcow
gladcow previously approved these changes Oct 5, 2018
Copy link
Copy Markdown

@gladcow gladcow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK, checked this logic in debugger in regtest.

codablock
codablock previously approved these changes Oct 9, 2018
Copy link
Copy Markdown

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

nmarley
nmarley previously approved these changes Oct 9, 2018
Copy link
Copy Markdown

@nmarley nmarley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6
Copy link
Copy Markdown
Author

UdjinM6 commented Oct 11, 2018

Fixed merge conflicts, pls re-review changes are trivial, see commits below to compare.

Previous commits for the reference:
fix CTxLockRequest::GetMinFee() cbfb817
Force regular IS txes to include MIN_FEE * n_inputs fee on creation r… … 55c54c7
set_autoix_spork_state should bump mocked time b81525e
make sure IS fee matches the expected one 668bcd6
turn off spork16 and test all types of txes again 1b52e90

@UdjinM6 UdjinM6 merged commit 90ad759 into dashpay:develop Oct 15, 2018
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request May 21, 2019
* fix CTxLockRequest::GetMinFee()

* Force regular IS txes to include MIN_FEE * n_inputs fee on creation regardless of auto-IS status

* set_autoix_spork_state should bump mocked time

* make sure IS fee matches the expected one

* turn off spork16 and test all types of txes again
@UdjinM6 UdjinM6 deleted the fixautois branch November 26, 2020 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants