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.

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

Add activation height for multisig fee sorting #1092

Merged
merged 2 commits into from
Nov 14, 2022

Conversation

fassadlr
Copy link
Contributor

No description provided.

@fassadlr fassadlr requested a review from quantumagi November 10, 2022 15:23
@@ -185,7 +185,8 @@ public CirrusMain()
GetMiningTimestampV2ActivationHeight = 3_709_000, // Monday 14 February 00:00:00 (Estimated)
GetMiningTimestampV2ActivationStrictHeight = 3_783_000, // Monday 28 February 07:00:00 (London Time) (Estimated)
ContractSerializerV2ActivationHeight = 3_386_335, // Monday 13 December 16:00:00 (Estimated)
Release1300ActivationHeight = 4_334_400
Release1300ActivationHeight = 4_334_400,
Release1400ActivationHeight = 0,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will set this once merged.

@fassadlr
Copy link
Contributor Author

@quantumagi
Copy link
Contributor

CI is failing

quantumagi
quantumagi previously approved these changes Nov 11, 2022
Copy link
Contributor

@quantumagi quantumagi left a comment

Choose a reason for hiding this comment

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

LGTM. Merge once CI passes. We can hard code the other activation heights now too - i.e. drop the BIP 9 setups. Also, perhaps we can use a dictionary (or array) for hard-coded activation heights instead of adding a variables each time - e.g. ActivationHeight["Release1400"] and ActivationHeight["ContractSerializerV2"] OR ActivationHeight[Release1400] and ActivationHeight[ContractSerializerV2], where the indexes are defined constants. Just a thought.

@fassadlr
Copy link
Contributor Author

@quantumagi I've ran all the failed tests locally and they pass bar the EnableAutoKickSync test.

@fassadlr
Copy link
Contributor Author

LGTM. Merge once CI passes. We can hard code the other activation heights now too - i.e. drop the BIP 9 setups. Also, perhaps we can use a dictionary (or array) for hard-coded activation heights instead of adding a variables each time - e.g. ActivationHeight["Release1400"] and ActivationHeight["ContractSerializerV2"] OR ActivationHeight[Release1400] and ActivationHeight[ContractSerializerV2], where the indexes are defined constants. Just a thought.

Can you please do a PR where we remove the second BIP 9?

@fassadlr fassadlr merged commit 58fc318 into release/1.4.0.0 Nov 14, 2022
@fassadlr fassadlr deleted the interflux-ms-fees-ort branch November 14, 2022 13:57
fr0stnk pushed a commit to fr0stnk/StratisFullNode that referenced this pull request Dec 28, 2022
…ms-fees-ort

Add activation height for multisig fee sorting
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.

2 participants