Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Revert "Fixes GetEntryScriptHash and GetCallingScriptHash (2.x) (#138)" #157

Merged
merged 2 commits into from
May 15, 2019

Conversation

erikzhang
Copy link
Member

This reverts commit 38c5dc0.

@codecov-io
Copy link

Codecov Report

Merging #157 into master-2.x will increase coverage by 11.1%.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff               @@
##           master-2.x     #157      +/-   ##
==============================================
+ Coverage       80.38%   91.49%   +11.1%     
==============================================
  Files              45       17      -28     
  Lines            4548     1986    -2562     
==============================================
- Hits             3656     1817    -1839     
+ Misses            892      169     -723
Impacted Files Coverage Δ
src/neo-vm/ExecutionContext.cs 87.5% <100%> (+2.88%) ⬆️
src/neo-vm/ExecutionEngine.cs 99.56% <100%> (-0.01%) ⬇️
tests/neo-vm.Tests/Converters/ScriptConverter.cs
tests/neo-vm.Tests/UtDebugger.cs
tests/neo-vm.Tests/Extensions/JsonExtensions.cs
tests/neo-vm.Tests/Cryptography/ECC/ECCurve.cs
tests/neo-vm.Tests/Types/VMUT.cs
tests/neo-vm.Tests/Types/VMUTEntry.cs
...ts/neo-vm.Tests/Cryptography/ECC/ECFieldElement.cs
tests/neo-vm.Tests/Types/ScriptTable.cs
... and 19 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cd5c3d0...fe4296e. Read the comment docs.

@ixje
Copy link
Contributor

ixje commented May 13, 2019

Can you describe why this is needed?
I had this ported to neo-python so need to know if I need to rollback as well.

@erikzhang
Copy link
Member Author

#138 may not be compatible with previous contracts and is being tested.

@ixje
Copy link
Contributor

ixje commented May 13, 2019

Ok, I'll keep watching this issue then

shargon
shargon previously approved these changes May 13, 2019
Copy link
Member

@vncoelho vncoelho left a comment

Choose a reason for hiding this comment

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

This is strange, because we synced Testnet and no issues were reported.
And @superboyiii synced the Mainnet and also did not found inconsistencies.

Let's double check this before reverting.

@erikzhang erikzhang marked this pull request as ready for review May 15, 2019 13:21
@erikzhang erikzhang dismissed vncoelho’s stale review May 15, 2019 13:21

Check by NGD team

@erikzhang erikzhang merged commit e9b0e6a into master-2.x May 15, 2019
@erikzhang erikzhang deleted the 2.x/revert-138 branch May 15, 2019 13:26
@ixje
Copy link
Contributor

ixje commented May 15, 2019

😞

@vncoelho
Copy link
Member

What happened, @ixje?

I am not sure if it really affected storage of Mainnet since I only compared for Testnet.
Did NGD confirmed inconsistencies, @erikzhang?
If true, let's keep 2.x like it is now and focus on the future.

@erikzhang
Copy link
Member Author

I have not tested it myself, but the NGD team has confirmed this problem.

@superboyiii
Copy link
Member

@vncoelho Could be seen here for the detail

@ixje
Copy link
Contributor

ixje commented May 16, 2019

@superboyiii there seems to be some doubt in whether this is the solution

Should be, I think. Or if there might be a better solution...

Did you try a comparison with a version that had this PR merged to validate this is the actual solution to the problem?

@superboyiii
Copy link
Member

Yes, I just completed the test of revert#138, it got the same correct storage with v2.10.0 and v2.9.4. There actually has contradiction between storage compatibility and TAIL CALL fixing. What a pity.....

@ixje
Copy link
Contributor

ixje commented May 16, 2019

Great! Thanks for the input. Now I can confidently revert this change as well

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants