Sync core-refactor with master (#3137)

* Allow access TestingEngine to internal (#3134) * Change to public StorageKey constructor * cschuchardt88's feedback * Added `publish` to `github packages` (#3072) * Added nuget packages source * test * Changed to windows * fixed version * fix * fix nuget * fixed nuget.config * Fixed test * Nuget fixes * git * working release * Added cron job * switch to keep 3 packages versions * Update .github/workflows/main.yml * Update .github/workflows/main.yml Co-authored-by: Shargon <[email protected]> * change secret * change delete also --------- Co-authored-by: Jimmy <[email protected]> Co-authored-by: Shargon <[email protected]> * Optimize opcode price charging (#3131) * Optimize price * Jimmy's review * CS0618 * Update tests/Neo.UnitTests/SmartContract/UT_OpCodePrices.cs * Avoid Obsolete --------- Co-authored-by: Jimmy <[email protected]> --------- Co-authored-by: Christopher Schuchardt <[email protected]> Co-authored-by: Jimmy <[email protected]>
neo-project · Feb 14, 2024 · b0cf836 · b0cf836
1 parent b4dadcb
commit b0cf836
Show file tree

Hide file tree

Showing 9 changed files with 134 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,6 +38,44 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         path-to-lcov: ./coverage/lcov.net7.0.info
 
+  PublishGithub:
+    if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/')
+    needs: Test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+
+    - name: Set Version
+      run: git rev-list --count HEAD | xargs printf 'CI%05d' | xargs -I{} echo 'VERSION_SUFFIX={}' >> $GITHUB_ENV
+
+    - name : Pack (Neo)
+      run: |
+        dotnet pack \
+        --configuration Release \
+        --output ./out \
+        --version-suffix ${{ env.VERSION_SUFFIX }}
+
+    - name: Remove Unwanted Files
+      working-directory: ./out
+      run: |
+        rm -v Neo.CLI*
+        rm -v Neo.GUI*
+
+    - name: Publish to Github Packages
+      working-directory: ./out
+      run: |
+        dotnet nuget push * \
+            --source https://nuget.pkg.github.com/neo-project/index.json \
+            --api-key "${{ secrets.GITHUB_TOKEN }}" \
+            --disable-buffering \
+            --no-service-endpoint;
+
   # MyGet isn't working
   # PublishMyGet:
   #   if: github.ref == 'refs/heads/master' && startsWith(github.repository, 'neo-project/')

diff --git a/.github/workflows/pkgs-delete.yml b/.github/workflows/pkgs-delete.yml
@@ -0,0 +1,51 @@
+name: Nuget Package Cleanup (github)
+
+on:
+  schedule:
+    - cron: '0 0 * * *' # Run every day at 24:00
+
+jobs:
+  delete-pkgs:
+    name: Delete Old Nuget Packages
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Delete Neo Package
+      uses: actions/delete-package-versions@v4
+      with:
+        package-name: Neo
+        package-type: nuget
+        min-versions-to-keep: 3
+        token: "${{ secrets.GITHUB_TOKEN }}"
+
+    - name: Delete Neo.ConsoleService Package
+      uses: actions/delete-package-versions@v4
+      with:
+        package-name: Neo.ConsoleService
+        package-type: nuget
+        min-versions-to-keep: 3
+        token: "${{ secrets.GITHUB_TOKEN }}"
+
+    - name: Delete Neo.ConsoleService Package
+      uses: actions/delete-package-versions@v4
+      with:
+        package-name: Neo.ConsoleService
+        package-type: nuget
+        min-versions-to-keep: 3
+        token: "${{ secrets.GITHUB_TOKEN }}"
+
+    - name: Delete Neo.Json Package
+      uses: actions/delete-package-versions@v4
+      with:
+        package-name: Neo.Json
+        package-type: nuget
+        min-versions-to-keep: 3
+        token: "${{ secrets.GITHUB_TOKEN }}"
+
+    - name: Delete Neo.VM Package
+      uses: actions/delete-package-versions@v4
+      with:
+        package-name: Neo.VM
+        package-type: nuget
+        min-versions-to-keep: 3
+        token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/NuGet.Config b/NuGet.Config
@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="github" value="https://nuget.pkg.github.com/neo-project/index.json" />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/Neo/Neo.csproj b/src/Neo/Neo.csproj
@@ -22,4 +22,8 @@
     <ProjectReference Include="..\Neo.VM\Neo.VM.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Neo.SmartContract.Testing" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs b/src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs
@@ -10,6 +10,7 @@
 // modifications are permitted.
 
 using Neo.VM;
+using System;
 using System.Collections.Generic;
 
 namespace Neo.SmartContract
@@ -19,6 +20,7 @@ partial class ApplicationEngine
         /// <summary>
         /// The prices of all the opcodes.
         /// </summary>
+        [Obsolete("You should use OpCodePriceTable")]
         public static readonly IReadOnlyDictionary<OpCode, long> OpCodePrices = new Dictionary<OpCode, long>
         {
             [OpCode.PUSHINT8] = 1 << 0,
@@ -218,5 +220,20 @@ partial class ApplicationEngine
             [OpCode.ISTYPE] = 1 << 1,
             [OpCode.CONVERT] = 1 << 13,
         };
+
+        public static readonly long[] OpCodePriceTable = new long[byte.MaxValue];
+
+        /// <summary>
+        /// Init OpCodePrices
+        /// </summary>
+        static ApplicationEngine()
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            foreach (var entry in OpCodePrices)
+#pragma warning restore CS0618 // Type or member is obsolete
+            {
+                OpCodePriceTable[(byte)entry.Key] = entry.Value;
+            }
+        }
     }
 }
