Merge remote-tracking branch 'origin/release/1.10.0' into dev

AElfProject · Sep 18, 2024 · 813c602 · 813c602
2 parents 0a3d971 + c51fc40
commit 813c602
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,20 +1,20 @@
 # Azure Pipelines configuration file
 jobs:
-  - template: templates/build-template-window.yml
-    parameters:
-      parts: 3
-      n: 1
-      codecoverage: true
-  - template: templates/build-template-window.yml
-    parameters:
-      parts: 3
-      n: 2
-      codecoverage: false
-  - template: templates/build-template-window.yml
-    parameters:
-      parts: 3
-      n: 3
-      codecoverage: false
+#  - template: templates/build-template-window.yml
+#    parameters:
+#      parts: 3
+#      n: 1
+#      codecoverage: true
+#  - template: templates/build-template-window.yml
+#    parameters:
+#      parts: 3
+#      n: 2
+#      codecoverage: false
+#  - template: templates/build-template-window.yml
+#    parameters:
+#      parts: 3
+#      n: 3
+#      codecoverage: false
   - template: templates/build-template-linux.yml
     parameters:
       parts: 3

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.303"
+    "version": "8.0.x"
   }
 }
diff --git a/src/AElf.CSharp.CodeOps/Validators/Whitelist/IWhitelistProvider.cs b/src/AElf.CSharp.CodeOps/Validators/Whitelist/IWhitelistProvider.cs
@@ -49,6 +49,8 @@ private void WhitelistAssemblies(Whitelist whitelist)
             .Assembly(typeof(IMethod).Assembly, Trust.Full) // AElf.CSharp.Core
             .Assembly(typeof(SecretSharingHelper).Assembly, Trust.Partial) // AElf.Cryptography
             .Assembly(typeof(ISmartContractBridgeContext).Assembly, Trust.Full) // AElf.Kernel.SmartContract.Shared
+            .Assembly(typeof(Groth16.Net.Verifier).Assembly, Trust.Full) // AElf.Cryptography.ECDSA
+            .Assembly(typeof(Poseidon.Net.Poseidon).Assembly, Trust.Full) 
             ;
     }