Add: update local-network-lite to 2.0.3

Conflux-Chain · Apr 16, 2020 · 63cc916 · 63cc916
1 parent 64e12b9
commit 63cc916
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 66 deletions.
diff --git a/development/local-node.js b/development/local-node.js
@@ -10,7 +10,7 @@ const ganacheserver = new Ganache({ verbose: true, genBlockInterval: 300 })
     accounts: [
       {
         secretKey:
-          '0xCA17316C298AC00F746B5F90330191EB08FC446A1A8A91D1F97E1F9588DBDD91',
+        '0xA46F301E2D0AC3EE7B83303D93DD49C14CE8E18251EB623ED468AAA12F572E74',
         balance: 1e23,
       },
     ],

diff --git a/package.json b/package.json
@@ -197,7 +197,7 @@
     "@storybook/addon-knobs": "^5.2.8",
     "@storybook/react": "^5.2.8",
     "@storybook/storybook-deployer": "^2.8.1",
-    "@yqrashawn/conflux-local-network-lite": "^2.0.1",
+    "@yqrashawn/conflux-local-network-lite": "^2.0.3",
     "@yqrashawn/conflux-portal-onboarding": "^0.2.0-alpha",
     "addons-linter": "1.14.0",
     "babel-eslint": "^10.0.2",