diff --git a/src/Neo/SmartContract/ApplicationEngine.cs b/src/Neo/SmartContract/ApplicationEngine.cs
@@ -529,7 +529,7 @@ protected virtual void OnSysCall(InteropDescriptor descriptor)
         protected override void PreExecuteInstruction(Instruction instruction)
         {
             Diagnostic?.PreExecuteInstruction(instruction);
-            AddGas(ExecFeeFactor * OpCodePrices[instruction.OpCode]);
+            AddGas(ExecFeeFactor * OpCodePriceTable[(byte)instruction.OpCode]);
         }
 
         protected override void PostExecuteInstruction(Instruction instruction)

diff --git a/src/Neo/SmartContract/Helper.cs b/src/Neo/SmartContract/Helper.cs
@@ -39,8 +39,8 @@ public static class Helper
         /// </summary>
         /// <returns>The calculated cost.</returns>
         public static long SignatureContractCost() =>
-            ApplicationEngine.OpCodePrices[OpCode.PUSHDATA1] * 2 +
-            ApplicationEngine.OpCodePrices[OpCode.SYSCALL] +
+            ApplicationEngine.OpCodePriceTable[(byte)OpCode.PUSHDATA1] * 2 +
+            ApplicationEngine.OpCodePriceTable[(byte)OpCode.SYSCALL] +
             ApplicationEngine.CheckSigPrice;
 
         /// <summary>
@@ -51,12 +51,12 @@ public static long SignatureContractCost() =>
         /// <returns>The calculated cost.</returns>
         public static long MultiSignatureContractCost(int m, int n)
         {
-            long fee = ApplicationEngine.OpCodePrices[OpCode.PUSHDATA1] * (m + n);
+            long fee = ApplicationEngine.OpCodePriceTable[(byte)OpCode.PUSHDATA1] * (m + n);
             using (ScriptBuilder sb = new())
-                fee += ApplicationEngine.OpCodePrices[(OpCode)sb.EmitPush(m).ToArray()[0]];
+                fee += ApplicationEngine.OpCodePriceTable[(byte)(OpCode)sb.EmitPush(m).ToArray()[0]];
             using (ScriptBuilder sb = new())
-                fee += ApplicationEngine.OpCodePrices[(OpCode)sb.EmitPush(n).ToArray()[0]];
-            fee += ApplicationEngine.OpCodePrices[OpCode.SYSCALL];
+                fee += ApplicationEngine.OpCodePriceTable[(byte)(OpCode)sb.EmitPush(n).ToArray()[0]];
+            fee += ApplicationEngine.OpCodePriceTable[(byte)OpCode.SYSCALL];
             fee += ApplicationEngine.CheckSigPrice * n;
             return fee;
         }

