Commit Graph

958 Commits

Author SHA1 Message Date
Chris Beams 75443aaa13
Support running ethereumj-studio as executable jar
See updated ethereumj-studio/README.md for details. Note that this
commit removes the `build-post-package.xml` ant file (for now) to
simplify the Gradle arrangement. This functionality can be re-introduced
later and more simply using Gradle's native DSL. In the meantime, both
the -core and -studio projects can be run using `gradle run` or run as
executable jars by running `gradle shadowJar` followed by the usual
`java -jar` execution of the resulting `-all` jar file found in each
project's respective `build/libs` directory.
2014-12-27 01:44:25 +01:00
Chris Beams 6645493adc
Move Gradle wrapper infrastructure to top level 2014-12-27 01:44:25 +01:00
Chris Beams 0900039bdd
Introduce top-level Gradle build
- Convert ethereumj-studio build from Maven to Gradle as well
 - Extract common build elements to top-level build.gradle
 - Update top-level README accordingly
2014-12-27 01:44:24 +01:00
Chris Beams c396eb11ea
Compensate for removal of gas price methods in poc-7
Block#getMinGasPrice and Blockchain#getGasPrice were removed in commit
aad53ba, causing compilation failures in ethereumj-studio when building
against current master of ethereumj-core. As it is unclear whether these
methods have proper replacements, this commit simply replaces calls to
these now-missing methods with the value `42`. Obviously this is a
stopgap measure and should be addressed properly as soon as possible.
2014-12-26 23:45:06 +01:00
Chris Beams 4a992fe93f
Ignore already-broken tests
The tests ignored in this commit have been failing for some time--both
under the Maven build and now under the new Gradle build. See
https://travis-ci.org/ethereum/ethereumj/builds/45100679 for an example
CI build that reflects these failures.

Rather than tracking down and fixing each issue, this commit ignores
each of these known failures such that subsequent refactorings and
changes can be made with the benifit of running the tests that do work
and knowing that no new failures have crept in.
2014-12-26 22:08:11 +01:00
Chris Beams e4ff767f45
Support installation of artifacts to local maven repo
Apply Gradle's 'maven' plugin in order to support `./gradlew install`
task, similar to `mvn install` for building and copying artifacts to the
users local ~/.m2 repository.
2014-12-26 21:50:15 +01:00
Chris Beams 4f4cf19b20
Remove unnecessary entries from root .gitignore 2014-12-26 21:49:01 +01:00
Chris Beams f845a3b751
Eliminate dependency on antlr4 Maven plugin
After porting the build from Maven to Gradle (see prior commits), the
org.ethereum.serpent.ParserGenerator class is no longer necessary as the
configuration of the antlr compiler that happened in this class now
happens directly in build.gradle. This class is thus removed in this
commit.

The plexus FileUtils class introduced by the antlr4 Maven plugin had
also been used in several locations in the codebase, probably just for
reasons of convenience. These uses have been replaced with Spring's
FileSystemUtils in order to allow for dropping the dependency on the
antlr4 Maven plugin entirely.
2014-12-26 21:49:01 +01:00
Chris Beams f9bcd2abad
Resolve JUnit 4.10 vs. 4.11 classpath conflict
ethereumj-core depends on elements specific to the JUnit 4.11 API, but (for
reasons that can only be assumed dubious) json-simple:1.1.1 transitively
includes JUnit 4.10. At the command line, Gradle handles this cleanly,
and gives ethereumj-core's direct dependence on 4.11 the precedence it
deserves. However, IDEA gets confused and gives 4.10 precedence. This
change explicitly excludes the transitive dependency from
json-simple->junit:4.10, eliminating the issue completely.
2014-12-26 21:49:00 +01:00
Chris Beams 2a8ecab299
Introduce src/gen/java for generated sources
Previously, sources generated from the serpent antlr grammar in
ethereumj-core/src/main/antlr4 were output into the build/generated-src
directory by default. This worked from the command line without issue,
but caused issues within IDEA, because the entirety of the 'build'
directory is excluded from compilation by default when working with a
Gradle-based project in IDEA.

This change simplifies the arrangement by writing these antlr-generated
sources to the src/gen/java. A .gitignore file has been added to ensure
that transient source files don't accidentally get checked in. A readme
file has been added to explain the situation to the uninitiated.
2014-12-26 21:49:00 +01:00
Chris Beams 7af08b54b5
Generate Gradle wrapper 2014-12-26 21:48:59 +01:00
Chris Beams 996e98d5cc
Port build from Maven to Gradle 2014-12-26 21:48:59 +01:00
Chris Beams a63f6445cc
Remove urls from class-level Javadoc
Prior to this change, the affected classes had Javadoc containing a url
as the first sentence. There were several issues with this:

 - The url used was inconsistent, varying between www.etherj.com,
   www.ethereumj.com and www.ethergit.com

 - Use of a url in the first sentence of a Javadoc comment is not
   consistent with Javadoc idioms. The first sentence should be the
   a short, self-contained description--in this case, the description of
   the class. If no such description is yet available, it is best to
   simply omit all text, leaving any tags (such as @author or @since).

 - Information about the project that this code belongs to should be
   expressed in the license header for each file. Currently, most files
   in ethereumj do not have license headers. This can be added in a
   later commit.
