Code

merge v0.2.8 features into master#525

Code

Merged

qoire merged 160 commits intomasteraionnetwork/aion:masterfrom master-pre-mergeaionnetwork/aion:master-pre-mergeCopy head branch name to clipboardJun 14, 2018

+10,742-5,147

Commits

Commits on Apr 18, 2018

• fix p2p tests

  ali-sharif

  committed
  9370587

Commits on May 9, 2018

• cleaning up the data recovery unit tests

  AlexandraRoatis

  committed
  024681a

• reenabling the journal prune DS #298

  AlexandraRoatis

  committed
  a19a604

• adding the pune block count to the configuration

  AlexandraRoatis

  committed
  349c930

Commits on May 10, 2018

• command line utils for exploring the state trie; corrections to the block printing utility

  AlexandraRoatis

  committed
  4041344

• rebuilding the genesis block if missing when attempting state recovery

  AlexandraRoatis

  committed
  f8152db

Commits on May 11, 2018

• disabled pruning when pruneBlockCount is negative; set a lower bound for the pruneBlockCount variable

  AlexandraRoatis

  committed
  9377138

• unit tests for JournalPruneDataSource.java

  AlexandraRoatis

  committed
  493f112

• correcting test case

  AlexandraRoatis

  committed
  7e8dfbd

Commits on May 16, 2018

• impoving comments for prune and repair functionality

  AlexandraRoatis

  committed
  bb92c60

• storing the public total difficulty inside the best block

  AlexandraRoatis

  committed
  b67323e

Commits on May 17, 2018

• extracting common code into a method

  AlexandraRoatis

  committed
  ab40ed4

• refactored JournalPruneDataSource to be independent of the block and block header

  AlexandraRoatis

  committed
  601e905

• replacing synchronized methods with read-write locks

  AlexandraRoatis

  committed
  e92d842

• disabling locking on the state database since the JournalPruneDS is locked

  AlexandraRoatis

  committed
  0fb29b9

• moving the JournalPruneDS test class in the correct folder

  AlexandraRoatis

  committed
  8aa1133

• unit tests for conformance to interface

  AlexandraRoatis

  committed
  ca0c44b

• concurrency tests for JournalPruneDS

  AlexandraRoatis

  committed
  d10df63

• unit tests for pruning functionality

  AlexandraRoatis

  committed
  3205e07

• removed dependency on modDbImpl

  AlexandraRoatis

  committed
  0f78cc8

• applying review comments

  AlexandraRoatis

  committed
  527f382

• added logger features

  aionJoey

  committed
  2f0ac31

• logger feature added

  aionJoey

  committed
  0d89dae

• logger feature added

  aionJoey

  committed
  07c93e1

Commits on May 18, 2018

• allows user to toggle logger

  aionJoey

  committed
  a2186ad

• first refactor: separate TaskInbound

  aionick

  committed
  6fd52f2

• second refactor: separate TaskSend

  aionick

  committed
  dc0cc75

• third refactor: separate TaskReceive

  aionick

  committed
  4cf4642

• fourth refactor: separate TaskStatus

  aionick

  committed
  91829ec

• fifth refactor: separate TaskConnectPeers

  aionick

  committed
  0b981ec

• sixth refactor: separate TaskClear

  aionick

  committed
  44e73a0

• moved MsgOut/In classes, renames and cleanups

  aionick

  committed
  4d8faec

• moved accept,read others into TaskInbound, cleanups

  aionick

  committed
  d1aba20

• added licenses, more cleanups

  aionick

  committed
  e7f2386

Commits on May 22, 2018

• refactoring to improve readability

  aionick

  committed
  a6b558a

• moved tasks to separate package

  aionick

  committed
  7182785

• bugfix: incorrect check for presence in the data source

  AlexandraRoatis

  committed
  606b1e3

• new configuration class and interface for pruning

  AlexandraRoatis

  committed
  d7c1f58

• using new detailed pruning configuration

  AlexandraRoatis

  committed
  e319850

