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

Added some limits in 2x #1376

Merged
merged 8 commits into from
Mar 17, 2020
Merged

Conversation

shargon
Copy link
Member

@shargon shargon commented Dec 19, 2019

Close #1375

Ensure that MerkleBlockPayload fit the expected values

  • Added small changes without relevance

@shargon shargon requested a review from erikzhang December 19, 2019 09:47
@shargon shargon changed the title Set limits in MerkleBlockPayload (2x) Added some limits in 2x Dec 19, 2019
@shargon shargon requested a review from Tommo-L January 2, 2020 09:08
@shargon shargon requested a review from superboyiii January 2, 2020 09:20
@shargon
Copy link
Member Author

shargon commented Jan 2, 2020

@superboyiii could you test the backward compatibility?

@nicolegys
Copy link
Contributor

@superboyiii could you test the backward compatibility?

I'll test it, need about 2-3 days for chain sync.

@nicolegys
Copy link
Contributor

TestResults:
Mainnet: compatible with 2.10.3
Testnet: 7 files different with 2.10.3/master2.x

Differences_pr1376.zip

It is strange that this pr is compatible with pr 1369 both on mainnet and testnet.

@shargon
Copy link
Member Author

shargon commented Jan 7, 2020

Are the same differences than #1369 (comment) ? seems very strange to me :S

@nicolegys
Copy link
Contributor

Are the same differences than #1369 (comment) ? seems very strange to me :S

Yes, I don't know why... Actually it's very strange to me, too.

@nicolegys
Copy link
Contributor

@shargon Will you go on with this pr or close it?

@shargon
Copy link
Member Author

shargon commented Feb 3, 2020

I think that should be merged @nicolegys

@nicolegys
Copy link
Contributor

Compatibility test pass. See reason on #1369 (comment)

@Tommo-L
Copy link
Contributor

Tommo-L commented Mar 13, 2020

Ready to merge?

@erikzhang erikzhang merged commit 9188fad into neo-project:master-2.x Mar 17, 2020
@shargon shargon deleted the merkleblock-limits branch March 17, 2020 07:32
ZhangTao1596 pushed a commit to ZhangTao1596/neo that referenced this pull request Jul 28, 2020
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.

4 participants