Sync update with neo pull 2119 #402

chenzhitong · 2020-12-07T06:44:16Z

Remove Contract.Create, Contract.Update, Contract.Destroy;
~~Add Contract.CallNative.~~

merge from origin

merge

m

This reverts commit 6b0c49c.

….CallNative.

chenzhitong · 2020-12-07T06:46:30Z

The test needs to be combined with neo-project/neo#2119

ProDog · 2020-12-07T07:59:43Z

src/Neo.SmartContract.Framework/Services/Neo/Contract.cs

-        [Syscall("System.Contract.Destroy")]
-        public static extern void Destroy();
+        [Syscall("System.Contract.CallNative")]
+        public static extern object CallNative(string name);


How to call it in the contract?😅

Remove this method, it's not for normal contract.

Need to support Update and Destroy.

src/Neo.SmartContract.Framework/Services/Neo/Contract.cs

ProDog · 2020-12-07T08:23:32Z

According to neo-project/neo#2119, new native contract hash is:

NEO hash: 0x74c21a1ca66b7a190bf2a65db83ba6fe550cea64
GAS hash: 0xb399c051778cf37a1e4ef88509b2e054d0420a32
ManagementContract hash: 0xdf18cb2476964c241558ed1e2e8881dcd2d50bde
Policy hash: 0xe8ff1989c19526f4d8102f226e2c6c993b63efe9
Designate hash: 0x7ab39c37afd995f2f947a7ecbf40e91307058595

…dotnet into neo2119

Tommo-L · 2020-12-08T06:59:55Z

src/Neo.SmartContract.Framework/Services/Neo/GAS.cs

