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

Merge release/4.0 to master #763

Merged
merged 102 commits into from Oct 30, 2018

Conversation

Projects
None yet
10 participants
@snazha-blkio
Collaborator

snazha-blkio commented Oct 30, 2018

Merges the contents of release/4.0 into master, now that we have released it.

y and others added some commits Mar 5, 2018

y
y
y
More effective implementation of MnemonicUtils.generateEntropy
It doesn't manipulate with strings that much as the old version.
Instead it uses a BitSet.

Also, some static tests for MnemonicUtils.generateEntropy were added in
this commit.
BIP-44 implementation
1. implement BIP-32 keypair
2. implement BIP-44 wallet on top of BIP-39 seed
CI
CI

snazha-blkio and others added some commits Oct 25, 2018

- Updating all "3.6.0" references to "4.0.0"
- Addressing some (not all) PR feedback
- Regenerating code
Updated OkHttp CipherSuites to include all INFURA CiperSuites
INFURA was recently updated to allow a very small of SSL CiperSuites:
 - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
 - TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
 - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
 - TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
 - TLS_RSA_WITH_AES_128_GCM_SHA256
 - TLS_RSA_WITH_AES_128_CBC_SHA256
 - TLS_RSA_WITH_AES_256_GCM_SHA384
 - TLS_RSA_WITH_AES_256_CBC_SHA256
Out of those 8 CipherSuites, only 4 are enabled by default in OkHttp.

This PR updates how Web3j builds the OkHttp client. Now Web3j explicitly
enables *all* CiperSuites supported by INFURA on its OkHttp client.
Merge pull request #686 from Mobilechain/BIP44
BIP-44 implementation
Merge pull request #660 from taivokasper/fix-usage
Fixes #656 usage strings to be in sync with command parsing
Merge pull request #757 from gaiazov/infura-ssl
Updated OkHttp CipherSuites to include all INFURA CiperSuites
y
y
Merge remote-tracking branch 'origin/remove_contract_bin_file_require…
…nment' into remove_contract_bin_file_requirenment
y
Merge pull request #408 from argentlabs/remove_contract_bin_file_requ…
…irenment

make *.bin optional for solidity codegen, issue: #360
Merge pull request #761 from web3j/feature/575-sign-message-prefix
Prefix message signing according to eth_sign. (#575)

@snazha-blkio snazha-blkio requested review from conor10 and iikirilov as code owners Oct 30, 2018

@snazha-blkio snazha-blkio merged commit 6160282 into master Oct 30, 2018

6 of 7 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
ci/gitlab/release/4.0 Pipeline passed on GitLab
Details
ci/gitlab/tags/v4.0.0-alpha-1 Pipeline passed on GitLab
Details
ci/gitlab/v4.0.0-alpha-1 Pipeline passed on GitLab
Details
codecov/patch Coverage not affected when comparing 4997746...cf66e64
Details
codecov/project 77.42% (+0.2%) compared to 4997746
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment