Skip to content

[neox] Merge master#1788

Merged
shargon merged 27 commits intoneo-project:neoxfrom
ZhangTao1596:neoxm
Jul 22, 2020
Merged

[neox] Merge master#1788
shargon merged 27 commits intoneo-project:neoxfrom
ZhangTao1596:neoxm

Conversation

@ZhangTao1596
Copy link
Copy Markdown

  • Merge master
  • Impl SeekInternal replace FindInternal

erikzhang and others added 27 commits June 22, 2020 19:15
* Buffer iterator

* Rename

* Remove using

Co-authored-by: Erik Zhang <erik@neo.org>
StorageContext needs to be public so it can be accessed by Neo Debugger

Co-authored-by: Erik Zhang <erik@neo.org>
Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Tommo-L <luchuan@neo.org>
* replace DataCache.Find by DataCache.Seek

* fix order

* optimize

* Update ByteArrayComparer.cs

* Update ByteArrayComparer.cs

* Update DataCache.cs

* fix comments

* fix comments

* fix comments

* Update DataCache.cs

* Update DataCache.cs

* Reorder methods

Co-authored-by: Tommo-L <luchuan@neo.org>
Co-authored-by: erikzhang <erik@neo.org>
Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Shargon <shargon@gmail.com>
* Change to double SHA256

* Clean code

* Revert change

* Clean code

* Fix checksum

* Update NefFile.cs

* Fix compile

* Clean code

Clean code
Fix checksum
Update NefFile.cs
Fix compile

* Optimize

* Optimize

* Fix

Co-authored-by: erikzhang <erik@neo.org>
* Check witness on isStandard

* Add IsDeployed

* Add IsPayable

* Fix UT

* format

* Add coverage

* Remove IsPayable, IsDeployed
* NEP10 abi

* To lower case

* Move to Manifest

* Clean code

* Update ContractManifest.cs

* Update ContractManifest.cs

* Fix native contracts

Co-authored-by: Erik Zhang <erik@neo.org>
* Capture faultException

* Update Wallet error

* Remove flag check

* Clean code
* Sender from signers

* Remove co-

* Move signers outside attributes

* Fix UT and remove Signers class

* Fix UT

* Add FeeOnly scope

* Remove orderBy

* Remove _signersCache

* Fix Signers

* Fix WitnessScope

* Fix Sender

* Update TransactionAttributeType.cs

* Update Wallet.cs

* Fix Wallet

* Rename

* Update Wallet.cs

* Update Wallet.cs

* Partial UT fix

* More UT fixes

* Fix Sender's WitnessScope

* Fix Wallet

* Fix UT

* Explicit FeeOnly for DeployNativeContracts

* Same order as serialization

* Test FeeOnly

* dotnet format

* format

Co-authored-by: Erik Zhang <erik@neo.org>
Co-authored-by: Tommo-L <luchuan@neo.org>
@shargon
Copy link
Copy Markdown
Member

shargon commented Jul 21, 2020

It's just a merge?

@ZhangTao1596
Copy link
Copy Markdown
Author

@shargon Merge and fix build error: Change FindInternal to SeekInternal because master changed.

@shargon shargon merged commit 3a0a732 into neo-project:neox Jul 22, 2020
@ZhangTao1596 ZhangTao1596 deleted the neoxm branch July 22, 2020 08:36
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.

6 participants