obscuren
35fe4313d5
pre-pow
2015-01-12 10:19:27 +01:00
Gav Wood
9a9987aeed
Merge commit 'a1023a5dffee7c06e8b75a21f5c9b8826e820942' into develop
...
Conflicts:
libjsqrc/ethereumjs/dist/ethereum.js.map
2015-01-11 18:18:05 +01:00
Gav Wood
5582901ca5
Various fixes to ethereum.js and client web API stuff.
2015-01-11 18:15:35 +01:00
Gav Wood
ded221fba2
Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop
...
Conflicts:
libjsqrc/ethereumjs/.travis.yml
libjsqrc/ethereumjs/README.md
libjsqrc/ethereumjs/dist/ethereum.js
libjsqrc/ethereumjs/dist/ethereum.js.map
libjsqrc/ethereumjs/lib/abi.js
libjsqrc/ethereumjs/package.json
2015-01-11 17:54:36 +01:00
Marek Kotewicz
ab745d3b0e
updated readme
2015-01-11 17:23:03 +01:00
Marek Kotewicz
b915c7a870
updated readme
2015-01-11 17:13:32 +01:00
Marek Kotewicz
6c26255979
Merge branch 'tests' into develop
2015-01-11 17:12:37 +01:00
Marek Kotewicz
e2c4525da7
Merge branch 'master' into develop
2015-01-11 17:12:29 +01:00
Marek Kotewicz
e778e127d6
spec reporter instead of nyan
2015-01-11 17:04:30 +01:00
Marek Kotewicz
a4e6f0b3c6
fixed travis.yml && added nmp test script
2015-01-11 16:40:09 +01:00
Marek Kotewicz
048e7771fb
Merge branch 'master' into tests
2015-01-11 16:36:38 +01:00
Marek Kotewicz
15c229300c
updated package json
2015-01-11 16:36:07 +01:00
Marek Kotewicz
24814a4f0f
Merge branch 'master' of https://github.com/ethereum/ethereum.js
2015-01-11 16:33:08 +01:00
Marek Kotewicz
6188e64473
Update README.md
2015-01-11 16:25:41 +01:00
Marek Kotewicz
c34b0c67a1
Update README.md
2015-01-11 16:23:06 +01:00
obscuren
7e6b72cb5c
removed accidental qt dep
2015-01-10 18:09:57 +01:00
obscuren
e3da85faed
Implemented filter for ws + fixes
...
* proper 0xhex
* filters fixed
* start of filter manager
* accounts for ws. Closes #246
2015-01-10 00:51:56 +01:00
obscuren
491c23a728
Moved the TD method from block processor.
2015-01-09 22:42:36 +01:00
obscuren
351516c57c
Cast to string for hashable type
2015-01-09 22:23:33 +01:00
obscuren
8c7b764d47
updated tests
2015-01-09 21:18:34 +01:00
obscuren
905b8cc82f
mem fixes for vm. Changed uncle inclusion tests
2015-01-09 17:38:35 +01:00
Marek Kotewicz
47687cf085
default padding changed to 0
2015-01-09 17:27:56 +01:00
Marek Kotewicz
29c60c000a
Merge branch 'develop' into tests
2015-01-09 16:48:44 +01:00
obscuren
35f4bb96f3
Limit hashes. Closes #249
2015-01-09 16:44:09 +01:00
Marek Kotewicz
92f171ec99
rerun gulp
2015-01-09 16:40:55 +01:00
Marek Kotewicz
0933a79ab8
missing fromAscii
2015-01-09 16:38:26 +01:00
obscuren
b136b387a7
Merge branch 'ethersphere-develop' into develop
2015-01-09 16:34:49 +01:00
obscuren
6eb455032c
recover
2015-01-09 15:32:14 +01:00
obscuren
5c8c0ae04e
Fixed size 0 bug
2015-01-09 15:30:46 +01:00
obscuren
a35be3a12a
Merge branch 'develop' of https://github.com/ethersphere/go-ethereum into ethersphere-develop
2015-01-09 13:37:15 +01:00
obscuren
f9b0d1a8e7
Updated to new ethereum.js api
2015-01-09 13:36:47 +01:00
Marek Kotewicz
543a87c63f
method signature length defined
2015-01-09 13:30:14 +01:00
obscuren
c9f566269b
merged
2015-01-09 13:28:48 +01:00
obscuren
bfa12d75f8
new switch
2015-01-09 13:26:49 +01:00
Marek Kotewicz
b3eda29f41
Merge branch 'master' into tests
2015-01-09 13:07:34 +01:00
obscuren
18d8bf4b9c
updated ethereum.js
2015-01-09 13:01:21 +01:00
obscuren
aee82d3196
removed
2015-01-09 13:00:37 +01:00
Marek Kotewicz
a5907a8239
Merge branch 'master' of https://github.com/ethereum/ethereum.js
2015-01-09 12:57:03 +01:00
Marek Kotewicz
2a6c84984a
version upgraded
2015-01-09 12:55:46 +01:00
Marek Kotewicz
0538c11576
sha3 method signature
2015-01-09 12:55:04 +01:00
obscuren
012a1c2533
Updated ethereum.js
2015-01-09 12:45:09 +01:00
Jeffrey Wilcke
c9015e2e04
module var fix
2015-01-09 12:44:11 +01:00
Jeffrey Wilcke
07fba274b1
module var fix
2015-01-09 12:43:45 +01:00
obscuren
585f259b63
Support input from args
2015-01-09 12:04:54 +01:00
zelig
b3161f5803
Merge remote-tracking branch 'upstream/develop' into develop
2015-01-09 06:21:47 +00:00
zelig
5a9952c7b4
major blockpool change
...
- the spec says response to getBlockHashes(from, max) should return all hashes starting from PARENT of from. This required major changes and results in much hackier code.
- Introduced a first round block request after peer introduces with current head, so that hashes can be linked to the head
- peerInfo records currentBlockHash, currentBlock, parentHash and headSection
- AddBlockHashes checks header section and creates the top node from the peerInfo of the best peer
- AddBlock checks peerInfo and updates the block there rather than in a node
- request further hashes once a section is created but then no more until the root block is found (so that we know when to stop asking)
- in processSection, when root node is checked and receives a block, we need to check if the section has a parent known to blockchain or blockPool
- when peers are switched, new peer launches a new requestHeadSection loop or activates its actual head section, i.e., the section for it currentBlockHash
- all tests pass
2015-01-09 06:03:45 +00:00
zelig
8ecc9509b3
add ErrInsufficientChainInfo error
2015-01-09 06:03:32 +00:00
zelig
f72cb28b0f
adapt unit tests to spec
...
- AddBlockHashes ignores the first hash (just used to match getBlockHashes query) sends the rest as blocksMsg
- new test TestPeerWithKnownParentBlock
- new test TestChainConnectingWithParentHash
- adapt all other tests to the new scheme
2015-01-09 05:57:09 +00:00
zelig
43ed0ed1ae
no need to call AddBlockHashes when receiving new block
2015-01-09 05:06:04 +00:00
zelig
69dfca2feb
minor changes in integration tests
2015-01-09 05:04:32 +00:00
