poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
275 Commits 22 Branches 24 Tags 156 MiB
Commit Graph

275 Commits

Author SHA1 Message Date
obscuren 6b644c17a7 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2014-04-15 16:18:04 -04:00
obscuren 7cb065489c added init and main functions to script 2014-04-15 16:13:04 -04:00
Maran c23a971a1f Fix up paneling 2014-04-14 17:14:07 -04:00
Maran 91c75c9305 Adding log messages to debug panel 2014-04-14 17:08:15 -04:00
Maran 28a48f1d9a Merge branch 'develop' of github.com:ethereum/go-ethereum into develop 2014-04-14 13:48:15 -04:00
Maran 8a2698ad5e Add send to contract 2014-04-14 13:46:59 -04:00
obscuren d092d05a31 Merge 2014-04-12 00:13:11 -04:00
obscuren ce43a9500f Debug steps 2014-04-12 00:12:10 -04:00
Maran ab8d96258e Added isContract to gui 2014-04-11 17:05:02 -04:00
Maran 3f82d5172f remove test menu 2014-04-11 16:47:55 -04:00
Maran 11aa7da6c3 Initial refactor for wallet qml 2014-04-11 16:44:13 -04:00
Maran 5768b18a3b Refactored simple send to use states 2014-04-11 15:18:38 -04:00
obscuren 710bbed1a2 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2014-04-11 13:36:27 -04:00
obscuren a9a6585913 Debugger 2014-04-11 13:36:25 -04:00
Maran 4d18798468 Fix merge conflicts 2014-04-11 13:33:08 -04:00
Maran cf1ae41bc0 Improved (hopefully) the send transaction tab 2014-04-11 13:26:14 -04:00
obscuren 8280dd65e6 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2014-04-11 12:50:36 -04:00
obscuren 3238894a3b Added wip debugger 2014-04-11 12:50:31 -04:00
Maran e2bf5d1270 Implemented key importing/generation for the GUI 2014-04-10 14:53:12 -04:00
Maran 834e43622c Merge branch 'feature/mnemonic' into develop 2014-04-09 11:08:35 -04:00
Jeffrey Wilcke d9ce5f5f82 Merge pull request #32 from cabreraalex/develop 
Fixed up grammar and spelling in README
 2014-04-09 17:02:00 +02:00
Maran cc5501b12f Importing mnemonic support 2014-04-09 10:29:52 -04:00
Maran 52b63459e9 Merge branch 'develop' into feature/mnemonic 2014-04-09 10:07:36 -04:00
obscuren 1e94cb5286 Nonce handling 2014-04-09 16:01:11 +02:00
Alex Cabrera cd799926d2 Fixed up grammar and spelling in README 2014-04-07 15:58:36 -04:00
Maran 2edf133b46 Added mnemonic priv key 2014-04-07 13:59:42 +02:00
obscuren 5da03f2e36 Merge branch 'develop' into miner 2014-04-05 11:20:37 +02:00
Maran ee5e7f2b35 Fix merge conflict 2014-04-01 13:18:42 +02:00
obscuren 5660d598df Added tx output 2014-04-01 10:40:34 +02:00
obscuren e403b28eea Fixed miner 2014-03-31 01:02:00 +02:00
obscuren 97b98b1250 Fixed an issue with sending gas to a contract 2014-03-31 00:22:50 +02:00
obscuren ebbc5e7cb8 Updated to new mutan api 2014-03-30 22:03:29 +02:00
obscuren 3fb7ae2fa1 Removed CreateTx 2014-03-27 19:45:55 +01:00
obscuren c5215fd4fb Added gas and gas price. 
* library's `createTx` method changed so it accepts a gas price
* dev console accepts code as well as the library
 2014-03-27 19:41:42 +01:00
obscuren 1257e8b4b3 Merge branch 'master' into develop 2014-03-27 15:24:56 +01:00
Jeffrey Wilcke 1323f60c07 Merge pull request #31 from ethersphere/master 
assetPath configurable on command line for ethereal GUI
 2014-03-27 15:24:36 +01:00
obscuren e65c4ee93e Updated transaction constructor 2014-03-27 15:22:20 +01:00
zelig 49c710bf44 assetPath configurable on command line for ethereal GUI 
- solves the problem of non-standard installs
- add AssetPath to config as string var
- introduced UiLib constructor which falls back to defaultAssetPath (earlier behaviour) if no assetPath is set
- defaultAssetPath now internal concern of UiLib
- gui.Start(assetPath) argument passed from ethereal main() as set Init() in config.go
- informative log message if wallet.qml fails to open
 2014-03-27 17:14:04 +07:00
Maran a30f5730b3 Reimplement new miner creation 2014-03-24 10:56:42 +01:00
Maran 6724d27c0c Merge master into miner branch 2014-03-24 10:26:19 +01:00
obscuren 642630db15 Moved node to ethereum 2014-03-22 12:03:10 +01:00
obscuren 45ec9c88e4 Moved node to ethereum 2014-03-22 12:03:03 +01:00
obscuren fe79a8f724 Merge branch 'develop' of https://github.com/WeMeetAgain/go-ethereum into WeMeetAgain-develop 
Conflicts:
	ethereal/Makefile
 2014-03-22 11:32:01 +01:00
obscuren 1f2547b8a7 Major re-organisation. 
The Ethereum node and Gui are now separated.
 2014-03-22 01:02:24 +01:00
obscuren 22b4e9b617 . 2014-03-22 00:35:53 +01:00
obscuren 0db86e4485 Updated to work with the new chain 2014-03-21 11:16:41 +01:00
Maran 3002570085 Mining rework 2014-03-20 11:20:10 +01:00
Maran 07734c1e1c Merge conflicts 2014-03-17 10:42:36 +01:00
obscuren 85e0447684 Fixed asset path error. Fixes #29 2014-03-16 18:34:34 +01:00
Cayman Nava 13e18e1d8f working linux makefile 
when building develop branch, checkout of eth-go develop branch is required
 2014-03-15 16:46:10 -07:00