• bugfix: method parameters should be generic

  AlexandraRoatis

  committed
  cf6e9d5

• new data source class that deletes from the current db only keys not present in the archive db

  AlexandraRoatis

  committed
  e40b699

• refactored journal prune class to take a data store as argument; method to check if open database added to data store interface

  AlexandraRoatis

  committed
  471614e

• building the journal prune on top of the data source with archive

  AlexandraRoatis

  committed
  9c5b552

• archiving the world state at runtime

  AlexandraRoatis

  committed
  8e487b5

• bugfix: incorrect variable update

  AlexandraRoatis

  committed
  631da9e

• file path check

  aionJoey

  committed
  236dddf

• added getNrgPrice functionality

  aionick

  committed
  4666b67

• init NrgOracle before get recommended nrg

  aionick

  committed
  629c5a8

• removed req method for getNrgPrice

  aionick

  committed
  3b6ac0b

Commits on May 23, 2018

• add null check back in

  aionick

  committed
  bfd5c85

• logger features

  aionJoey

  committed
  0bdb509

• improved binding and db locking error messages

  aionick

  committed
  5f4ecec

• bugfix: reseting the root back to its initial value after recovery

  AlexandraRoatis

  committed
  2e89e3f

• optimizing the sync BACKWARD and FORWARD behavior

  AlexandraRoatis

  committed
  f8242db

• fixing config file

  AlexandraRoatis

  committed
  cf03e54

• added test for valid log path check

  aionJoey

  committed
  67209d3

Commits on May 24, 2018

• changed to check if you have..

  aionick

  committed
  8522525

• bugfix: printing the size of the trie states should only consider the main chain

  AlexandraRoatis

  committed
  47da914

• fix javaapi doesn't shutdown properly and revise some wording in the shutdown log

  AionJayT

  committed
  54270e0

• additional stop condition for sync FORWARD mode

  AlexandraRoatis

  committed
  b42dd50

• new pruning configurations and default values

  AlexandraRoatis

  committed
  27a7a52

• separated MsgIn and MsgOut

  aionick

  committed
  f31e6ba

Commits on May 25, 2018

• defined fields in terms of interfaces

  aionick

  committed
  1d48630

• keep this PR up to date with its dependent PR.

  Show description for 89a28b4
  aionick

  committed
  89a28b4

• added enhancement box

  aionick

  committed
  0101b06

• fix merge conflict

  AionJayT

  committed
  c9e92b8

• Merge pull request #509 from aionick/fix_err_msgs

  Show description for 4466731
  AionJayT

  authored
  4466731

• remove duplicate method

  AionJayT

  committed
  253f3d5

• Merge branch 'p2p-outbound' of https://github.com/aionnetwork/aion into p2p-outbound

  AionJayT

  committed
  5ee86f1

• correcting broken test cases

  AlexandraRoatis

  committed
  ada9502

• fix testcase of the BlockPropagationTest

  AionJayT

  committed
  e71422f

• extracting the buildGenesis functionality to a utils class

  AlexandraRoatis

  committed
  0e4880a

• added test cases for log file creation

  aionJoey

  committed
  ba2050a

• Removed commenting out @after

  aionJoey

  authored
  fda465f

• state pruning as CLI options

  AlexandraRoatis

  committed
  188a483

• skipping full batch when in FORWARD mode and last block satisfies requirement

  AlexandraRoatis

  committed
  d87ac87

• checking for prune restrictions before importing blocks

  AlexandraRoatis

  committed
  d415e4a

• null path now returns false

  aionJoey

  committed
  651c408

• Merge branch 'enhance_logger' of https://github.com/aionJoey/aion into enhance_logger

  aionJoey

  committed
  79f5422

Commits on May 28, 2018

• removed commented-out code

  aionick

  committed
  9b0e045

• added unit test option

  aionick

  committed
  3a15d59

• moved init nrgOracle logic to ApiAion

  aionick

  committed
  3467903

