fix hardfork issues

src/Neo/ProtocolSettings.cs

@@ -144,7 +144,7 @@ public static ProtocolSettings Load(string path, bool optional = true)
         /// <returns>The loaded <see cref="ProtocolSettings"/>.</returns>
         public static ProtocolSettings Load(IConfigurationSection section)
         {
-            return new ProtocolSettings
+            Custom = new ProtocolSettings
             {
                 Network = section.GetValue("Network", Default.Network),
                 AddressVersion = section.GetValue("AddressVersion", Default.AddressVersion),
@@ -164,6 +164,7 @@ public static ProtocolSettings Load(IConfigurationSection section)
                     ? EnsureOmmitedHardforks(section.GetSection("Hardforks").GetChildren().ToDictionary(p => Enum.Parse<Hardfork>(p.Key, true), p => uint.Parse(p.Value))).ToImmutableDictionary()
                     : Default.Hardforks
             };
+            return Custom;
         }
 
         /// <summary>

src/Neo/SmartContract/Native/ContractMethodAttribute.cs

@@ -23,12 +23,19 @@ internal class ContractMethodAttribute : Attribute
         public long CpuFee { get; init; }
         public long StorageFee { get; init; }
         public Hardfork? ActiveIn { get; init; } = null;
+        public Hardfork? DeprecatedIn { get; init; } = null;
 
         public ContractMethodAttribute() { }
 
         public ContractMethodAttribute(Hardfork activeIn)
         {
             ActiveIn = activeIn;
         }
+
+        public ContractMethodAttribute(bool isDeprecated, Hardfork deprecatedIn)
+        {
+            if (!isDeprecated) throw new ArgumentException("isDeprecated must be true", nameof(isDeprecated));
+            DeprecatedIn = deprecatedIn;
+        }
     }
 }

src/Neo/SmartContract/Native/ContractMethodMetadata.cs

@@ -36,6 +36,7 @@ internal class ContractMethodMetadata
         public CallFlags RequiredCallFlags { get; }
         public ContractMethodDescriptor Descriptor { get; }
         public Hardfork? ActiveIn { get; init; } = null;
