aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #325 from fjl/deps-cleanupJeffrey Wilcke2015-02-1849-2007/+145
|\ | | | | Cleanup imports
| * p2p/nat: switch to github.com/huin/goupnpFelix Lange2015-02-1723-33/+32
| | | | | | | | My temporary fix was merged upstream.
| * crypto: switch to golang.org/x/cryptoFelix Lange2015-02-1710-254/+15
| | | | | | | | | | code.google.com/p/go.crypto is deprecated and will cause problems in future versions of Go.
| * rpc/ws: switch to golang.org/x/netFelix Lange2015-02-1710-10/+96
| | | | | | | | | | code.google.com/p/go.net is deprecated and will cause problems in future versions of Go.
| * p2p: fix ecies dependency in testsFelix Lange2015-02-179-1710/+2
| | | | | | | | | | We forgot to update this reference when moving ecies into the go-ethereum repo.
* | added bootnode back inobscuren2015-02-181-2/+1
| |
* | Removed mined transactions from pending view. Closes #321obscuren2015-02-183-27/+12
| |
* | Forgot to add the case for logs. Closes #336obscuren2015-02-181-18/+9
| |
* | Changed to ChainEvent and fixed a nil pointer in transactobscuren2015-02-188-14/+47
| |
* | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-171-1/+2
|\ \
| * \ Merge pull request #327 from fjl/udp-out-of-rangeJeffrey Wilcke2015-02-171-1/+2
| |\ \ | | | | | | | | p2p/discover: fix pending replies iteration
| | * | p2p/discover: fix pending replies iterationFelix Lange2015-02-171-1/+2
| | |/ | | | | | | | | | | | | | | | Range expressions capture the length of the slice once before the first iteration. A range expression cannot be used here since the loop modifies the slice variable (including length changes).
* | / Implement register and watchTxobscuren2015-02-173-2/+88
|/ /
* | Merge branch 'alexvandesande-ui' into developobscuren2015-02-171-1/+1
|\ \
| * | commented peer count outobscuren2015-02-171-1/+1
| | |
* | | Merge branch 'ui' of https://github.com/alexvandesande/go-ethereum into developobscuren2015-02-1715-187/+255
|\| |
| * | Merge branch 'develop' into uiAlexandre Van de Sande2015-02-1715-102/+62
| |\ \
| * | | Updated iconsAlexandre Van de Sande2015-02-176-4/+3
| | | |
| * | | removed status bar codeAlexandre Van de Sande2015-02-171-73/+0
| | | |
| * | | badge supportAlexandre Van de Sande2015-02-172-9/+9
| | | |
| * | | side iconsAlexandre Van de Sande2015-02-174-19/+103
| | | |
| * | | SideIcons work. Copy paste still doesn't.Alexandre Van de Sande2015-02-173-13/+55
| | | |
| * | | merge conflictsAlexandre Van de Sande2015-02-16769-2864/+442336
| |\ \ \
| * | | | Solved Issue #318 and added states to back buttonAlexandre Van de Sande2015-02-166-20/+21
| | | | |
| * | | | Add http when not present on browserAlexandre Van de Sande2015-02-161-1/+6
| | | | |
| * | | | changed url bar behaviour. Failed attempt at iconAlexandre Van de Sande2015-02-143-75/+77
| | | | |
* | | | | Filter and mutex locks addedobscuren2015-02-177-17/+33
| | | | |
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-171-2/+4
|\ \ \ \ \
| * | | | | Updated P2PConnected log fieldsTaylor Gerring2015-02-171-2/+4
| | |_|/ / | |/| | |
* | | | | Added optional address slice. Closes #326obscuren2015-02-171-2/+16
| | | | |
* | | | | Use new rlp (TODO requires some refactoring)obscuren2015-02-171-2/+23
|/ / / /
* | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-17671-17/+435443
|\ \ \ \ | | |_|/ | |/| |
| * | | Update obscuren/qml revisionTaylor Gerring2015-02-172-1/+3
| | | |
| * | | Add godep usage informationTaylor Gerring2015-02-171-0/+2
| | | |
| * | | Add Docker Hub link to automated buildsTaylor Gerring2015-02-171-0/+1
| | | |
| * | | Use explicit branch and godepTaylor Gerring2015-02-171-5/+9
| | |/ | |/|
| * | Update Travis to use godepTaylor Gerring2015-02-161-1/+2
| | |
| * | Add versioned dependencies from godepTaylor Gerring2015-02-16667-0/+435414
| | |
| * | Merge branch 'develop' of github.com:ethereum/go-ethereum into developTaylor Gerring2015-02-165-25/+20
| |\ \
| * | | Use Go binary instead of building from sourceTaylor Gerring2015-02-161-6/+5
| | | |
| * | | Use latest Trusty versionTaylor Gerring2015-02-161-1/+1
| | | |
| * | | Group Qt dependencies togetherTaylor Gerring2015-02-161-6/+6
| | | |
| * | | Ignore locally built binariesTaylor Gerring2015-02-161-0/+3
| | | |
* | | | "centralised" mining to backend. Closes #323obscuren2015-02-1711-96/+47
| |/ / |/| |
* | | Changed default denominatorsobscuren2015-02-163-3/+5
| | |
* | | Added invalid sec key testobscuren2015-02-161-1/+10
| | |
* | | Removed reference to lastBlockNumber & LastBlockNumberobscuren2015-02-161-21/+5
|/ /
* | Resolved some bugs in the minerobscuren2015-02-153-13/+12
| | | | | | | | | | | | * TODO nonce error sometimes persists * Fixed mining on wrong blocks * Fixed state error & receipt fail
* | Merge branch 'develop' into bountyobscuren2015-02-156-14/+19
|\ \
| * | HTTP RPC only listen on localhostobscuren2015-02-151-1/+1
| | |
| * | Validate seckey when generating pub keyobscuren2015-02-151-1/+6
| | |
| * | Use a mutex write-lock for a write operationobscuren2015-02-152-8/+8
| | |
| * | Reference pointer to block instead of pointer to functionobscuren2015-02-151-1/+1
| | |
| * | Unmarshal in to pointer to stringobscuren2015-02-151-3/+3
|/ /
* | removed some old menu itemsobscuren2015-02-152-32/+0
| |
* | Reset URL barobscuren2015-02-151-1/+9
| |
* | Fixed a few errors in the browser special meta tags objectsobscuren2015-02-151-30/+28
| |
* | Fixed mining & limited hash powerobscuren2015-02-145-22/+44
| |
* | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-144-25/+43
|\ \
| * \ Merge pull request #309 from fjl/peer-windowJeffrey Wilcke2015-02-144-25/+43
| |\ \ | | | | | | | | Fix Mist Peers Window
| | * | cmd/mist: fix peer windowFelix Lange2015-02-143-25/+37
| | | |
| | * | p2p: print Cap as name/versionFelix Lange2015-02-141-0/+6
| |/ /
* | | Moved ECIES to repo & added secondary title for webviewobscuren2015-02-146-6/+18
| | | | | | | | | | | | | | | * ECIES moved from obscuren to ethereum * Added html META[name=badge] to reflect menuItem.secondaryTitle
* | | Add 'crypto/ecies/' from commit '7c0f4a9b18d992166452d8cd32caaefd92b26386'obscuren2015-02-147-0/+1703
|\ \ \ | |/ / |/| | | | | | | | | | | git-subtree-dir: crypto/ecies git-subtree-mainline: 49a739c8d647739b3d815966f8854a4e9978df56 git-subtree-split: 7c0f4a9b18d992166452d8cd32caaefd92b26386
| * | Merge pull request #3 from Gustav-Simonsson/fix_ecies_params_init_bugJeffrey Wilcke2015-02-141-8/+2
| |\ \ | | | | | | | | Fix ECIES params nil bug
| | * | Fix ECIES params nil bugGustav Simonsson2015-02-121-8/+2
| |/ / | | | | | | | | | | | | * Change ECIES params init function to static var as it does not have state; fixes TestMarshalencryption.
| * | Merge pull request #2 from Gustav-Simonsson/correct_ecies_shared_key_generationJeffrey Wilcke2015-02-121-12/+17
| |\ \ | | | | | | | | Correct ECIES shared key length check
| | * | Correct ECIES shared key length checkGustav Simonsson2015-02-121-12/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | * Ensure the ECIES shared key is padded with zero bytes if it's smaller than the requested key length. * Split the ECIES shared key error into two; one for when the generated key is too big for the params and one for when it's nil (point of infinity returned by the curve scalar multiplication).
| * | Merge pull request #1 from Gustav-Simonsson/fix_reference_linksJeffrey Wilcke2014-12-121-2/+2
| |\ \ | | | | | | | | Update reference pdf links
| | * | Update reference pdf linksGustav Simonsson2014-12-111-2/+2
| |/ /
| * / initobscuren2014-12-107-0/+1704
| /
* | Merge branch 'Gustav-Simonsson-align_key_and_ecdsa_nonce_entropy' into developobscuren2015-02-146-125/+105
|\ \
| * | Merge branch 'align_key_and_ecdsa_nonce_entropy' of ↵obscuren2015-02-146-125/+105
|/| | | | | | | | | | | https://github.com/Gustav-Simonsson/go-ethereum into Gustav-Simonsson-align_key_and_ecdsa_nonce_entropy
| * | Remove secp256_rand.go and update testsGustav Simonsson2015-02-142-107/+11
| | |
| * | Unexport randEntropy type and use exported Reader insteadGustav Simonsson2015-02-132-5/+7
| | |
| * | Set both key generation and ECDSA nonce to use mixed entropyGustav Simonsson2015-02-114-18/+92
| | | | | | | | | | | | | | | | | | * Move random entropy functions to new package randentropy * Add function to get n bytes entropy where up to first 32 bytes are mixed with OS entropy sources
* | | disabled testobscuren2015-02-141-0/+1
| | |
* | | Merge pull request #308 from fjl/default-bootnodesJeffrey Wilcke2015-02-141-2/+11
|\ \ \ | | | | | | | | eth: add default bootnode
| * | | eth: add default bootnodeFelix Lange2015-02-141-2/+11
|/ / /
* | | Fixed QML errorsobscuren2015-02-143-7/+1
| | |
* | | Reset hash rate to 0 when mining is stoppedobscuren2015-02-141-1/+2
| | |
* | | Updated coin.js abiobscuren2015-02-141-56/+57
| | |
* | | Update balance label when miningobscuren2015-02-144-2/+18
| | |
* | | Propagate blocksobscuren2015-02-142-3/+2
| | |
* | | Fixed issue in peer windowobscuren2015-02-143-10/+14
| | | | | | | | | | | | | | | * Fixed issues where new peer window could cause a crash when entering an empty string
* | | Updated windowobscuren2015-02-141-20/+6
| | |
* | | Merge branch 'develop' into poc8obscuren2015-02-14495-13816/+2209830
|\ \ \
| * \ \ Merge branch 'miner' into developobscuren2015-02-1413-265/+236
| |\ \ \
| | * | | Fixed a few issues in the miner and updated hash rate titleobscuren2015-02-145-29/+66
| | | | | | | | | | | | | | | | | | | | | | | | | * Sometimes old nonces were set by "old" agents * Added the hash rate to the miner
| | * | | Merge branch 'develop' into minerobscuren2015-02-1463-2161/+4618
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'fjl-poc8-net-integration' into developobscuren2015-02-1352-1948/+3984
| |\ \ \ \
| | * | | | mergeobscuren2015-02-135-893/+17
| | | | | |
| | * | | | wipobscuren2015-02-1352-1943/+4855
| |/| | | |
| | * | | | p2p: bump devp2p protcol version to 3Felix Lange2015-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For compatibility with cpp-ethereum
| | * | | | p2p: handle disconnect before protocol handshakeFelix Lange2015-02-131-0/+7
| | | | | |
| | * | | | p2p/discover: fix race in ListenUDPFelix Lange2015-02-131-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | udp.Table was assigned after the readLoop started, so packets could arrive and be processed before the Table was there.
| | * | | | p2p: ensure we don't dial ourselfFelix Lange2015-02-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addPeer doesn't allow self connects, but we can avoid opening connections in the first place.
| | * | | | p2p: add I/O timeout for encrytion handshakeFelix Lange2015-02-131-1/+3
| | | | | |
| | * | | | p2p: fix goroutine leak for invalid peersFelix Lange2015-02-131-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deflect logic called Disconnect on the peer, but the peer never ran and wouldn't process the disconnect request.
| | * | | | p2p: improve read deadlinesFelix Lange2015-02-132-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are now two deadlines, frameReadTimeout and payloadReadTimeout. The frame timeout is longer and allows for connections that are idle. The message timeout is still short and ensures that we don't get stuck in the middle of a message.
| | * | | | p2p/discover: map listening port using configured mechanismFelix Lange2015-02-134-18/+35
| | | | | |
| | * | | | p2p/discover: code review fixesFelix Lange2015-02-133-7/+9
| | | | | |
| | * | | | cmd/ethereum, cmd/mist, eth, p2p: use package p2p/natFelix Lange2015-02-139-522/+54
| | | | | | | | | | | | | | | | | | | | | | | | This deletes the old NAT implementation.
| | * | | | p2p/nat: new package for port mapping stuffFelix Lange2015-02-133-0/+499
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have verified that UPnP and NAT-PMP work against an older version of the MiniUPnP daemon running on pfSense. This code is kind of hard to test automatically.
| | * | | | cmd/bootnode: new command (replaces cmd/peerserver)Felix Lange2015-02-101-0/+86
| | | | | |
| | * | | | eth: remove unused Ethereum sync fieldsFelix Lange2015-02-101-4/+0
| | | | | |
| | * | | | cmd/mist, cmd/ethereum: add CLI arguments for node keyFelix Lange2015-02-105-16/+72
| | | | | |
| | * | | | crypto: add key loading functionsFelix Lange2015-02-102-1/+30
| | | | | |
| | * | | | eth: don't warn if no BootNodes are specifiedFelix Lange2015-02-091-0/+3
| | | | | |
| | * | | | p2p/discover: deflake UDP testsFelix Lange2015-02-094-59/+123
| | | | | |
| | * | | | cmd/ethereum, cmd/mist: add flag for discovery bootstrap nodesFelix Lange2015-02-079-22/+43
| | | | | |
| | * | | | cmd/mist, eth, javascript, p2p: use Node URLs for peer suggestionsFelix Lange2015-02-076-62/+21
| | | | | |
| | * | | | p2p: fixes for actual connectionsFelix Lange2015-02-076-29/+38
| | | | | | | | | | | | | | | | | | | | | | | | The unit test hooks were turned on 'in production'.
| | * | | | p2p/discover: add node URL functions, distinguish TCP/UDP portsFelix Lange2015-02-078-326/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The discovery RPC protocol does not yet distinguish TCP and UDP ports. But it can't hurt to do so in our internal model.
| | * | | | cmd/ethereum, cmd/mist, core, eth, javascript, xeth: fixes for new p2p APIFelix Lange2015-02-0616-125/+86
| | | | | |
| | * | | | cmd/peerserver: is goneFelix Lange2015-02-061-58/+0
| | | | | | | | | | | | | | | | | | | | | | | | Will be back soon. Maybe.
| | * | | | p2p: integrate p2p/discoverFelix Lange2015-02-0615-1659/+1056
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overview of changes: - ClientIdentity has been removed, use discover.NodeID - Server now requires a private key to be set (instead of public key) - Server performs the encryption handshake before launching Peer - Dial logic takes peers from discover table - Encryption handshake code has been cleaned up a bit - baseProtocol is gone because we don't exchange peers anymore - Some parts of baseProtocol have moved into Peer instead
| | * | | | p2p/discover: add some helper functionsFelix Lange2015-02-064-20/+41
| | | | | |
| | * | | | p2p/discover: new package implementing the Node Discovery ProtocolFelix Lange2015-02-064-0/+1428
| | | | | |
| | * | | | rlp: fix encoding of arrays with byte element typeFelix Lange2015-02-062-1/+27
| | | | | |
| | * | | | crypto: make it easier to run Sha3 on multiple inputsFelix Lange2015-02-062-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crypto.Sha3(append(foo, bar)) --> crypto.Sha3(foo, bar) crypto.Sha3([]byte{}) --> crypto.Sha3()
| | * | | | key generation abstracted out, for testing with deterministic keyszelig2015-02-062-12/+92
| | | | | |
| | * | | | fix clientidentity test after privkey removedzelig2015-02-061-6/+2
| | | | | |
| | * | | | get rid of Private Key in ClientIdentityzelig2015-02-061-5/+3
| | | | | |
| | * | | | make crypto handshake calls package level, store privateKey on peer + tests okzelig2015-02-063-87/+52
| | | | | |
| | * | | | apply handshake related improvements from p2p.crypto branchzelig2015-02-063-29/+31
| | | | | |
| | * | | | add temporary forced session token generationzelig2015-02-062-0/+8
| | | | | |
| | * | | | peer-level integration test for crypto handshakezelig2015-02-063-15/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add const length params for handshake messages - add length check to fail early - add debug logs to help interop testing (!ABSOLUTELY SHOULD BE DELETED LATER) - wrap connection read/writes in error check - add cryptoReady channel in peer to signal when secure session setup is finished - wait for cryptoReady or timeout in TestPeersHandshake
| | * | | | chop first byte when cryptoid.PubKeyS is set from identity.Pubkey() since ↵zelig2015-02-061-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | this is directly copied in the auth message
| | * | | | add initial peer level test (failing)zelig2015-02-061-1/+52
| | | | | |
| | * | | | add code documentationzelig2015-02-061-15/+47
| | | | | |
| | * | | | changes that fix it all:zelig2015-02-062-57/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - set proper public key serialisation length in pubLen = 64 - reset all sizes and offsets - rename from DER to S (we are not using DER encoding) - add remoteInitRandomPubKey as return value to respondToHandshake - add ImportPublicKey with error return to read both EC golang.elliptic style 65 byte encoding and 64 byte one - add ExportPublicKey falling back to go-ethereum/crypto.FromECDSAPub() chopping off the first byte - add Import - Export tests - all tests pass
| | * | | | important fix for peer pubkey. when taken from identity, chop first format byte!zelig2015-02-061-1/+1
| | | | | |
| | * | | | add equality check for nonce and remote noncezelig2015-02-061-0/+6
| | | | | |
| | * | | | add minor comments to the testzelig2015-02-061-0/+4
| | | | | |
| | * | | | first stab at integrating crypto in our p2pzelig2015-02-063-44/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - abstract the entire handshake logic in cryptoId.Run() taking session-relevant parameters - changes in peer to accomodate how the encryption layer would be switched on - modify arguments of handshake components - fixed test getting the wrong pubkey but it till crashes on DH in newSession()
| | * | | | integrate cryptoId into peer and connection lifecyclezelig2015-02-062-3/+33
| | | | | |
| | * | | | completed the test. FAIL now. it crashes at diffie-hellman. ECIES -> ↵zelig2015-02-062-43/+57
| | | | | | | | | | | | | | | | | | | | | | | | secp256k1-go panics
| | * | | | handshake test to cryptozelig2015-02-061-1/+1
| | | | | |
| | * | | | handshake test to cryptozelig2015-02-062-2/+54
| | | | | |
| | * | | | fix crashzelig2015-02-061-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add session token check and fallback to shared secret in responder call too - use explicit length for the types of new messages - fix typo resp[resLen-1] = tokenFlag
| | * | | | rewrite to comply with latest speczelig2015-02-061-53/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - correct sizes for the blocks : sec signature 65, ecies sklen 16, keylength 32 - added allocation to Xor (should be optimized later) - no pubkey reader needed, just do with copy - restructuring now into INITIATE, RESPOND, COMPLETE -> newSession initialises the encryption/authentication layer - crypto identity can be part of client identity, some initialisation when server created
| | * | | | add crypto auth logic to p2pzelig2015-02-061-0/+174
| | | | | |
| | * | | | fix protocol to accomodate privkeyzelig2015-02-062-1/+14
| | | | | |
| | * | | | add privkey to clientIdentity + testszelig2015-02-062-5/+21
| | | | | |
| | * | | | initial hook for crypto handshake (void, off by default)zelig2015-02-061-0/+26
| | | | | |
| * | | | | Merge branch 'logjson' into developobscuren2015-02-1310-133/+638
| |\ \ \ \ \
| | * \ \ \ \ mergeobscuren2015-02-13311-8609/+24796
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | removed messagesobscuren2015-02-136-87/+2
| | | | | | |
| * | | | | | cmd + t switches to new dapp windowobscuren2015-02-121-2/+3
| | | | | | |
| | * | | | | Move standard fields to LogEventTaylor Gerring2015-02-124-173/+151
| | | | | | |
| | * | | | | Move event names within each objectTaylor Gerring2015-02-113-30/+119
| | | | | | |
| | * | | | | Use strongly-typed objectsTaylor Gerring2015-02-114-76/+305
| | | | | | |
| | * | | | | Add initial P2P json logsTaylor Gerring2015-01-221-1/+61
| | | | | | |
| | * | | | | Rename jsonlogger methodTaylor Gerring2015-01-222-2/+2
| | | | | | |
| | * | | | | Check LogSystem typeTaylor Gerring2015-01-221-2/+10
| | | | | | |
| | * | | | | Add JsonLogger typeTaylor Gerring2015-01-222-0/+35
| | | | | | |
| | * | | | | Split file cleanupTaylor Gerring2015-01-223-13/+13
| | | | | | |
| | * | | | | Add JsonLevel log levelTaylor Gerring2015-01-221-1/+2
| | | | | | |
| | * | | | | Add LogFormat flagTaylor Gerring2015-01-224-3/+13
| | | | | | |
| | * | | | | Add rawLogSystemTaylor Gerring2015-01-221-0/+24
| | | | | | |
| | * | | | | Split into multiple filesTaylor Gerring2015-01-223-122/+130
| | | | | | |
| | | | * | | Merge branch 'develop' into minerobscuren2015-02-1241-1097/+1651
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Documented methods & removed old manifestobscuren2015-02-125-131/+36
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-122-0/+58
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge pull request #303 from fjl/rlp-flatJeffrey Wilcke2015-02-122-0/+58
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | rlp: add Flat
| | | * | | | | rlp: add FlatFelix Lange2015-02-122-0/+58
| | | | | | | |
| * | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-1210-135/+113
| |\| | | | | |
| | * | | | | | Merge pull request #302 from alexvandesande/UIJeffrey Wilcke2015-02-123-119/+96
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Catalog Page Behaviour
| | | * | | | | | Catalog Page BehaviourAlexandre Van de Sande2015-02-123-119/+96
| | | | | | | | |
| | * | | | | | | Merge pull request #301 from ethereum/travisTaylor Gerring2015-02-111-3/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Updates to Travis config
| | | * | | | | | | Add go check to prefetched test dependenciesTaylor Gerring2015-02-061-0/+1
| | | | | | | | | |
| | | * | | | | | | Updated go list commandTaylor Gerring2015-02-061-1/+1
| | | | | | | | | |
| | | * | | | | | | Use after_success build stepTaylor Gerring2015-02-061-1/+3
| | | | | | | | | |
| | | * | | | | | | No long use v1 branch of qml repoTaylor Gerring2015-02-061-2/+1
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Temporarily skip broken TestVerifyPoWTaylor Gerring2015-02-111-0/+1
| | | | | | | | |
| | * | | | | | | Merge pull request #300 from tgerring/jsonrpcTaylor Gerring2015-02-114-7/+8
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow RPC ID to be string or null
| | | * | | | | | | #295 Allow RPC ID to be stringTaylor Gerring2015-02-114-6/+6
| | | | | | | | | |
| | | * | | | | | | Merge branch 'develop' into jsonrpcTaylor Gerring2015-02-11229-7023/+15536
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: rpc/ws/server.go
| | * | | | | | | | No longer switch branches for go-qml depTaylor Gerring2015-02-111-6/+0
| | | | | | | | | |
| | * | | | | | | | Merge branch 'sveneh-origin_develop' into developTaylor Gerring2015-02-111-1/+4
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Merge branch 'origin_develop' of https://github.com/sveneh/go-ethereum into ↵Taylor Gerring2015-02-111-1/+4
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sveneh-origin_develop
| | | * | | | | | | | Dockerfile creation speed-up by not running go tests, added a workaroundsveneh2015-02-091-1/+4
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | so that docker's cache is invalidated whenever th git repo is updated.
| | | | * | | | | | Merge branch 'jsonrpc' of github.com:ethereum/go-ethereum into jsonrpcTaylor Gerring2015-01-2927-701/+697
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Use custom Send methodsTaylor Gerring2015-01-291-7/+11
| | | | | | | | | | |
| * | | | | | | | | | updated coinobscuren2015-02-111-12/+7
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #298 from alexvandesande/UIJeffrey Wilcke2015-02-1121-920/+1526
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | UI changes to Mist
| | * | | | | | | | removed icomoonAlexandre Van de Sande2015-02-101-0/+0
| | | | | | | | | |
| | * | | | | | | | Recreated the changes on a new branchAlexandre Van de Sande2015-02-1022-920/+1526
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #296 from frewsxcv/patch-1Felix Lange2015-02-101-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fix broken link in README
| | * | | | | | | Fix broken link in READMECorey Farwell2015-02-071-1/+1
| | |/ / / / / /
| * | | | | | | Fixed "to" fieldobscuren2015-02-103-1/+7
| | | | | | | |
| * | | | | | | moved managerobscuren2015-02-092-16/+22
| | | | | | | |
| | | | | | | * Basic structure minerobscuren2015-02-109-293/+198
| | | | | | | |
| | | | | | | * mergedobscuren2015-02-0931-259/+352
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Updated coinobscuren2015-02-081-30/+66
| | | | | | | |
| * | | | | | | Compare regardless of lengthobscuren2015-02-081-1/+1
| | | | | | | |
| * | | | | | | Moved log message to detail outputobscuren2015-02-081-1/+1
| | | | | | | |
| * | | | | | | Fixed iteratorobscuren2015-02-082-2/+40
| | | | | | | |
| * | | | | | | Renamed filterobscuren2015-02-081-1/+2
| |/ / / / / /
| * | | | / / API changed to use Pubkey only. Reflected that change in the rest of the apiobscuren2015-02-066-6/+7
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-062-6/+5
| |\ \ \ \ \
| | * | | | | Pin Travis go version to 1.4.1Taylor Gerring2015-02-061-1/+1
| | | | | | |
| | * | | | | Only submit on coverage report successTaylor Gerring2015-02-061-2/+1
| | | | | | |
| | * | | | | Only download missing deps, not buildTaylor Gerring2015-02-061-1/+1
| | | | | | |
| | * | | | | Don't reference by $GOROOTTaylor Gerring2015-02-061-2/+2
| | | | | | |
| * | | | | | Undone fix. Will re-enable once chain resetsobscuren2015-02-061-12/+5
| |/ / / / /
| * | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-061-2/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md
| | * | | | | Updated readmeobscuren2015-02-061-10/+10
| | | | | | |
| * | | | | | Updated readmeobscuren2015-02-061-10/+10
| |/ / / / /
| * | | | | Merge pull request #290 from ↵Jeffrey Wilcke2015-02-062-7/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gustav-Simonsson/correct_block_parent_timestamp_check Correct block parent timestamp check and typos
| | * | | | | Correct block parent timestamp check and typosGustav Simonsson2015-02-042-7/+7
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-067-17/+13
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #287 from ethereum/system-testingJeffrey Wilcke2015-02-067-17/+13
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Seednode CLI param updates
| | | * | | | | | Move hardcoded seed node address to app flagTaylor Gerring2015-02-037-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces functionality `-seed=true` with `-seed="ip:port"`
| * | | | | | | | updated homeobscuren2015-02-061-1/+1
| | | | | | | | |
| * | | | | | | | Merge commit '9d84609b3faf797f4a611587abdda3d6b3b07917' into developobscuren2015-02-064-51/+17
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/ethereum/ethereum.jsMarek Kotewicz2015-02-060-0/+0
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | bring back jsonrpc single method calls in pollingMarek Kotewicz2015-02-064-51/+17
| | | | | | | | | | |
| * | | | | | | | | | pending / chain eventobscuren2015-02-066-5/+71
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'tgerring-develop' into developobscuren2015-02-066-40/+39
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'develop' of https://github.com/tgerring/go-ethereum into ↵obscuren2015-02-066-40/+39
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tgerring-develop Conflicts: rpc/http/server.go
| | * | | | | | | | | Merge branch 'develop' of github.com:tgerring/go-ethereum into developTaylor Gerring2015-02-055-39/+39
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Update RPC message formatTaylor Gerring2015-02-043-22/+27
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch 'develop' of github.com:tgerring/go-ethereum into developTaylor Gerring2015-02-043-17/+12
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Update signature for rpc websocketsTaylor Gerring2015-02-022-15/+9
| | | | | | | | | | | |
| | | | * | | | | | | | Decrease log level for Sending RPC payloadTaylor Gerring2015-02-021-2/+3
| | | | | | | | | | | |
| | | | * | | | | | | | Merge pull request #3 from ethereum/developTaylor Gerring2015-02-02553-23848/+2237273
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Update to develop
| | * | | | | | | | | | | Use different default RPC port per #186Taylor Gerring2015-02-052-2/+2
| | |/ / / / / / / / / /
| | | | | | | | | | | * Merge branch 'develop' into minerobscuren2015-02-069-26/+27
| | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Default gas price and default gas for rpcobscuren2015-02-054-18/+15
| | | | | | | | | | | |
| * | | | | | | | | | | set uncles regardless of empty uncle list. Fixes invalid blocks being minedobscuren2015-02-052-5/+4
| | | | | | | | | | | |
| * | | | | | | | | | | fixed testobscuren2015-02-052-0/+3
| | | | | | | | | | | |
| | | | | | | | | | | * wipobscuren2015-02-063-88/+116
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Propagate known transactions to new peers on connectobscuren2015-02-056-22/+30
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' into minerobscuren2015-02-0535-482/+1340
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ updated testsobscuren2015-02-0528-946/+2130
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge pull request #55 from ethereum/developMarek Kotewicz2015-02-045-4/+19
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | | fixed jsonrpc result field 0 not handled properly
| | | | * | | | | | | | fixed jsonrpc response 0 not handled properlyMarek Kotewicz2015-02-045-4/+19
| | | |/ / / / / / / /
| | | * | | | | | | | version upgradeMarek Kotewicz2015-02-042-2/+2
| | | | | | | | | | |
| | | * | | | | | | | jsonrpc.js tests && jsonrpc response validation is more strictMarek Kotewicz2015-02-048-10/+235
| | | | | | | | | | |
| | | * | | | | | | | jsonrpc.js file && batch pollingMarek Kotewicz2015-02-047-46/+196
| | | | | | | | | | |
| | | * | | | | | | | simplified polling && jsonrpc payload creationMarek Kotewicz2015-02-047-90/+36
| | | | | | | | | | |
| | | * | | | | | | | tests && fixes for utils methodsMarek Kotewicz2015-02-046-4/+101
| | | | | | | | | | |
| | | * | | | | | | | clearing testsMarek Kotewicz2015-02-047-442/+465
| | | | | | | | | | |
| | | * | | | | | | | version upgrade 0.0.12Marek Kotewicz2015-02-032-2/+2
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'develop' into cppMarek Kotewicz2015-02-0313-247/+555
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/ethereum.js.map dist/ethereum.min.js
| | | | * | | | | | | | parsing events outputMarek Kotewicz2015-02-036-13/+69
| | | | | | | | | | | |
| | | | * | | | | | | | gulpMarek Kotewicz2015-02-033-5/+35
| | | | | | | | | | | |
| | | | * | | | | | | | event outputParser && testsMarek Kotewicz2015-02-038-136/+288
| | | | | | | | | | | |