Sync update with neo pull 2119

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

@@ -28,15 +28,6 @@ public class Contract
         [Syscall("System.Contract.CallEx")]
         public static extern object CallEx(UInt160 scriptHash, string method, object[] arguments, CallFlags flag);
 
-        [Syscall("System.Contract.Create")]
-        public static extern Contract Create(byte[] script, string manifest);
-
-        [Syscall("System.Contract.Update")]
-        public static extern void Update(byte[] script, string manifest);
-
-        [Syscall("System.Contract.Destroy")]
-        public static extern void Destroy();
-
         [Syscall("System.Contract.GetCallFlags")]
         public static extern byte GetCallFlags();
 

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; }
         public static extern string Symbol { get; }
         public static extern byte Decimals { get; }
         public static extern BigInteger TotalSupply();

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

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Neo.SmartContract.Framework.Services.Neo
+{
+    [Contract("0xdf18cb2476964c241558ed1e2e8881dcd2d50bde")]
+    class ManagementContract
+    {
+        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; }
+        public static extern Contract GetContract(UInt160 hash);
+    }
+}

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

@@ -8,6 +8,8 @@ public class Oracle
         public static extern UInt160 Hash { [ContractHash] get; }
         public const uint MinimumResponseFee = 0_10000000;
         public static extern string Name { get; }
+        public static extern int Id { get; }
+        public static extern uint ActiveBlockIndex { get; }
         public static extern void Request(string url, string filter, string callback, object userData, long gasForResponse);
     }
 }

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

@@ -10,6 +10,8 @@ public class Policy
     {
         public static extern UInt160 Hash { [ContractHash] get; }
         public static extern string Name();
+        public static extern int Id { get; }
+        public static extern uint ActiveBlockIndex { get; }
         public static extern uint GetMaxTransactionsPerBlock();
         public static extern uint GetMaxBlockSize();
         public static extern long GetMaxBlockSystemFee();

templates/Template.CSharp/Contract1.cs

@@ -7,44 +7,44 @@
 namespace $safeprojectname$
 {
     [ManifestExtra("Author", "Neo")]
-    [ManifestExtra("Email", "[email protected]")]
-    [ManifestExtra("Description", "This is a contract example")]
-    public class Contract1 : SmartContract
+[ManifestExtra("Email", "[email protected]")]
+[ManifestExtra("Description", "This is a contract example")]
+public class Contract1 : SmartContract
+{
+    //TODO: Replace it with your own address.
+    static readonly UInt160 Owner = "NiNmXL8FjEUEs1nfX9uHFBNaenxDHJtmuB".ToScriptHash();
+
+    private static bool IsOwner() => Runtime.CheckWitness(Owner);
+
+    // When this contract address is included in the transaction signature,
+    // this method will be triggered as a VerificationTrigger to verify that the signature is correct.
+    // For example, this method needs to be called when withdrawing token from the contract.
+    public static bool Verify() => IsOwner();
+
+    // TODO: Replace it with your methods.
+    public static byte[] MyMethod()
     {
-        //TODO: Replace it with your own address.
-        static readonly UInt160 Owner = "NiNmXL8FjEUEs1nfX9uHFBNaenxDHJtmuB".ToScriptHash();
-
-        private static bool IsOwner() => Runtime.CheckWitness(Owner);
-
-        // When this contract address is included in the transaction signature,
-        // this method will be triggered as a VerificationTrigger to verify that the signature is correct.
-        // For example, this method needs to be called when withdrawing token from the contract.
-        public static bool Verify() => IsOwner();
-
-        // TODO: Replace it with your methods.
-        public static byte[] MyMethod()
-        {
-            return Storage.Get("Hello");
-        }
-
-        public static void _deploy(bool update)
-        {
-            if (update) return;
-
-            // It will be executed during deploy
-            Storage.Put("Hello", "World");
-        }
-
-        public static void Update(byte[] script, string manifest)
-        {
-            if (!IsOwner()) throw new Exception("No authorization.");
-            Contract.Update(script, manifest);
-        }
-
-        public static void Destroy()
-        {
-            if (!IsOwner()) throw new Exception("No authorization.");
-            Contract.Destroy();
-        }
+        return Storage.Get("Hello");
+    }
+
+    public static void _deploy(bool update)
+    {
+        if (update) return;
+
+        // It will be executed during deploy
+        Storage.Put("Hello", "World");
     }
+
+    public static void Update(byte[] nefFile, string manifest)
+    {
+        if (!IsOwner()) throw new Exception("No authorization.");
+        Contract.Call(ManagementContract.Hash, "update", new object[] { nefFile, manifest });
+    }
+
+    public static void Destroy()
+    {
+        if (!IsOwner()) throw new Exception("No authorization.");
+        Contract.Call(ManagementContract.Hash, "destroy", new object[] {});
+    }
+}
 }

templates/Template.NEP5.CSharp/NEP5.Owner.cs

@@ -19,16 +19,16 @@ public static bool Deploy()
             return true;
         }
 
-        public static void Update(byte[] script, string manifest)
+        public static void Update(byte[] nefFile, string manifest)
         {
             if (!IsOwner()) throw new Exception("No authorization.");
-            Contract.Update(script, manifest);
+            Contract.Call(ManagementContract.Hash, "update", nefFile, manifest);
         }
 
         public static void Destroy()
         {
             if (!IsOwner()) throw new Exception("No authorization.");
-            Contract.Destroy();
+            Contract.Call(ManagementContract.Hash, "destroy");
         }
 
         private static bool IsOwner() => Runtime.CheckWitness(Owner);

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

@@ -9,21 +9,6 @@ public static object Call(UInt160 scriptHash, string method, object[] arguments)
             return Contract.Call(scriptHash, method, arguments);
         }
 
-        public static object Create(byte[] script, string manifest)
-        {
-            return Contract.Create(script, manifest);
-        }
-
-        public static void Update(byte[] script, string manifest)
-        {
-            Contract.Update(script, manifest);
-        }
-
-        public static void Destroy()
-        {
-            Contract.Destroy();
-        }
-
         public static int GetCallFlags()
         {
             return Contract.GetCallFlags();

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

@@ -4,9 +4,10 @@ namespace Neo.Compiler.MSIL.TestClasses
 {
     public class Contract_CreateAndUpdate : SmartContract.Framework.SmartContract
     {
-        public static int OldContract(byte[] script, string manifest)
+        public static int OldContract(byte[] nefFile, string manifest)
         {
             Contract.Update(script, manifest);
+            Contract.Call(ManagementContract.Hash, "update", new object[] { nefFile, manifest });
             return 123;
         }
     }