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

Sync neo changes #676

Merged
merged 9 commits into from
Dec 1, 2020
Merged

Sync neo changes #676

merged 9 commits into from
Dec 1, 2020

Conversation

superboyiii
Copy link
Member

@superboyiii superboyiii commented Oct 22, 2020

Related: neo-project/neo#2044
Close #685
Please dont't merge until related PRs are all merged.

neo-cli/CLI/MainService.cs Outdated Show resolved Hide resolved
@shargon
Copy link
Member

shargon commented Oct 29, 2020

@superboyiii could you test it again? neo-project/neo#1973

@shargon shargon changed the title Copy abi to nef Create use nef instead of script Nov 7, 2020
@@ -281,10 +281,11 @@ private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath,

// Build script

scriptHash = file.ScriptHash;
var fileData = file.ToArray();
scriptHash = fileData.ToScriptHash();
Copy link
Contributor

Choose a reason for hiding this comment

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

this scripthash is incorrect.

Copy link
Contributor

Choose a reason for hiding this comment

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

see #680

@superboyiii superboyiii mentioned this pull request Nov 27, 2020
@superboyiii
Copy link
Member Author

superboyiii commented Nov 27, 2020

@superboyiii could you test it again?

Works well on my local within neo-project/neo#2044 and neo-project/neo-devpack-dotnet#391. Test with both native and nep17. @shargon

@superboyiii superboyiii changed the title Create use nef instead of script Sync neo changes Dec 1, 2020
@superboyiii
Copy link
Member Author

superboyiii commented Dec 1, 2020

@shargon Need your review again. It works well on my local.

@shargon shargon merged commit 5bfa70e into master Dec 1, 2020
@shargon shargon deleted the copy-abi-to-nef branch December 1, 2020 19:11
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.

MainService no longer compiles against neo master branch
5 participants