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

256 Commits

Author SHA1 Message Date
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
Maran 1c983ed80c More mining stuff 2014-03-11 15:17:23 +01:00
Maran 96fcc1da32 Initial smart-miner stuff 2014-03-10 12:38:31 +01:00
obscuren fbd53f0e34 Renamed block manager to state manager 2014-03-05 10:57:14 +01:00
obscuren f7fb5b902c Conform to the new server model 2014-03-05 10:44:43 +01:00
obscuren 8275059856 Moved qml files, conform to the new server model. 
QML files got moved to their own directories. QML now has a ui helper
which should find assets in the correct resource directory
 2014-03-05 10:44:33 +01:00
obscuren 833a1a4eab Block mining log 2014-03-03 11:32:58 +01:00
obscuren 3d2c3b0107 Using asset path helper (includes a debug path atm) 2014-03-03 00:54:41 +01:00
obscuren a482b0cc1b WIP Makefile 2014-03-03 00:54:05 +01:00
obscuren 00533003b7 Get rid of the xpm files 2014-03-03 00:53:24 +01:00
obscuren b0be847416 Updated to use the state on the blocks 2014-03-03 00:53:10 +01:00
obscuren 570ab249b3 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2014-03-01 19:53:24 +01:00
Jeffrey Wilcke c6d6ca283d Update README.md 2014-02-28 17:04:45 +01:00
Jeffrey Wilcke 30c5922aa4 Update README.md 2014-02-28 17:02:38 +01:00
Jeffrey Wilcke 59a68b316f Update README.md 2014-02-28 17:02:24 +01:00
Jeffrey Wilcke 893da20ead Merge pull request #21 from jarradh/master 
Search bin directory for qml
 2014-02-28 16:46:34 +01:00
Jarrad Hope aa7c53b7ef Search bin directory for qml 2014-02-28 16:41:30 +01:00
obscuren a9d89d1f59 Merge branch 'develop' 2014-02-28 13:08:55 +01:00
obscuren f6a9aa4110 fixed about window 2014-02-28 13:08:41 +01:00
obscuren b72d3528bf Merge branch 'release/0.3.0' into develop 2014-02-28 12:20:59 +01:00