1015 Commits

Author SHA1 Message Date
ligi
69aadc8f5b Make preBuild depend on antlr4 2015-05-30 19:25:18 +02:00
Jarrad Hope
9116a3a79c minor readme and config lint error ignore changes 2015-05-28 20:17:24 +02:00
Adrian Tiberius
97bcf7a92f Changed Readme 2015-05-28 19:46:11 +02:00
Yaroslav Dmytrotsa
0338d45a4f Merge branch 'android-test-poc9-rlpx' of https://opulence.git.beanstalkapp.com/ethereumj into android-test-poc9-rlpx 2015-05-28 19:17:42 +03:00
Yaroslav Dmytrotsa
2902058cd3 set all timeouts to 300 2015-05-28 19:17:13 +03:00
Adrian Tiberius
a11fe4db44 develop branch merge 2015-05-28 13:48:14 +02:00
Yaroslav Dmytrotsa
da38a89d49 increase peer.channel.read.timeout to prevent readTimeoutException. 2015-05-28 11:23:16 +03:00
Adrian Tiberius
ff9c129235 Added missing files 2015-05-27 22:36:56 +02:00
Adrian Tiberius
035e990b7f Changed the node to the one in main develop branch. 2015-05-27 22:31:19 +02:00
Adrian Tiberius
8fe358c2f6 Latest merges from develop branch. 2015-05-27 22:09:04 +02:00
Adrian Tiberius
80bdbf0f66 More cleaning 2015-05-27 21:53:43 +02:00
Adrian Tiberius
779eddd9f9 More cleaning.
Started implementing BlockStore for android.
2015-05-27 20:05:59 +02:00
Adrian Tiberius
25506f3813 Some cleaning 2015-05-27 16:59:14 +02:00
Adrian Tiberius
92f2c29f69 Added missing files.
Some debugging changes.
2015-05-26 22:48:43 +02:00
Adrian Tiberius
43905b99a2 merged develop branch 2015-05-26 15:23:26 +02:00
Adrian Tiberius
ccb8f4cdd1 Some files didn't upload to latest version. 2015-05-22 22:24:18 +02:00
Adrian Tiberius
9b29b9ea95 Replaced RoboSpring with Dagger2 2015-05-22 21:19:38 +02:00
Adrian Tiberius
ea2fc0239f Merged poc-9-merge-rlpx from main repo. 2015-05-14 19:47:06 +02:00
Adrian Tiberius
22f70082c4 Hardcoded remoteId. 2015-05-14 18:44:47 +02:00
Adrian Tiberius
abd6ef1d4c Working netty version. Added missing dependency. 2015-05-14 17:32:03 +02:00
Adrian Tiberius
856cea2867 Added missing files from previous commit. Added Android-studio-material ui. 2015-05-14 16:22:19 +02:00
Adrian Tiberius
0b5f6f9c02 Merged poc-9 branch.
Some minimalistic console ui implementation.
2015-05-14 13:38:26 +02:00
Adrian Tiberius
ff71583142 Readded serpent.
Reenabled antlr.
2015-05-06 19:26:56 +02:00
Adrian Tiberius
fb31912de4 jsontestsuite android fixes. 2015-05-06 16:00:34 +02:00
Adrian Tiberius
b85abefebd Readded jsontestingsuite.
Removed hibernate dependency.
2015-05-06 15:59:02 +02:00
Jarrad Hope
ed43eb9a0a deleting things we probably need later 2015-05-03 09:34:49 +07:00
Adrian Tiberius
3d3e8f82c5 Succesfull app run:
Replaced spring framework with robospring.
Changed ethereumj-core build to android-library.
Disabled BlockStoreImpl until we make it android compatible( use InMemoryBlockstore ).
Disabled antlr4 dependencies.
Commented some dependencies(needs testing before enabling).
Excluded dom4j and org.jboss.spec.javax.transaction dependencies (problems with android).
Change to netty 4.0.18.Final (this seems to work with android; latest 4.1 and 5.0 presented some problems; needs additional testing).
2015-04-28 20:08:04 +02:00
Adrian Tiberius
1d3782c3be Added android app wrapper 2015-04-28 20:14:10 +03:00
eugene-shevchenko
a23617afda VM trace JSON serialization bugfix. 2015-04-09 22:42:52 +03:00
eugene-shevchenko
429d1025a2 Merge branch 'vm-trace-listener' 2015-04-09 11:49:43 +03:00
eugene-shevchenko
a0ad521fa1 VM trace extending with 'result' and 'error' fields. 2015-04-09 11:48:57 +03:00
eugene-shevchenko
e2f6eef1c9 Op.deep field added. 2015-04-07 20:42:06 +03:00
eugene-shevchenko
732ba7d8b3 TransactionExecutor backward compatibility constructor added. 2015-04-06 17:34:11 +03:00
eugene-shevchenko
d6e21a3ad6 TransactionExecutor backward compatibility constructor added. 2015-04-06 12:52:02 +03:00
eugene-shevchenko
b823521882 VM trace creation listener added. 2015-04-02 17:59:13 +03:00
Roman Mandeleil
332e15eafe Merge branch 'master' of https://github.com/ethereum/ethereumj 2015-03-31 12:55:04 +03:00
Roman Mandeleil
91ca027d80 Stringify runtime error option 2015-03-31 12:48:53 +03:00
eugene-shevchenko
6bf85643bd Merge branch 'master' into pending-transaction-datasource 2015-03-30 12:16:01 +03:00
eugene-shevchenko
a7b0fa1c7b Pending Transaction - save in external datasource
context init logging added.
2015-03-30 12:15:35 +03:00
eugene-shevchenko
3f1ec43b3b Merge branch 'pending-transaction-datasource' 2015-03-27 22:31:10 +02:00
eugene-shevchenko
f2bf688f85 Pending Transaction - save in external datasource
context initialization fix
2015-03-27 22:30:24 +02:00
eugene-shevchenko
f87a0f5fea Pending Transaction - save in external datasource
Created redis cloud entry point. Pending transactions storages in Redis depending 'redis.enabled' property and Redis availability.
2015-03-27 17:48:43 +02:00
eugene-shevchenko
52d9d19a18 redis.enabled property added 2015-03-27 17:36:43 +02:00
Roman Mandeleil
ebfdb860a8 Finalize only master push feature 2015-03-27 17:21:28 +03:00
Roman Mandeleil
28b39a90ca Empty commit 2015-03-27 17:17:34 +03:00
eugene-shevchenko
339b0e57e4 Pending Transaction - save in external datasource 2015-03-27 12:59:54 +02:00
eugene-shevchenko
a5ca9cffd0 Merge branch 'master' into pending-transaction-datasource 2015-03-27 12:50:06 +02:00
eugene-shevchenko
4ef20af5e0 Pending Transaction - save in external datasource 2015-03-27 12:49:32 +02:00
Roman Mandeleil
eb72c20f6d Pushing empty commit 2015-03-27 12:47:15 +03:00
Roman Mandeleil
6e92c3a5e0 Fix branch name env var 2015-03-27 12:43:45 +03:00