Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sync to Neo.SmartContract.Framework v3.0.0-rc3 #44

Merged
merged 14 commits into from
Jun 29, 2021
Merged

sync to Neo.SmartContract.Framework v3.0.0-rc3 #44

merged 14 commits into from
Jun 29, 2021

Conversation

superboyiii
Copy link
Member

@superboyiii superboyiii commented Apr 15, 2021 •
edited by erikzhang
Loading

Close #46

@superboyiii
Copy link
Member Author

@chenzhitong @shargon

@erikzhang
Copy link
Member

Duplicate of #43

@erikzhang erikzhang marked this as a duplicate of #43 Apr 15, 2021
chenzhitong
chenzhitong reviewed Apr 15, 2021
View reviewed changes
csharp/NEP17/NEP17.cs Outdated

public static UInt160 GetOwner() => Owner;

public static UInt160 GetOwner2() => Owner2;
Copy link
Member

Choose a reason for hiding this comment

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

For testing?

chenzhitong
chenzhitong reviewed Apr 15, 2021
View reviewed changes
csharp/NEP17/NEP17.cs Outdated
@@ -9,13 +9,17 @@ namespace Neo.SmartContract.Examples
[ManifestExtra("Email", "dev@neo.org")]
[ManifestExtra("Description", "This is a NEP17 example")]
[SupportedStandards("NEP-17")]
[ContractPermission("*", "onNEP17Payment")]
[ContractPermission("*", "*")]
Copy link
Member

Choose a reason for hiding this comment

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

Why change this line

chenzhitong
chenzhitong reviewed Apr 16, 2021
View reviewed changes
csharp/NEP17/NEP17.csproj Outdated

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>Neo.SmartContract.Examples</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="3.0.0-preview5" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.0.0-CI00300" />
Copy link
Member

@chenzhitong chenzhitong Apr 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Missing NuGet.Config file

<?xml version="1.0" encoding="utf-8"?>
<configuration>
  <packageSources>
    <clear />
    <add key="MyGet-neo" value="https://www.myget.org/F/neo/api/v3/index.json" />
    <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
  </packageSources>
</configuration>

@superboyiii
Copy link
Member Author

Duplicate of #43

We can iterate examples if any code style changes but not do anything together before release, it could help developers to know the changes step by step.

@satoshichou
Copy link

satoshichou commented Apr 16, 2021 •
edited
Loading

Duplicate of #43

We can iterate examples if any code style changes but not do anything together before release, it could help developers to know the changes step by step.

Agree, it's good for me. I'm writing sc on neo and it makes the example more clear and these methods are all compatible with the latest compiler as what I tested.

chenzhitong
chenzhitong previously approved these changes Apr 16, 2021
View reviewed changes
shargon
shargon previously approved these changes Apr 16, 2021
View reviewed changes
@erikzhang
Copy link
Member

The NEP-17 example should inherit Nep17Token.

@erikzhang erikzhang dismissed shargon’s stale review May 5, 2021 04:48

Please update to 3.0.0-rc2

@superboyiii superboyiii changed the title sync to Neo.SmartContract.Framework v3.0.0-CI00300 sync to Neo.SmartContract.Framework v3.0.0-rc2 May 14, 2021
@superboyiii
Copy link
Member Author

superboyiii commented May 14, 2021 •
edited
Loading

The NEP-17 example should inherit Nep17Token.
Please update to 3.0.0-rc2

All done.

nicolegys
nicolegys previously approved these changes May 14, 2021
View reviewed changes
Copy link

@nicolegys nicolegys left a comment

Choose a reason for hiding this comment

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

tested

@superboyiii
Copy link
Member Author

@erikzhang pls review again.

shargon
shargon reviewed Jun 23, 2021
View reviewed changes
Copy link
Member

@shargon shargon left a comment

Choose a reason for hiding this comment

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

Tested?

csharp/NEP17/NEP17.cs Outdated Show resolved Hide resolved
csharp/NEP17/NEP17.cs Show resolved Hide resolved
@superboyiii superboyiii changed the title sync to Neo.SmartContract.Framework v3.0.0-rc2 sync to Neo.SmartContract.Framework v3.0.0-rc3 Jun 23, 2021
nicolegys
nicolegys previously approved these changes Jun 23, 2021
View reviewed changes
Copy link

@nicolegys nicolegys left a comment

Choose a reason for hiding this comment

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

Test pass

@superboyiii
Copy link
Member Author

@shargon pls review again.

shargon
shargon previously approved these changes Jun 24, 2021
View reviewed changes
@superboyiii
Copy link
Member Author

@erikzhang Merge?

@superboyiii superboyiii dismissed stale reviews from shargon and nicolegys via 7005756 June 29, 2021 06:16
vncoelho
vncoelho approved these changes Jun 29, 2021
View reviewed changes
Copy link
Member

@vncoelho vncoelho left a comment

Choose a reason for hiding this comment

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

Working as expected. Thanks,

@vncoelho vncoelho merged commit 0b2ff45 into neo-project:master Jun 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vncoelho vncoelho vncoelho approved these changes

@erikzhang erikzhang erikzhang approved these changes

@shargon shargon shargon approved these changes

@nicolegys nicolegys nicolegys left review comments

@chenzhitong chenzhitong chenzhitong left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Need new examples for rc2, pls.
7 participants
@superboyiii @erikzhang @satoshichou @shargon @chenzhitong @vncoelho @nicolegys