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

Feature/sm2sm3 #2853

Merged
merged 21 commits into from
Jan 10, 2020
Merged

Feature/sm2sm3 #2853

merged 21 commits into from
Jan 10, 2020

Conversation

alberto-zhang
Copy link
Contributor

What does this PR do?
SignUtils.hash replace Sha256.hash and SignUtils.of replace Sha256.of
delete SM3 class ,add SM3Hash class
Why are these changes required?
SignUtils.hash replace Sha256.hash and SignUtils.of replace Sha256.of
delete SM3 class ,add SM3Hash class
This PR has been tested by:

  • Unit Tests
  • Manual Testing

Follow up

Extra details

zhenping and others added 15 commits January 7, 2020 14:02
add the SM3Hash class
9fd1f30 
Signed-off-by: zhenping <federico.zhen@tron.network>
add the Hash interface
998fc1c 
Signed-off-by: zhenping <federico.zhen@tron.network>
add the HashInterface and revise the comment
a2d6341 
Signed-off-by: zhenping <federico.zhen@tron.network>
Merge remote-tracking branch 'origin/feature/sm2sm3' into feature/sm2sm3
064abcd
add switch fork for cross chain
3cefcb2
delete the SM3 Class
273515d 
Signed-off-by: zhenping <federico.zhen@tron.network>
add sha256 hash check
1ea7e7c
Merge branch 'feature/sm2sm3' of https://github.com/tronprotocol/java…
7caf3e5 
…-tron into feature/sm2sm3
@alberto-zhang
SignUtils.hash replace Sha256.hash
a4446f9
@alberto-zhang
SignUtils.of replace Sha256.of
2f8bb2c
@alberto-zhang
Merge branch 'feature/sm2sm3' of github.com:alberto-zhang/java-tron i…
e05e9dd 
…nto feature/sm2sm3
@alberto-zhang
remove SignUtils.of
cb7bcd2
@DorianRust
Merge pull request #2846 from alberto-zhang/feature/sm2sm3
82685e5 
SignUtils modify stage 1
fix bug
d44d68b
fix bug
02a9a85
@codecov-io
Copy link

codecov-io commented Jan 9, 2020 •
edited
Loading

Codecov Report

Merging #2853 into develop will decrease coverage by 1.26%.
The diff coverage is 58.44%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #2853      +/-   ##
=============================================
- Coverage      50.94%   49.67%   -1.27%     
+ Complexity      6121     5729     -392     
=============================================
  Files            628      623       -5     
  Lines          38553    35611    -2942     
  Branches        4527     3977     -550     
=============================================
- Hits           19641    17691    -1950     
+ Misses         17363    16435     -928     
+ Partials        1549     1485      -64
Impacted Files Coverage Δ Complexity Δ
common/src/main/java/org/tron/core/Constant.java 66.66% <ø> (ø) 1 <0> (ø) ⬇️
...n/java/org/tron/core/exception/HeaderNotFound.java 50% <ø> (ø) 1 <0> (ø) ⬇️
...se/src/main/java/org/tron/core/db/CommonStore.java 62.5% <ø> (+0.96%) 3 <0> (-3) ⬇️
...a/org/tron/core/capsule/utils/TransactionUtil.java 63.07% <0%> (+2.78%) 5 <0> (ø) ⬇️
...va/org/tron/common/application/CliApplication.java 0% <0%> (ø) 0 <0> (ø) ⬇️
.../java/org/tron/core/zen/ZenTransactionBuilder.java 78.01% <0%> (-2.23%) 21 <0> (-21)
...k/src/main/java/org/tron/program/SolidityNode.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...a/org/tron/common/application/ApplicationImpl.java 82.5% <0%> (-5.84%) 11 <0> (-10)
...ain/java/org/tron/core/services/RpcApiService.java 4.62% <0%> (-0.38%) 8 <0> (-3)
...in/java/org/tron/core/capsule/utils/BlockUtil.java 0% <0%> (ø) 0 <0> (ø) ⬇️
... and 70 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 02a9a85...2b897d3. Read the comment docs.

@DorianRust DorianRust merged commit 22418ec into develop Jan 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DorianRust DorianRust DorianRust approved these changes

@Federico2014 Federico2014 Federico2014 approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@alberto-zhang @codecov-io @Federico2014 @DorianRust