@@ -9,6 +9,8 @@ public class GAS
    {
        public static extern UInt160 Hash { [ContractHash] get; }
        public static extern string Name { get; }
+        public static extern int Id { get; }
+        public static extern uint ActiveBlockIndex { get; }


Remove this two methods, which weren't defined for contract.

If you remove these fields, the fifth field will become the third one, which will be incorrect.

We can use private

I tested without ActiveBlockIndex and it works well, I think that we should remove it. Please take a look @erikzhang

templates/Template.CSharp/Contract1.cs

tests/Neo.SmartContract.Framework.UnitTests/TestClasses/Contract_CreateAndUpdate.cs

Co-authored-by: Owen Zhang <[email protected]>

…ct_CreateAndUpdate.cs Co-authored-by: Owen Zhang <[email protected]>

shargon · 2020-12-08T09:39:55Z

Wait for #391

src/Neo.SmartContract.Framework/Services/Neo/ManagementContract.cs

…dotnet into neo2119

Add Safe attribute

shargon · 2020-12-13T11:33:33Z

Merge?

superboyiii · 2020-12-14T07:50:29Z

I found native hash was changed again in the latest neo master.

        ManagementContract      0xcd97b70d82d69adfcd9165374109419fade8d6ab
        NeoToken        0x0a46e2e37c9987f570b4af253fb77e7eef0f72b6
        GasToken        0xa6a6c15dcdc9b997dac448b6926522d22efeedfb
        PolicyContract  0xdde31084c0fdbebc7f5ed5f53a38905305ccee14
        OracleContract  0xb1c37d5847c2ae36bdde31d0cc833a7ad9667f8f
        DesignationContract     0xc0073f4c7069bf38995780c9da065f9b3949ea7a

Do you think it's good to be fixed in this PR or create another? @chenzhitong @shargon

superboyiii · 2020-12-15T06:01:45Z

Merge? It works well on mine.

superboyiii · 2020-12-16T02:14:31Z

@erikzhang Could you review this?

陈志同 and others added 11 commits September 10, 2020 21:16

Merge pull request #1 from neo-project/master

cdc135f

merge from origin

Merge pull request #2 from neo-project/master

be2a614

merge

Merge pull request #3 from neo-project/master

30893a3

m

Merge pull request #4 from neo-project/master

f293fb5

m

Upgrade target framework.

6b0c49c

Revert "Upgrade target framework."

c36f9b2

This reverts commit 6b0c49c.

Safe Attribute

0ce51ed

Update Contract1.cs (neo-project#398)

782fa68

Revert "publish neon to myget/github packages" (neo-project#395)

d13e363

Remove Contract.Create、Contract.Update、Contract.Destroy; Add Contract…

85ca995

….CallNative.

Merge branch 'master' into neo2119

1270f96

ProDog reviewed Dec 7, 2020

View reviewed changes

Tommo-L reviewed Dec 7, 2020

View reviewed changes

src/Neo.SmartContract.Framework/Services/Neo/Contract.cs Show resolved Hide resolved

陈志同 added 3 commits December 7, 2020 16:47

Update

b80c12f

Merge branch 'neo2119' of https://github.com/chenzhitong/neo-devpack-…

6f9aa5d

…dotnet into neo2119

remove CallNative

25793fe

superboyiii mentioned this pull request Dec 7, 2020

Preview4 Checklist neo-project/neo#1936

Closed

44 tasks

Tommo-L reviewed Dec 8, 2020

View reviewed changes

superboyiii reviewed Dec 8, 2020

View reviewed changes

templates/Template.CSharp/Contract1.cs Outdated Show resolved Hide resolved

superboyiii reviewed Dec 8, 2020

View reviewed changes

templates/Template.CSharp/Contract1.cs Outdated Show resolved Hide resolved

superboyiii suggested changes Dec 8, 2020

View reviewed changes

tests/Neo.SmartContract.Framework.UnitTests/TestClasses/Contract_CreateAndUpdate.cs Outdated Show resolved Hide resolved

陈志同 and others added 3 commits December 8, 2020 02:50

Update templates/Template.CSharp/Contract1.cs

6dc95ee

Co-authored-by: Owen Zhang <[email protected]>

Update templates/Template.CSharp/Contract1.cs

ca0a550

Co-authored-by: Owen Zhang <[email protected]>

Update tests/Neo.SmartContract.Framework.UnitTests/TestClasses/Contra…

da4e1d8

…ct_CreateAndUpdate.cs Co-authored-by: Owen Zhang <[email protected]>

cloud8little reviewed Dec 9, 2020

View reviewed changes

src/Neo.SmartContract.Framework/Services/Neo/ManagementContract.cs Outdated Show resolved Hide resolved

陈志同 added 2 commits December 9, 2020 16:47

public

e5d1685

Merge branch 'neo2119' of https://github.com/chenzhitong/neo-devpack-…

d6f559c

…dotnet into neo2119

shargon and others added 3 commits December 10, 2020 11:26

Fix UT

1e02f34

More fixes

0298a2e

Merge pull request #6 from shargon/safe-attribute

2d91cb3

Add Safe attribute

shargon mentioned this pull request Dec 10, 2020

Sync update with neo pull 2119 #403

Closed

shargon and others added 6 commits December 10, 2020 17:15

More fixes

06c3b30

More UT

a7ce9fe

Fix UT's

3493312

dotnet-format

a754a23

Fix Last test

3e09e8d

Merge branch 'master' into neo2119

431f482

shargon previously approved these changes Dec 13, 2020

View reviewed changes

chenzhitong dismissed shargon’s stale review via 9439ccd December 14, 2020 08:23

Update

9439ccd

shargon previously approved these changes Dec 14, 2020

View reviewed changes

Remove private properties

c7d4ca8

shargon dismissed their stale review via c7d4ca8 December 14, 2020 09:14

shargon previously approved these changes Dec 14, 2020

View reviewed changes

Merge branch 'master' into neo2119

493f225

chenzhitong dismissed shargon’s stale review via b0770d2 December 15, 2020 08:06

Fixed UT

b0770d2

shargon previously approved these changes Dec 15, 2020

View reviewed changes

disable warning CS0626

aa997f3

erikzhang dismissed shargon’s stale review via aa997f3 December 16, 2020 05:22

erikzhang approved these changes Dec 16, 2020

View reviewed changes

shargon approved these changes Dec 16, 2020

View reviewed changes

shargon merged commit fac2847 into neo-project:master Dec 16, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync update with neo pull 2119 #402

Sync update with neo pull 2119 #402

chenzhitong commented Dec 7, 2020 •

edited

Loading

chenzhitong commented Dec 7, 2020 •

edited

Loading

ProDog Dec 7, 2020

Tommo-L Dec 7, 2020

ProDog Dec 7, 2020

ProDog commented Dec 7, 2020 •

edited

Loading

Tommo-L Dec 8, 2020

erikzhang Dec 8, 2020

shargon Dec 10, 2020

shargon Dec 14, 2020 •

edited

Loading

shargon commented Dec 8, 2020

shargon commented Dec 13, 2020

superboyiii commented Dec 14, 2020 •

edited

Loading

superboyiii commented Dec 15, 2020 •

edited

Loading

superboyiii commented Dec 16, 2020

Sync update with neo pull 2119 #402

Sync update with neo pull 2119 #402

Conversation

chenzhitong commented Dec 7, 2020 • edited Loading

chenzhitong commented Dec 7, 2020 • edited Loading

ProDog Dec 7, 2020

Choose a reason for hiding this comment

Tommo-L Dec 7, 2020

Choose a reason for hiding this comment

ProDog Dec 7, 2020

Choose a reason for hiding this comment

ProDog commented Dec 7, 2020 • edited Loading

Tommo-L Dec 8, 2020

Choose a reason for hiding this comment

erikzhang Dec 8, 2020

Choose a reason for hiding this comment

shargon Dec 10, 2020

Choose a reason for hiding this comment

shargon Dec 14, 2020 • edited Loading

Choose a reason for hiding this comment

shargon commented Dec 8, 2020

shargon commented Dec 13, 2020

superboyiii commented Dec 14, 2020 • edited Loading

superboyiii commented Dec 15, 2020 • edited Loading

superboyiii commented Dec 16, 2020

chenzhitong commented Dec 7, 2020 •

edited

Loading

chenzhitong commented Dec 7, 2020 •

edited

Loading

ProDog commented Dec 7, 2020 •

edited

Loading

shargon Dec 14, 2020 •

edited

Loading

superboyiii commented Dec 14, 2020 •

edited

Loading

superboyiii commented Dec 15, 2020 •

edited

Loading