116 Commits

Author SHA1 Message Date
Wolf Posdorfer
cf3c8cf83a this was lost somehow 2018-03-02 11:05:47 +01:00
Wolf Posdorfer
b2fa16d4fa Merge branch 'release/0.16'
# Conflicts:
#	Readme.md
#	pom.xml
#	src/main/java/com/github/jtendermint/jabci/socket/TSocket.java
#	src/main/java/com/github/jtendermint/jabci/socket/async/AsyncServer.java
#	src/main/java/com/github/jtendermint/jabci/types/BlockGossip.java
#	src/main/java/com/github/jtendermint/jabci/types/BlockGossipOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/BlockID.java
#	src/main/java/com/github/jtendermint/jabci/types/BlockIDOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/BlockSize.java
#	src/main/java/com/github/jtendermint/jabci/types/BlockSizeOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ConsensusParams.java
#	src/main/java/com/github/jtendermint/jabci/types/ConsensusParamsOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/Evidence.java
#	src/main/java/com/github/jtendermint/jabci/types/EvidenceOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/Header.java
#	src/main/java/com/github/jtendermint/jabci/types/HeaderOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/KVPair.java
#	src/main/java/com/github/jtendermint/jabci/types/KVPairOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/PartSetHeader.java
#	src/main/java/com/github/jtendermint/jabci/types/PartSetHeaderOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/Request.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestBeginBlock.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestBeginBlockOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestCheckTx.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestCheckTxOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestCommit.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestDeliverTx.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestDeliverTxOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestEcho.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestEchoOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestEndBlock.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestEndBlockOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestFlush.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestInfo.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestInfoOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestInitChain.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestInitChainOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestQuery.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestQueryOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestSetOption.java
#	src/main/java/com/github/jtendermint/jabci/types/RequestSetOptionOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/Response.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseBeginBlock.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseCheckTx.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseCheckTxOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseCommit.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseCommitOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseDeliverTx.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseDeliverTxOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseEcho.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseEchoOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseEndBlock.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseEndBlockOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseException.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseExceptionOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseFlush.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseInfo.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseInfoOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseInitChain.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseQuery.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseQueryOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseSetOption.java
#	src/main/java/com/github/jtendermint/jabci/types/ResponseSetOptionOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/TxSize.java
#	src/main/java/com/github/jtendermint/jabci/types/TxSizeOrBuilder.java
#	src/main/java/com/github/jtendermint/jabci/types/Types.java
#	src/main/java/com/github/jtendermint/jabci/types/Validator.java
#	src/main/java/com/github/jtendermint/jabci/types/ValidatorOrBuilder.java
#	src/main/proto/types.proto
2018-03-02 11:02:35 +01:00
Wolf Posdorfer
6976a669a4 fix circleci format errors 2018-03-02 10:48:49 +01:00
Wolf Posdorfer
48d06b239f Merge branch 'develop' into release/0.16 v0.16 2018-03-02 10:43:28 +01:00
Wolf Posdorfer
c9d40b297c bump year number 2018-03-02 10:43:07 +01:00
Wolf Posdorfer
50e609c03c prepare release 2018-03-02 10:41:07 +01:00
Wolf Posdorfer
ce5cdc7c80 code cleanups
- removed sysouts
- removed methods in counter-example
- also removed async-server
2018-03-02 10:36:17 +01:00
srmo
aff15ae3db Update to abci v0.16.0 -
- we now understand that tendermint/abci uses proper protobuf encoding with zigZag varint wiretype
2018-03-02 02:15:34 +01:00
srmo
950bf85115 Update to abci v0.16.0 -
- implement new strange varint prefix. It's not really more intuitive
2018-03-02 01:32:11 +01:00
Wolf Posdorfer
b062156597 version 0.15 on develop 2018-01-30 12:48:41 +01:00
Wolf Posdorfer
f2ac02f2e2 Revert "Merge branch 'master' into release/0.15"
This reverts commit 340d9f7687538918722b4906f74ca5bb976453fd, reversing
changes made to a90bb33e9019d6f4506db2f4fb04c956161c89a2.
2018-01-30 12:38:37 +01:00
Wolf
340d9f7687
Merge branch 'master' into release/0.15 2018-01-30 12:06:32 +01:00
Wolf Posdorfer
baf45cedc7 revert java counter to base 2018-01-30 12:03:00 +01:00
Wolf Posdorfer
c79bb909e9 tm 15 updates 2018-01-30 12:02:48 +01:00
Wolf Posdorfer
a90bb33e90 Merge branch 'circleci' into release/0.15
# Conflicts:
#	circle.yml
2018-01-30 11:59:41 +01:00
Wolf Posdorfer
5aa9233321 version bump 2018-01-30 11:56:58 +01:00
Wolf Posdorfer
f92dea6d4e revert java counter to base 2018-01-30 11:53:56 +01:00
Wolf Posdorfer
4db95fac8d tm 0.15 updates 2018-01-30 11:44:26 +01:00
srmo
10a95d75b9 fix maven warning about wrong version name 2017-12-10 18:53:50 +01:00
srmo
42942990d6 Add missing GoGoProtos types. Though I'm not really sure what I'm doing here - had to manually adjust the import in Types
Also, add custom CodeType type as it was removed in 0.13.
2017-12-10 18:51:11 +01:00
srmo
68eb051982 Initial commit for new types from tendermint-0.13 - BROKEN as I have no idea where the new codetypes live :( 2017-12-10 18:34:18 +01:00
Wolf Posdorfer
b6fde85085 move settings.xml 2017-12-01 11:04:26 +01:00
Wolf Posdorfer
2db4a8ff49 updating readme 2017-12-01 11:02:53 +01:00
Wolf Posdorfer
36685080ec Merge branch 'release/0.12.0.2' 2017-12-01 11:00:56 +01:00
Wolf Posdorfer
7456f6be00 Merge branch 'circleci' into release/0.12.0.2 2017-12-01 10:58:59 +01:00
Wolf
19d3f573e1
Merge pull request #29 from jTendermint/Issue-27
Issue 27
2017-12-01 10:52:23 +01:00
Wolf
5957b03584
Merge pull request #25 from paulrd/patch-4
Fixed bug in reporting app data 'hash' on commit
2017-11-29 14:37:23 +01:00
posdorfer
da9b638b01 #27 make sockettimeout configurable 2017-11-23 16:26:40 +01:00
posdorfer
daf8f0b6df #27 socket.accept() block indefinately, preventing while loop from
exiting, preventing serversocket from ever reaching finally
2017-11-23 16:20:24 +01:00
Wolf Posdorfer
7ef2e0c9a2 Merge branch 'release/0.12.0.1'
# Conflicts:
#	.circleci.settings.xml
#	circle.yml
#	pom.xml
2017-11-14 14:49:08 +01:00
Wolf Posdorfer
88afdde49d creating 0.12.0.1 release 2017-11-14 14:37:31 +01:00
Wolf Posdorfer
1eb109c038 CircleCI branch 2017-11-14 14:36:39 +01:00
Wolf Posdorfer
9f6c61ab7a Circle-CI -Only branch 2017-11-14 14:32:29 +01:00
Wolf Posdorfer
9cbb406485 Version bump 2017-11-14 14:27:13 +01:00
Wolf Posdorfer
c0346319e0 make counting of open sockets possible + last time a socket was opened 2017-11-14 13:30:06 +01:00
Paul
bd1e6c7e4c
Fixed bug in reporting app data 'hash' on commit
We allocate 4 bytes not 32. `rewind()` is required because `copyFrom` copies from current position in ByteBuffer to end of ByteBuffer. Current position points to the end of the last 'put' so we rewind to point to the beginning.
2017-11-13 09:30:49 -04:00
Stephan Müller
a8f9ee0d28 fix README 2017-11-09 18:40:45 +01:00
Stephan Müller
0a6301f24a provide pubkey for gpg (this should be removed and a sign-only key should be used instead) 2017-11-09 18:18:18 +01:00
Stephan Müller
4ea222902a cleanup the mess 2017-11-09 18:13:57 +01:00
Stephan Müller
6997b44c88 cleanup the mess 2017-11-09 18:03:28 +01:00
Stephan Müller
129a5aff2c cleanup: change develop version to be SNAPSHOT and streamline pom with master 2017-11-09 16:49:57 +01:00
Stephan Müller
0fd6b4c0b3 circleCi: run tests immediately 2017-11-09 16:34:49 +01:00
Stephan Müller
7facc3b0e2 circleCi: do not use surefire goal 2017-11-09 16:31:25 +01:00
Stephan Müller
a6df8ce377 circleCi: try something else. Maybe this works out of the box 2017-11-09 16:28:10 +01:00
Stephan Müller
6c5f35474e try to enable deployment 2017-11-09 16:22:43 +01:00
Stephan Müller
e86b81da99 try to enable deployment 2017-11-09 16:19:53 +01:00
Stephan Müller
01080dfea0 prepare release 2017-11-09 16:07:50 +01:00
Stephan Müller
c079dfd11c provide circleCi maven settings 2017-11-09 15:25:59 +01:00
Stephan Müller
c10ce99055 remove bamboo reference 2017-11-09 15:17:55 +01:00
Stephan Müller
8ffbeb8a29 Bump version 2017-11-09 15:13:55 +01:00