Prevent Ownable2Step update after renounce

Author: Jim8y

src/Neo.SmartContract.Framework/Ownable2Step.cs

@@ -47,8 +47,12 @@ public abstract class Ownable2Step : SmartContract
         // The proposed owner awaiting acceptance. Absent (null) means no transfer is in flight.
         private const byte Prefix_PendingOwner = 0xFC;
 
+        // Separates "not initialized yet" from "initialized and later renounced".
+        private const byte Prefix_OwnerInitialized = 0xFB;
+
         private static LocalStorageMap OwnerStorage => new(Prefix_Owner);
         private static LocalStorageMap PendingOwnerStorage => new(Prefix_PendingOwner);
+        private static LocalStorageMap OwnerInitializedStorage => new(Prefix_OwnerInitialized);
 
         /// <summary>
         /// Returns the current owner, or <see langword="null"/> if ownership has been renounced
@@ -175,6 +179,7 @@ public static void RenounceOwnership()
 
             UInt160? previousOwner = GetOwner();
             OwnerStorage.Delete(ByteString.Empty);
+            OwnerInitializedStorage.Put(ByteString.Empty, true);
             PendingOwnerStorage.Delete(ByteString.Empty);
             OnOwnershipTransferred(previousOwner, null);
         }
@@ -191,15 +196,25 @@ public static void RenounceOwnership()
         /// </remarks>
         protected static void InitializeOwner(object? data, bool update)
         {
-            if (update && GetOwner() is not null)
-                return;
+            if (update)
+            {
+                if (OwnerInitializedStorage.GetBoolean(ByteString.Empty))
+                    return;
+
+                if (GetOwner() is not null)
+                {
+                    OwnerInitializedStorage.Put(ByteString.Empty, true);
+                    return;
+                }
+            }
 
             data ??= Runtime.Transaction.Sender;
 
             UInt160 initialOwner = (UInt160)data;
             ExecutionEngine.Assert(initialOwner.IsValidAndNotZero, "owner must be valid");
 
             OwnerStorage.Put(ByteString.Empty, initialOwner);
+            OwnerInitializedStorage.Put(ByteString.Empty, true);
             OnOwnershipTransferred(null, initialOwner);
         }
     }

tests/Neo.SmartContract.Framework.UnitTests/Ownable2StepTest.cs

@@ -289,7 +289,7 @@ public void InitializeOwner_UpdateInitializesWhenOwnerMissing()
         var engine = CreateEngine();
         var contract = Deploy(engine, out _, out _);
 
-        contract.ClearOwnerForTest();
+        contract.ClearOwnershipStateForTest();
         Assert.IsNull(contract.GetOwner());
 
         contract.InitializeForTest(Bob.Account, true);
@@ -299,6 +299,20 @@ public void InitializeOwner_UpdateInitializesWhenOwnerMissing()
         Merge(contract);
     }
 
+    [TestMethod]
+    public void InitializeOwner_UpdateDoesNotReinitializeAfterRenounce()
+    {
+        var engine = CreateEngine();
+        var contract = Deploy(engine, out _, out _);
+
+        contract.RenounceOwnership();
+        contract.InitializeForTest(Bob.Account, true);
+
+        Assert.IsNull(contract.GetOwner());
+        Assert.ThrowsException<TestException>(() => contract.TransferOwnership(Charlie.Account));
+        Merge(contract);
+    }
+
     [TestMethod]
     public void RePropose_SupersedesPending()
     {
@@ -418,6 +432,12 @@ public static void ClearOwnerForTest()
     {
         Storage.Delete(new byte[] { 0xFD });
     }
+
+    public static void ClearOwnershipStateForTest()
+    {
+        Storage.Delete(new byte[] { 0xFD });
+        Storage.Delete(new byte[] { 0xFB });
+    }
 }";
 
         var tempFile = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid():N}.cs");
@@ -480,6 +500,9 @@ public abstract class OwnableTwoStepProxy(SmartContractInitialize initialize)
         [DisplayName("clearOwnerForTest")]
         public abstract void ClearOwnerForTest();
 
+        [DisplayName("clearOwnershipStateForTest")]
+        public abstract void ClearOwnershipStateForTest();
+
         [DisplayName("transferOwnership")]
         public abstract void TransferOwnership(UInt160 newOwner);