Moved ECIES to repo & added secondary title for webview

* ECIES moved from obscuren to ethereum * Added html META[name=badge] to reflect menuItem.secondaryTitle
10 years ago · 84f7c966f7
parent 396f1a0a33
commit 84f7c966f7
6 changed files with 18 additions and 6 deletions
--- a/cmd/mist/assets/examples/info.html
+++ b/cmd/mist/assets/examples/info.html
@ -1,8 +1,8 @@

 <!doctype>
 <html>
-
 <head>
+<meta name="badge" content="10">
 <script type="text/javascript" src="../ext/bignumber.min.js"></script>
 <script type="text/javascript" src="../ext/ethereum.js/dist/ethereum.js"></script>
 </head>
@ -60,7 +60,7 @@
    var web3 = require('web3');
    var eth = web3.eth;

-    web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080'));
+    web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8545'));

    document.querySelector("#number").innerHTML = eth.number;
    document.querySelector("#coinbase").innerHTML = eth.coinbase
--- a/cmd/mist/assets/qml/views/browser.qml
+++ b/cmd/mist/assets/qml/views/browser.qml
@ -334,12 +334,24 @@ Rectangle {
 			}
 			z: 10

+   Timer {
+       interval: 500; running: true; repeat: true
+       onTriggered: {
+           webview.runJavaScript("document.querySelector('meta[name=badge]').getAttribute('content')", function(badge) {
+               if (badge) {
+                   menuItem.secondaryTitle = badge;
+               }
+           });
+        }
+   }
+			
 			onLoadingChanged: {
 				if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
 					webview.runJavaScript("document.title", function(pageTitle) {
 						menuItem.title = pageTitle;	
 					});

+
 					//var topBarStyle
 					webView.runJavaScript("document.querySelector(\"meta[name='ethereum-dapp-url-bar-style']\").getAttribute(\"content\")", function(topBarStyle){
 						if (topBarStyle=="transparent") {
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@ -18,10 +18,10 @@ import (
 	"code.google.com/p/go-uuid/uuid"
 	"code.google.com/p/go.crypto/pbkdf2"
 	"code.google.com/p/go.crypto/ripemd160"
+	"github.com/ethereum/go-ethereum/crypto/ecies"
 	"github.com/ethereum/go-ethereum/crypto/secp256k1"
 	"github.com/ethereum/go-ethereum/crypto/sha3"
 	"github.com/ethereum/go-ethereum/ethutil"
-	"github.com/obscuren/ecies"
 )

 func init() {
--- a/p2p/crypto.go
+++ b/p2p/crypto.go
@ -8,10 +8,10 @@ import (
 	"io"

 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/crypto/ecies"
 	"github.com/ethereum/go-ethereum/crypto/secp256k1"
 	ethlogger "github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/p2p/discover"
-	"github.com/obscuren/ecies"
 )

 var clogger = ethlogger.NewLogger("CRYPTOID")
--- a/whisper/envelope.go
+++ b/whisper/envelope.go
@ -7,9 +7,9 @@ import (
 	"time"

 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/crypto/ecies"
 	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/obscuren/ecies"
 )

 const (
--- a/whisper/whisper.go
+++ b/whisper/whisper.go
@ -8,10 +8,10 @@ import (
 	"time"

 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/crypto/ecies"
 	"github.com/ethereum/go-ethereum/event/filter"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/obscuren/ecies"
 	"gopkg.in/fatih/set.v0"
 )