首页 发现 帮助
注册 登录
skyfffire
/
core-chain
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Moved ECIES to repo & added secondary title for webview

* ECIES moved from obscuren to ethereum
* Added html META[name=badge] to reflect menuItem.secondaryTitle
obscuren 10 年之前
父节点
396f1a0a33
当前提交
84f7c966f7
共有 6 个文件被更改，包括 18 次插入 和 6 次删除
分列视图 显示文件统计
  1. 2 2
      cmd/mist/assets/examples/info.html
  2. 12 0
      cmd/mist/assets/qml/views/browser.qml
  3. 1 1
      crypto/crypto.go
  4. 1 1
      p2p/crypto.go
  5. 1 1
      whisper/envelope.go
  6. 1 1
      whisper/whisper.go

+ 2 - 2
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

+ 12 - 0
cmd/mist/assets/qml/views/browser.qml
查看文件 

@@ -333,6 +333,17 @@ Rectangle {
 
 				top: navBar.bottom
 
 			}
 
 			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) {
 
@@ -340,6 +351,7 @@ Rectangle {
 
 						menuItem.title = pageTitle;	
 					});
 
 
+
 
 					//var topBarStyle
 
 					webView.runJavaScript("document.querySelector(\"meta[name='ethereum-dapp-url-bar-style']\").getAttribute(\"content\")", function(topBarStyle){
 
 						if (topBarStyle=="transparent") {

+ 1 - 1
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() {

+ 1 - 1
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")

+ 1 - 1
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 (

+ 1 - 1
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"
 
 )