Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Master merge to dev #3298

Merged
merged 226 commits into from
Jul 22, 2020
Merged

Master merge to dev #3298

merged 226 commits into from
Jul 22, 2020

Conversation

lvs007
Copy link
Contributor

@lvs007 lvs007 commented Jul 21, 2020

What does this PR do?

Why are these changes required?

This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

317787106 and others added 30 commits March 18, 2020 11:08
@317787106
add shileded contract proto
17c29bb
@317787106
add shielded contract in RpcApiService
5913b40
@317787106
add http api for shielded contract
e092396
add the shieldedTRC20 interface: CreateShieldedContractParameters, Cr…
9943cf7 
…eateShieldedContractParametersWithoutAsk
add the shielded TRC20 token interface
2dd7847
implement the feature to check whether the note is spent
1818c52
rename the CreateShieldedTRC20ContractNullifer interface
a9d980e
@skipjack8
add verifyproofcontract with tip137, update librustzcash params
00cc7df
@skipjack8
update data to be hashed, add position field
71da30f
add the test code for shielded contract
5d407db
add the createShieldedTRC20Parameters test
3a0ff88
add the shielded contract scan test
c9fb34d
@skipjack8
update dataToBeSigned in shieldedtrc20contract
751b547
add the solidity interface and format the code
e4406c4
@skipjack8
update execute verifyTransferProof parallelly, and add trc20 contract…
8fc90ad 
… test
add more test cases for shielded token contract API
0d635ef
Merge remote-tracking branch 'origin/feature/shielded_TRC20_contract'…
9b3a484 
… into feature/shielded_TRC20_contract

# Conflicts:
#	framework/src/test/java/org/tron/core/WalletTest.java
@skipjack8
update parallelly execute verifyTransferProof
15324e5
add more test code for shielded token contract
d22dad7
Merge branch 'feature/shielded_TRC20_contract' of https://github.com/…
74583a6 
…tronprotocol/java-tron into feature/shielded_TRC20_contract
format the test code
ba7cb59
format the shielded TRC 20 token code
b0d6d93
@skipjack8
fix CountDownLatch error, and format code style
3c417c8
@skipjack8
Merge branch 'feature/shielded_TRC20_contract' of https://github.com/…
3e16900 
…tronprotocol/java-tron into feature/shielded_TRC20_contract
add the shielded trc20 contract stress test
87cc779
update the shielded trc20 contract stress test
5a6156d
format the shielded TRC20 test code
9be2798
optimize the shielded TRC20 code
5085953
@skipjack8
optimize online stress of shielded contract
70100d8
@skipjack8
add check present of infoById
0741456
federico.zhen and others added 15 commits June 28, 2020 17:08
fix the sonar code smell
2259019
Merge remote-tracking branch 'origin/fix/release_4.0_sonar_check' int…
9832dad 
…o fix/release_4.0_sonar_check
remove the ovk in spendDescription
b1f3e6d
@MiraculousWang
delete sonar in travisCI
0c14dbb
add the initialization for burn cipher
a9b11e4
Merge remote-tracking branch 'origin/fix/release_4.0_sonar_check' int…
d6edc6b 
…o fix/release_4.0_sonar_check
@skipjack8
Merge pull request #3250 from tronprotocol/fix/release_4.0_sonar_check
af91eb4 
fix sonar check in release_vm_4.0_shielded
Merge branch 'release_vm_shielded_4.0' of github.com:tronprotocol/jav…
9c05026 
…a-tron into release_vm_shielded_4.0
change version to 4.0.0
8022f16
change version to 4.0.0
df54ac2
@xxo1shine
Merge pull request #3269 from tronprotocol/release_vm_shielded_4.0_ve…
b836c72 
…rsion1

Release vm shielded 4.0 version1
@Yrp
Merge pull request #3246 from tronprotocol/release_vm_shielded_4.0
b01d5c7 
Release vm shielded 4.0
update a new version. version name:Odyssey-v3.7-216-gb01d5c721,versio…
8e14395 
…n code:13200
@Yrp
Merge pull request #3270 from tronprotocol/version/Odyssey-v3.7-216-g…
742f321 
…b01d5c721

update a new version. version name:Odyssey-v3.7-216-gb01d5c721,versio…
@lvs007
merge master
2184247
@lvs007 lvs007 merged commit 75bb021 into develop Jul 22, 2020
@lvs007 lvs007 deleted the master-merge-to-dev branch September 28, 2020 06:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xxo1shine xxo1shine xxo1shine approved these changes

@skipjack8 skipjack8 skipjack8 approved these changes

@Yrp Yrp Awaiting requested review from Yrp

@houlei1017 houlei1017 Awaiting requested review from houlei1017

@renchenchang renchenchang Awaiting requested review from renchenchang

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.