Commit Graph

1346 Commits

Author SHA1 Message Date
romanman f74841ac74 Merge pull request #17 from nicksavers/master
Block stateRoot generation & Initial usage of LevelDB (which still needs work)
2014-05-30 20:59:02 +03:00
nicksavers 01ccfeb0fa Remove merge conflict in system.properties 2014-05-29 22:08:41 +02:00
nicksavers 4107c7848b Merge branch 'master' of github.com:nicksavers/ethereumj 2014-05-29 22:06:34 +02:00
nicksavers 1edf4ad278 Merge after merge 2014-05-29 22:06:14 +02:00
nicksavers 6b22137c05 Merge pushes from romanman/master 2014-05-29 21:52:18 +02:00
nicksavers 25b38c8128 Generate stateRoot from actual state 2014-05-29 21:38:51 +02:00
romanman bb9e0d1bee minor changes:
1. fixed un-toggle button on toolbar when by X window closed
2. introduced property for connection
2014-05-29 17:51:59 +03:00
romanman 0e62e5b58f Serpent editor to support save/load files 2014-05-29 16:24:37 +03:00
nicksavers af86249019 Initial usage of LevelDB - still needs lots of work 2014-05-29 11:30:54 +02:00
romanman 0be061fddf Redesign SerpentEditors controls
1. Introduced side vertical toolbar
2. 5  tool actions included (Open/Save file, Compile/Deploy/Call contract)
3. Convenient shortcuts ctrl + o, ctrl +s, ctrl + F9, ctrl + shift + F9, ctrl  + F8
2014-05-29 12:05:18 +03:00
romanman 2504cec497 Major change to Serpent compiler:
1. support for [init] [code] blocks
2. wrap the code before send with VM runnable header
3. GUI adjustments for new changes
2014-05-29 09:18:56 +03:00
romanman dc5cda4ddb Header for Contract VM runnable structure 2014-05-28 20:20:46 +03:00
romanman 71e185d9eb Fixing bug in RLP 2014-05-28 19:34:05 +03:00
romanman a175dc699f Adding new functions to the serpent grammar 2014-05-28 17:03:10 +03:00
romanman 1d5584885a Merge pull request #16 from nicksavers/master
Fix warning for unchecked operation in TransactionExecutor
2014-05-28 17:00:01 +03:00
nicksavers cb5d611b10 Various line/import cleanup and move AddressState to core-package 2014-05-28 15:57:26 +02:00
nicksavers df38d1b6b3 Write description for build file and changed to lowercase filename 2014-05-28 15:43:37 +02:00
nicksavers e768d03ca1 Clean and update documentation Transaction class 2014-05-28 15:37:18 +02:00
nicksavers bcb934bed7 Fix warning for unchecked operation in TransactionExecutor 2014-05-28 15:01:17 +02:00
romanman 67a8bd8e78 Merge pull request #15 from nicksavers/master
Format timestamp for Block details
2014-05-28 15:51:00 +03:00
nicksavers b2b95b189b Add run script for linux 2014-05-28 14:39:44 +02:00
nicksavers aeca671328 Add version for maven-jar-plugin 2014-05-28 14:39:22 +02:00
nicksavers aa5b942f87 Format timestamp for Block details 2014-05-28 09:58:08 +02:00
romanman 2b25736cc8 [asm asm] block fixing bugs and setting color style 2014-05-28 09:11:24 +03:00
romanman 47bc05f4d7 Serpent compiler progress + bug fixing:
1. Serpent: added asm block and msg function.
2. Bug: in case of transaction timeout it wasn't canceled from the pending.
3. BlockChain table the option to copy value after mouse click
2014-05-27 23:30:44 +03:00
romanman 656733985e misc
1. PayoutDialog validation
2. Transaction execution after fail bug
2014-05-27 13:29:21 +03:00
romanman 04d3492f30 Changing package structure 2014-05-27 12:01:58 +03:00
romanman 2e2e7f128c Fix auto scroll in ConnectionConsole 2014-05-27 11:50:11 +03:00
romanman 3f0fea6a08 minor 2014-05-27 10:25:45 +03:00
romanman 959c7d2d9e minor 2014-05-27 10:23:19 +03:00
romanman 7262f13181 Merge branch 'master' of https://github.com/nicksavers/ethereumj
Conflicts:
	src/main/java/org/ethereum/manager/MainData.java
2014-05-27 10:21:53 +03:00
romanman 51d3ed57e3 Packaging the application for production structure 2014-05-27 10:17:11 +03:00
nicksavers c94ff5bfa2 Clean up formatting of some classes 2014-05-26 23:49:33 +02:00
nicksavers 4c65678296 Fix bug of negative blocknumbers 2014-05-26 23:49:01 +02:00
romanman 28f8fe4101 Label encoding bug 2014-05-26 23:24:51 +03:00
romanman 905239b139 Call contract GUI & functionality 2014-05-26 21:59:14 +03:00
romanman 3f6c813ce1 Transaction data/init refactoring
-- One field is enough for new spec
2014-05-26 21:25:17 +03:00
romanman 28086ce09e Contract address calc & field on the dialog 2014-05-26 20:17:35 +03:00
romanman 6f75a25379 The functions for contract call data encodeing 2014-05-26 19:44:44 +03:00
romanman 99e141f667 After the first contract creation succeed 2014-05-26 19:06:55 +03:00
romanman 7645262d55 Merge pull request #13 from nicksavers/master
Fix Trie to generate the expected rootHash
2014-05-26 08:28:45 +03:00
nicksavers 5eca3059f7 Replace Trie.cmp() now using RootHash instead of DeepEquals 2014-05-25 23:43:50 +02:00
nicksavers b2b69fc5a4 Fix Trie to generate the expected rootHash 2014-05-25 23:33:28 +02:00
romanman c141dd98a6 Integrating ContractCreationDialog (now sending tx yet) 2014-05-25 23:12:12 +03:00
romanman e5f4515cb1 Draft_1 for compile assembly to a machine code 2014-05-25 21:39:47 +03:00
romanman dbbfe450e5 PendingTransaction mechanism introduced:
1. the dialog put a pending transaction on the list
 2. the dialog send the transaction to a net
 3. wherever the transaction got for the wire in will change to approve state
 4. only after the approve a Wallet state changes

 5. After the block is received with that tx the pending been clean up
2014-05-25 14:52:45 +03:00
romanman 0c01a4fde6 ContractSubmitDialog prototype 2014-05-25 12:43:35 +03:00
romanman 6e1862c317 Merge pull request #12 from nicksavers/master
Small fix Transaction.getSender() / update Log-version / removed imports
2014-05-25 08:43:03 +03:00
nicksavers 8b57d3facb Move clientName to SystemProperties 2014-05-24 19:54:20 +02:00
nicksavers c61569bf69 Fix tx encoding without signature, Add txTests, Fix Message tests 2014-05-24 19:36:50 +02:00