Sync neo changes #391

shargon · 2020-11-12T18:03:05Z

NEP17 changes Implement NEP-17 neo#2024
Contract hash create changes Update contract without change the hash neo#2044
Require Remove ContractFeatures #390 Update contract without change the hash neo#2044
Close Neo.Compiler.MSIL no longer compiles against neo master branch #400

Tommo-L · 2020-11-13T00:17:54Z

call onPayment in Transfer method?

shargon · 2020-11-13T08:22:35Z

call onPayment in Transfer method?

In the template right?

Tommo-L · 2020-11-13T08:27:30Z

call onPayment in Transfer method?

In the template right?

Yes

Tommo-L · 2020-11-13T08:28:31Z

UT failed

shargon · 2020-11-13T08:35:24Z

UT failed

It will need the neo nuget

src/Neo.Compiler.MSIL/FuncExport.cs

shargon · 2020-11-13T11:33:21Z

src/Neo.Compiler.MSIL/DebugExport.cs

        {
            var docMap = GetDocumentMap(module);
            addrConvTable ??= ImmutableDictionary<int, int>.Empty;

            var outjson = new JObject();
-            outjson["hash"] = FuncExport.ComputeHash(script);


@devhawk do you need the name in debugExport?

I need whatever unique identifier is used to identify the contract.

Is there a design document describing how contract deploy and invoke is supposed to work now? I am all for having a stable contract identifier other than the script hash, though it's not clear what the new design is?

One question - Have we considered the impact on dynamic contract invocations scenarios. Using script hash to invoke a contract means that any calling contracts break when a dependent contract is updated. That is, I was calling a specific contract by script hash it will be obvious something has changed if that script hash is no longer valid. With a stable identifier, will it still be obvious if a dependent contract has made a backwards incompatible change?

Hi @devhawk, thinking in this perspective you mentioned, it may be important to create a flag that says that the contract trust any update on the dynamic invoked contract.
For instance, most of the DeFi projects are relying on external dynamic invoked contracts. In this sense, consider the need of mutual update is something plausible.

I would expect that dynamic invoke scenarios always require "mutual update" as you called it @vncoelho. I'm not sure it's a good idea to make the change less obvious. Right now, if you update your contract it breaks anyone who calls it since the hash changes. If we keep the hash, will that allow a developer to publish a malicious contract update w/o their users noticing?

ProDog · 2020-11-16T09:19:19Z

src/Neo.Compiler.MSIL/FuncExport.cs

-            //hash
-            outjson["hash"] = ComputeHash(script);
+            //name
+            outjson["name"] = module.attributes


According to the https://github.com/neo-project/neo/pull/2024/files#diff-6a8fe6159fb062d52f619635b6c0e2123632e3a61acdc5f86b867da878af2e02R166, name is on first level in manifest, but here the name is inside the abi.

Now I am not sure, maybe it's more appropriate to put the Name in the abi 🤔. What do you think?

I think name and supportedstandards should be on the same level, maybe it shouldn't be added here?

See neo-project/neo-devpack-dotnet#391 and neo-project/neo#2044.

Tommo-L · 2020-11-20T02:58:13Z

UT failed

templates/Template.NEP17.CSharp/NEP17.cs

shargon · 2020-11-20T09:53:19Z

UT failed

It require neo-project/neo#2044

cloud8little · 2020-12-09T03:43:20Z

Test passed with commit 882a721

send neo to the contract.

neo> send neo 0xc77487f73dfde3f76f690f5df96c39af72bc1667 100 NfkPM5juAxBETYXNMZpp1zzxVCwJpAqQRh
password: *
TXID: 0x3be7f74736b3544b389ce1a5319da4a138ee97009c08f52f7a11b74d58e198e7
neo> invoke 0xc77487f73dfde3f76f690f5df96c39af72bc1667 totalSupply []
Invoking script with: 'EMAMC3RvdGFsU3VwcGx5DBRnFrxyrzls+V0PaW/34/0994d0x0FifVtS'
VM State: HALT
Gas Consumed: 0.0374394
Result Stack: [{"type":"Integer","value":"2000100000000000"}]
Relay tx(no|yes): no

send gas to the contract

neo> send gas 0xc77487f73dfde3f76f690f5df96c39af72bc1667 5 NfkPM5juAxBETYXNMZpp1zzxVCwJpAqQRh
password: *
TXID: 0x7735e0947eddff53049d39807c38f872380c78879b8f8776f316789a23ff6d63
neo> invoke 0xc77487f73dfde3f76f690f5df96c39af72bc1667 totalSupply []
Invoking script with: 'EMAMC3RvdGFsU3VwcGx5DBRnFrxyrzls+V0PaW/34/0994d0x0FifVtS'
VM State: HALT
Gas Consumed: 0.0374394
Result Stack: [{"type":"Integer","value":"2000100500000000"}]
Relay tx(no|yes): no

send the asset to other account.

neo> invoke 0xc77487f73dfde3f76f690f5df96c39af72bc1667 balanceOf [{"type":"Hash160","value":"0xeaf0dd7a6b7b4248b22c2b5f7f0f4b5a448692d9"}] NfkPM5juAxBETYXNMZpp1zzxVCwJpAqQRh NfkPM5juAxBETYXNMZpp1zzxVCwJpAqQRh
Invoking script with: 'DBTZkoZEWksPf18rLLJIQntret3w6hHADAliYWxhbmNlT2YMFGcWvHKvOWz5XQ9pb/fj/T33h3THQWJ9W1I='
VM State: HALT
Gas Consumed: 0.0377198
Result Stack: [{"type":"Integer","value":"2000100500000000"}]
Relay tx(no|yes): no
neo> create address 1
[■■■■■■■■■■] (100.0%)
Export addresses to address.txt
neo> list address
   Address: NfkPM5juAxBETYXNMZpp1zzxVCwJpAqQRh  Standard
ScriptHash: 0xeaf0dd7a6b7b4248b22c2b5f7f0f4b5a448692d9

   Address: NfjpZ2RJ1JHozNqiHLXRd2wr4qNVSnzsLk  MultiSignature
ScriptHash: 0x0b0920a82bfabf01e87d17d91b32d9f23b2677d9

   Address: NMZZos2yCEM9G2zdkMjd89MFSjjqn7xaVL  WatchOnly
ScriptHash: 0xf8e5270ffc3a50ccc611c3842d7643d8f56a1412

   Address: NSjjFysocrQhNmF26c5njBWgT4QFPttCRD  WatchOnly
ScriptHash: 0xb4e2fed09cf4968fea4885c5677866a15618d94a

   Address: NMbRM6VGEqNHSeFvwHrsDqpPi5cxtM9MEe  Standard
ScriptHash: 0x581d1eded06bbac72e3a6f14aab62114b92f6e12

neo> send 0xc77487f73dfde3f76f690f5df96c39af72bc1667  NMbRM6VGEqNHSeFvwHrsDqpPi5cxtM9MEe 160
password: *
TXID: 0xe169673f3a69faa6bfc27a0045dcf57c240ce4b592d1de2ce28a42b2f03755ac
neo> invoke 0xc77487f73dfde3f76f690f5df96c39af72bc1667 balanceOf [{"type":"Hash160","value":"0xeaf0dd7a6b7b4248b22c2b5f7f0f4b5a448692d9"}] NfkPM5juAxBETYXNMZpp1zzxVCwJpAqQRh NfkPM5juAxBETYXNMZpp1zzxVCwJpAqQRh
Invoking script with: 'DBTZkoZEWksPf18rLLJIQntret3w6hHADAliYWxhbmNlT2YMFGcWvHKvOWz5XQ9pb/fj/T33h3THQWJ9W1I='
VM State: HALT
Gas Consumed: 0.0377198
Result Stack: [{"type":"Integer","value":"2000084500000000"}]
Relay tx(no|yes): no

templates/Template.NEP17.CSharp/NEP17.Helpers.cs

templates/Template.NEP17.CSharp/NEP17.Crowdsale.cs

cloud8little · 2020-12-09T07:15:27Z

#391 (comment)
use neo to mint only success for the first time. Refs:

erikzhang · 2020-12-09T07:36:26Z

@cloud8little Fixed.

Tommo-L · 2020-12-09T07:43:55Z

When transfer NEO, it'll trigger twice OnPayment.
One is for auto-clamied
https://github.com/neo-project/neo/blob/beac9a9432ea3b6d423f570ab535a257e750bab8/src/neo/SmartContract/Native/Tokens/NeoToken.cs#L68

Another is NEO transfer:
https://github.com/neo-project/neo/blob/beac9a9432ea3b6d423f570ab535a257e750bab8/src/neo/SmartContract/Native/Tokens/Nep17Token.cs#L146

There are two OnPayment context in stack, after NEO transfered.

superboyiii · 2020-12-09T08:38:30Z

@cloud8little Fixed.

It still get the wrong CallingScriptHash. I found the first received CallingScriptHash is the Nep17 contract itself's if mint twice.
When this transaction make contract address auto claim gas, the CallingScriptHash can be contract address itself and it also call onPayment?

erikzhang · 2020-12-09T09:10:15Z

It should be fixed by neo-project/neo#2130

shargon · 2020-12-09T09:34:41Z

Because the problem it's in core and not in the template, we can merge it?

superboyiii · 2020-12-09T09:50:50Z

I think template is OK, we can merge it first because #402 is waiting for this.

shargon · 2020-12-09T14:36:17Z

Merge? 🚀

erikzhang · 2020-12-09T14:46:53Z

@shargon We need to fix #391 (comment)

src/Neo.SmartContract.Framework/UInt160.cs

templates/Template.NEP17.CSharp/NEP17.Crowdsale.cs

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

shargon · 2020-12-10T08:49:59Z

Null should return false or throw?

shargon added 2 commits November 12, 2020 19:02

Initial commit

4c2e79d

Remove hash from ABI

f5f161b

shargon mentioned this pull request Nov 12, 2020

Copy Abi into nef file and use nef for scriptHash #378

Closed

Clean lines

38e0590

Tommo-L reviewed Nov 13, 2020

View reviewed changes

src/Neo.Compiler.MSIL/FuncExport.cs Show resolved Hide resolved

shargon added 3 commits November 13, 2020 12:23

Fixes

9c8e7db

Merge remote-tracking branch 'neo-project/master' into sync-nep17

5379d41

Fix some UT

7ad9b72

shargon commented Nov 13, 2020

View reviewed changes

superboyiii mentioned this pull request Nov 16, 2020

Preview4 Checklist neo-project/neo#1936

Closed

44 tasks

ProDog reviewed Nov 16, 2020

View reviewed changes

ProDog mentioned this pull request Nov 16, 2020

Implement NEP-17 neo-project/neo#2024

Merged

Change name to manifest

4448877

ProDog mentioned this pull request Nov 17, 2020

Update contract without change the hash neo-project/neo#2044

Merged

roman-khimov added a commit to nspcc-dev/neo-go that referenced this pull request Nov 18, 2020

manifest/compiler: drop hashes from ABI and debug info

59537ae

See neo-project/neo-devpack-dotnet#391 and neo-project/neo#2044.

shargon mentioned this pull request Nov 19, 2020

Neo master branch can't load contract manifest generated by neon master branch #394

Closed

shargon added 2 commits November 19, 2020 12:12

Merge branch 'master' into sync-nep17

cc4cced

Update nuget

88fa514

cloud8little reviewed Nov 20, 2020

View reviewed changes

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

shargon added 3 commits November 20, 2020 10:22

Update NEP17.cs

6947047

Merge branch 'master' into sync-nep17

c0db531

Fix more UT

f4df31a

Some fixes

2ec0748

erikzhang added 2 commits December 9, 2020 13:11

Optimize Mint

bd4c246

Remove GetTransactionAmount

8d0d298

erikzhang reviewed Dec 9, 2020

View reviewed changes

templates/Template.NEP17.CSharp/NEP17.Helpers.cs Outdated Show resolved Hide resolved

cloud8little reviewed Dec 9, 2020

View reviewed changes

templates/Template.NEP17.CSharp/NEP17.Crowdsale.cs Outdated Show resolved Hide resolved

Fix claim gas

493b278

shargon mentioned this pull request Dec 9, 2020

Safe Attribute #401

Closed

Add IsValid

15f9de1

erikzhang reviewed Dec 10, 2020

View reviewed changes

src/Neo.SmartContract.Framework/UInt160.cs Outdated Show resolved Hide resolved

src/Neo.SmartContract.Framework/UInt160.cs Outdated Show resolved Hide resolved

Tommo-L reviewed Dec 10, 2020

View reviewed changes

templates/Template.NEP17.CSharp/NEP17.Crowdsale.cs Show resolved Hide resolved

erikzhang and others added 4 commits December 10, 2020 11:33

Update NEP17.Crowdsale.cs

8d1e266

Update src/Neo.SmartContract.Framework/UInt160.cs

0823a31

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

Remove Size from UInt160 and UInt256

7992c3a

Update UInt256.cs

befe380

Fix UT

a572293

erikzhang approved these changes Dec 10, 2020

View reviewed changes

shargon merged commit 64db190 into neo-project:master Dec 10, 2020

shargon deleted the sync-nep17 branch December 10, 2020 09:05

devhawk mentioned this pull request Dec 10, 2020

debug info hash property is needed #404

Merged

roman-khimov mentioned this pull request Dec 14, 2020

native: fix contract hashes nspcc-dev/neo-go#1616

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync neo changes #391

Sync neo changes #391

shargon commented Nov 12, 2020 •

edited

Loading

Tommo-L commented Nov 13, 2020

shargon commented Nov 13, 2020

Tommo-L commented Nov 13, 2020

Tommo-L commented Nov 13, 2020

shargon commented Nov 13, 2020

shargon Nov 13, 2020

devhawk Nov 13, 2020

devhawk Nov 13, 2020

vncoelho Nov 19, 2020 •

edited

Loading

devhawk Nov 19, 2020

ProDog Nov 16, 2020

shargon Nov 16, 2020

ProDog Nov 16, 2020

Tommo-L commented Nov 20, 2020

shargon commented Nov 20, 2020

cloud8little commented Dec 9, 2020

cloud8little commented Dec 9, 2020

erikzhang commented Dec 9, 2020

Tommo-L commented Dec 9, 2020

superboyiii commented Dec 9, 2020 •

edited

Loading

erikzhang commented Dec 9, 2020

shargon commented Dec 9, 2020

superboyiii commented Dec 9, 2020

shargon commented Dec 9, 2020

erikzhang commented Dec 9, 2020

shargon commented Dec 10, 2020

Sync neo changes #391

Sync neo changes #391

Conversation

shargon commented Nov 12, 2020 • edited Loading

Tommo-L commented Nov 13, 2020

shargon commented Nov 13, 2020

Tommo-L commented Nov 13, 2020

Tommo-L commented Nov 13, 2020

shargon commented Nov 13, 2020

shargon Nov 13, 2020

Choose a reason for hiding this comment

devhawk Nov 13, 2020

Choose a reason for hiding this comment

devhawk Nov 13, 2020

Choose a reason for hiding this comment

vncoelho Nov 19, 2020 • edited Loading

Choose a reason for hiding this comment

devhawk Nov 19, 2020

Choose a reason for hiding this comment

ProDog Nov 16, 2020

Choose a reason for hiding this comment

shargon Nov 16, 2020

Choose a reason for hiding this comment

ProDog Nov 16, 2020

Choose a reason for hiding this comment

Tommo-L commented Nov 20, 2020

shargon commented Nov 20, 2020

cloud8little commented Dec 9, 2020

cloud8little commented Dec 9, 2020

erikzhang commented Dec 9, 2020

Tommo-L commented Dec 9, 2020

superboyiii commented Dec 9, 2020 • edited Loading

erikzhang commented Dec 9, 2020

shargon commented Dec 9, 2020

superboyiii commented Dec 9, 2020

shargon commented Dec 9, 2020

erikzhang commented Dec 9, 2020

shargon commented Dec 10, 2020

shargon commented Nov 12, 2020 •

edited

Loading

vncoelho Nov 19, 2020 •

edited

Loading

superboyiii commented Dec 9, 2020 •

edited

Loading