• FileUtils dependency avoided

  aionJoey

  committed
  43d206b

• moved the prune restriction to block filtering

  AlexandraRoatis

  committed
  eeb8627

• bugfix: checking for null keys, values and batches

  AlexandraRoatis

  committed
  8a1160b

• getCumulativeDifficulty returns 0 or runtime TD; genesis block calls getDifficultyBI for initial TD setup

  AlexandraRoatis

  committed
  1491b8a

• updating the bestBlock total diff at loading

  AlexandraRoatis

  committed
  fd5113b

• merged with master-pre-merge

  AlexandraRoatis

  committed
  76f97db

Commits on May 29, 2018

• backward sync step as constant

  AlexandraRoatis

  committed
  51edfc4

• extracting repeated code into methods in TaskImportBlocks

  AlexandraRoatis

  committed
  9e2d789

• prune parameters as constants

  AlexandraRoatis

  committed
  bff2e1c

Commits on May 30, 2018

• bugfix: reducing the heap space requirements for the state recovery

  AlexandraRoatis

  committed
  e0ca459

• Update README.md

  kzeine

  authored
  e1e80ff

• p2p bug fix and TaskSend benchmarking(temp)

  AionJayT

  committed
  341308a

Commits on May 31, 2018

• made txBroadCastRoute field visible

  aionick

  committed
  325f0a7

• Merge pull request #511 from kzeine/master

  Show description for 36b1dc7
  qoire

  authored
  36b1dc7

• correcting the license header

  AlexandraRoatis

  committed
  6ad5911

• p2pmgr & tasks enhancement

  AionJayT

  committed
  e1e956a

Commits on Jun 1, 2018

• updated licenses and other minor fixes

  aionick

  committed
  9c65721

• added braces to one-line ifs

  aionick

  committed
  8def32b

• Merge pull request #487 from aionnetwork/db-td-refactor

  Show description for 4b5e4f7
  AionJayT

  authored
  4b5e4f7

• Merge branch 'master-pre-merge' into db-journal-prune

  AlexandraRoatis

  authored
  46fccd6

• Merge pull request #478 from aionnetwork/db-journal-prune

  Show description for 8ac445d
  AionJayT

  authored
  8ac445d

• added headers and changed comments

  aionJoey

  committed
  1f0e586

• Merge branch 'enhance_logger' of https://github.com/aionJoey/aion into enhance_logger

  aionJoey

  committed
  6e70b12

• Merge branch 'master-pre-merge' into db-archive-states

  AlexandraRoatis

  authored
  ab6d339

• Merge pull request #513 from aionnetwork/db-archive-states

  Show description for 756ccde
  AionJayT

  authored
  756ccde

• Merge pull request #508 from aionick/add_enhancement

  Show description for 3cb0eb0
  AionJayT

  authored
  3cb0eb0

• Merge pull request #503 from aionick/fix_err_msgs

  Show description for 1d44cbd
  AionJayT

  authored
  1d44cbd

• fix merge conflict

  AionJayT

  committed
  4f9e6b6

• fix merge conflict

  AionJayT

  committed
  7388acf

• fixing the bug introduced by the different branch merges

  AlexandraRoatis

  committed
  94b973e

• Merge pull request #514 from aionnetwork/fix-index-tests

  Show description for 23500ab
  AionJayT

  authored
  23500ab

• updated commenting

  aionJoey

  committed
  b88dfa1

• Merge branch 'master-pre-merge' into p2p-outbound

  AionJayT

  committed
  3af3ad7

• remove debugging cnt/log

  AionJayT

  committed
  6ec9f87

• remove unused variable

  AionJayT

  committed
  6b57d9f

• bugfix: missing null checks

  AlexandraRoatis

  committed
  67712be

• Merge branch 'master-pre-merge' into p2p-outbound

  AionJayT

  committed
  31812c3

• Merge pull request #502 from aionJoey/enhance_logger

  Show description for 8f93329
  AionJayT

  authored
  8f93329

