aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/loggingzelig2014-06-263-23/+33
|\
| * Added amount to contract during debuggingobscuren2014-06-262-8/+12
| * Added option to not break eachlineobscuren2014-06-263-15/+21
* | 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
|\|
| * Removed old compile methodsobscuren2014-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
|\|
| * 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
| | |/ | |/|
* | | 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
|\| |
| * | Added a execBlock method which replays the given blockobscuren2014-06-232-3/+21
| |/
* | 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
|\|
| * 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
* | 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 '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
* | Merge branch 'develop' of github.com:ethereum/go-ethereum into developzelig2014-06-1419-595/+1392
|\|
| * 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'poc5-rc11Maran2014-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'2Maran2014-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'poc5-rc10obscuren2014-05-279-112/+617
| |\ \ \
| * \ \ \ Merge branch 'release/poc5-rc9'poc5-rc9obscuren2014-05-2612-33/+113
| |\ \ \ \
| | | | | * 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
* | | | | | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into developzelig2014-05-2410-22/+97
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | / 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
| |\ \ \
* | \ \ \ Merge branch 'release/poc5-rc8'poc5-rc8obscuren2014-05-218-46/+156
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| |\
* | \ Merge branch 'release/poc5-rc7'poc5-rc7obscuren2014-05-2017-304/+522
|\ \ \ | | |/ | |/|
| * | 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
| |\
* | \ Merge branch 'release/poc5-rc6'poc5-rc6obscuren2014-05-1513-120/+195
|\ \ \ | | |/ | |/|
| * | 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'obscuren2014-05-131-2/+2
|\|
| * 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
* | | Merge branch 'release/poc5-rc4'poc5-rc4obscuren2014-05-1311-185/+355
|\| |
| * | 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
| | |\
| | * | Refactored some code and fixed #37obscuren2014-05-122-155/+214
| * | | Actually start the Ethereum server on starting the GUIMaran2014-05-121-0/+6
| | |/ | |/|
| * | Disable seed by defaultMaran2014-05-122-2/+2
| |/
| * PreProcess => PreParseobscuren2014-05-121-1/+1
| * Merge branch 'release/poc5-rc3' into developobscuren2014-05-104-5/+5
| |\
* | \ Merge branch 'release/poc5-rc3'poc5-rc3obscuren2014-05-104-5/+5
|\ \ \ | | |/ | |/|
| * | Upgraded to new mutanobscuren2014-05-104-5/+5
| |/
| * Merge branch 'release/poc5-rc2' into developobscuren2014-05-101-1/+1
| |\
* | \ Merge branch 'release/poc5-rc2'poc5-rc2obscuren2014-05-1014-298/+590
|\ \ \ | | |/ | |/|
| * | Bumpobscuren2014-05-101-1/+1
| |/
| * fxedobscuren2014-05-105-4/+619
| * Moved Ext app js to its own dirobscuren2014-05-106-252/+12
| * Changed seedingobscuren2014-05-093-4/+3
| * Cleanupobscuren2014-05-095-157/+77
| * Fixed closureobscuren2014-05-082-4/+3
| * Normalized fontobscuren2014-05-061-1/+0
| * Merge branch 'release/poc5-rc1' into developobscuren2014-05-051-1/+2
| |\
* | \ Merge branch 'release/poc5-rc1'poc5-rc1obscuren2014-05-0534-247/+10205
|\ \ \ | | |/ | |/|
| * | bumpobscuren2014-05-051-1/+2
| |/
| * Renamed etherpc to ethrpcMaran2014-05-052-4/+4
| * Merge branch 'develop' into feature/rpcMaran2014-05-055-24/+58
| |\
| | * Changed getkey and secrettoaddressobscuren2014-05-053-16/+20
| | * Added storage watchobscuren2014-05-055-18/+48
| * | Implemented rpc for ethereal and ethereumMaran2014-05-053-5/+10
| * | Fix circular depsMaran2014-05-031-2/+5
| * | Merge branch 'develop' into feature/rpcMaran2014-05-027-221/+21
| |\|
| | * Updated sample coinobscuren2014-05-021-2/+2
| | * Moved public interfaceobscuren2014-05-026-219/+19
| * | Merge branch 'develop' into feature/rpcMaran2014-05-0216-253/+352
| |\|
| | * Fixed samplecoinobscuren2014-05-025-29/+42
| | * Added string conversion APIobscuren2014-05-023-2/+61
| | * Moved APIobscuren2014-05-024-107/+17
| | * Moved Ext ethereum apiobscuren2014-05-022-17/+124
| | * Added a 'set' method to change window settings for external applicationsobscuren2014-05-023-0/+12
| | * Moved and improved sample coinobscuren2014-05-025-0/+114
| | * Fixed minor issue with upnp where 'err' wasn't checked resulting in crashobscuren2014-05-024-125/+9
| * | Moved RPC Server and implemented it as a packageMaran2014-05-025-267/+9
| * | Initial commitMaran2014-05-022-0/+267
| |/
| * Fixed tx nonceobscuren2014-04-301-2/+5
| * getBalanceAt getStorageAt, fixed get balance api callobscuren2014-04-303-5/+9
| * fixed state object changes for eth apiobscuren2014-04-306-58/+98
| * API changesobscuren2014-04-303-152/+208
| * Split off External applications from main libraryobscuren2014-04-304-57/+286
| * Added mutedobscuren2014-04-297-173/+287
| * Merge pull request #34 from compleatang/developJeffrey Wilcke2014-04-292-3/+3
| |\
| | * PreProcess moved to Mutan packageCasey Kuhlman2014-04-282-3/+3
| |/
| * Draft mut(an)ed(itor)obscuren2014-04-2810-0/+8300
| * Using mutan assembler stageobscuren2014-04-281-2/+2
| * Updated version numberobscuren2014-04-272-2/+2
| * Leverage the new watch & address:changed functionalityobscuren2014-04-268-68/+114
| * Movedobscuren2014-04-261-0/+65
| * Mergeobscuren2014-04-253-69/+67
| |\
| | * typo interruptzelig2014-04-161-2/+2
| | * non-interactive optionzelig2014-04-162-57/+49
| | * logfilezelig2014-04-162-7/+23
| | * empty string -> empty byte arrayzelig2014-04-161-1/+1
| * | Added callback mechanism and updated UIobscuren2014-04-245-19/+64