+        public Hardfork? DeprecatedIn { get; init; } = null;
 
         public ContractMethodMetadata(MemberInfo member, ContractMethodAttribute attribute)
         {
@@ -60,6 +61,7 @@ public ContractMethodMetadata(MemberInfo member, ContractMethodAttribute attribu
             StorageFee = attribute.StorageFee;
             RequiredCallFlags = attribute.RequiredCallFlags;
             ActiveIn = attribute.ActiveIn;
+            DeprecatedIn = attribute.DeprecatedIn;
             Descriptor = new ContractMethodDescriptor
             {
                 Name = Name,

src/Neo/SmartContract/Native/CryptoLib.cs

@@ -21,6 +21,12 @@
     /// </summary>
     public sealed partial class CryptoLib : NativeContract
     {
+        private static readonly Dictionary<NamedCurve, ECCurve> curves = new()
+        {
+            [NamedCurve.secp256k1] = ECCurve.Secp256k1,
+            [NamedCurve.secp256r1] = ECCurve.Secp256r1,
+        };
+
         private static readonly Dictionary<NamedCurveHash, (ECCurve Curve, Hasher Hasher)> s_curves = new()
         {
             [NamedCurveHash.secp256k1SHA256] = (ECCurve.Secp256k1, Hasher.SHA256),
@@ -85,7 +91,7 @@
         /// <param name="signature">The signature to be verified.</param>
         /// <param name="curveHash">A pair of the curve to be used by the ECDSA algorithm and the hasher function to be used to hash message.</param>
         /// <returns><see langword="true"/> if the signature is valid; otherwise, <see langword="false"/>.</returns>
-        [ContractMethod(CpuFee = 1 << 15)]
+        [ContractMethod(Hardfork.HF_Cockatrice, CpuFee = 1 << 15)]
         public static bool VerifyWithECDsa(byte[] message, byte[] pubkey, byte[] signature, NamedCurveHash curveHash)
         {
             try
@@ -98,5 +104,19 @@
                 return false;
             }
         }
+
+        // This is for solving the hardfork issue in https://github.com/neo-project/neo/pull/3209
+        [ContractMethod(true, Hardfork.HF_Cockatrice, CpuFee = 1 << 15)]
+        public static bool VerifyWithECDsa(byte[] message, byte[] pubkey, byte[] signature, NamedCurve curve)
+        {
+            try
+            {
+                return Crypto.VerifySignature(message, signature, pubkey, curves[curve]);
+            }
+            catch (ArgumentException)
+            {
+                return false;
+            }
+        }
     }
 }

src/Neo/SmartContract/Native/NativeContract.cs

@@ -184,7 +184,15 @@ private NativeContractsCache.CacheEntry GetAllowedMethods(IsHardforkEnabledDeleg
             byte[] script;
             using (ScriptBuilder sb = new())
             {
-                foreach (ContractMethodMetadata method in methodDescriptors.Where(u => u.ActiveIn is null || hfChecker(u.ActiveIn.Value, index)))
+                foreach (ContractMethodMetadata method in methodDescriptors.Where(u
+                             =>
+                             // no hardfork is involved
+                             u.ActiveIn is null && u.DeprecatedIn is null ||
+                             // deprecated method hardfork is involved
+                             u.DeprecatedIn is not null && hfChecker(u.DeprecatedIn.Value, index) == false ||
+                             // active method hardfork is involved
+                             u.ActiveIn is not null && hfChecker(u.ActiveIn.Value, index))
+                         )
                 {
                     method.Descriptor.Offset = sb.Length;
                     sb.EmitPush(0); //version
@@ -366,6 +374,8 @@ internal async void Invoke(ApplicationEngine engine, byte version)
                 ContractMethodMetadata method = currentAllowedMethods.Methods[context.InstructionPointer];
                 if (method.ActiveIn is not null && !engine.IsHardforkEnabled(method.ActiveIn.Value))
                     throw new InvalidOperationException($"Cannot call this method before hardfork {method.ActiveIn}.");
+                if (method.DeprecatedIn is not null && engine.IsHardforkEnabled(method.DeprecatedIn.Value))
+                    throw new InvalidOperationException($"Cannot call this method after hardfork {method.DeprecatedIn}.");
                 ExecutionContextState state = context.GetState<ExecutionContextState>();
                 if (!state.CallFlags.HasFlag(method.RequiredCallFlags))
                     throw new InvalidOperationException($"Cannot call this method with the flag {state.CallFlags}.");

src/Neo/SmartContract/Native/NeoToken.cs

@@ -63,7 +63,7 @@ public sealed class NeoToken : FungibleToken<NeoToken.NeoAccountState>
            "from", ContractParameterType.PublicKey,
            "to", ContractParameterType.PublicKey,
            "amount", ContractParameterType.Integer)]
-        [ContractEvent(3, name: "CommitteeChanged",
+        [ContractEvent(Hardfork.HF_Cockatrice, 3, name: "CommitteeChanged",
            "old", ContractParameterType.Array,
            "new", ContractParameterType.Array)]
         internal NeoToken() : base()
@@ -203,14 +203,20 @@ internal override ContractTask OnPersistAsync(ApplicationEngine engine)
                 cachedCommittee.Clear();
                 cachedCommittee.AddRange(ComputeCommitteeMembers(engine.Snapshot, engine.ProtocolSettings));
 
-                var newCommittee = cachedCommittee.Select(u => u.PublicKey).ToArray();
-
-                if (!newCommittee.SequenceEqual(prevCommittee))
+                // Hardfork check for https://github.com/neo-project/neo/pull/3158
+                // New notification will case 3.7.0 and 3.6.0 have different behavior
+                var index = engine.PersistingBlock?.Index ?? Ledger.CurrentIndex(engine.Snapshot);
+                if (engine.ProtocolSettings.IsHardforkEnabled(Hardfork.HF_Cockatrice, index))
                 {
-                    engine.SendNotification(Hash, "CommitteeChanged", new VM.Types.Array(engine.ReferenceCounter) {
-                        new VM.Types.Array(engine.ReferenceCounter, prevCommittee.Select(u => (ByteString)u.ToArray())) ,
-                        new VM.Types.Array(engine.ReferenceCounter, newCommittee.Select(u => (ByteString)u.ToArray()))
-                    });
+                    var newCommittee = cachedCommittee.Select(u => u.PublicKey).ToArray();
+
+                    if (!newCommittee.SequenceEqual(prevCommittee))
+                    {
+                        engine.SendNotification(Hash, "CommitteeChanged", new VM.Types.Array(engine.ReferenceCounter) {
+                            new VM.Types.Array(engine.ReferenceCounter, prevCommittee.Select(u => (ByteString)u.ToArray())) ,
+                            new VM.Types.Array(engine.ReferenceCounter, newCommittee.Select(u => (ByteString)u.ToArray()))
+                        });
+                    }
                 }
             }
             return ContractTask.CompletedTask;

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

@@ -58,8 +58,8 @@ public void TestSetAndGet()
             publicKeys[0] = key1.PublicKey;
             publicKeys[1] = key2.PublicKey;
             publicKeys = publicKeys.OrderBy(p => p).ToArray();
-
-            List<Role> roles = new List<Role>() { Role.StateValidator, Role.Oracle, Role.NeoFSAlphabetNode, Role.P2PNotary };
+            // Notary effect after the fork.
+            List<Role> roles = new List<Role>() { Role.StateValidator, Role.Oracle, Role.NeoFSAlphabetNode };//, Role.P2PNotary };
             foreach (var role in roles)
             {
                 var snapshot1 = _snapshot.CreateSnapshot();