Skip to content

merge from origin#1

Merged
chenzhitong merged 29 commits intochenzhitong:masterfrom
neo-project:master
Sep 11, 2020
Merged

merge from origin#1
chenzhitong merged 29 commits intochenzhitong:masterfrom
neo-project:master

Conversation

@chenzhitong
Copy link
Copy Markdown
Owner

No description provided.

ShawnYun and others added 29 commits June 23, 2020 16:38
* Update nugets

* Fix event

* Fix one UT

* Change state to array

* Fix event UT

* Add callbacks

* Update

* Clean code

* some fixes

* Fix Create

* Update Neo.Compiler.MSIL.csproj

* Update Neo.Compiler.MSIL.csproj

* Add BinaryEncode

* Add Base64 test

* Remove Notify

* remove delegate

* Change to enum

* Action callback

* Add test for ensure SyscallCallbacks

* Remove action

* Remove action

* Add more overloads

Co-authored-by: erikzhang <erik@neo.org>
* Check return type

* Clean message

* Fix UT

* Fix Contains

* Update FuncExport.cs

* Update src/Neo.Compiler.MSIL/FuncExport.cs

Co-authored-by: HaoqiangZhang <gripzhang@outlook.com>

* Tuple and UT

* Clean code

* Fix void

* Update

* Fix type to TypeReference

* More IApiInterface

* Recover miss changes

* Clean usings

* Fix ut

* Fix UT Again

* Fix Tuple type

Co-authored-by: HaoqiangZhang <gripzhang@outlook.com>
Co-authored-by: erikzhang <erik@neo.org>
* WIP

* add hash to debug info

* fixup

* don't emit hidden sequence points

* include local variables in debug info

* global tool support

* fix netstandard2.1

* fixup merge

* fix null ref issues

* debug info unit test

* fix null deref in FuncExport.ConvType

* use TargetFramework

Co-authored-by: Harry Pierson <harrypierson@ngd.neo.org>
Co-authored-by: Shargon <shargon@gmail.com>
* to lower case

* Fix UT

Co-authored-by: Shargon <Shargon@gmail.com>
* Add AsBigInteger

* Change to

* Fix UT

* Update Helper.cs

* Update Helper.cs

* Update UT

* Fix 2 UT

* Add ISNULL to BigInteger

Co-authored-by: Luchuan <luchuan@ngd.neo.org>
* Isolate TestEngine to test .nef files

* Code review

* Fix UnitTest error

* Fix UnitTests + code review

* Update path ToLowerInvariant

Co-authored-by: Shargon <shargon@gmail.com>

* Including using BinaryReader

Co-authored-by: Thais Bastos <thais.bastos@simpli.com.br>
Co-authored-by: Shargon <shargon@gmail.com>
* Nep10 as attribute

* Clean using

* Scape json

* Fix null

* Rename test method

* Fix UT
* Update nugets

* Fix event

* Fix one UT

* Change state to array

* Fix event UT

* Add callbacks

* Update

* Clean code

* some fixes

* Fix Create

* Update Neo.Compiler.MSIL.csproj

* Update Neo.Compiler.MSIL.csproj

* Add BinaryEncode

* Add Base64 test

* Remove Notify

* remove delegate

* Change to enum

* Action callback

* Add test for ensure SyscallCallbacks

* Remove action

* Fix UT

* Fix UT

* Change comment

* Unify Manifest generation
* add byte.AsString and Map UTs

* fix

* Update src/Neo.SmartContract.Framework/Helper.cs

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

* fix

* fix

* fix Enum and Iterator Test

* update neo

* fix

* fix map key and UT

Co-authored-by: Erik Zhang <erik@neo.org>
Co-authored-by: Shargon <shargon@gmail.com>
* fix static storagemap

* add comment

* fix

* fix

* add UT and comment

Co-authored-by: Shargon <shargon@gmail.com>
* Optimize rule

* Other hashset

* Remove var

* Other optimization

* Clean code
Co-authored-by: Shargon <shargon@gmail.com>
* add ConTractCall and UTs, delete Appcall

* fix

* Disable warnings

* spilt and fix

* del ID

* fix Neo and Policy, Add UT

* del blank line

* fix internal

Co-authored-by: erikzhang <erik@neo.org>
Co-authored-by: Shargon <shargon@gmail.com>
* Clean code

* Use FullName

* Fix extension

* Fix of fix
* StrictUTF8

* StrictUTF8
* Remove MyJson

* Remove MyJson

* Remove base58

* dotnet-format

* Fix func

* Clean code

* Fix ut
* fix optimizer error

* Add UT

* Update tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_OptimizationTest.cs

Co-authored-by: Luchuan <luchuan@ngd.neo.org>

* fix jarray

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Luchuan <luchuan@ngd.neo.org>
* support providing logger to Program.Compile

* retrieve assembly from program type

Co-authored-by: Harry Pierson <harrypierson@ngd.neo.org>
* Update nugets

* Fix event

* Fix one UT

* Change state to array

* Fix event UT

* Add callbacks

* Update

* Clean code

* some fixes

* Fix Create

* Update Neo.Compiler.MSIL.csproj

* Update Neo.Compiler.MSIL.csproj

* Add BinaryEncode

* Add Base64 test

* Remove Notify

* remove delegate

* Change to enum

* Action callback

* Add test for ensure SyscallCallbacks

* Remove action

Co-authored-by: Erik Zhang <erik@neo.org>
@chenzhitong chenzhitong merged commit cdc135f into chenzhitong:master Sep 11, 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.

5 participants