Perform native contract initialization for the set of hardforks

src/Neo/SmartContract/Native/ContractManagement.cs

@@ -70,7 +70,7 @@ internal override async ContractTask OnPersist(ApplicationEngine engine)
         {
             foreach (NativeContract contract in Contracts)
             {
-                if (contract.IsInitializeBlock(engine.ProtocolSettings, engine.PersistingBlock.Index, out Hardfork? hf))
+                if (contract.IsInitializeBlock(engine.ProtocolSettings, engine.PersistingBlock.Index, out var hfs))
                 {
                     ContractState contractState = contract.GetContractState(engine.ProtocolSettings, engine.PersistingBlock.Index);
                     StorageItem state = engine.Snapshot.GetAndChange(CreateStorageKey(Prefix_Contract).Add(contract.Hash));
@@ -92,7 +92,18 @@ internal override async ContractTask OnPersist(ApplicationEngine engine)
                         oldContract.Manifest = contractState.Manifest;
                     }
 
-                    await contract.Initialize(engine, hf);
+                    // Initialize native contract
+                    await contract.Initialize(engine, null);
+
+                    // Initialize native contract for specific hardforks
+                    if (hfs?.Length > 0)
+                    {
+                        foreach (var hf in hfs)
+                        {
+                            await contract.Initialize(engine, hf);
+                        }
+                    }
+
                     // Emit native contract notification
                     engine.SendNotification(Hash, state is null ? "Deploy" : "Update", new VM.Types.Array(engine.ReferenceCounter) { contract.Hash.ToArray() });
                 }

src/Neo/SmartContract/Native/NativeContract.cs

@@ -266,19 +266,14 @@ protected virtual void OnManifestCompose(ContractManifest manifest) { }
         /// </summary>
         /// <param name="settings">The <see cref="ProtocolSettings"/> where the HardForks are configured.</param>
         /// <param name="index">Block index</param>
-        /// <param name="hardfork">Active hardfork</param>
+        /// <param name="hardforks">Active hardforks</param>
         /// <returns>True if the native contract must be initialized</returns>
-        internal bool IsInitializeBlock(ProtocolSettings settings, uint index, out Hardfork? hardfork)
+        internal bool IsInitializeBlock(ProtocolSettings settings, uint index, out Hardfork[] hardforks)
         {
-            // If is not configured, the Genesis is the a initialized block
-            if (index == 0 && ActiveIn is null)
-            {
-                hardfork = null;
-                return true;
-            }
+            var hfs = new List<Hardfork>();
 
-            // If is in the hardfork height, return true
-            foreach (Hardfork hf in usedHardforks)
+            // If is in the hardfork height, add them to return array
+            foreach (var hf in usedHardforks)
             {
                 if (!settings.Hardforks.TryGetValue(hf, out var activeIn))
                 {
@@ -288,13 +283,26 @@ internal bool IsInitializeBlock(ProtocolSettings settings, uint index, out Hardf
 
                 if (activeIn == index)
                 {
-                    hardfork = hf;
-                    return true;
+                    hfs.Add(hf);
                 }
             }
 
+            // Return all initialize hardforks
+            if (hfs.Count > 0)
+            {
+                hardforks = hfs.ToArray();
+                return true;
+            }
+
+            // If is not configured, the Genesis is an initialization block.
+            if (index == 0 && ActiveIn is null)
+            {
+                hardforks = hfs.ToArray();
+                return true;
+            }
+
             // Initialized not required
-            hardfork = null;
+            hardforks = null;
             return false;
         }
 

tests/Neo.UnitTests/SmartContract/Native/UT_NativeContract.cs

@@ -81,7 +81,8 @@ public void TestIsInitializeBlock()
             Assert.IsNull(hf);
 
             Assert.IsTrue(NativeContract.CryptoLib.IsInitializeBlock(settings, 20, out hf));
-            Assert.AreEqual(Hardfork.HF_Cockatrice, hf);
+            Assert.AreEqual(1, hf.Length);
+            Assert.AreEqual(Hardfork.HF_Cockatrice, hf[0]);
         }
 
         [TestMethod]