use npm connect

OneKeyHQ · Jan 12, 2022 · 015dfa7 · 015dfa7
1 parent be9e703
commit 015dfa7
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 28 deletions.
diff --git a/eth-onekey-keyring/index.js b/eth-onekey-keyring/index.js
@@ -2,7 +2,7 @@ const { EventEmitter } = require('events')
 const ethUtil = require('ethereumjs-util')
 const Transaction = require('ethereumjs-tx')
 const HDKey = require('hdkey')
-const TrezorConnect = require('@onekeyhq/connect').default
+const TrezorConnect = require('@onekeyfe/connect').default
 
 const hdPathString = `m/44'/60'/0'/0`
 const keyringType = 'Trezor Hardware'

diff --git a/eth-onekey-keyring/package.json b/eth-onekey-keyring/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyhq/eth-onekey-keyring",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "A OneKey compatible keyring, for onekey hardware wallets",
   "files": [
     "index.js"
@@ -33,7 +33,7 @@
     "mocha/mkdirp": "^0.5.1"
   },
   "dependencies": {
-    "@onekeyhq/connect": "8.6.1-extended",
+    "@onekeyfe/connect": "8.7.0-extended",
     "eth-sig-util": "^1.4.2",
     "ethereumjs-tx": "^1.3.4",
     "ethereumjs-util": "^7.0.9",

diff --git a/eth-onekey-keyring/test/test-eth-onekey-keyring.js b/eth-onekey-keyring/test/test-eth-onekey-keyring.js
@@ -9,7 +9,7 @@ const sinon = require('sinon')
 
 const EthereumTx = require('ethereumjs-tx')
 const HDKey = require('hdkey')
-const TrezorConnect = require('@onekeyhq/connect').default
+const TrezorConnect = require('@onekeyfe/connect').default
 
 const TrezorKeyring = require('..')
 

diff --git a/eth-onekey-keyring/yarn.lock b/eth-onekey-keyring/yarn.lock
@@ -116,10 +116,10 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@onekeyhq/[email protected]":
+"@onekeyfe/[email protected]":
   version "1.0.19"
-  resolved "https://npm.pkg.github.com/download/@onekeyhq/blockchain-link/1.0.19/1e4446addf052f2020fe584a3d1d3b9ac69a1f18806cccd3adb1bfda86a47b59#6bd0284cc040257426b1f03630c6d4b41682cc49"
-  integrity sha512-OxWaIwsu10EGoNU9iqxMGboEwtZc4NdOV/i9d0GCCQ9w1j5bwuS2/LxWR1rguLWDNFFu6SaxctAvRFzeLM4xIw==
+  resolved "https://registry.yarnpkg.com/@onekeyfe/blockchain-link/-/blockchain-link-1.0.19.tgz#6732e11e17b3ff7083d627a25b352278bec59049"
+  integrity sha512-hoZ3ELzqmy1idoSxeLtGpYot6PyJmYm5Bwr4R4FLTOtLR7avI5+HIZDv7xLlPAM+6mEPksbHpp1gwxsDt0DbXg==
   dependencies:
     bignumber.js "^9.0.1"
     es6-promise "^4.2.8"
@@ -128,15 +128,15 @@
     tiny-worker "^2.3.0"
     ws "^7.4.0"
 
-"@onekeyhq/connect@8.6.1-extended":
-  version "8.6.1-extended"
-  resolved "https://npm.pkg.github.com/download/@onekeyhq/connect/8.6.1-extended/c8836aedd9424301a1f07a91de6ce2b575e52d5ab695f099d40ef556594b621f#b9329d5c080654574dd53e5302bd5cd4621e140a"
-  integrity sha512-qUzT52qLRsvS2cgEqNNx0szeQLtqv9N0cP1g7wBzu30MeP1p1QpTCzANIMgCoS2Gql/mX/5jy/eK8r9Zho/MGA==
+"@onekeyfe/connect@8.7.0-extended":
+  version "8.7.0-extended"
+  resolved "https://registry.yarnpkg.com/@onekeyfe/connect/-/connect-8.7.0-extended.tgz#4507776b48e94de970c462474dac43acb7b2ffac"
+  integrity sha512-4zVWEE/w24zUdcNR9YxYj0fBy5um5V2nOZGZLjYlkIpO3B4FbOfXAvj0bPi4c+VFJkj3MlxMOMtq1NZwGWOYUQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@onekeyhq/blockchain-link" "1.0.19"
-    "@onekeyhq/link" "1.7.5"
-    "@onekeyhq/rollout" "1.0.6"
+    "@onekeyfe/blockchain-link" "1.0.19"
+    "@onekeyfe/link" "1.7.5"
+    "@onekeyfe/rollout" "1.0.6"
     "@sentry/browser" "^6.4.0"
     "@sentry/integrations" "^6.4.0"
     "@sentry/tracing" "^6.4.0"
@@ -157,10 +157,10 @@
     url-join "^4.0.1"
     whatwg-fetch "^3.5.0"
 
-"@onekeyhq/[email protected]":
+"@onekeyfe/[email protected]":
   version "1.7.5"
-  resolved "https://npm.pkg.github.com/download/@onekeyhq/link/1.7.5/1bdce865ec2d3341867e4a06a0e428b55865de7e2cca5191ae838b347a394fba#549f2a8fb54699f976e0ac260598c6cbc81c0f50"
-  integrity sha512-biDf4fVamQXroX/OVPG4KvTUvvh+MXNe0xwMJBm0Si7SuxWj3rYHh/+x/ROnjDwJJK/qNbpKrASMFhBOIAkk1A==
+  resolved "https://registry.yarnpkg.com/@onekeyfe/link/-/link-1.7.5.tgz#64ab57fc65652e6e753ec72d9a2defe3980d38f7"
+  integrity sha512-7SnF8+EUdsRghGS0EaD3mWwg/eN5AAlGu0V4CONvj2daKjytIaG7LLkYsQXSC3VRakjgGpjhUeBR0h7GBoha8Q==
   dependencies:
     bigi "^1.4.1"
     ecurve "^1.0.3"
@@ -171,10 +171,10 @@
     semver-compare "^1.0.0"
     whatwg-fetch "^3.5.0"
 
-"@onekeyhq/[email protected]":
+"@onekeyfe/[email protected]":
   version "1.0.6"
-  resolved "https://npm.pkg.github.com/download/@onekeyhq/rollout/1.0.6/dab197211436334fa96d5e9c4796aacf7ffc82e58c26e5b8110d5f5663175bd2#ecf85780b70827d566c5ed4bb48f4a2553b1cdd4"
-  integrity sha512-jMH5C+G9jEU7TeUnUSXvw54+VKq2jXFdN0eJrmFTMi8CybwcaQwlUfKtcbU5jm3KCX3+VBA7XK3ka/7e+lL1jg==
+  resolved "https://registry.yarnpkg.com/@onekeyfe/rollout/-/rollout-1.0.6.tgz#3d2f1121be525a48cb97543434fe599e592208a1"
+  integrity sha512-zPJO0BOkzE2nbtEM8KGUgWGuzhNLjyLr7MnnL6Il4RnS/VQ7gsN84c76cmz0VksM7nL09Zk9K7HmxPdIkC1gyQ==
   dependencies:
     cross-fetch "^3.0.6"
     runtypes "^5.0.1"

diff --git a/extension-controllers/package.json b/extension-controllers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyhq/extension-controllers",
-  "version": "5.1.3",
+  "version": "5.1.4",
   "description": "Collection of platform-agnostic modules for creating secure data models for cryptocurrency wallets",
   "license": "MIT",
   "files": [

diff --git a/extension-controllers/src/assets/CurrencyRateController.ts b/extension-controllers/src/assets/CurrencyRateController.ts
@@ -150,7 +150,8 @@ export class CurrencyRateController extends BaseController<CurrencyRateConfig, C
    * @returns - Promise resolving to exchange rate for given currency
    */
   async fetchExchangeRate(currency: string, nativeCurrency = this.activeNativeCurrency, includeUSDRate?: boolean): Promise<CurrencyRateState> {
-    let json = await handleFetch(this.getPricingURLOneKey(currency, nativeCurrency, includeUSDRate));
+	const res = await handleFetch(this.getPricingURLOneKey(currency, nativeCurrency, includeUSDRate));
+	let json = res.data;
     if(!json || !json[currency.toUpperCase()]) {
        json = await handleFetch(this.getPricingURL(currency, nativeCurrency, includeUSDRate));
     }

diff --git a/rpc-cap/package.json b/rpc-cap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyhq/rpc-cap",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "A module for adding an object-capabilities system to any JSON-RPC API as middleware for json-rpc-engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -41,7 +41,7 @@
     "typescript": "^4.1.2"
   },
   "dependencies": {
-    "@onekeyhq/extension-controllers": "^5.1.1",
+    "@onekeyhq/extension-controllers": "^5.1.2",
     "eth-rpc-errors": "^3.0.0",
     "is-subset": "^0.1.1",
     "json-rpc-engine": "^5.3.0",

diff --git a/rpc-cap/yarn.lock b/rpc-cap/yarn.lock
@@ -358,10 +358,10 @@
     loglevel "^1.5.0"
     obs-store "^4.0.3"
 
-"@onekeyhq/extension-controllers@^5.1.1":
-  version "5.1.1"
-  resolved "https://npm.pkg.github.com/download/@onekeyhq/extension-controllers/5.1.1/7ef23d96788f701340a5e5438ad1225c867e71e14edab7979eba24be7567e78f#c3267d823b53104828693785faf40829ecdd15aa"
-  integrity sha512-B1Q3sns09ZiBX9agGAweBX3eKZhgW3uArnVPJXjqYv67V6iG2Kj1Cx5noTR5vRH3kvULHH+78WfUVheFMY0H8g==
+"@onekeyhq/extension-controllers@^5.1.2":
+  version "5.1.3"
+  resolved "https://npm.pkg.github.com/download/@onekeyhq/extension-controllers/5.1.3/ef8b8a1f098944e8e051484cdf449d8f9cff0d190fc59df9006019bb1e73b073#b89bc4d5895e8e4b4ec6d36be0080600db9298bb"
+  integrity sha512-0tP8N0U0TMzfUxp+ZENbpVtakSS2WJndKwOq5yWyF21Qgmp1ItFRVjJeL02hsNBnoGzVYz6cZyTSF3tXWDK9Ew==
   dependencies:
     "@onekeyhq/contract-metadata" "^1.28.1"
     "@onekeyhq/eth-keyring-controller" "^6.1.1"