ethereum / ethereumj

61%

develop: 55%

LAST BUILD ON BRANCH swarm

branch: swarm

CHANGE BRANCH

x

Reset

• swarm
• master
• poc-5
• revert-205-master
• whisper
• poc-9
• poc-9-merge-rlpx
• develop
• origin/develop
• poc-9-performance-shift
• contract-details-external-storage
• config
• discover
• threads-issue
• stage
• storage-dict
• eth-62
• pending-state
• whisper-upgrade
• conflict-255k
• logging
• rlpx-framing
• gas-int256
• tiberius
• tmp-fork-test
• miner
• eth-legacy-cutoff
• release1.1.0-prepare
• eip-8
• storage-dict-refactor
• perf-test
• morden-conflict-440k
• blockchain-config
• solc
• 1.2.0-homestead-RC
• db-refactor
• 1.2.0-prepare
• 1.2.0
• feature/json-rpc
• version/versioning
• version/bad-blocks
• feature/pending-state
• hotfix/leveldb.1.18-linux
• version/leveldb.1.18-linux
• feature/no-static-config
• feature/new-sync
• hf-126
• 1.3.0-RC1
• 1.2
• 1.2.8-daoRescue
• 1.3.0-RC2-daoRescue
• 1.3.0-RC3-daoRescue2
• 1.3.0-RC4
• 1.3.0-RC5-DaoHardFork
• feature/hibernate-remove
• feature/trie-prune
• 1.3.0-RC7
• feature/fork-separate
• travis-build-test
• feature/new-api
• feature/489-flush-imported-block-on-sync
• feature/488-database-versioning
• pr/512
• feature/457-autorepair-corrupted-leveldb
• feature/refactor-init-sequence
• feature/457-leveldb-on-mac-and-repair
• feature/514-direct-path-to-genesis
• feature/451-using-logback
• feature/540-database-version-after-reset
• feature/broadcast-new-blocks-507
• 1.3.1
• feature/532-refactor-duplication-soliditytype
• feature/546-database-version-bug-clean-ws
• feature/552-handle-missing-security-provider
• feature/v63-response-only
• feature/discovery-enhancement-550
• 1.3.2
• feature/fix-new-hashes-557
• feature/reputation-change-550
• feature/blockain-lock-406
• feature/more-sync-enhancements
• feature/checking-db-genesis
• feature/adjust-discovery
• feature/337-remove-fake-info-in-discovery
• feature/567-discovery-issues
• 1.3.6
• eip158-tests
• feature/update-solc-version
• feature/eth63-db-refactor
• hotfix/eip155-160-161
• tests/eip160
• fix/vm-tests
• hotfix/genesis-path
• fix/difficulty-encode
• 1.3.7
• hotfix/1.3.7-fix
• feature/498-external-miner-support
• hotfix/hf4-problem
• feature/588-eth-call-with-pending
• feature/hf4
• hotfix/1.3.8
• fix/parity-encoding
• 1.3.8
• 1.3.9
• feature/fast-sync-parallel
• fix/sync-tweaks
• tests/sources
• fix/receipt-hash-622
• fix/rlp-decode
• fix/multithread-sources-test
• tests/long-running
• fix/blockqueue-size
• feature/fast-sync-optimization
• feature/rlp-counting-bytes-658
• feature/hive-simulation-tests
• feature/rlp-state-620
• fix/coveralls-668
• fix/execution-gas-used-613
• fix/quick-ropsten
• fix/several-constraints-checks
• feature/v64-draft
• bugfix/force-solc-overwrite
• 1.4.0
• feature/offheap-dag
• feature/par1
• 1.3.10
• develop-1.3.x
• 1.4.1
• release-1.3.x
• experiment/par1
• fix/eth63-cast
• feature/attacks-optimize
• feature/handle-two-hash-checks
• feature/hive-consensus-tests
• feature/optimize-net-import
• bugfix/correct-node-names
• feature/hardcode-difficulty
• hotfix/vmhook
• bugfix/long-shutdown-spring
• release-1.4.x
• feature/node-leveldb-758
• temp-1
• fix/quotient-filter
• fix/fast-sync-stall
• 1.5.0
• hotfix/replay-block-state
• 1.4.4
• feature/optional-system-exit
• eip-96
• eip-100
• eip-140
• eip-198
• eip-214
• eip-213
• eip-658
• eip-669
• eip-684
• eip-212
• tests
• 1.6.1
• hotfix/trie-npe
• hotfix/p2p-fix
• 1.6.2
• 1.6.3
• feature/snappy
• debug/bloom-logging
• feature-upgradejava8
• fix-circleci-tests
• feature/db-upgrade
• fix-rlp-936
• fix-snappy-error
• add-absent-copy
• feature-events-api
• dirty-profiling
• fix/duplicate-version
• logsbloom-comment
• fix/rpc-removal
• fix/github-tests
• research/casper
• release-1.6.x
• 1.7.0
• 1.7.1
• 1.7.2
• fix/sync-done
• fix/gasprice-tracker
• fix/limit-outgoing-msg
• fix/no-fast-headers
• fix/sync-queue-size
• fix/remove-headers-db
• v1.7.2
• 1.7.3
• fix/rlp-decode-attack
• rc-1.8.0
• fix/drop-same-ip
• feature/miner-events
• fix/new-peer-ip-check
• feature/private-auto-sync
• fix/ethash-listener
• 1.8.0
• fix/early-sync-complete
• fix/sendtx-comment
• fix/ropsten-3467853
• 1.8.1
• fix/utils-test
• fix/rc-active-peers
• fix/ethash-rule
• sharding/randao
• research/sharding
• fix/rlp-bomb
• sharding/validators
• fix/vm-recursion
• feature/1138-event-listener-improve
• adyliu-develop
• feature/optimize-dependencies
• 1.8.2
• tonycox-immutableDW
• fix/fastsync-db-delete
• sharding/block-processing
• fix/discovery-exceptions
• feature/eip-1052
• feature/eip-145
• sharding/block-proposing
• feature/multi-file-dump-loading
• feature/config-list
• sharding/state-transition
• feature/eip-1283
• feature/eip-1014
• feature/vmhook-extracting
• feature/eip-1234
• sharding/committees
• sharding/multi-validator-service
• fix/abi-indexed-event
• feature/create2-gas-cost-update
• sharding/refactor-validator-service
• rc-1.9.0
• hotfix/uncaught-exception-filter
• feature/move-samples-to-module
• 1.9.0
• sharding/beacon-attester
• fix/ropsten-constantinople
• fix/ropsten-forks
• fix/validate-header-chain
• fix/extcodehash-empty-acc
• sharding/propose-attestations
• 1.9.1
• sharding/bls381milagro
• fix/abi-mutidim
• sharding/state-updates
• constantinople
• 1.10.0
• 1.10.1
• fix/contract-event-parse
• feature/petersburg
• 1.11.0
• 0966feff08079c888371b21e998b1a9e971822e7
• fix/ropsten-revert
• feature/solc-0.5.x
• fix/create-revert
• 1.12.0
• patch/abi

Merge remote-tracking branch 'origin/develop' into swarm

Conflicts:
	ethereumj-core/src/main/java/org/ethereum/facade/EthereumFactory.java