• Merge branch 'master-pre-merge' into p2p-outbound

  AionJayT

  committed
  688ad84

• add license

  AionJayT

  committed
  bc3f2c8

Commits on Jun 4, 2018

• AW-103 Add local.storage.dir flag

  victorbalan

  committed
  7770c9c

• refactor p2p module

  AionJayT

  committed
  bfbc0d7

• move varible from the interface to the implement class

  AionJayT

  committed
  0816027

• refactor p2p log system

  AionJayT

  committed
  7ea47e5

Commits on Jun 5, 2018

• Fix typo in ketstore path

  victorbalan

  committed
  fdc1e7e

• Merge pull request #500 from aionick/add_nrgPrice

  Show description for d3a9916
  AionJayT

  authored
  d3a9916

• fix build error

  AionJayT

  committed
  51d78d8

• 1. refine p2plog 2. update ant build files

  AionJayT

  committed
  a472c03

• update build file in modAionImpl

  AionJayT

  committed
  52486e7

• refactor nrgOracle and java/web3 API refactors

  AionJayT

  committed
  0d70751

• Merge branch 'master-pre-merge' into p2p-log

  AionJayT

  committed
  7057a20

• replace log in TaskShowStatus

  AionJayT

  committed
  cc5dc1d

• small rework in ApiAion0

  AionJayT

  committed
  1855ef8

• Merge branch 'master-pre-merge' into p2p-log

  AionJayT

  committed
  f089d9d

• adjustment the config settings for fitting the log feature

  AionJayT

  committed
  d34f433

• fix test error

  AionJayT

  committed
  a42df62

• remove giving seed during the random class construct

  AionJayT

  committed
  154167d

• rename static variable

  AionJayT

  committed
  9326849

• refactor NodeMgr

  AionJayT

  committed
  2d81a07

• add exception log in the nodeMgr shutdown

  AionJayT

  committed
  93da2b6

Commits on Jun 6, 2018

• adjustment log level

  AionJayT

  committed
  c3656b4

Commits on Jun 7, 2018

• Merge pull request #516 from Centrys/aw-103

  Show description for 4cefbfe
  AionJayT

  authored
  4cefbfe

Commits on Jun 8, 2018

• pack client API into release bin

  AionJayT

  committed
  1778dbf

• update pack script

  AionJayT

  committed
  1280ae2

Commits on Jun 13, 2018

• Merge pull request #520 from aionnetwork/api-pack

  Show description for f272658
  AionJayT

  authored
  f272658

• Merge pull request #515 from aionnetwork/p2p-outbound

  Show description for 382531f
  AionJayT

  authored
  382531f

• Merge pull request #518 from aionnetwork/p2p-log

  Show description for 96f57a4
  AionJayT

  authored
  96f57a4

• Merge pull request #505 from aionnetwork/api_shutdown

  Show description for 5e3c07b
  AionJayT

  authored
  5e3c07b

• bugfix: total diff set for best block at load time

  

  AlexandraRoatis

  authored and

  AionJayT

  committed
  464b474

• fix block import issue and merge conflict

  AionJayT

  committed
  6d71545

• Merge branch 'master-pre-merge' of https://github.com/aionnetwork/aion into master-pre-merge

  AionJayT

  committed
  2da97ef

Commits on Jun 14, 2018

• test rollback on fork with exception

  

  AlexandraRoatis

  authored and

  AionJayT

  committed
  d0c5ddd

• test rollback on adding invalid block

  

  AlexandraRoatis

  authored and

  AionJayT

  committed
  3fb07f0

• import block to the fork chain issue fix

  AionJayT

  committed
  395bb01

• update fvm ref

  AionJayT

  committed
  4df7eb6

• update aion_api ref

  AionJayT

  committed
  ef6c78a

• pump kernel version

  AionJayT

  committed
  c9e951b

• update fvm ref

  AionJayT

  committed
  048b86d