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

Update VM to match C# + Add JSON VM Test support #921

Merged
merged 20 commits into from
Mar 26, 2019
Merged

Update VM to match C# + Add JSON VM Test support #921

merged 20 commits into from
Mar 26, 2019

Conversation

ixje
Copy link
Member

@ixje ixje commented Mar 25, 2019

What current issue(s) does this address, or what feature is it adding?
This brings the VM up to date with the following PR's:
neo-project/neo#601
neo-project/neo-vm#75
neo-project/neo-vm#84
neo-project/neo-vm#87
neo-project/neo-vm#90

also add supports for running the official C# tests for the ExecutionEngine

How did you solve this problem?
update code

How did you make sure your solution works?
make test and test against JSON test cases of the C# neo-vm

Are there any special changes in the code that we should be aware of?
too many

Please check the following, if applicable:

  • Did you add any tests?
  • Did you run make lint?
  • Did you run make test?
  • Are you making a PR to a feature branch or development rather than master?
  • Did you add an entry to CHANGELOG.rst? (if not, please do)

ixje and others added 18 commits January 16, 2019 11:17
…into CityOfZion/development

* 'development' of https://github.com/CityOfZion/neo-python:
  Bump version: 0.8.4-dev → 0.8.5-dev
  Updated changelog for release
…into CityOfZion/development

* 'development' of https://github.com/CityOfZion/neo-python:
  Prove "getbalance" RPC method (#906)
  Improve usage of neo-python CLI (#907)
* Add wallet height to bottom toolbar

* update changelog

* Add wallet height to bottom toolbar

* change wallet height increment logic
* Fixed size calculation for RegisterTransaction

* Updated CHANGELOG.rst
* commit '8a08b0de8fcb153a92161d986f2ccc4158649b07':
  Support #888 (#911)
  Fixed size calculation for RegisterTransaction (#916)
  Add wallet height to bottom toolbar (#912)
  Enhance 'wallet' cmd output (#909)
  remove bitcoin imported function (will be removed from neocore) (#910)

# Conflicts:
#	CHANGELOG.rst
#	neo/VM/ExecutionEngine.py
@ixje ixje changed the base branch from master to development March 25, 2019 12:41
@coveralls
Copy link

coveralls commented Mar 25, 2019

Coverage Status

Coverage increased (+0.2%) to 86.773% when pulling d076726 on ixje:update-vm into 411df44 on CityOfZion:development.

Copy link
Contributor

@jseagrave21 jseagrave21 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 massive! 💪 Great work!

@ixje
Copy link
Member Author

ixje commented Mar 26, 2019

thanks!

@ixje ixje merged commit 668f0c1 into CityOfZion:development Mar 26, 2019
@ixje ixje deleted the update-vm branch March 26, 2019 08:39
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.

5 participants