aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added sample coin as a submoduleobscuren2014-07-042-0/+3
* Removed sample coinobscuren2014-07-045-116/+0
* Visual updatesobscuren2014-07-042-13/+9
* Silent compiler errors when continues compilingobscuren2014-07-041-2/+2
* Updated debuggerobscuren2014-07-042-18/+91
* Merge branch 'ethersphere-feature/clientid' into developobscuren2014-07-045-25/+47
|\
| * Modify main wrapperszelig2014-07-043-10/+30
| * Gui saves custom client id and loglevelzelig2014-07-042-15/+17
|/
* .obscuren2014-07-021-1/+0
* Break points and debugger commandsobscuren2014-07-022-25/+124
* For namreg only show items starting without leading zeros.obscuren2014-07-021-1/+3
* VM Updateobscuren2014-07-021-1/+2
* Listen for namereg changesobscuren2014-07-021-2/+5
* Moved filesobscuren2014-07-028-31/+8
* Fixed nameregobscuren2014-07-023-9/+12
* Merge branch 'release/0.5.16' into developobscuren2014-07-012-2/+2
|\
| * bumpobscuren2014-07-012-2/+2
|/
* Merge pull request #96 from ethersphere/feature/keysJeffrey Wilcke2014-07-0115-266/+152
|\
| * Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/keyszelig2014-07-011-1/+1
| |\
| | * Merge branch 'ebuchman-miner_up_to_date' into developobscuren2014-07-011-1/+1
| | |\
| | | * fix: miner wait untill UpToDateEthan Buchman2014-07-011-1/+1
| | |/
| * | changed name for ethutil hex functions; and access to keyring via keyManagerzelig2014-06-305-8/+8
| * | gui changeszelig2014-06-301-36/+52
| * | remove ui/library; instead expose gui itself for initial windowzelig2014-06-301-46/+0
| * | main loop uses new flags and common methods in util: db, keymanager set up; p...zelig2014-06-301-3/+7
| * | new command line optionszelig2014-06-301-4/+8
| * | Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/keyszelig2014-06-302-0/+4
| |\|
| | * Merge branch 'master' into developobscuren2014-06-292-0/+4
| | |\ | |_|/ |/| |
* | | Wait for catchup when starting the minerobscuren2014-06-291-0/+4
* | | Merge branch 'develop'obscuren2014-06-272-5/+11
|\ \ \
* | | | Added install scriptobscuren2014-06-271-0/+48
* | | | Merge branch 'release/0.5.15'obscuren2014-06-2726-593/+797
|\ \ \ \
* \ \ \ \ Merge branch 'release/0.5.14'obscuren2014-06-205-57/+7
|\ \ \ \ \
* \ \ \ \ \ Merge branch 'release/0.5.13'obscuren2014-06-179-35/+141
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch 'release/poc5-rc12'obscuren2014-06-109-22/+192
|\ \ \ \ \ \ \
| | | | | | * | added utility functions to set up db, keymanager, ethereum init and simplify ...zelig2014-06-301-46/+50
| | | | | | * | remove keys file, now subsumed under ethcrypto/key_managerzelig2014-06-301-108/+0
| | | | | | * | main loop uses new flags and common methods in util: db, keymanager set upzelig2014-06-301-2/+6
| | | | | | * | new command line optionszelig2014-06-301-4/+8
| | | | | | * | changed name for ethutil hex functionszelig2014-06-301-5/+5
| | | | | | * | fix logmessage if data directory doesn't existzelig2014-06-291-1/+1
| | | | | | |/
| | | | | | * Check if go install succeedobscuren2014-06-271-0/+4
| | | | | | * Fix for installerobscuren2014-06-272-2/+2
| | | | | |/
| | | | | * Initialization of Qt should happen before anything elseobscuren2014-06-271-2/+3
| | | | | * updateobscuren2014-06-271-1/+5
| | | | | * updateobscuren2014-06-271-1/+1
| | | | | * Added install scriptobscuren2014-06-271-0/+49
| | | | | * Merge branch 'release/0.5.15' into developobscuren2014-06-272-2/+2
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | bumpobscuren2014-06-271-1/+1
| | | | * | Merge branch 'develop' into release/0.5.15obscuren2014-06-2717-506/+551
| | | | |\|
| | | | | * Merge branch 'ethersphere-feature/logging' into developobscuren2014-06-2717-506/+551
| | | | | |\
| | | | | | * go fmtzelig2014-06-278-226/+226
| | | | | | * Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/loggingzelig2014-06-263-23/+33
| | | | | | |\
| | | | | | * | gui stopzelig2014-06-264-13/+47
| | | | | | * | log sliderzelig2014-06-262-3/+15
| | | | | | * | interrupt handlers now orderedzelig2014-06-264-16/+24
| | | | | | * | new logger API for upstream mergezelig2014-06-261-1/+1
| | | | | | * | repl.Stop() to only if running, fixes panic after js> exit followed by interruptzelig2014-06-261-15/+23
| | | | | | * | add newline to help usage msgzelig2014-06-262-2/+2
| | | | | | * | Merge remote-tracking branch 'upstream/develop' into feature/loggingzelig2014-06-251-41/+0
| | | | | | |\ \
| | | | | | * | | update log levels to include DebugDetail; correct default datadir for etherealzelig2014-06-252-3/+4
| | | | | | * | | fix logSlider: now has 5 levels, initialized to gui.GetLogLevel which is set ...zelig2014-06-251-2/+2
| | | | | | * | | merge upstreamzelig2014-06-2511-39/+210
| | | | | | |\ \ \
| | | | | | * | | | fix imports in ui_lib and flags cos of defaultAssetPath move; fix logLevel ty...zelig2014-06-234-11/+17
| | | | | | * | | | merge upstreamzelig2014-06-232-4/+17
| | | | | | |\ \ \ \
| | | | | | * | | | | refactor cli and gui wrapper code. Details:zelig2014-06-2310-465/+429
| | | | | | * | | | | fix gitignore to ignore executableszelig2014-06-231-1/+2
| | | | | | * | | | | merge upstreamzelig2014-06-235-57/+7
| | | | | | |\ \ \ \ \
| | | | | | * | | | | | changed logger API, functions that allow Gui to implement ethlog.LogSystem fo...zelig2014-06-233-29/+38
| | | | | | * | | | | | add logging for jsrezelig2014-06-231-1/+7
| | | | | | * | | | | | add logging start/exit to js consolezelig2014-06-231-0/+2
| | | | | | * | | | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into developzelig2014-06-196-28/+101
| | | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developzelig2014-06-1419-595/+1392
| | | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developzelig2014-05-2410-22/+97
| | | | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | bumpobscuren2014-06-271-1/+1
| | | | |/ / / / / / / / / /
| | | | * | | | | | | | | / Increase width of asm instructionobscuren2014-06-271-1/+1
| | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |
| | | | * | | | | | | | | Added amount to contract during debuggingobscuren2014-06-262-8/+12
| | | | * | | | | | | | | Added option to not break eachlineobscuren2014-06-263-15/+21
| | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | * | | | | | | | Removed old compile methodsobscuren2014-06-251-41/+0
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | | * | | | | | | Implemented TX History for ethjsMaran2014-06-252-0/+9
| | | | * | | | | | | Moved BlockDo to utilsobscuren2014-06-252-1/+20
| | | | * | | | | | | Save repl history to file and recall on next sessionobscuren2014-06-242-2/+29
| | | | * | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-06-245-35/+152
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-06-232-3/+21
| | | | | |\ \ \ \ \ \ \ | | | | | | | |_|_|_|_|/ | | | | | | |/| | | | |
| | | | | * | | | | | | Implements QML Apps. Implements #47Maran2014-06-235-35/+152
| | | | | | |_|_|_|_|/ | | | | | |/| | | | |
| | | | * | | | | | | Renamed execBlockobscuren2014-06-241-1/+1
| | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Added a execBlock method which replays the given blockobscuren2014-06-232-3/+21
| | | | |/ / / / /
| | | | * | | | | Merge branch 'release/0.5.14' into developobscuren2014-06-202-2/+2
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | bumpobscuren2014-06-202-2/+2
| | | |/ / / / /
| | | * | | | | Removed old debugger codeobscuren2014-06-202-52/+2
| | | * | | | | Verbose loggingobscuren2014-06-192-3/+3
| | | | |_|_|/ | | | |/| | |
| | | * | | | Merge branch 'release/0.5.13' into developobscuren2014-06-172-2/+2
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | bumpobscuren2014-06-172-2/+2
| | |/ / / /
| | * | | | Removed init feesobscuren2014-06-162-6/+0
| | * | | | Max 250 logobscuren2014-06-151-1/+7
| | * | | | Added a log level slider which can change the log levelobscuren2014-06-143-9/+53
| | * | | | Minor UI adjustmentsobscuren2014-06-122-11/+40
| | | |_|/ | | |/| |
| | * | | Toggle inspector / reload using magic rectangleMaran2014-06-111-1/+25
| | * | | Reimplement -datadir flag. Implements #79Maran2014-06-114-4/+12
| | * | | Implemented usedGas to the explorerMaran2014-06-111-3/+3
| | * | | Add GasLimit to the block explorerMaran2014-06-111-2/+3
| | * | | Merge branch 'release/poc5-rc12' into developobscuren2014-06-102-2/+2
| | |\ \ \ | | |/ / / | |/| | |
| * | | | bumpobscuren2014-06-102-2/+2
| |/ / /
| * | | Fixed debugger hangobscuren2014-06-103-9/+33
| * | | debugger outputobscuren2014-06-061-1/+2
| * | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-06-056-7/+143
| |\ \ \
| | * | | Implement getStateKeyVal for JS bindings.Maran2014-06-044-3/+18
| | * | | Add loading of extra build in js files to JS-Repl. Implements #67Maran2014-06-041-0/+19
| | * | | Added namereg register option to qml walletMaran2014-06-032-2/+30
| | * | | Implemented transaction catching up. Implements #73Maran2014-06-031-0/+11
| | * | | Tweaks and latency added to peeroverviewMaran2014-06-031-5/+6
| | * | | Added Peer WindowMaran2014-06-023-2/+64
| |/ / / |/| | |
| * | | Added more debugger outputobscuren2014-06-051-4/+13
|/ / /
* | | ethereum instead of ethereal. Fixes #69obscuren2014-05-311-1/+1
* | | fixed logging issue that would otherwise crash the client. Fixes #68obscuren2014-05-311-6/+9
* | | Merge branch 'develop'obscuren2014-05-311-1/+2
|\ \ \
| * | | show first?obscuren2014-05-311-1/+2
* | | | Merge branch 'develop'obscuren2014-05-314-17/+43
|\| | |
| * | | Added ini file for ethereum. fixes #66obscuren2014-05-314-17/+43
* | | | Merge branch 'develop'obscuren2014-05-3010-1042/+1001
|\| | |
| * | | Added config file setup. Fixes #59obscuren2014-05-305-28/+35
| * | | Unified the contract interface and tx interface. Fixes #62obscuren2014-05-302-51/+54
| * | | Improved UIobscuren2014-05-305-130/+47
| * | | Update peer infoobscuren2014-05-301-3/+13
| * | | Minor GUI updatesobscuren2014-05-303-36/+49
| * | | .obscuren2014-05-291-1001/+1001
| * | | Minor UI changesobscuren2014-05-294-17/+25
| * | | Minimal fee for sending transactionsobscuren2014-05-291-1/+1
| * | | Removed regexp for nameregobscuren2014-05-291-2/+2
| * | | Disabled instruction selectionobscuren2014-05-292-2/+3
* | | | Merge branch 'develop'obscuren2014-05-296-243/+252
|\| | |
| * | | mergeobscuren2014-05-294-1007/+1004
| |\ \ \
| | * | | Add 0x when feeding data to debuggerMaran2014-05-291-1/+1
| | * | | Merge branch 'release/poc5-rc11' into developMaran2014-05-282-2/+2
| | |\ \ \
| * | | | | Fixes and improved debuggerobscuren2014-05-295-1242/+1252
* | | | | | Fix merge conflictMaran2014-05-280-0/+0
|\ \ \ \ \ \
| * | | | | | Data and script in the debugger accept "0x" values and regular scriptingobscuren2014-05-282-25/+45
* | | | | | | Merge branch 'release/poc5-rc11'Maran2014-05-286-37/+106
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Bump to RC11Maran2014-05-282-2/+2
| | |/ / / | |/| | |
| * | | | Refactor hex encode and remove coupling of popup to main windowMaran2014-05-282-4/+2
| |/ / /
| * | | Hooked up the Block Explorer to the Debugger so we can instantly debug made t...Maran2014-05-283-8/+59
| * | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-280-0/+0
| |\ \ \
| | * \ \ Merge branch 'hotfix/2' into developMaran2014-05-283-990/+976
| | |\ \ \
| * | \ \ \ Merge branch 'master' into developobscuren2014-05-283-990/+976
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'hotfix/2'Maran2014-05-283-990/+976
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Consolidated external qml files to hopefully prevent crashing bugMaran2014-05-283-990/+976
|/ / / / /
* | | | | Merge branch 'develop'obscuren2014-05-272-1/+32
|\ \ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'release/poc5-rc10'obscuren2014-05-279-112/+617
|\ \ \ \ \
* \ \ \ \ \ Merge branch 'release/poc5-rc9'obscuren2014-05-2612-33/+113
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'release/poc5-rc8'obscuren2014-05-218-46/+156
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch 'release/poc5-rc7'obscuren2014-05-2017-304/+522
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge branch 'release/poc5-rc6'obscuren2014-05-1513-120/+195
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge branch 'develop'obscuren2014-05-131-2/+2
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc4'obscuren2014-05-1311-185/+355
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc3'obscuren2014-05-104-5/+5
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc2'obscuren2014-05-1014-298/+590
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc1'obscuren2014-05-0534-247/+10205
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * | Debugger script&data now accept "0x" valuesobscuren2014-05-282-25/+45
| | | | | | | | | | | |/ /
| | | | | | | | | | | * | Added some shortcutsobscuren2014-05-272-1/+32
| | | | | | | | | | | * | Merge branch 'release/poc5-rc10' into developobscuren2014-05-272-2/+2
| | | | | | | | | | | |\ \ | | | | | | | | | | | |/ / | | | | | | | | | | |/| |
| | | | | | | | | | * | | bumpobscuren2014-05-272-2/+2
| | | | | | | | | | |/ /
| | | | | | | | | | * | Minor fixes and improvements to the uiobscuren2014-05-274-27/+40
| | | | | | | | | | * | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-273-22/+161
| | | | | | | | | | |\ \
| | | | | | | | | | | * | Uhm whatMaran2014-05-271-1/+2
| | | | | | | | | | | * | Adding new blocks on broadcastMaran2014-05-272-5/+15
| | | | | | | | | | | * | Increase size for asmMaran2014-05-271-2/+2
| | | | | | | | | | | * | Removed recursive function for loopMaran2014-05-272-15/+8
| | | | | | | | | | | * | Fix merge conflictMaran2014-05-274-47/+64
| | | | | | | | | | | |\ \
| | | | | | | | | | | * | | Remove extra log statementMaran2014-05-261-1/+0
| | | | | | | | | | | * | | Implemented simple block/tx explorerMaran2014-05-262-20/+139
| | | | | | | | | | | * | | Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-267-21/+33
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-234-3/+10
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | | Hide inspector by defaultMaran2014-05-221-1/+1
| | | | | | | | | | | * | | | | Fix merge conflictsMaran2014-05-225-3/+73
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-213-10/+46
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-212-1/+5
| | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | Wait with mining until up to dateMaran2014-05-211-5/+4
| | | | | | | | | | * | | | | | | | | New debugger implementedobscuren2014-05-274-18/+25
| | | | | | | | | | * | | | | | | | | New debuggerobscuren2014-05-273-145/+258
| | | | | | | | | | * | | | | | | | | Sep debugger from mainobscuren2014-05-274-6/+222
| | | | | | | | | | | |_|_|_|_|_|/ / | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | * | | | | | | | Fixed debuggerobscuren2014-05-274-47/+64
| | | | | | | | | | | |_|_|_|_|/ / | | | | | | | | | | |/| | | | | |
| | | | | | | | | | * | | | | | | Merge branch 'release/poc5-rc9' into developobscuren2014-05-262-2/+2
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / | | | | | | | | | |/| | | | | | |
| | | | | | | | | * | | | | | | | Bumpobscuren2014-05-262-2/+2
| | | | | | | | | |/ / / / / / /
| | | | | | | | | * | | | | | / Recv send for txsobscuren2014-05-262-10/+15
| | | | | | | | | | |_|_|_|_|/ | | | | | | | | | |/| | | | |
| | | | | | | | | * | | | | | New main script through init return valueobscuren2014-05-235-10/+17
| | | | | | | | | | |_|_|_|/ | | | | | | | | | |/| | | |
| | | | | | | | | * | | | | Custom identifierobscuren2014-05-224-3/+10
| | | | | | | | | | |_|_|/ | | | | | | | | | |/| | |
| | | | | | | | | * | | | Added mining stop and startobscuren2014-05-222-9/+44
| | | | | | | | | * | | | Fixes #49obscuren2014-05-221-0/+5
| | | | | | | | | * | | | Fixes #50obscuren2014-05-221-1/+22
| | | | | | | | | | |_|/ | | | | | | | | | |/| |
| | | | | | | | | * | | Merge branch 'release/poc5-rc8' into developobscuren2014-05-212-3/+4
| | | | | | | | | |\ \ \ | | | | | | | | | |/ / / | | | | | | | | |/| | |
| | | | | | | | * | | | Bumpedobscuren2014-05-212-3/+4
| | | | | | | | |/ / /
| | | | | | | | * | | Improved on some ui elementsobscuren2014-05-212-0/+40
| | | | | | | | * | | Fixed unconfirmed balance stringobscuren2014-05-211-7/+2
| | | | | | | | | |/ | | | | | | | | |/|
| | | | | | | | * | Removed method nameobscuren2014-05-212-1/+5
| | | | | | | | |/
| | | | | | | | * Updated readme to reflect optionsobscuren2014-05-212-17/+13
| | | | | | | | * Switch variables as intendedobscuren2014-05-211-2/+2
| | | | | | | | * Changed flag parsingobscuren2014-05-211-1/+10
| | | | | | | | * Refactored some of the functionsobscuren2014-05-212-16/+81
| | | | | | | | * Forked version of otto so we can support lowerCased methodsobscuren2014-05-203-3/+3
| | | | | | | | * Merge branch 'release/poc5-rc7' into developobscuren2014-05-202-2/+2
| | | | | | | | |\ | | | | | | | | |/ | | | | | | | |/|
| | | | | | | * | Bumpobscuren2014-05-202-2/+2
| | | | | | | |/
| | | | | | | * Implemented GUI watchers for rapid reload. Implements #46Maran2014-05-202-3/+69
| | | | | | | * Removed old console in favor of the new JS REPLobscuren2014-05-203-272/+1
| | | | | | | * Refactored file structureobscuren2014-05-203-101/+124
| | | | | | | * Increase default peer amount to 10Maran2014-05-202-2/+2
| | | | | | | * Added js interpret modeobscuren2014-05-193-3/+29
| | | | | | | * Improved REPL outputobscuren2014-05-195-12/+89
| | | | | | | * Added multi-line supportobscuren2014-05-193-9/+35
| | | | | | | * Improved consoleobscuren2014-05-191-4/+70
| | | | | | | * Changed loggingobscuren2014-05-191-4/+3
| | | | | | | * Removed nonce incrementingobscuren2014-05-191-2/+4
| | | | | | | * Readline repl for linux & osxobscuren2014-05-177-39/+122
| | | | | | | * Merge branch 'feature/otto' into developobscuren2014-05-164-2/+122
| | | | | | | |\
| | | | | | | | * Tell config which loggers to useobscuren2014-05-162-3/+3
| | | | | | | | * Implemented JavaScript consoleobscuren2014-05-162-18/+53
| | | | | | | | * Basic javascript consoleobscuren2014-05-163-0/+85
| | | | | | | |/
| | | | | | | * Refactored to reactor. Fixes #42obscuren2014-05-151-6/+7
| | | | | | | * Merge branch 'release/poc5-rc6' into developobscuren2014-05-152-2/+4
| | | | | | | |\ | | | | | | | |/ | | | | | | |/|
| | | | | | * | Bumped versionobscuren2014-05-152-2/+4
| | | | | | |/
| | | | | | * Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-143-22/+28
| | | | | | |\
| | | | | | | * Prevent crash during import of privkeys.Maran2014-05-141-3/+2
| | | | | | | * Fix merge conflictsMaran2014-05-1411-72/+107
| | | | | | | |\
| | | | | | | * | Make sure we have a coinbase address to mine withMaran2014-05-141-4/+10
| | | | | | | * | Refactored RPC client to utils so it can be reusedMaran2014-05-143-17/+14
| | | | | | | * | Rewritten a check to only start mining once we are caught up with all peersMaran2014-05-141-6/+9
| | | | | | * | | Update wallet value for coinbase rewards. Implements #44 & #43obscuren2014-05-142-12/+31
| | | | | | | |/ | | | | | | |/|
| | | | | | * | Switched to new keyring methodsobscuren2014-05-1411-71/+106
| | | | | | |/
| | | | | | * Refactored mining into utils and exposed it to ethereal. Partly fixes #43Maran2014-05-143-24/+36
| | | | | | * Generate coinbase from privatekey, not pubkey. Partily fixes #43Maran2014-05-141-1/+1
| | | | | | * Changed validators to regexp validatorsobscuren2014-05-142-4/+5
| | | | | |/
| | | | | * Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-131-2/+2
| | | | |/|
| | | | | * TypoMaran2014-05-131-1/+1
| | | | | * Removed harcoded addresses from GetBlock JS bindings. Fixes #39Maran2014-05-131-2/+2
| | | | * | Bumpedobscuren2014-05-131-1/+1
| | | | |/
| | | | * Depcrecated setMaran2014-05-131-0/+3
| | | | * Adding new API test case htmlMaran2014-05-131-0/+43
| | | | * Change coinbase to be the address not public keyMaran2014-05-131-1/+4
| | | | * Implemented new JS/EthPub methodsMaran2014-05-133-22/+66
| | | | * Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-135-4/+8
| | | | |\
| | | | | * Fix merge conflictMaran2014-05-133-4/+4
| | | | | |\
| | | | | * \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-131-3/+3
| | | | | |\ \
| | | | | * | | Implemented a flag for a different RPC port; --rpcportMaran2014-05-134-2/+6
| | | | * | | | Fixobscuren2014-05-132-2/+2
| | | | | |_|/ | | | | |/| |
| | | | * | | Public ethereum interface uses EthManagerobscuren2014-05-133-3/+3
| | | | | |/ | | | | |/|
| | | | * | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-134-6/+14
| | | | |\|
| | | | | * Added support to NewJsonRpc to return an error as well as an interfaceMaran2014-05-132-4/+12
| | | | | * Enable seed againMaran2014-05-132-2/+2
| | | | * | Fixed wallet crash for new account. Fixes #38obscuren2014-05-131-3/+3
| | | | |/
| | | | * Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-122-155/+214
| | | | |\
| | | | | * Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-122-2/+2
| | | | | |\