diff --git a/test/e2e/fixtures/imported-account/state.json b/test/e2e/fixtures/imported-account/state.json
@@ -4,121 +4,163 @@
       "mkrMigrationReminderTimestamp": null
     },
     "CachedBalancesController": {
-      "cachedBalances": {
-        "4": {}
-      }
+      "cachedBalances": {}
     },
     "CurrencyController": {
-      "conversionDate": 1575697244.188,
-      "conversionRate": 149.61,
+      "conversionDate": 1585699587.453,
+      "conversionRate": 133.54,
       "currentCurrency": "usd",
       "nativeCurrency": "CFX"
     },
     "IncomingTransactionsController": {
-      "incomingTransactions": {},
+      "incomingTransactions": {
+      },
       "incomingTxLastFetchedBlocksByNetwork": {
         "goerli": null,
         "kovan": null,
+        "localhost": 48,
         "mainnet": null,
-        "rinkeby": 5570536
+        "rinkeby": null,
+        "ropsten": null,
+        "testnet": 669821
       }
     },
     "KeyringController": {
-      "vault": "{\"data\":\"s6TpYjlUNsn7ifhEFTkuDGBUM1GyOlPrim7JSjtfIxgTt8/6MiXgiR/CtFfR4dWW2xhq85/NGIBYEeWrZThGdKGarBzeIqBfLFhw9n509jprzJ0zc2Rf+9HVFGLw+xxC4xPxgCS0IIWeAJQ+XtGcHmn0UZXriXm8Ja4kdlow6SWinB7sr/WM3R0+frYs4WgllkwggDf2/Tv6VHygvLnhtzp6hIJFyTjh+l/KnyJTyZW1TkZhDaNDzX3SCOHT\",\"iv\":\"FbeHDAW5afeWNORfNJBR0Q==\",\"salt\":\"TxZ+WbCW6891C9LK/hbMAoUsSEW1E8pyGLVBU6x5KR8=\"}"
+      "vault": "{\"data\":\"PFoPAVWSvgTQSld4pBw+7KF5Y7tl366nXMp6s6eqxY2QPx9++99OEjZ3sfuWrNcVIhzN8YO2jB0QqfZKn/WBWV9mWhQirqwdYAaiE0FnBJwfHDoMdGBCS/J8lE6yFzIrAECHZtAX/xrVK0Nx90L5WGt0vArOFwKcXlO31Fwc/q/dH4DFWtpRN5gqNSu6JCC3swcI6y+WtRdisPn94W0Ngk3M7EE1AD+WcBcoqijnLHVf0d3dOPfQwvsu7onNMeyA\",\"iv\":\"09s3jX1XEBHt6+FKyGM7zg==\",\"salt\":\"f6UpzrePd+cGwOA8vmHlu7A9ckbYr1tsPJ7Xe371E5k=\"}"
     },
     "NetworkController": {
-      "network": "5777",
+      "network": "0x2c",
       "provider": {
         "nickname": "",
         "rpcTarget": "",
         "ticker": "CFX",
         "type": "localhost"
       },
       "settings": {
+        "chainId": 2,
+        "network": 2,
+        "nickname": "conflux-test-net",
+        "rpcUrl": "http://testnet-jsonrpc.conflux-chain.org:12537",
         "ticker": "CFX"
       }
     },
     "OnboardingController": {
-      "onboardingTabs": {},
-      "seedPhraseBackedUp": false
+      "onboardingTabs": {
+      },
+      "seedPhraseBackedUp": true
     },
     "PermissionsMetadata": {
       "domainMetadata": {
-        "metamask.github.io": {
+        "ogs.google.com": {
           "icon": null,
-          "name": "M E T A M A S K M E S H T E S T"
+          "name": "ogs.google.com"
+        },
+        "www.google.com": {
+          "icon": null,
+          "name": "dark background and light text chrome - Google Search"
         }
       },
-      "permissionsHistory": {},
+      "permissionsHistory": {
+      },
       "permissionsLog": [
         {
-          "id": 746677923,
+          "id": 1748681906,
+          "method": "eth_accounts",
+          "methodType": "restricted",
+          "origin": "www.google.com",
+          "request": {
+            "id": 1748681906,
+            "jsonrpc": "2.0",
+            "method": "eth_accounts",
+            "origin": "www.google.com",
+            "params": []
+          },
+          "requestTime": 1585699057729,
+          "response": {
+            "id": 1748681906,
+            "jsonrpc": "2.0",
+            "result": []
+          },
+          "responseTime": 1585699057730,
+          "success": true
+        },
+        {
+          "id": 1938070636,
           "method": "eth_accounts",
           "methodType": "restricted",
-          "origin": "metamask.github.io",
+          "origin": "ogs.google.com",
           "request": {
-            "id": 746677923,
+            "id": 1938070636,
             "jsonrpc": "2.0",
             "method": "eth_accounts",
-            "origin": "metamask.github.io",
+            "origin": "ogs.google.com",
             "params": []
           },
-          "requestTime": 1575697241368,
+          "requestTime": 1585699057730,
           "response": {
-            "id": 746677923,
+            "id": 1938070636,
             "jsonrpc": "2.0",
             "result": []
           },
-          "responseTime": 1575697241370,
+          "responseTime": 1585699057731,
           "success": true
         }
       ]
     },
     "PreferencesController": {
       "accountTokens": {
-        "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": {
-          "rinkeby": [],
-          "ropsten": []
+        "0x1e08d58857d7d79b2c14d5160682248aa80ac6e2": {
+          "localhost": [],
+          "testnet": []
         }
       },
-      "assetImages": {},
+      "assetImages": {
+      },
       "completedOnboarding": true,
       "currentAccountTab": "history",
       "currentLocale": "en",
       "featureFlags": {
+        "advancedInlineGas": true,
         "showIncomingTransactions": true,
         "transactionTime": false
       },
-      "firstTimeFlowType": "create",
+      "firstTimeFlowType": "import",
       "forgottenPassword": false,
       "frequentRpcListDetail": [],
       "identities": {
-        "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": {
-          "address": "0x5cfe73b6021e818b776b421b1c4db2474086a7e1",
+        "0x1e08d58857d7d79b2c14d5160682248aa80ac6e2": {
+          "address": "0x1e08d58857d7d79b2c14d5160682248aa80ac6e2",
           "name": "Account 1"
         }
       },
-      "knownMethodData": {},
-      "lostIdentities": {},
+      "ipfsGateway": "ipfs.dweb.link",
+      "knownMethodData": {
+      },
+      "lastSelectedAddressByOrigin": {
+      },
+      "lostIdentities": {
+      },
       "metaMetricsId": null,
       "metaMetricsSendCount": 0,
       "participateInMetaMetrics": false,
       "preferences": {
         "useNativeCurrencyAsPrimaryCurrency": true
       },
-      "selectedAddress": "0x5cfe73b6021e818b776b421b1c4db2474086a7e1",
-      "suggestedTokens": {},
+      "selectedAddress": "0x1e08d58857d7d79b2c14d5160682248aa80ac6e2",
+      "suggestedTokens": {
+      },
       "tokens": [],
       "useBlockie": false,
       "useNonceField": false
     },
-    "config": {},
+    "config": {
+    },
     "firstTimeInfo": {
-      "date": 1575697234195,
-      "version": "7.7.0"
+      "date": 1585699040456,
+      "version": "0.1.0"
     }
   },
   "meta": {
-    "version": 40
+    "version": 41
   }
 }
diff --git a/test/e2e/tests/simple-send.spec.js b/test/e2e/tests/simple-send.spec.js
@@ -1,13 +1,13 @@
 const { By, Key } = require('selenium-webdriver')
 const { withFixtures } = require('../helpers')
 
-describe('MetaMask Browser Extension', function () {
-  it('can send a simple transaction from one account to another', async function () {
+describe('MetaMask Browser Extension', function() {
+  it('can send a simple transaction from one account to another', async function() {
     const ganacheOptions = {
       accounts: [
         {
           secretKey:
-            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+            '0x680031FFE9A0EE33CC25E4214E8793622F43088EC5E91638720C37B2708469B1',
           balance: 25000000000000000000,
         },
       ],

diff --git a/yarn.lock b/yarn.lock
@@ -2731,17 +2731,17 @@
     pify "^3.0.0"
     safe-event-emitter "^1.0.1"
 
-"@yqrashawn/conflux-local-network-lite@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@yqrashawn/conflux-local-network-lite/-/conflux-local-network-lite-2.0.1.tgz#b4e10b927ece3495d820f704140eb7de2297165c"
-  integrity sha512-BFckbt8tZC+7F8/js75icjYzR1WchlgY8gst7AY8SjxFEx83PvA2ZLxskAOLP9r72FgtAy5fSIG+/X/O2nPSkA==
+"@yqrashawn/conflux-local-network-lite@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@yqrashawn/conflux-local-network-lite/-/conflux-local-network-lite-2.0.3.tgz#2dccb370ea02e15d605737006db078bce78f7b02"
+  integrity sha512-BAiGnJrWwctpSFeFZ+TKh7ByJ/1cgquMt62pNxE+4eQGOVmssbGNP1CwvSFthmbFgksGkwivDd2GPs4OQJRNWA==
   dependencies:
-    ethereumjs-util "^6.2.0"
+    cfx-util "^0.0.1-c"
     express "^4.17.1"
     express-async-errors "^3.1.1"
-    got "^10.2.2"
+    got "^10.5.7"
     jayson "^3.2.0"
-    js-conflux-sdk "^0.8.0-alpha"
+    js-conflux-sdk "^0.9.0-alpha"
     make-dir "^3.0.2"
     platform-is "^1.0.4"
     rimraf "^3.0.1"
@@ -10228,19 +10228,6 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereum
     safe-buffer "^5.1.1"
     secp256k1 "^3.0.1"
 
-ethereumjs-util@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.2.0.tgz#23ec79b2488a7d041242f01e25f24e5ad0357960"
-  integrity sha512-vb0XN9J2QGdZGIEKG2vXM+kUdEivUfU6Wmi5y0cg+LRhDYKnXIZ/Lz7XjFbHRR9VIKq2lVGLzGBkA++y2nOdOQ==
-  dependencies:
-    "@types/bn.js" "^4.11.3"
-    bn.js "^4.11.0"
-    create-hash "^1.1.2"
-    ethjs-util "0.1.6"
-    keccak "^2.0.0"
-    rlp "^2.2.3"
-    secp256k1 "^3.0.1"
-
 ethereumjs-util@~6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.0.0.tgz#f14841c182b918615afefd744207c7932c8536c0"
@@ -12574,10 +12561,10 @@ got@9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-got@^10.2.2:
-  version "10.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-10.6.0.tgz#ac3876261a4d8e5fc4f81186f79955ce7b0501dc"
-  integrity sha512-3LIdJNTdCFbbJc+h/EH0V5lpNpbJ6Bfwykk21lcQvQsEcrzdi/ltCyQehFHLzJ/ka0UMH4Slg0hkYvAZN9qUDg==
+got@^10.5.7:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-10.7.0.tgz#62889dbcd6cca32cd6a154cc2d0c6895121d091f"
+  integrity sha512-aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg==
   dependencies:
     "@sindresorhus/is" "^2.0.0"
     "@szmarczak/http-timer" "^4.0.0"
@@ -15244,6 +15231,20 @@ js-conflux-sdk@^0.8.0-alpha:
     secp256k1 "^3.7.1"
     superagent "^5.1.0"
 
+js-conflux-sdk@^0.9.0-alpha:
+  version "0.9.0-alpha"
+  resolved "https://registry.yarnpkg.com/js-conflux-sdk/-/js-conflux-sdk-0.9.0-alpha.tgz#fb0b2c7558746533cfc42cbb9f1135a9d55c5b34"
+  integrity sha512-L4T8AAenfJs0YF5fAMO6V5UfX4BuTTscib7cY/4toTus+dXEtrfLGfUrxUJzZpO3cUg+hOr+AeQnlYliL8o1Rg==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+    big.js "^5.2.2"
+    esm "^3.2.25"
+    jsbi "^3.1.1"
+    keccak "^2.0.0"
+    lodash "^4.17.15"
+    secp256k1 "^3.7.1"
+    superagent "^5.1.0"
+
 js-levenshtein@^1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@@ -22285,7 +22286,7 @@ rlp@^2.0.0, rlp@^2.2.1:
     bn.js "^4.11.1"
     safe-buffer "^5.1.1"
 
-rlp@^2.2.3, rlp@^2.2.4:
+rlp@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.2.4.tgz#d6b0e1659e9285fc509a5d169a9bd06f704951c1"
   integrity sha512-fdq2yYCWpAQBhwkZv+Z8o/Z4sPmYm1CUq6P7n6lVTOdb949CnqA0sndXal5C1NleSVSZm6q5F3iEbauyVln/iw==