diff --git a/tests/Neo.UnitTests/SmartContract/UT_Contract.cs b/tests/Neo.UnitTests/SmartContract/UT_Contract.cs
@@ -164,7 +164,7 @@ public void TestSignatureRedeemScriptFee()
             byte[] verification = Contract.CreateSignatureRedeemScript(key.PublicKey);
             byte[] invocation = new ScriptBuilder().EmitPush(UInt160.Zero).ToArray();
 
-            var fee = PolicyContract.DefaultExecFeeFactor * (ApplicationEngine.OpCodePrices[OpCode.PUSHDATA1] * 2 + ApplicationEngine.OpCodePrices[OpCode.SYSCALL] + ApplicationEngine.CheckSigPrice);
+            var fee = PolicyContract.DefaultExecFeeFactor * (ApplicationEngine.OpCodePriceTable[(byte)OpCode.PUSHDATA1] * 2 + ApplicationEngine.OpCodePriceTable[(byte)OpCode.SYSCALL] + ApplicationEngine.CheckSigPrice);
 
             using (ApplicationEngine engine = ApplicationEngine.Create(TriggerType.Verification, new Transaction { Signers = Array.Empty<Signer>(), Attributes = Array.Empty<TransactionAttribute>() }, null, settings: TestBlockchain.TheNeoSystem.Settings))
             {
@@ -192,7 +192,7 @@ public void TestCreateMultiSigRedeemScriptFee()
             byte[] verification = Contract.CreateMultiSigRedeemScript(2, publicKeys);
             byte[] invocation = new ScriptBuilder().EmitPush(UInt160.Zero).EmitPush(UInt160.Zero).ToArray();
 
-            long fee = PolicyContract.DefaultExecFeeFactor * (ApplicationEngine.OpCodePrices[OpCode.PUSHDATA1] * (2 + 2) + ApplicationEngine.OpCodePrices[OpCode.PUSHINT8] * 2 + ApplicationEngine.OpCodePrices[OpCode.SYSCALL] + ApplicationEngine.CheckSigPrice * 2);
+            long fee = PolicyContract.DefaultExecFeeFactor * (ApplicationEngine.OpCodePriceTable[(byte)OpCode.PUSHDATA1] * (2 + 2) + ApplicationEngine.OpCodePriceTable[(byte)OpCode.PUSHINT8] * 2 + ApplicationEngine.OpCodePriceTable[(byte)OpCode.SYSCALL] + ApplicationEngine.CheckSigPrice * 2);
 
             using (ApplicationEngine engine = ApplicationEngine.Create(TriggerType.Verification, new Transaction { Signers = Array.Empty<Signer>(), Attributes = Array.Empty<TransactionAttribute>() }, null, settings: TestBlockchain.TheNeoSystem.Settings))
             {

diff --git a/tests/Neo.UnitTests/SmartContract/UT_OpCodePrices.cs b/tests/Neo.UnitTests/SmartContract/UT_OpCodePrices.cs
@@ -23,7 +23,20 @@ public class UT_OpCodePrices
         public void AllOpcodePriceAreSet()
         {
             foreach (OpCode opcode in Enum.GetValues(typeof(OpCode)))
-                Assert.IsTrue(ApplicationEngine.OpCodePrices.ContainsKey(opcode), opcode.ToString());
+            {
+#pragma warning disable CS0618 // Type or member is obsolete
+                Assert.IsTrue(ApplicationEngine.OpCodePrices.ContainsKey(opcode), opcode.ToString(), $"{opcode} without price");
+                Assert.AreEqual(ApplicationEngine.OpCodePrices[opcode], ApplicationEngine.OpCodePriceTable[(byte)opcode], $"{opcode} price mismatch");
+#pragma warning restore CS0618 // Type or member is obsolete
+
+                if (opcode == OpCode.RET ||
+                    opcode == OpCode.SYSCALL ||
+                    opcode == OpCode.ABORT ||
+                    opcode == OpCode.ABORTMSG)
+                    continue;
+
+                Assert.AreNotEqual(0, ApplicationEngine.OpCodePriceTable[(byte)opcode], $"{opcode} without price");
+            }
         }
     }
 }