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.

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

Initial baseline: Merge contents of master onto develop for the 3.6.* release #719

Merged
merged 796 commits into from
Sep 26, 2018

Conversation

snazha-blkio
Copy link
Contributor

What does this PR do?

develop and master have diverged, we need to pull all the changes made on master (assuming that's where the last release was cut from) onto develop so that development can commence on 3.6

Where should the reviewer start?

Please take a look at the file diffs and assess, unfortunately I don't have too much context here to say much.

Why is it needed?

To baseline the develop branch ahead of the next 3.6 release

dukei and others added 30 commits January 31, 2018 20:40
…rray was converted to List but contained items remained unchanged.

All tests pass
Added company using web3j to the Readme
added a project that is built using web3j
added overload to allow signing without hashing message
Added reward action to trace
Add TransactionReceipt.toString() and Log.toString()
Improve quick start documentation. remove confusing InfuraHttpClient …
implementation of ENS Reverse name resolution
Moved convertToNative to Contract class
Fixes the Log addition to contract events
bcoste and others added 23 commits July 16, 2018 14:18
Do not generate methods for constant functions that return void
modify rawTransaction decode.
Added mnemonic validation method, entropy generation method.
Add method to get Rinkeby keystore directory
2. Regenerated Solidity smart contract wrappers in codegen module.
Fix bug in RlpString.asBigInteger
Added WebSocketClient constructor to allow access to headers
Added Apache Camel to the web3j using projects list
Add codeowners and pull request template
@codecov
Copy link

codecov bot commented Sep 26, 2018

Codecov Report

❗ No coverage uploaded for pull request base (develop@9a9c914). Click here to learn what that means.
The diff coverage is 78.12%.

Impacted file tree graph

@@            Coverage Diff             @@
##             develop     #719   +/-   ##
==========================================
  Coverage           ?   77.12%           
  Complexity         ?     1795           
==========================================
  Files              ?      239           
  Lines              ?     6667           
  Branches           ?      996           
==========================================
  Hits               ?     5142           
  Misses             ?     1275           
  Partials           ?      250
Impacted Files Coverage Δ Complexity Δ
...3j/protocol/core/methods/response/DbPutString.java 100% <ø> (ø) 2 <0> (?)
...3j/protocol/core/methods/response/EthAccounts.java 100% <ø> (ø) 2 <0> (?)
...3j/protocol/core/methods/response/DbGetString.java 100% <ø> (ø) 2 <0> (?)
...web3j/protocol/core/methods/response/DbPutHex.java 100% <ø> (ø) 2 <0> (?)
...web3j/protocol/core/methods/response/DbGetHex.java 100% <ø> (ø) 2 <0> (?)
...g/web3j/protocol/core/filters/FilterException.java 0% <0%> (ø) 0 <0> (?)
.../src/main/java/org/web3j/console/WalletRunner.java 0% <0%> (ø) 0 <0> (?)
...degen/src/main/java/org/web3j/codegen/Console.java 0% <0%> (ø) 0 <0> (?)
...c/main/java/org/web3j/console/WalletSendFunds.java 0% <0%> (ø) 0 <0> (?)
core/src/main/java/org/web3j/ens/RecordTypes.java 0% <0%> (ø) 0 <0> (?)
... and 75 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 9a9c914...2a259ec. Read the comment docs.

Copy link
Contributor

@conor10 conor10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy with this

@snazha-blkio snazha-blkio merged commit e665acd into develop Sep 26, 2018
Copy link
Contributor

@iikirilov iikirilov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@snazha-blkio snazha-blkio added this to the 3.6 milestone Oct 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.