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

71 Commits

Author SHA1 Message Date
Taylor Gerring d186bf0dfe Fix Mist types build errors 2015-03-22 14:25:33 +01:00
zelig 5e7702fd05 Merge remote-tracking branch 'upstream/develop' into frontier/js 
Conflicts:
	cmd/ethereum/js.go
	javascript/types.go
 2015-03-16 22:46:29 +07:00
obscuren b523441361 Moved ethutil => common 2015-03-16 11:27:38 +01:00
zelig 31ffca6d8a remove jsre from mist 2015-03-15 13:18:58 +07:00
Felix Lange 9bf513e993 Merge ethereum/poc-9 into accounts-integration 
Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go
 2015-03-09 23:25:46 +01:00
Felix Lange 697f6748b8 cmd/mist: use cli library and package accounts 2015-03-09 23:08:47 +01:00
obscuren 20741a96ac Updated xeth instances to take extra param for ui.Interface 
Please be aware that if any of the instances on xeth.frontend are called
the program will crash due to the default, temporarily, frontend
interface.
 2015-03-09 13:50:05 +01:00
Gustav Simonsson bc45e5c6de Integrate eth_accounts and eth_transact to use new account manager 
* Add from to eth_transact / xeth.Transact and add static pass in lieu
  of integrating with native Mist window for user passphrase entry
* Make eth_accounts return AccountManager.Accounts()
* Add a Generate Key menu item in Mist
 2015-03-06 13:10:42 +00:00
Felix Lange e64f727529 Merge pull request #433 from fjl/newcli 
Improved CLI
 2015-03-06 14:02:16 +01:00
Felix Lange bdba044a80 ethutil: remove Config variable 
Various functions throughout the codebase used it to grab settings. This
has to stop because I want to use them without reading the config file.

These functions can now be used without reading the config first:

* ethdb.NewLDBDatabase
* ethrepl.NewJSRepl
* vm.New
 2015-03-06 02:46:56 +01:00
obscuren 377c8a13de Merge branch 'develop' into poc-9 2015-03-05 17:37:18 +01:00
obscuren 44b83c6ea6 Removed unused variables 2015-03-05 17:37:00 +01:00
obscuren c47866d251 Miner fixes and updates (including miner) 2015-03-05 09:14:58 +01:00
Alexandre Van de Sande 21c373b55d Network Health Panel with mining 2015-03-02 18:39:07 -03:00
obscuren 0006585391 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2015-02-19 22:46:15 +01:00
obscuren fa4cbad315 Optimisations and fixed a couple of DDOS issues in the miner 2015-02-19 22:33:22 +01:00
Felix Lange 1ec6190e86 cmd/mist: show peer names in peers window 2015-02-19 16:54:53 +01:00
obscuren 0057bb4ef6 WIP QT Clipboard 2015-02-19 11:51:38 +01:00
obscuren c1474e1877 Removed mined transactions from pending view. Closes #321 2015-02-17 23:10:37 +01:00
obscuren 7fc9b5b3f9 Changed to ChainEvent and fixed a nil pointer in transact 2015-02-17 22:20:47 +01:00
obscuren 567428fb34 Filter and mutex locks added 2015-02-17 16:12:55 +01:00
obscuren 8135752a32 "centralised" mining to backend. Closes #323 2015-02-17 12:24:58 +01:00
Felix Lange 8464e43eaf cmd/mist: fix peer window 2015-02-14 00:12:37 +01:00
obscuren ce239333d5 Update balance label when mining 2015-02-13 18:15:23 +01:00
obscuren 0f3c25b265 Propagate blocks 2015-02-13 18:03:16 +01:00
obscuren 8305d409d2 Merge branch 'develop' into miner 2015-02-13 17:00:15 +01:00
obscuren da2fae0e43 Basic structure miner 2015-02-10 13:04:38 +01:00
Felix Lange 56f777b2fc cmd/ethereum, cmd/mist, core, eth, javascript, xeth: fixes for new p2p API 2015-02-06 00:03:59 +01:00
obscuren 1c51e12c18 Merge branch 'jsonrpc' into qt5.4 2015-01-28 18:36:41 +01:00
obscuren 872b249711 further cleaned up xeth interface 2015-01-28 18:36:23 +01:00
obscuren 45e15f62f5 merge jsonrpc 2015-01-28 18:22:53 +01:00
obscuren 7f638f0b2d moving to a better xeth 2015-01-28 18:14:28 +01:00
obscuren fb7c03ff4d switched to obscuren/qml 2015-01-28 14:51:54 +01:00
obscuren 9a11a94894 Updated assets & moved messages 2015-01-28 14:02:36 +01:00
obscuren 012a1c2533 Updated ethereum.js 2015-01-09 12:45:09 +01:00
obscuren ee84b20247 Reworking GUI interaction. Fixed javascript inject. Closes #132 2015-01-08 16:38:24 +01:00
obscuren fed3e6a808 Refactored ethutil.Config.Db out 2015-01-07 13:17:48 +01:00
obscuren 117f66e823 Added license headers 2015-01-06 12:13:57 +01:00
obscuren c9985bf563 Fixed peer window. Minor tweaks and fixes 2015-01-05 19:53:53 +01:00
obscuren f16810c48e added shh back in 2015-01-05 17:12:52 +01:00
obscuren 09841b1c9b Cleaned up some of that util 2015-01-04 14:20:16 +01:00
obscuren 0972bdeda2 Fixed using new trie iterator API 2015-01-02 12:07:26 +01:00
obscuren e2e3fa3d11 Updated Mist to use new blocks 2014-12-23 14:44:45 +01:00
obscuren 4051c0333f Added whisper js api 2014-12-22 13:23:11 +01:00
obscuren 207b6c50fb Merge branch 'badsig' of https://github.com/ebuchman/go-ethereum into ebuchman-badsig 
Conflicts:
	core/transaction_pool.go
 2014-12-19 00:33:05 +01:00
obscuren 22d29a6d52 merge 2014-12-19 00:02:55 +01:00
obscuren 5ad473d758 Moved methods to messages 2014-12-18 15:33:22 +01:00
obscuren db494170dc Created generic message (easy for testing) 2014-12-18 15:18:13 +01:00
obscuren 721e8ae93f Merged develop 2014-12-18 13:19:41 +01:00
obscuren 2d09e67713 Updated to new methods 2014-12-18 13:17:24 +01:00