wildcard to any and add nep24 (#1041)

* wildcard to any and add nep24 * Update src/Neo.SmartContract.Framework/Interfaces/INEP24.cs --------- Co-authored-by: Shargon <[email protected]>
neo-project · May 20, 2024 · 1cdd0f5 · 1cdd0f5
1 parent a2de77d
commit 1cdd0f5
Show file tree

Hide file tree

Showing 30 changed files with 116 additions and 208 deletions.
diff --git a/examples/Example.SmartContract.Event/Event.cs b/examples/Example.SmartContract.Event/Event.cs
@@ -22,7 +22,7 @@ namespace Event;
 [ContractDescription("A sample contract that demonstrates how to use Events")]
 [ContractVersion("0.0.1")]
 [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-[ContractPermission(Permission.WildCard, Method.WildCard)]
+[ContractPermission(Permission.Any, Method.Any)]
 public class SampleEvent : SmartContract
 {
     [DisplayName("new_event_name")]

diff --git a/examples/Example.SmartContract.Exception/Exception.cs b/examples/Example.SmartContract.Exception/Exception.cs
@@ -20,7 +20,7 @@ namespace Exception
     [ContractDescription("A sample contract to demonstrate how to handle exception")]
     [ContractVersion("0.0.1")]
     [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-    [ContractPermission(Permission.WildCard, Method.WildCard)]
+    [ContractPermission(Permission.Any, Method.Any)]
     public class SampleException : SmartContract
     {
         [ByteArray("0a0b0c0d0E0F")]

diff --git a/examples/Example.SmartContract.HelloWorld/HelloWorld.cs b/examples/Example.SmartContract.HelloWorld/HelloWorld.cs
@@ -21,7 +21,7 @@ namespace HelloWorld;
 [ContractEmail("[email protected]")]
 [ContractVersion("0.0.1")]
 [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-[ContractPermission(Permission.WildCard, Method.WildCard)]
+[ContractPermission(Permission.Any, Method.Any)]
 public class HelloWorldorld : SmartContract
 {
     /// <summary>

diff --git a/examples/Example.SmartContract.Inscription/Inscription.cs b/examples/Example.SmartContract.Inscription/Inscription.cs
@@ -22,7 +22,7 @@ namespace Inscription
     [ContractDescription("A sample inscription contract.")]
     [ContractVersion("0.0.1")]
     [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-    [ContractPermission(Permission.WildCard, Method.WildCard)]
+    [ContractPermission(Permission.Any, Method.Any)]
     public class SampleInscription : SmartContract
     {
         /// <summary>

diff --git a/examples/Example.SmartContract.NEP17/SampleNep17Token.cs b/examples/Example.SmartContract.NEP17/SampleNep17Token.cs
@@ -25,7 +25,7 @@ namespace NEP17
     [ContractVersion("0.0.1")]
     [ContractDescription("A sample NEP-17 token")]
     [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-    [ContractPermission(Permission.WildCard, Method.WildCard)]
+    [ContractPermission(Permission.Any, Method.Any)]
     [SupportedStandards(NepStandard.Nep17)]
     public class SampleNep17Token : Nep17Token
     {

diff --git a/examples/Example.SmartContract.NFT/Loot.cs b/examples/Example.SmartContract.NFT/Loot.cs
@@ -24,7 +24,7 @@ namespace NFT
     [ContractAuthor("core-dev", "[email protected]")]
     [ContractDescription("This is a text Example.SmartContract.NFT")]
     [SupportedStandards(NepStandard.Nep11)]
-    [ContractPermission(Permission.WildCard, Method.OnNEP11Payment)]
+    [ContractPermission(Permission.Any, Method.OnNEP11Payment)]
     [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
     public partial class Loot : Nep11Token<TokenState>
     {

diff --git a/examples/Example.SmartContract.Oracle/Oracle.cs b/examples/Example.SmartContract.Oracle/Oracle.cs
@@ -24,7 +24,7 @@ namespace Oracle
     [ContractDescription("A sample contract to demonstrate how to use Example.SmartContract.Oracle Service")]
     [ContractVersion("0.0.1")]
     [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-    [ContractPermission(Permission.WildCard, Method.WildCard)]
+    [ContractPermission(Permission.Any, Method.Any)]
     public class SampleOracle : SmartContract, IOracle
     {
         [Safe]

diff --git a/examples/Example.SmartContract.SampleRoyaltyNEP11Token/SampleRoyaltyNEP11Token.cs b/examples/Example.SmartContract.SampleRoyaltyNEP11Token/SampleRoyaltyNEP11Token.cs
@@ -11,6 +11,7 @@
 
 using Neo.SmartContract.Framework;
 using Neo.SmartContract.Framework.Attributes;
+using Neo.SmartContract.Framework.Interfaces;
 using Neo.SmartContract.Framework.Native;
 using Neo.SmartContract.Framework.Services;
 using System.ComponentModel;
@@ -24,9 +25,9 @@ namespace NonDivisibleNEP11
     [ContractVersion("0.0.1")]
     [ContractDescription("A sample of NEP-11 Royalty Feature")]
     [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-    [ContractPermission(Permission.WildCard, Method.WildCard)]
+    [ContractPermission(Permission.Any, Method.Any)]
     [SupportedStandards(NepStandard.Nep11)]
-    public class SampleRoyaltyNEP11Token : Nep11Token<Nep11TokenState>
+    public class SampleRoyaltyNEP11Token : Nep11Token<Nep11TokenState>, INep24
     {
         #region Owner
 

diff --git a/examples/Example.SmartContract.Storage/ExampleStorage.cs b/examples/Example.SmartContract.Storage/ExampleStorage.cs
@@ -21,7 +21,7 @@ namespace ExampleStorage
     [ContractDescription("A sample contract to demonstrate how to use storage")]
     [ContractVersion("0.0.1")]
     [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-    [ContractPermission(Permission.WildCard, Method.WildCard)]
+    [ContractPermission(Permission.Any, Method.Any)]
     public class SampleStorage : SmartContract
     {
         #region Byte

diff --git a/examples/Example.SmartContract.Transfer/TransferContract.cs b/examples/Example.SmartContract.Transfer/TransferContract.cs
@@ -27,7 +27,7 @@ namespace Transfer;
 [ContractDescription("A sample contract to demonstrate how to transfer NEO and GAS")]
 [ContractVersion("1.0.0.0")]
 [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-[ContractPermission(Permission.WildCard, Method.WildCard)]
+[ContractPermission(Permission.Any, Method.Any)]
 public class TransferContract : SmartContract
 {
     private static readonly UInt160 Owner = "NUuJw4C4XJFzxAvSZnFTfsNoWZytmQKXQP";

diff --git a/examples/Example.SmartContract.ZKP/ExampleZKP.cs b/examples/Example.SmartContract.ZKP/ExampleZKP.cs
@@ -22,7 +22,7 @@ namespace ZKP
     [ContractVersion("0.0.1")]
     [ContractDescription("A sample contract to demonstrate how to use Example.SmartContract.ZKPil")]
     [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/examples/")]
-    [ContractPermission(Permission.WildCard, Method.WildCard)]
+    [ContractPermission(Permission.Any, Method.Any)]
     public class ExampleZKP : SmartContract
     {
         public static readonly byte[] alphaPoint =

diff --git a/examples/examples.sln b/examples/examples.sln