-
Notifications
You must be signed in to change notification settings - Fork 257
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Regarding the release PR for aelf project version 1.12.0 #3630
Merged
Merged
Changes from 86 commits
Commits
Show all changes
100 commits
Select commit
Hold shift + click to select a range
955096c
Add whitelist solution
chopin-fan 47595fc
Resolve issue of compilation and running, and add unit-test
chopin-fan 53f389c
Revert appsettings.json
chopin-fan a57f39e
feat(zkp): Add methods required for supporting zkp verification over …
gldeng b66e60c
Change version to 8.0.402 in sonarqube.yaml
chopin-fan 6469d74
Change version of sdk
chopin-fan 00d0b6e
Change version of sdk
chopin-fan 77e2d11
Add sources
chopin-fan 7c9c674
Merge branch 'dev' into feature/whitelist-to-sdk
chopin-fan 8838901
Merge branch 'dev' into feature/whitelist-to-sdk
chopin-fan 0c5cf13
Change versions and add whitelist
chopin-fan 8262cd9
Merge remote-tracking branch 'origin/feature/whitelist-to-sdk' into f…
chopin-fan 4e5b3aa
Remove poseidon and groth16 in IWhitelistProvider.cs
chopin-fan aa43d7b
Add config for auto-publishing
chopin-fan 534f24b
Now some of inline txs will have their own tx id via layered method n…
eanzhao 46e54c5
Improve layered method name.
eanzhao be03fce
Put inline txs to block body.
eanzhao 8291fb1
Fix block sync issue.
eanzhao 1ac0435
1. Remove useless comments
chopin-fan 0b3ab87
Cancel inline event log
chopin-fan 8626f56
extend seed expiration time
JimAelf 54fb07d
extend SEED expiration time
JimAelf 1e7c987
transaction result status optimization, clear return the expired desc…
JimAelf 8ec60e3
Fixed GetTransactionResultAsync: compare BestChainHeight with RefBloc…
eanzhao daaec05
optimize the result of transaction result
JimAelf 1ad4d46
support zk
chopin-fan 8c4234a
Resolve unit test issue
chopin-fan e1ccdb9
Resolve Verification Failure Issue
chopin-fan 9df0b20
Resolve the difficulty of creating inline transactions by eventlog du…
chopin-fan 5dd5ac8
Rename method name
chopin-fan 6d433e5
Add unit-test for zk supporting
chopin-fan c876944
Clean up unused code and optimize the code
chopin-fan 60b637d
Update the sdk version
chopin-fan d416275
Temporarily remove the unit test; it will be added back later
chopin-fan 8299f35
Temporarily remove the unit test; it will be added back later
chopin-fan 3067232
Modify config in azure-pipelines.yml
chopin-fan 69ec7e8
Modify config in azure-pipelines.yml
chopin-fan c045573
set a the Error message to the output to infer that the transaction w…
JimAelf 18763ee
Modify config in azure-pipelines.yml
chopin-fan 52efae9
set a the Error message to the output to infer that the transaction w…
JimAelf de45a0f
set a the Error message to the output to infer that the transaction w…
JimAelf 60cb378
If transaction satus is "NOT_EXIST", and the lag of the refblock is b…
JimAelf 1b7c212
handle the Sonar build problem
JimAelf c53dbf7
handle the Sonar build problem
JimAelf af79e90
Fix tx expired error message.
eanzhao 1404c3e
Add new event: SeedExpirationTimeUpdated
eanzhao d1a71ef
CallCount revert to 15000
chopin-fan 6ea81f8
Merge pull request #3621 from AElfProject/feature/transaction-result-…
JimAelf e617a69
The Status is obsolete. Use StatusV2 instead
JimAelf d1658fd
The Status is obsolete. Use StatusV2 instead
JimAelf 0f4b2c4
The Status is obsolete in this version. Use StatusV2 instead
JimAelf f16179d
Merge branch 'dev' into feature/inline-tx-id
chopin-fan b3a138c
Add unit-test for cross-aa
chopin-fan b498ff5
Add unit test
chopin-fan c84faaa
Remove unused unit test
chopin-fan cec89b7
unit test done
JimAelf 2e1522e
unit test done
JimAelf 85e9efd
Merge pull request #3620 from AElfProject/feature/inline-tx-id
JimAelf 67ea4aa
Tune Get_TransactionResultV2_Expired_Testf and fixed tx.statusv2 issues.
eanzhao 39398fa
Will return new status if pending txs already expired.
eanzhao d594e53
Merge branch 'dev' into feature/whitelist-to-sdk
chopin-fan f21fc2d
Merge pull request #3625 from AElfProject/feature/transaction-result-…
JimAelf 9d567e4
Merge pull request #3624 from AElfProject/feature/extend-seed-expirat…
JimAelf 4926267
Merge pull request #3626 from AElfProject/dev
JimAelf c4a291c
TransactionResult optimization, add a new method GetTransactionResult…
JimAelf dc42b74
Merge pull request #3627 from AElfProject/feature/transaction-result-…
JimAelf a74faf0
Remove inline transaction modification because of the early publishme…
JimAelf 2a62de2
update StatusV2 to StatusWithBVP
JimAelf 187d3ed
Merge pull request #3628 from AElfProject/feature/transaction-result-…
JimAelf d38683f
Remove publish config in main and side project
chopin-fan 187a4c5
Merge branch 'dev' into feature/whitelist-to-sdk
chopin-fan 29143a2
token contract add inline transaction modification
JimAelf 94abd2a
Merge branch 'dev' into feature/whitelist-to-sdk
chopin-fan 71c5095
Merge pull request #3614 from AElfProject/feature/whitelist-to-sdk
JimAelf 6008ea5
Revert code
chopin-fan 77ed70a
try to skip issue that node can not produce
chopin-fan 3340791
Remove TriggerConsensusEventAsync
chopin-fan a584079
Add TriggerConsensusEventAsync for image
chopin-fan 6bf28b9
remove TriggerConsensusEventAsync
chopin-fan 745b326
add TriggerConsensusEventAsync
chopin-fan 3222d1c
Add log
chopin-fan c522ab9
Add log
chopin-fan 692c6b2
1. Remove log and resolve issue
chopin-fan b8fb0d8
Remove unused code
chopin-fan 586a98a
Remove cross-aa code
chopin-fan ff58f36
Adjust the implementation of zk function
chopin-fan 4d02f27
Adjust implementation of ZK function
chopin-fan 230fceb
Adjust impletation of zk function
chopin-fan c124761
Adjust to static method
chopin-fan a2ef9a6
Add WhitelistCryptographyHelpers whitelist method
chopin-fan c752104
Adjust zk code
chopin-fan 3383c90
remove priveteAssets
chopin-fan ee4801f
adjust version of Nethereum.Web3
chopin-fan a2e3579
remove unused code
chopin-fan 7b1eb9b
Add unit test
chopin-fan b4804c6
Merge branch 'master' into release/1.12.2
chopin-fan 99e57c9
Change method name to TransactionResultWithBVP
chopin-fan 453d96b
Merge remote-tracking branch 'origin/release/1.12.2' into release/1.12.2
chopin-fan 03ede96
Remove inline_transaction.proto
chopin-fan 3688493
Remove poseidong
chopin-fan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
{ | ||
"sdk": { | ||
"version": "8.0.x" | ||
"version": "8.0.*" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,9 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<configuration> | ||
<packageSources> | ||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3"/> | ||
<add key="aelf" value="https://www.myget.org/F/aelf-project-dev/api/v3/index.json" protocolVersion="3"/> | ||
<add key="Nuget Test" value="https://int.nugettest.org/api/v2" /> | ||
<add key="nexus" value="https://nexus-poc.test.aelf.dev/repository/nuget-group/index.json" protocolVersion="3" /> | ||
</packageSources> | ||
</configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
syntax = "proto3"; | ||
|
||
option csharp_namespace = "AElf.Types"; | ||
|
||
|
||
import "aelf/core.proto"; | ||
import "aelf/options.proto"; | ||
|
||
service InlineTransaction { | ||
} | ||
|
||
message InlineTransactionCreated { | ||
option (aelf.is_event) = true; | ||
aelf.Transaction transaction = 1 [(aelf.is_indexed) = true]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add a new helper,not SecretSharingHelper
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.