diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-14 07:25:47 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-14 07:25:47 +0800 |
| commit | 84f7c966f725ef0f5c62b4427857d112c0d1e828 (patch) | |
| tree | 22eb1d46333f5cc32b92cb143599821e9861d462 | |
| parent | 396f1a0a33aaa0acf0f1381471c37dabb3caa94e (diff) | |
| download | go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.gz go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.bz2 go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.lz go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.xz go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.zst go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.zip | |
Moved ECIES to repo & added secondary title for webview
* ECIES moved from obscuren to ethereum
* Added html META[name=badge] to reflect menuItem.secondaryTitle
| -rw-r--r-- | cmd/mist/assets/examples/info.html | 4 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/browser.qml | 12 | ||||
| -rw-r--r-- | crypto/crypto.go | 2 | ||||
| -rw-r--r-- | p2p/crypto.go | 2 | ||||
| -rw-r--r-- | whisper/envelope.go | 2 | ||||
| -rw-r--r-- | whisper/whisper.go | 2 |
6 files changed, 18 insertions, 6 deletions
diff --git a/cmd/mist/assets/examples/info.html b/cmd/mist/assets/examples/info.html index daad8c706..d8816b19f 100644 --- 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 diff --git a/cmd/mist/assets/qml/views/browser.qml b/cmd/mist/assets/qml/views/browser.qml index 04b2229ec..3cbabf0b6 100644 --- a/cmd/mist/assets/qml/views/browser.qml +++ b/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") { diff --git a/crypto/crypto.go b/crypto/crypto.go index 2c8f82977..e59250eb2 100644 --- 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() { diff --git a/p2p/crypto.go b/p2p/crypto.go index 2692d708c..7e4b43712 100644 --- 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") diff --git a/whisper/envelope.go b/whisper/envelope.go index 3c477ad9f..d30397c98 100644 --- 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 ( diff --git a/whisper/whisper.go b/whisper/whisper.go index 066f2c4ea..50c2f98fd 100644 --- 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" ) |