Skip to content

Commit 6912ed3

Browse files
committed
Merge branch 'feature/multi-tx' of aelf:AElfProject/AElf into feature/multi-tx
2 parents 6f0a5b0 + e4bfd43 commit 6912ed3

4 files changed

Lines changed: 19 additions & 17 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ When you are ready for a review by the core team, just remove ```[WIP]``` from y
7676

7777
## Versioning
7878

79-
We use Semantic Versioning (SemVer) for versioning, if you're intereted in closely following aelf's developement please check out the [SemVer docs](https://semver.org/).
79+
We use Semantic Versioning (SemVer) for versioning, if you're interested in closely following aelf's development please check out the [SemVer docs](https://semver.org/).
8080

8181
## License
8282

azure-pipelines.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# Azure Pipelines configuration file
22
jobs:
3-
- template: templates/build-template-window.yml
4-
parameters:
5-
parts: 3
6-
n: 1
7-
codecoverage: true
8-
- template: templates/build-template-window.yml
9-
parameters:
10-
parts: 3
11-
n: 2
12-
codecoverage: false
13-
- template: templates/build-template-window.yml
14-
parameters:
15-
parts: 3
16-
n: 3
17-
codecoverage: false
3+
# - template: templates/build-template-window.yml
4+
# parameters:
5+
# parts: 3
6+
# n: 1
7+
# codecoverage: true
8+
# - template: templates/build-template-window.yml
9+
# parameters:
10+
# parts: 3
11+
# n: 2
12+
# codecoverage: false
13+
# - template: templates/build-template-window.yml
14+
# parameters:
15+
# parts: 3
16+
# n: 3
17+
# codecoverage: false
1818
- template: templates/build-template-linux.yml
1919
parameters:
2020
parts: 3

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.303"
3+
"version": "8.0.x"
44
}
55
}

src/AElf.CSharp.CodeOps/Validators/Whitelist/IWhitelistProvider.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ private void WhitelistAssemblies(Whitelist whitelist)
4949
.Assembly(typeof(IMethod).Assembly, Trust.Full) // AElf.CSharp.Core
5050
.Assembly(typeof(SecretSharingHelper).Assembly, Trust.Partial) // AElf.Cryptography
5151
.Assembly(typeof(ISmartContractBridgeContext).Assembly, Trust.Full) // AElf.Kernel.SmartContract.Shared
52+
.Assembly(typeof(Groth16.Net.Verifier).Assembly, Trust.Full) // AElf.Cryptography.ECDSA
53+
.Assembly(typeof(Poseidon.Net.Poseidon).Assembly, Trust.Full)
5254
;
5355
}
5456

0 commit comments

Comments
 (0)