2014-12-26 11:57:21 +01:00
Chris Beams 7d2cf7f954
Use @since tags in Javadoc vs. "created on" metadata
- @since is recognized by Javadoc processor; "created on:" is not
 - Remove hh:mm information as it is unnecessary
 - Replace slashes in dates with dots, e.g. 26/12/2014 => 26.12.2014
2014-12-26 11:47:47 +01:00
Chris Beams c38907bc34
Use correct syntax for Javadoc @author tags 2014-12-26 11:38:30 +01:00
Chris Beams 58874cfc7e
Apply basic formatting
- Do not align assignments on equals signs
 - Use spaces before opening curly braces
 - Add spaces between parameters as necessary
 - Insert newlines between method declarations
 - Other minor changes

This formatting pass is not comprehensive. For the most part, it does
not deal with Javadoc formatting, line wrapping, parameter alignment
rules or a number of other items that can be addressed later.
2014-12-26 11:22:44 +01:00
Chris Beams e5fcf5b48e
Strip trailing whitespace 2014-12-26 09:45:14 +01:00
Chris Beams 0827fb5c8f
Convert tabs to spaces
Prior to this change, 78% of lines in .java files with leading
whitespace used four-space indentation, while 22% used tabs.
2014-12-26 09:42:39 +01:00
Chris Beams c7cb5231fe
Convert all files to unix line endings 2014-12-26 09:19:37 +01:00
skype me: roman.mandeleil 9f9d864036 Merge pull request #178 from ligi/ligi/code_review/simplify_transaction
simplify
2014-12-25 19:32:59 +02:00
skype me: roman.mandeleil 0d6638e19b Merge pull request #177 from ligi/ligi/code_review/simplify_is_exist
simplify
2014-12-25 11:06:10 +02:00
ligi 499d925082 simplify 2014-12-25 01:19:31 +01:00
ligi 06bc7323ca simplify 2014-12-24 23:56:33 +01:00
romanman b1c82cb59e fix ton of bugs for poc-7 compatibility 2014-12-24 15:55:36 +02:00
romanman aad53ba2c5 Introducing StateTest json suite support:
+ passing: stInitCodeTest
+ passing: stLogTests
+ passing: stRecursiveCreate
+ passing: stRefundTest
2014-12-20 23:09:48 +02:00
romanman c271346a4f Fix network connection:
+ inbound connection GET_HASHES fix
2014-12-14 17:01:23 +01:00
romanman e8eaa4f6f9 eth: 49
+ RETURN new cost
2014-12-14 12:53:55 +01:00
romanman a216aba714 tiny fix 2014-12-14 11:51:08 +01:00
romanman 6cfcb83476 eth:49 adaption:
+ SHA3 new cost calc
2014-12-14 11:46:59 +01:00
romanman 8320c53d40 reconnect bug fixed 2014-12-11 16:56:16 +01:00
romanman fb30cf0447 Merge remote-tracking branch 'origin/master' 2014-12-11 12:54:20 +01:00
romanman b75078e53d general info expose by AdminInfo been 2014-12-11 12:54:01 +01:00
skype me: roman.mandeleil 9d53d80e4f Merge pull request #174 from ligi/fix_cli_sh
fix an error ( Error: Unable to access jarfile ./lib/ethereumj-0.7.9.jar )
2014-12-11 10:37:59 +01:00
skype me: roman.mandeleil c9ea4c07d4 Merge pull request #170 from biafra23/ethereumj/master
EtherSaleWallet
2014-12-11 10:28:03 +01:00
romanman 70fc04104c Several fixes:
+ sync fix for NEW_BLOCK got in the middle of sync process
+ sync for rollback
+ apply transaction adjustments
2014-12-11 09:50:42 +01:00
ligi 99af4432a9 fix an error ( Error: Unable to access jarfile ./lib/ethereumj-0.7.9.jar ) 2014-12-10 17:00:06 +01:00
romanman a8d407ab28 fixing GitHub test suite structure 2014-12-09 11:19:49 +01:00
romanman d804cbb722 saving TransactionReceipt, bumping eth:48 2014-12-07 21:30:18 +01:00
romanman 254c51704a adapting for poc-7 final (eth:47) :
+ Repository refactoring
2014-12-04 14:35:18 +01:00
skype me: roman.mandeleil 1907c0691f Merge pull request #171 from negedzuregal/master
VMTests all pass
2014-12-04 10:28:25 +01:00
alon muroch ae575b9283 cleanup 2014-12-04 10:27:18 +01:00
alon muroch 4fd56485f1 Merge branch 'master' of https://github.com/ethereum/ethereumj 2014-12-04 10:26:18 +01:00
alon muroch abff6bd330 vmlogs test passes 2014-12-04 10:26:07 +01:00
alon muroch a88ec65459 log tests 2014-12-04 10:15:01 +01:00
romanman afc8dafab1 fixing my mistake NOT <--> BYTE switch 2014-12-04 09:29:49 +01:00
romanman a2b00ff8dd test fixing 2014-12-04 08:52:47 +01:00
Dirk Jäckel c1bae97740 Avoid JCE provider for SHA3 2014-12-04 01:03:05 +01:00
romanman 1bf087f9f7 json testing uncommented 2014-12-03 23:52:44 +01:00
Dirk Jäckel a9d3a845e6 EtherSaleWallet 2014-12-03 23:22:20 +01:00
romanman 18eeb587a9 fixing bloom filter - counting from the right not from the left !!! 2014-12-03 22:19:53 +01:00