status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
427 Commits 3 Branches 0 Tags 38 MiB
Commit Graph

427 Commits

Author SHA1 Message Date
romanman 63a87f36a8 Merge branch 'master' of https://github.com/romanman/ethereumj 
Conflicts:
	src/main/java/org/ethereum/vm/Program.java
 2014-06-08 07:58:26 +01:00
romanman 970f978734 Merge pull request #28 from nicksavers/master 
Fix BlockTest and added asserts for Block#1 calculations
 2014-06-08 07:53:09 +01:00
nicksavers 068d0ded4c Fix BlockTest and added asserts for Block#1 calcluations 2014-06-08 00:52:24 +02:00
romanman f26ad508df Logger configuration improve 2014-06-07 23:31:25 +01:00
romanman bee4ea0771 @authorship specified - epic days shall be remembered 2014-06-07 22:59:26 +01:00
romanman 037e1f230c Merge pull request #27 from nicksavers/master 
Refactoring and cleanup with documentation
 2014-06-07 22:43:50 +01:00
nicksavers 3927158062 Create new class Account which contains AccountState for use in wallet 2014-06-07 23:16:49 +02:00
nicksavers 2e8d413817 Document class and indentation to comply with convention http://docs.oracle.com/javase/tutorial/java/nutsandbolts/switch.html 2014-06-07 21:11:44 +02:00
romanman bf6693122d Contract Creation: 
+ main sequence
 - no edge cases testeds
 2014-06-07 19:08:50 +01:00
romanman 36a8c2da62 Merge pull request #26 from nicksavers/master 
Fix TransactionTest for zero nonce
 2014-06-07 18:18:33 +01:00
nicksavers 2d566604d8 Fix TransactionTest for zero nonce 2014-06-07 19:13:56 +02:00
romanman 8b545d6620 some minor changes and fixes 2014-06-07 18:04:06 +01:00
romanman 90e7ab6a33 Merge pull request #25 from nicksavers/master 
Add failing Block calc tests and update Denomination enum
 2014-06-07 18:01:39 +01:00
nicksavers f4d933f445 Mini merge 2014-06-07 18:49:58 +02:00
nicksavers a00ff1e205 Mega merge with major refactoring 2014-06-07 18:47:14 +02:00
nicksavers 0dab8330f1 Add comment to Block calculation 2014-06-07 18:37:36 +02:00
nicksavers 9880f3ec15 Remove call to Blockchain DB from Genesis and fix default calc values 2014-06-07 18:37:06 +02:00
nicksavers 5d4814a8eb Change my mind on using constants instead of enums for Gas 2014-06-07 18:36:26 +02:00
nicksavers 7013e1ab1a Replace GasLedger with Gas enum class 2014-06-07 18:35:35 +02:00
nicksavers 6407f48c3a Add failing Block calc tests and update Denomination enum 2014-06-07 18:33:48 +02:00
nicksavers 693930c7e4 Add failing Block calc tests and update Denomination enum 2014-06-07 18:32:41 +02:00
romanman 0154ac6a0f minor fix for last push 2014-06-07 16:39:34 +01:00
romanman 9319272a5a Major refactoring : 
WorldManager introduced
WalletTransaction for wallet waiting tx
Pending Transaction for block creation
 2014-06-07 16:36:52 +01:00
nicksavers f59e2408f9 Remove call to Blockchain DB from Genesis and fix default calc values 2014-06-07 17:27:38 +02:00
nicksavers eb46749f53 Settle on GasCost for classname 2014-06-07 16:37:20 +02:00
nicksavers dcd69f26ea Change my mind on using constants instead of enums for Gas 2014-06-07 16:19:32 +02:00
nicksavers 76175bca90 Replace GasLedger with Gas enum class 2014-06-07 16:13:05 +02:00
nicksavers 890d06c995 Merge branch 'master' of github.com:nicksavers/ethereumj 2014-06-07 15:50:07 +02:00
nicksavers 0a4a030f56 Add failing Block calc tests and update Denomination enum 2014-06-07 15:49:54 +02:00
nicksavers c1b8cd3bf9 Add failing Block calc tests and update Denomination enum 2014-06-07 15:49:34 +02:00
romanman dcf19fba08 Merge pull request #24 from nicksavers/master 
Remove obsolete state code and placeholder for processing txs in block
 2014-06-07 10:09:35 +01:00
nicksavers cae6fecab7 Merge branch 'master' of github.com:nicksavers/ethereumj 2014-06-07 10:49:36 +02:00
nicksavers fccb26d74b Remove obsolete state code and placeholder for processing txs in block 2014-06-07 10:49:26 +02:00
nicksavers 1a2ba273b9 Remove obsolete state code and placeholder for processing txs in block 2014-06-07 10:48:56 +02:00
romanman a22dfb99f9 Merge pull request #23 from nicksavers/master 
Merge small changes
 2014-06-07 09:42:36 +01:00
nicksavers a3f2206d51 Merge small changes 2014-06-07 10:04:19 +02:00
romanman 11cbb3c1b6 fixing git mess 2 2014-06-06 20:11:21 +01:00
romanman 14d2bc5a2c fixing git mess 2014-06-06 20:10:51 +01:00
romanman 1f3a25f4f6 finalization process: 
new block stateRoot calc
 2014-06-06 20:04:13 +01:00
romanman 3380dff118 small defects from the last merge 2014-06-06 19:50:12 +01:00
romanman 9f70c014a1 preparing for state finalization 2014-06-06 15:16:44 +01:00
romanman 3f7891ff36 merge conflict 2014-06-06 15:10:07 +01:00
romanman 3e58497a6f Merge pull request #22 from nicksavers/master 
Calculate txTrieRoot from txs in a block + minors
 2014-06-06 14:46:58 +01:00
nicksavers 6ec5dd9d12 Calculate txTrieRoot from actual transactions in a block and move block header to separate class 2014-06-06 15:30:24 +02:00
romanman 72f7e18d7a The right way to encode [transactionsTrie] for block header 2014-06-06 04:23:36 +01:00
romanman b9d551d2fa VM impl: 
+ SDIV, SMOD, MOD, SLT, SGT ops implemented and unittested
+ Gas calculation for memory & storage
 2014-06-05 12:36:36 +03:00
romanman 517bb2cec1 Gas Ledger introduced 
+ latest merge
+ some GUI adjustments
 2014-06-05 06:49:19 +03:00
romanman 991d9770cb Merge branch 'master' of https://github.com/romanman/ethereumj 2014-06-05 06:37:16 +03:00
romanman 734d25bdc0 Merge pull request #21 from nicksavers/master 
Impl faster ADD
 2014-06-05 06:34:19 +03:00
nicksavers d12e079b64 Continue from last block in DB 2014-06-05 01:05:05 +02:00