Merge branch 'develop' into to-autocomplete

feature/default_network_editable
Анна 6 years ago
commit 90934bca46
  1. 40
      .circleci/config.yml
  2. 17
      .eslintignore
  3. 5
      .eslintrc
  4. 3
      .nsprc
  5. 2
      .nvmrc
  6. 52
      app/404.html
  7. 79
      app/error.html
  8. BIN
      app/images/404.png
  9. BIN
      app/images/cancel.png
  10. BIN
      app/images/deadface.png
  11. 53
      app/images/loginglogo.svg
  12. BIN
      app/images/logo.png
  13. BIN
      app/images/pw-128x128.png
  14. BIN
      app/images/pw-48x48.png
  15. BIN
      app/images/pw128x128.png
  16. 35
      app/loading.html
  17. 5
      app/manifest.json
  18. 5
      app/scripts/background.js
  19. 4
      app/scripts/contentscript.js
  20. 6
      app/scripts/controllers/preferences.js
  21. 1
      app/scripts/lib/contracts/registrar.js
  22. 2
      app/scripts/lib/contracts/resolver.js
  23. 40
      app/scripts/lib/ipfsContent.js
  24. 8
      app/scripts/lib/notification-manager.js
  25. 71
      app/scripts/lib/resolver.js
  26. 1
      app/scripts/metamask-controller.js
  27. 4
      app/scripts/migrations/023.js
  28. 59
      app/unsupport.html
  29. 2
      development/announcer.js
  30. 2
      development/backGroundConnectionModifiers.js
  31. 15
      development/beefy.js
  32. 4
      development/mock-dev.js
  33. 2
      development/mockExtension.js
  34. 2
      development/selector.js
  35. 15
      development/sourcemap-validator.js
  36. 3
      development/ui-dev.js
  37. 12
      development/verify-locale-strings.js
  38. 8
      development/version-bump.js
  39. 37
      gentests.js
  40. 53
      gulpfile.js
  41. 4
      mascara/example/server.js
  42. 2
      mascara/src/app/first-time/breadcrumbs.js
  43. 76
      mascara/src/app/first-time/buy-ether-screen.js
  44. 42
      mascara/src/app/shapeshift-form/index.js
  45. 2
      mascara/test/helpers.js
  46. 6
      mascara/test/index.js
  47. 2
      mascara/test/test-ui.js
  48. 16
      mascara/test/util/mascara-test-helper.js
  49. 11
      notices/notices.js
  50. 1
      old-ui/app/app.js
  51. 4
      old-ui/app/components/transaction-list-item.js
  52. 28947
      package-lock.json
  53. 29
      package.json
  54. 19
      test/e2e/beta/contract-test/contract.js
  55. 12
      test/e2e/beta/from-import-beta-ui.spec.js
  56. 23
      test/e2e/beta/metamask-beta-ui.spec.js
  57. 2
      test/integration/lib/add-token.js
  58. 9
      test/integration/lib/confirm-sig-requests.js
  59. 2
      test/integration/lib/mascara-first-time.js
  60. 4
      test/integration/lib/send-new-ui.js
  61. 1
      test/integration/lib/tx-list-items.js
  62. 2
      test/lib/mock-encryptor.js
  63. 6
      test/lib/mock-tx-gen.js
  64. 100
      test/lib/react-trigger-change.js
  65. 2
      test/mascara.conf.js
  66. 10
      test/screens/new-ui.js
  67. 1
      test/unit/app/account-import-strategies.spec.js
  68. 2
      test/unit/app/controllers/address-book-controller.js
  69. 3
      test/unit/app/controllers/network-contoller-test.js
  70. 14
      test/unit/app/controllers/transactions/nonce-tracker-test.js
  71. 45
      test/unit/app/controllers/transactions/pending-tx-test.js
  72. 2
      test/unit/app/controllers/transactions/recipient-blacklist-checker-test.js
  73. 8
      test/unit/app/controllers/transactions/tx-controller-test.js
  74. 1
      test/unit/app/controllers/transactions/tx-gas-util-test.js
  75. 33
      test/unit/app/controllers/transactions/tx-state-history-helper-test.js
  76. 47
      test/unit/app/controllers/transactions/tx-state-manager-test.js
  77. 2
      test/unit/app/controllers/transactions/tx-utils-test.js
  78. 8
      test/unit/app/edge-encryptor-test.js
  79. 4
      test/unit/app/nodeify-test.js
  80. 7
      test/unit/app/pending-balance-test.js
  81. 77
      test/unit/app/seed-phrase-verifier-test.js
  82. 2
      test/unit/components/balance-component-test.js
  83. 4
      test/unit/components/bn-as-decimal-input-test.js
  84. 2
      test/unit/components/pending-tx-test.js
  85. 16
      test/unit/migrations/022-test.js
  86. 12
      test/unit/migrations/023-test.js
  87. 11
      test/unit/migrations/024-test.js
  88. 10
      test/unit/migrations/025-test.js
  89. 1
      test/unit/migrations/template-test.js
  90. 54
      test/unit/responsive/components/dropdown-test.js
  91. 7
      ui/app/components/customize-gas-modal/index.js
  92. 3
      ui/app/components/pages/create-account/import-account/json.js
  93. 3
      ui/app/components/pages/create-account/import-account/private-key.js
  94. 5
      ui/app/components/send/currency-display.js
  95. 5
      ui/app/components/send_/send.utils.js
  96. 30
      ui/app/components/send_/send.utils.test.js
  97. 2
      ui/app/conversion-util.js
  98. 22
      ui/app/conversion-util.test.js
  99. 10
      ui/app/selectors.js

@ -97,7 +97,7 @@ workflows:
jobs: jobs:
prep-deps-npm: prep-deps-npm:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -116,7 +116,7 @@ jobs:
prep-deps-firefox: prep-deps-firefox:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- run: - run:
@ -129,7 +129,7 @@ jobs:
prep-build: prep-build:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -148,7 +148,7 @@ jobs:
prep-docs: prep-docs:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -163,7 +163,7 @@ jobs:
prep-scss: prep-scss:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -182,7 +182,7 @@ jobs:
test-lint: test-lint:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -193,7 +193,7 @@ jobs:
test-deps: test-deps:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -204,7 +204,7 @@ jobs:
test-e2e-chrome: test-e2e-chrome:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -220,7 +220,7 @@ jobs:
test-e2e-firefox: test-e2e-firefox:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -241,7 +241,7 @@ jobs:
test-e2e-beta-chrome: test-e2e-beta-chrome:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -257,7 +257,7 @@ jobs:
test-e2e-beta-firefox: test-e2e-beta-firefox:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -278,7 +278,7 @@ jobs:
job-screens: job-screens:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -295,7 +295,7 @@ jobs:
job-publish-prerelease: job-publish-prerelease:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -322,7 +322,7 @@ jobs:
job-publish-release: job-publish-release:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -345,7 +345,7 @@ jobs:
test-unit: test-unit:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -358,7 +358,7 @@ jobs:
environment: environment:
browsers: '["Firefox"]' browsers: '["Firefox"]'
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -382,7 +382,7 @@ jobs:
environment: environment:
browsers: '["Chrome"]' browsers: '["Chrome"]'
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -401,7 +401,7 @@ jobs:
environment: environment:
browsers: '["Firefox"]' browsers: '["Firefox"]'
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -425,7 +425,7 @@ jobs:
environment: environment:
browsers: '["Chrome"]' browsers: '["Chrome"]'
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -442,7 +442,7 @@ jobs:
all-tests-pass: all-tests-pass:
docker: docker:
- image: circleci/node:8-browsers - image: circleci/node:8.11.3-browsers
steps: steps:
- run: - run:
name: All Tests Passed name: All Tests Passed

@ -1,6 +1,21 @@
node_modules/**
dist/**
builds/**
test-builds/**
docs/**
development/bundle.js
development/states.js
app/scripts/lib/extension-instance.js app/scripts/lib/extension-instance.js
app/scripts/chromereload.js
ui/lib/blockies.js
mascara/src/app/first-time/spinner.js
mascara/test/jquery-3.1.0.min.js
test/integration/bundle.js test/integration/bundle.js
test/integration/jquery-3.1.0.min.js test/integration/jquery-3.1.0.min.js
test/integration/helpers.js test/integration/helpers.js
test/integration/lib/first-time.js test/integration/lib/first-time.js
ui/lib/blockies.js

@ -37,7 +37,9 @@
"document": false, "document": false,
"navigator": false, "navigator": false,
"web3": true, "web3": true,
"window": false "window": false,
"$": false,
"QUnit": false
}, },
"rules": { "rules": {
@ -159,5 +161,6 @@
"yield-star-spacing": [2, "both"], "yield-star-spacing": [2, "both"],
"yoda": [2, "never"], "yoda": [2, "never"],
"prefer-const": 1, "prefer-const": 1,
"mocha/no-exclusive-tests": "error"
} }
} }

@ -1,6 +1,7 @@
{ {
"exceptions": [ "exceptions": [
"https://nodesecurity.io/advisories/566", "https://nodesecurity.io/advisories/566",
"https://nodesecurity.io/advisories/157" "https://nodesecurity.io/advisories/157",
"https://nodesecurity.io/advisories/577"
] ]
} }

@ -1 +1 @@
v6.3.1 v8.11.3

@ -0,0 +1,52 @@
<html>
<head>
<title>MetaMask</title>
<style>
*{
padding: 0;
margin: 0;
box-sizing: border-box;
}
img{
display: block;
}
html, body{
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}
.app{
position: relative;
width: 100%;
height: auto;
overflow: hidden;
}
img{
display: block;
width: 100%;
height: auto;
}
h2{
display: block;
width: 100%;
overflow: hidden;
position: absolute;
bottom: 20%;
left: 0;
color: #1b243d;
text-align: center;
}
h2 > a{
color: #1b243d;
}
</style>
</head>
<body>
<div class="app">
<img src="./images/404.png" alt="">
<h2>Powered by <a href="https://www.portal.network/">Portal Network</a></h2>
</div>
</body>
</html>

@ -0,0 +1,79 @@
<html>
<head>
<title>MetaMask Error</title>
<link href="https://fonts.googleapis.com/css?family=Rokkitt" rel="stylesheet">
<style>
*{
padding: 0;
margin: 0;
box-sizing: border-box;
}
img{
display: block;
}
html, body{
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}
@keyframes logoAmin{
from {transform: scale(1);}
50%{transform: scale(1.1);}
to {transform: scale(1);}
}
.errorBox{
width: 70%;
height: auto;
overflow: hidden;
background-image: url("./images/deadface.png");
background-repeat: no-repeat;
background-position: 100% 50%;
background-size: auto 90%;
padding: 5px;
}
.errorBox > img{
width: 100px;
height: auto;
margin-bottom: 25px;
animation: logoAmin 1s infinite linear;
}
.errorBox > h1, .errorBox > h2{
letter-spacing: 2px;
}
.errorBox > h1{
color: #9b9b9b;
font-size: 40px;
}
.errorBox > h2{
color: #1b243d;
font-size: 20px;
padding-top: 5px;
}
.errorBox > h2 >a{
color: #1b243d;
}
.errorBox > h2 >a:hover{
color: #44588e;
}
.errorBox > h1 > span{
color: #33559f;
}
</style>
</head>
<body>
<div class="errorBox">
<img src="./images/logo.png" alt="">
<h1><span id="name"></span> not found</h1>
<h2>Powered by <a href="https://www.portal.network/">Portal Network</a></h2>
</div>
<script>
let index = location.href.lastIndexOf("?name=")
let name = location.href.slice(index + 6)
document.getElementById("name").innerHTML = name
</script>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="128px" height="128px" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 49.3 (51167) - http://www.bohemiancoding.com/sketch -->
<title>logo2</title>
<desc>Created with Sketch.</desc>
<defs>
<polygon id="path-1" points="0 82.118 126.527 82.118 126.527 0 0 0"></polygon>
</defs>
<g id="logo2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Page-1" transform="translate(1.000000, 23.000000)">
<path d="M6.8811,74.2729 C6.6901,74.0489 6.4661,73.8719 6.2111,73.7389 C5.9551,73.6069 5.6861,73.5409 5.4031,73.5409 L0.0001,73.5409 L0.0001,82.0769 L0.9581,82.0769 L0.9581,74.4029 L5.2261,74.4029 C5.4261,74.4029 5.6071,74.4549 5.7661,74.5599 C5.9251,74.6649 6.0601,74.7969 6.1701,74.9569 C6.2791,75.1159 6.3631,75.2939 6.4231,75.4899 C6.4821,75.6859 6.5111,75.8759 6.5111,76.0579 C6.5111,76.2219 6.4891,76.3949 6.4431,76.5779 C6.3981,76.7599 6.3221,76.9289 6.2171,77.0839 C6.1121,77.2389 5.9831,77.3669 5.8281,77.4669 C5.6731,77.5669 5.4851,77.6179 5.2671,77.6179 L3.9941,77.6179 L3.9941,78.4789 L5.4311,78.4789 C5.7141,78.4789 5.9801,78.4129 6.2311,78.2809 C6.4821,78.1489 6.7031,77.9709 6.8951,77.7479 C7.0861,77.5239 7.2361,77.2679 7.3461,76.9809 C7.4561,76.6939 7.5101,76.3909 7.5101,76.0719 C7.5101,75.7149 7.4531,75.3829 7.3391,75.0729 C7.2251,74.7629 7.0721,74.4959 6.8811,74.2729" id="Fill-1" fill="#1B243D"></path>
<path d="M16.43,79.1157 C16.247,79.5207 15.999,79.8797 15.684,80.1887 C15.369,80.4997 15.005,80.7457 14.59,80.9277 C14.175,81.1107 13.735,81.2017 13.27,81.2017 C12.805,81.2017 12.365,81.1107 11.95,80.9277 C11.534,80.7457 11.172,80.4997 10.862,80.1887 C10.552,79.8797 10.305,79.5207 10.123,79.1157 C9.941,78.7097 9.85,78.2787 9.85,77.8227 C9.85,77.3757 9.941,76.9447 10.123,76.5297 C10.305,76.1147 10.552,75.7527 10.862,75.4417 C11.172,75.1327 11.537,74.8837 11.956,74.6967 C12.376,74.5097 12.818,74.4167 13.284,74.4167 C13.748,74.4167 14.188,74.5097 14.603,74.6967 C15.018,74.8837 15.381,75.1327 15.691,75.4417 C16.001,75.7527 16.247,76.1147 16.43,76.5297 C16.612,76.9447 16.703,77.3757 16.703,77.8227 C16.703,78.2787 16.612,78.7097 16.43,79.1157 M16.341,74.7647 C15.953,74.3777 15.495,74.0697 14.966,73.8417 C14.437,73.6137 13.872,73.4997 13.27,73.4997 C12.668,73.4997 12.102,73.6137 11.574,73.8417 C11.044,74.0697 10.586,74.3777 10.199,74.7647 C9.811,75.1527 9.503,75.6087 9.275,76.1337 C9.047,76.6577 8.933,77.2167 8.933,77.8087 C8.933,78.4017 9.047,78.9607 9.275,79.4847 C9.503,80.0097 9.811,80.4657 10.199,80.8527 C10.586,81.2407 11.044,81.5487 11.574,81.7757 C12.102,82.0047 12.668,82.1177 13.27,82.1177 C13.872,82.1177 14.437,82.0047 14.966,81.7757 C15.495,81.5487 15.953,81.2407 16.341,80.8527 C16.728,80.4657 17.036,80.0097 17.264,79.4847 C17.492,78.9607 17.606,78.4017 17.606,77.8087 C17.606,77.2167 17.492,76.6577 17.264,76.1337 C17.036,75.6087 16.728,75.1527 16.341,74.7647" id="Fill-3" fill="#1B243D"></path>
<path d="M26.2249,74.2729 C26.0329,74.0489 25.8089,73.8719 25.5549,73.7389 C25.2989,73.6069 25.0299,73.5409 24.7469,73.5409 L19.3439,73.5409 L19.3439,82.0769 L20.3009,82.0769 L20.3009,74.4029 L24.5699,74.4029 C24.7699,74.4029 24.9499,74.4549 25.1099,74.5599 C25.2689,74.6649 25.4039,74.7969 25.5139,74.9569 C25.6229,75.1159 25.7069,75.2939 25.7669,75.4899 C25.8259,75.6859 25.8549,75.8759 25.8549,76.0579 C25.8549,76.2219 25.8319,76.3949 25.7869,76.5779 C25.7409,76.7599 25.6659,76.9289 25.5609,77.0839 C25.4559,77.2389 25.3269,77.3669 25.1709,77.4669 C25.0169,77.5669 24.8289,77.6179 24.6109,77.6179 L23.2969,77.6179 L25.5819,82.0769 L26.6079,82.0769 L24.7879,78.4789 C25.0709,78.4789 25.3379,78.4129 25.5889,78.2809 C25.8389,78.1489 26.0579,77.9709 26.2459,77.7479 C26.4319,77.5239 26.5799,77.2679 26.6899,76.9809 C26.7989,76.6939 26.8539,76.3909 26.8539,76.0719 C26.8539,75.7149 26.7969,75.3829 26.6829,75.0729 C26.5689,74.7629 26.4159,74.4959 26.2249,74.2729" id="Fill-5" fill="#1B243D"></path>
<polygon id="Fill-7" fill="#1B243D" points="35.8694 73.5405 28.4134 73.5405 28.4134 74.4025 31.6554 74.4025 31.6554 82.0765 32.6134 82.0765 32.6134 74.4025 35.8694 74.4025"></polygon>
<polygon id="Fill-9" fill="#1B243D" points="35.3084 82.0766 41.4234 82.0766 40.8344 81.2156 36.8134 81.2156 39.7814 75.1406 43.2294 82.0766 44.2964 82.0766 39.7814 73.0896"></polygon>
<polygon id="Fill-11" fill="#1B243D" points="46.7859 73.5405 45.8279 73.5405 45.8279 82.0765 52.3269 82.0765 52.3269 81.2155 46.7859 81.2155"></polygon>
<polygon id="Fill-13" fill="#1B243D" points="66.0471 81.27 60.6441 73.541 59.0431 73.541 59.0431 82.077 60.0011 82.077 60.0011 74.334 65.5001 82.077 67.0051 82.077 67.0051 73.541 66.0471 73.541"></polygon>
<polygon id="Fill-15" fill="#1B243D" points="68.9202 82.0766 75.4182 82.0766 75.4182 81.2156 69.8782 81.2156 69.8782 74.4026 75.4182 74.4026 75.4182 73.5406 68.9202 73.5406"></polygon>
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="Clip-18"></g>
<polygon id="Fill-17" fill="#1B243D" mask="url(#mask-2)" points="71.218 78.479 75.309 78.479 75.309 77.618 71.218 77.618"></polygon>
<polygon id="Fill-19" fill="#1B243D" mask="url(#mask-2)" points="77.2923 74.4028 80.5343 74.4028 80.5343 82.0768 81.4923 82.0768 81.4923 74.4028 84.7483 74.4028 84.7483 73.5408 77.2923 73.5408"></polygon>
<polygon id="Fill-20" fill="#1B243D" mask="url(#mask-2)" points="95.8284 81.3657 91.6694 73.0897 87.5794 81.2977 87.5794 73.5407 86.6214 73.5407 86.6214 82.0767 88.2634 82.0767 91.6694 75.0997 95.1174 82.0767 96.7864 82.0767 96.7864 73.5407 95.8284 73.5407"></polygon>
<path d="M106.0203,79.1157 C105.8373,79.5207 105.5893,79.8797 105.2743,80.1887 C104.9603,80.4997 104.5953,80.7457 104.1803,80.9277 C103.7653,81.1107 103.3253,81.2017 102.8603,81.2017 C102.3953,81.2017 101.9553,81.1107 101.5403,80.9277 C101.1243,80.7457 100.7623,80.4997 100.4523,80.1887 C100.1423,79.8797 99.8953,79.5207 99.7133,79.1157 C99.5313,78.7097 99.4403,78.2787 99.4403,77.8227 C99.4403,77.3757 99.5313,76.9447 99.7133,76.5297 C99.8953,76.1147 100.1423,75.7527 100.4523,75.4417 C100.7623,75.1327 101.1273,74.8837 101.5463,74.6967 C101.9663,74.5097 102.4093,74.4167 102.8743,74.4167 C103.3393,74.4167 103.7793,74.5097 104.1943,74.6967 C104.6083,74.8837 104.9713,75.1327 105.2813,75.4417 C105.5913,75.7527 105.8373,76.1147 106.0203,76.5297 C106.2023,76.9447 106.2933,77.3757 106.2933,77.8227 C106.2933,78.2787 106.2023,78.7097 106.0203,79.1157 M105.9313,74.7647 C105.5433,74.3777 105.0853,74.0697 104.5563,73.8417 C104.0273,73.6137 103.4623,73.4997 102.8603,73.4997 C102.2583,73.4997 101.6923,73.6137 101.1643,73.8417 C100.6343,74.0697 100.1763,74.3777 99.7893,74.7647 C99.4013,75.1527 99.0933,75.6087 98.8653,76.1337 C98.6373,76.6577 98.5233,77.2167 98.5233,77.8087 C98.5233,78.4017 98.6373,78.9607 98.8653,79.4847 C99.0933,80.0097 99.4013,80.4657 99.7893,80.8527 C100.1763,81.2407 100.6343,81.5487 101.1643,81.7757 C101.6923,82.0047 102.2583,82.1177 102.8603,82.1177 C103.4623,82.1177 104.0273,82.0047 104.5563,81.7757 C105.0853,81.5487 105.5433,81.2407 105.9313,80.8527 C106.3193,80.4657 106.6263,80.0097 106.8543,79.4847 C107.0823,78.9607 107.1963,78.4017 107.1963,77.8087 C107.1963,77.2167 107.0823,76.6577 106.8543,76.1337 C106.6263,75.6087 106.3193,75.1527 105.9313,74.7647" id="Fill-21" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M115.8152,74.2729 C115.6232,74.0489 115.4002,73.8719 115.1452,73.7389 C114.8892,73.6069 114.6202,73.5409 114.3372,73.5409 L108.9342,73.5409 L108.9342,82.0769 L109.8912,82.0769 L109.8912,74.4029 L114.1602,74.4029 C114.3602,74.4029 114.5402,74.4549 114.7002,74.5599 C114.8592,74.6649 114.9942,74.7969 115.1042,74.9569 C115.2132,75.1159 115.2972,75.2939 115.3572,75.4899 C115.4162,75.6859 115.4452,75.8759 115.4452,76.0579 C115.4452,76.2219 115.4222,76.3949 115.3772,76.5779 C115.3312,76.7599 115.2562,76.9289 115.1512,77.0839 C115.0462,77.2389 114.9172,77.3669 114.7612,77.4669 C114.6072,77.5669 114.4192,77.6179 114.2012,77.6179 L112.8872,77.6179 L115.1722,82.0769 L116.1982,82.0769 L114.3782,78.4789 C114.6612,78.4789 114.9282,78.4129 115.1792,78.2809 C115.4292,78.1489 115.6482,77.9709 115.8362,77.7479 C116.0222,77.5239 116.1702,77.2679 116.2802,76.9809 C116.3892,76.6939 116.4442,76.3909 116.4442,76.0719 C116.4442,75.7149 116.3872,75.3829 116.2732,75.0729 C116.1592,74.7629 116.0062,74.4959 115.8152,74.2729" id="Fill-22" fill="#1B243D" mask="url(#mask-2)"></path>
<polygon id="Fill-23" fill="#1B243D" mask="url(#mask-2)" points="126.5266 73.5405 125.4866 73.5405 123.3666 77.8505 125.4866 82.0765 126.5266 82.0765 124.4336 77.8505"></polygon>
<polygon id="Fill-24" fill="#1B243D" mask="url(#mask-2)" points="119.2078 73.5405 118.2498 73.5405 118.2498 82.0765 119.2078 82.0765 119.2078 78.2735 122.1078 78.2735 122.1078 77.4115 119.2078 77.4115"></polygon>
<path d="M72.4627,48.06 C67.3487,48.06 61.5897,46.102 56.2467,42.545 C55.7657,42.225 55.2427,42.234 55.0787,42.564 C54.9137,42.894 55.1697,43.421 55.6507,43.741 C61.4477,47.6 67.6967,49.725 73.2447,49.725 C77.8417,49.725 81.5387,48.281 83.9357,45.548 C86.2857,42.87 87.1877,39.202 86.5457,34.942 C86.4797,34.504 86.0177,34.036 85.5137,33.896 C85.0107,33.756 84.6557,33.998 84.7217,34.436 C85.3137,38.362 84.4817,41.743 82.3157,44.211 C80.1077,46.73 76.6997,48.06 72.4627,48.06" id="Fill-25" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M84.5081,28.4746 C84.2921,28.0146 83.7441,27.6416 83.2851,27.6416 C82.8251,27.6416 82.6281,28.0146 82.8431,28.4746 C83.2451,29.3286 83.5941,30.1886 83.8801,31.0306 C84.0341,31.4866 84.5521,31.9036 85.0361,31.9626 C85.0741,31.9676 85.1121,31.9706 85.1481,31.9706 C85.5591,31.9706 85.7741,31.6646 85.6311,31.2456 C85.3211,30.3326 84.9441,29.4006 84.5081,28.4746" id="Fill-26" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M71.5769,13.6919 C65.5769,9.5209 59.0759,7.2239 53.2699,7.2239 C48.6269,7.2239 44.9069,8.6949 42.5129,11.4779 C40.1969,14.1689 39.3079,17.9979 40.0099,22.2589 C40.0819,22.6979 40.5479,23.1639 41.0509,23.2979 C41.1429,23.3219 41.2309,23.3339 41.3109,23.3339 C41.6679,23.3339 41.8889,23.1039 41.8299,22.7449 C41.1839,18.8179 42.0039,15.2889 44.1379,12.8079 C46.3439,10.2439 49.7719,8.8879 54.0529,8.8879 C59.4039,8.8879 65.3959,11.0049 70.9259,14.8499 C71.4009,15.1799 71.9309,15.1889 72.1109,14.8689 C72.2909,14.5489 72.0519,14.0219 71.5769,13.6919" id="Fill-27" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M42.6355,25.9184 C42.4805,25.4624 41.9635,25.0444 41.4795,24.9854 C40.9955,24.9264 40.7285,25.2474 40.8845,25.7034 C41.1935,26.6164 41.5715,27.5484 42.0075,28.4744 C42.2225,28.9344 42.7705,29.3064 43.2305,29.3064 C43.6905,29.3064 43.8875,28.9344 43.6715,28.4744 C43.2695,27.6194 42.9215,26.7594 42.6355,25.9184" id="Fill-28" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M48.9544,5.5986 C48.9954,5.5986 49.0354,5.5956 49.0734,5.5896 C50.1214,5.4216 51.2354,5.3376 52.3844,5.3376 C52.8434,5.3376 53.0404,4.9646 52.8254,4.5046 C52.6094,4.0456 52.0614,3.6726 51.6014,3.6726 C50.3714,3.6726 49.1784,3.7636 48.0554,3.9426 C47.6324,4.0106 47.5174,4.4336 47.7984,4.8886 C48.0544,5.3016 48.5494,5.5986 48.9544,5.5986" id="Fill-29" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M38.4558,28.4746 C41.5898,35.1436 47.1408,41.4016 54.0858,46.0956 C54.3238,46.2566 54.5728,46.3366 54.7848,46.3366 C54.9988,46.3366 55.1738,46.2546 55.2598,46.0896 C55.4298,45.7636 55.1798,45.2356 54.7008,44.9126 C48.2228,40.5336 43.0448,34.6966 40.1208,28.4746 C37.7008,23.3246 37.0648,18.4506 38.2838,14.3796 C39.4638,10.4356 42.3918,7.5286 46.5268,6.1936 C46.9118,6.0696 46.9538,5.6106 46.6218,5.1676 C46.2888,4.7246 45.7088,4.4676 45.3248,4.5906 C40.8908,6.0226 37.7518,9.1386 36.4868,13.3646 C35.1808,17.7296 35.8618,22.9536 38.4558,28.4746" id="Fill-30" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M77.4417,51.3588 C76.3937,51.5268 75.2797,51.6118 74.1307,51.6118 C73.6717,51.6118 73.4737,51.9838 73.6907,52.4438 C73.9057,52.9028 74.4537,53.2758 74.9137,53.2758 C76.1437,53.2758 77.3367,53.1848 78.4607,53.0048 C78.8827,52.9378 78.9977,52.5148 78.7167,52.0598 C78.4357,51.6058 77.8647,51.2918 77.4417,51.3588" id="Fill-31" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M88.0589,28.4741 C84.9249,21.8061 79.3749,15.5481 72.4319,10.8551 C71.9539,10.5311 71.4279,10.5341 71.2579,10.8601 C71.0879,11.1871 71.3379,11.7141 71.8159,12.0371 C78.2939,16.4161 83.4709,22.2531 86.3949,28.4741 C88.7639,33.5141 89.4229,38.3051 88.3009,42.3281 C87.2169,46.2181 84.4469,49.1491 80.5019,50.5781 C80.1259,50.7151 80.0999,51.1811 80.4419,51.6201 C80.7209,51.9771 81.1569,52.2061 81.5129,52.2061 C81.5939,52.2061 81.6709,52.1951 81.7419,52.1691 C85.9709,50.6351 88.9399,47.4951 90.1029,43.3251 C91.3049,39.0121 90.5989,33.8771 88.0589,28.4741" id="Fill-32" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M36.5716,28.4746 C36.3556,28.0146 35.8076,27.6416 35.3476,27.6416 C34.8886,27.6416 34.6906,28.0146 34.9066,28.4746 C37.7026,34.4226 42.1996,40.1156 47.9136,44.9396 C48.1826,45.1666 48.4956,45.2876 48.7556,45.2876 C48.9226,45.2876 49.0686,45.2376 49.1656,45.1336 C49.4136,44.8656 49.2566,44.3466 48.8136,43.9726 C43.4356,39.4326 39.2026,34.0736 36.5716,28.4746" id="Fill-33" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M56.8172,49.5649 C55.1282,48.6039 53.4612,47.5269 51.8632,46.3639 C51.3942,46.0229 50.8562,45.9969 50.6592,46.3039 C50.4632,46.6129 50.6842,47.1389 51.1522,47.4799 C52.8492,48.7149 54.6202,49.8589 56.4142,50.8789 C56.6212,50.9979 56.8282,51.0549 57.0062,51.0549 C57.2542,51.0549 57.4482,50.9439 57.5132,50.7329 C57.6242,50.3699 57.3132,49.8469 56.8172,49.5649" id="Fill-34" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M75.7991,55.1606 C70.9321,55.1606 65.5491,53.8386 60.2301,51.3366 C59.7241,51.0986 59.2721,51.2246 59.2191,51.6186 C59.1671,52.0126 59.5341,52.5236 60.0391,52.7616 C65.6911,55.4206 71.4111,56.8246 76.5821,56.8246 C77.0411,56.8246 77.2381,56.4526 77.0231,55.9926 C76.8061,55.5326 76.2591,55.1606 75.7991,55.1606" id="Fill-35" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M71.843,8.6733 C75.749,11.1523 79.3,14.1083 82.396,17.4603 C85.599,20.9283 88.139,24.6343 89.944,28.4743 C90.16,28.9343 90.707,29.3063 91.167,29.3063 C91.627,29.3063 91.824,28.9343 91.608,28.4743 C89.691,24.3953 86.993,20.4583 83.588,16.7723 C80.3,13.2113 76.528,10.0713 72.379,7.4383 C71.893,7.1303 71.379,7.1563 71.231,7.4983 C71.083,7.8393 71.357,8.3653 71.843,8.6733" id="Fill-36" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M64.1145,4.6572 C65.5935,5.2632 67.0835,5.9662 68.5425,6.7462 C68.7385,6.8512 68.9315,6.9012 69.0985,6.9012 C69.3585,6.9012 69.5575,6.7802 69.6135,6.5532 C69.7045,6.1782 69.3735,5.6592 68.8735,5.3912 C67.3235,4.5622 65.7405,3.8162 64.1695,3.1722 C63.6625,2.9652 63.2385,3.1282 63.2225,3.5382 C63.2075,3.9492 63.6075,4.4492 64.1145,4.6572" id="Fill-37" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M50.7161,1.788 C53.6641,1.788 56.7851,2.266 59.9921,3.207 C60.0951,3.237 60.1921,3.252 60.2811,3.252 C60.6281,3.252 60.8491,3.034 60.8041,2.687 C60.7471,2.252 60.2931,1.78 59.7881,1.631 C56.3801,0.631 53.0651,0.123 49.9331,0.123 C49.4741,0.123 49.2761,0.496 49.4921,0.956 C49.7081,1.415 50.2561,1.788 50.7161,1.788" id="Fill-38" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M36.7913,1.5722 C37.1013,1.3622 37.0253,0.8602 36.6233,0.4512 C36.2213,0.0432 35.6443,-0.1178 35.3333,0.0932 C32.3243,2.1362 30.1993,4.9382 29.0183,8.4202 C28.8973,8.7782 29.1993,9.3012 29.6923,9.5912 C29.9053,9.7152 30.1183,9.7762 30.3023,9.7762 C30.5443,9.7762 30.7353,9.6702 30.8043,9.4672 C31.9243,6.1662 33.9383,3.5102 36.7913,1.5722" id="Fill-39" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M29.3557,10.9082 C28.8527,10.6582 28.3887,10.7682 28.3197,11.1542 C28.1767,11.9612 28.0807,12.8002 28.0327,13.6492 C28.0107,14.0562 28.4037,14.5592 28.9107,14.7732 C29.0647,14.8382 29.2117,14.8692 29.3417,14.8692 C29.6417,14.8692 29.8547,14.7072 29.8707,14.4242 C29.9157,13.6192 30.0067,12.8242 30.1427,12.0592 C30.2107,11.6732 29.8587,11.1582 29.3557,10.9082" id="Fill-40" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M96.823,47.3579 C96.33,47.0689 95.832,47.1249 95.711,47.4819 C94.591,50.7829 92.576,53.4389 89.723,55.3769 C89.414,55.5869 89.489,56.0889 89.891,56.4979 C90.174,56.7849 90.542,56.9499 90.844,56.9499 C90.972,56.9499 91.089,56.9199 91.181,56.8569 C94.191,54.8119 96.316,52.0099 97.497,48.5289 C97.617,48.1709 97.316,47.6469 96.823,47.3579" id="Fill-41" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M97.6082,41.9389 C97.1012,41.7279 96.6742,41.8889 96.6562,42.2969 C96.6162,43.1809 96.5212,44.0529 96.3722,44.8889 C96.3042,45.2749 96.6562,45.7909 97.1592,46.0409 C97.3412,46.1299 97.5192,46.1739 97.6742,46.1739 C97.9462,46.1739 98.1512,46.0409 98.1942,45.7939 C98.3512,44.9129 98.4522,43.9929 98.4942,43.0589 C98.5122,42.6509 98.1162,42.1489 97.6082,41.9389" id="Fill-42" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M70.7937,44.5092 C61.9517,44.5092 51.3777,37.3162 47.2227,28.4742 C43.0667,19.6332 46.8797,12.4392 55.7217,12.4392 C64.5637,12.4392 75.1377,19.6332 79.2927,28.4742 C83.4477,37.3162 79.6357,44.5092 70.7937,44.5092 M54.9397,10.7752 C45.1797,10.7752 40.9717,18.7152 45.5577,28.4742 C50.1447,38.2342 61.8157,46.1742 71.5757,46.1742 C81.3357,46.1742 85.5437,38.2342 80.9577,28.4742 C76.3707,18.7152 64.6987,10.7752 54.9397,10.7752" id="Fill-43" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M36.9939,5.7876 C36.5479,5.4176 35.9899,5.3376 35.7469,5.6096 C34.2189,7.3236 33.1309,9.3756 32.5139,11.7096 C32.4159,12.0796 32.7409,12.6006 33.2389,12.8726 C33.4379,12.9816 33.6359,13.0346 33.8059,13.0346 C34.0619,13.0346 34.2599,12.9166 34.3179,12.6946 C34.8999,10.4966 35.9239,8.5646 37.3629,6.9516 C37.6049,6.6786 37.4399,6.1586 36.9939,5.7876" id="Fill-44" fill="#1B243D" mask="url(#mask-2)"></path>
<path d="M90.5696,51.5581 C92.2026,49.8011 93.3576,47.6751 94.0016,45.2401 C94.0996,44.8691 93.7756,44.3481 93.2766,44.0761 C92.7776,43.8041 92.2946,43.8831 92.1966,44.2541 C91.5906,46.5471 90.5026,48.5491 88.9656,50.2041 C88.7166,50.4701 88.8746,50.9911 89.3176,51.3641 C89.5866,51.5911 89.8996,51.7121 90.1596,51.7121 C90.3266,51.7121 90.4716,51.6621 90.5696,51.5581" id="Fill-45" fill="#1B243D" mask="url(#mask-2)"></path>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

@ -0,0 +1,35 @@
<html>
<head>
<title>MetaMask Loading</title>
<style>
#div-logo {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 256px;
}
#logo {
width: 100%;
animation: pulse 1s ease-in-out infinite;
}
@keyframes pulse {
0% {
opacity: 1;
}
50% {
opacity: 0.5;
transform: scale(0.95, 0.95);
}
100% {
opacity: 1;
}
}
</style>
</head>
<body>
<div id="div-logo">
<img id="logo" src="./images/loginglogo.svg">
</div>
</body>
</html>

@ -59,7 +59,10 @@
"unlimitedStorage", "unlimitedStorage",
"clipboardWrite", "clipboardWrite",
"http://localhost:8545/", "http://localhost:8545/",
"https://*.infura.io/" "https://*.infura.io/",
"activeTab",
"webRequest",
"*://*.eth/"
], ],
"web_accessible_resources": [ "web_accessible_resources": [
"inpage.js" "inpage.js"

@ -26,6 +26,8 @@ const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics')
const EdgeEncryptor = require('./edge-encryptor') const EdgeEncryptor = require('./edge-encryptor')
const getFirstPreferredLangCode = require('./lib/get-first-preferred-lang-code') const getFirstPreferredLangCode = require('./lib/get-first-preferred-lang-code')
const getObjStructure = require('./lib/getObjStructure') const getObjStructure = require('./lib/getObjStructure')
const ipfsContent = require('./lib/ipfsContent.js')
const { const {
ENVIRONMENT_TYPE_POPUP, ENVIRONMENT_TYPE_POPUP,
ENVIRONMENT_TYPE_NOTIFICATION, ENVIRONMENT_TYPE_NOTIFICATION,
@ -66,6 +68,7 @@ initialize().catch(log.error)
// setup metamask mesh testing container // setup metamask mesh testing container
setupMetamaskMeshMetrics() setupMetamaskMeshMetrics()
/** /**
* An object representing a transaction, in whatever state it is in. * An object representing a transaction, in whatever state it is in.
* @typedef TransactionMeta * @typedef TransactionMeta
@ -155,6 +158,7 @@ async function initialize () {
const initLangCode = await getFirstPreferredLangCode() const initLangCode = await getFirstPreferredLangCode()
await setupController(initState, initLangCode) await setupController(initState, initLangCode)
log.debug('MetaMask initialization complete.') log.debug('MetaMask initialization complete.')
ipfsContent(initState.NetworkController.provider)
} }
// //
@ -258,6 +262,7 @@ function setupController (initState, initLangCode) {
}) })
global.metamaskController = controller global.metamaskController = controller
// report failed transactions to Sentry // report failed transactions to Sentry
controller.txController.on(`tx:status-update`, (txId, status) => { controller.txController.on(`tx:status-update`, (txId, status) => {
if (status !== 'failed') return if (status !== 'failed') return

@ -115,8 +115,8 @@ function logStreamDisconnectWarning (remoteLabel, err) {
* @returns {boolean} {@code true} if Web3 should be injected * @returns {boolean} {@code true} if Web3 should be injected
*/ */
function shouldInjectWeb3 () { function shouldInjectWeb3 () {
return doctypeCheck() && suffixCheck() return doctypeCheck() && suffixCheck() &&
&& documentElementCheck() && !blacklistedDomainCheck() documentElementCheck() && !blacklistedDomainCheck()
} }
/** /**

@ -111,9 +111,9 @@ class PreferencesController {
* @returns {Promise<string>} selectedAddress the selected address. * @returns {Promise<string>} selectedAddress the selected address.
*/ */
syncAddresses (addresses) { syncAddresses (addresses) {
let { identities, lostIdentities } = this.store.getState() const { identities, lostIdentities } = this.store.getState()
let newlyLost = {} const newlyLost = {}
Object.keys(identities).forEach((identity) => { Object.keys(identities).forEach((identity) => {
if (!addresses.includes(identity)) { if (!addresses.includes(identity)) {
newlyLost[identity] = identities[identity] newlyLost[identity] = identities[identity]
@ -128,7 +128,7 @@ class PreferencesController {
if (this.diagnostics) this.diagnostics.reportOrphans(newlyLost) if (this.diagnostics) this.diagnostics.reportOrphans(newlyLost)
// store lost accounts // store lost accounts
for (let key in newlyLost) { for (const key in newlyLost) {
lostIdentities[key] = newlyLost[key] lostIdentities[key] = newlyLost[key]
} }
} }

@ -0,0 +1 @@
module.exports = [{'constant': true, 'inputs': [{'name': 'node', 'type': 'bytes32'}], 'name': 'resolver', 'outputs': [{'name': '', 'type': 'address'}], 'payable': false, 'type': 'function'}, {'constant': true, 'inputs': [{'name': 'node', 'type': 'bytes32'}], 'name': 'owner', 'outputs': [{'name': '', 'type': 'address'}], 'payable': false, 'type': 'function'}, {'constant': false, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'label', 'type': 'bytes32'}, {'name': 'owner', 'type': 'address'}], 'name': 'setSubnodeOwner', 'outputs': [], 'payable': false, 'type': 'function'}, {'constant': false, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'ttl', 'type': 'uint64'}], 'name': 'setTTL', 'outputs': [], 'payable': false, 'type': 'function'}, {'constant': true, 'inputs': [{'name': 'node', 'type': 'bytes32'}], 'name': 'ttl', 'outputs': [{'name': '', 'type': 'uint64'}], 'payable': false, 'type': 'function'}, {'constant': false, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'resolver', 'type': 'address'}], 'name': 'setResolver', 'outputs': [], 'payable': false, 'type': 'function'}, {'constant': false, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'owner', 'type': 'address'}], 'name': 'setOwner', 'outputs': [], 'payable': false, 'type': 'function'}, {'anonymous': false, 'inputs': [{'indexed': true, 'name': 'node', 'type': 'bytes32'}, {'indexed': false, 'name': 'owner', 'type': 'address'}], 'name': 'Transfer', 'type': 'event'}, {'anonymous': false, 'inputs': [{'indexed': true, 'name': 'node', 'type': 'bytes32'}, {'indexed': true, 'name': 'label', 'type': 'bytes32'}, {'indexed': false, 'name': 'owner', 'type': 'address'}], 'name': 'NewOwner', 'type': 'event'}, {'anonymous': false, 'inputs': [{'indexed': true, 'name': 'node', 'type': 'bytes32'}, {'indexed': false, 'name': 'resolver', 'type': 'address'}], 'name': 'NewResolver', 'type': 'event'}, {'anonymous': false, 'inputs': [{'indexed': true, 'name': 'node', 'type': 'bytes32'}, {'indexed': false, 'name': 'ttl', 'type': 'uint64'}], 'name': 'NewTTL', 'type': 'event'}]

@ -0,0 +1,2 @@
module.exports =
[{'constant': true, 'inputs': [{'name': 'interfaceID', 'type': 'bytes4'}], 'name': 'supportsInterface', 'outputs': [{'name': '', 'type': 'bool'}], 'payable': false, 'type': 'function'}, {'constant': true, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'contentTypes', 'type': 'uint256'}], 'name': 'ABI', 'outputs': [{'name': 'contentType', 'type': 'uint256'}, {'name': 'data', 'type': 'bytes'}], 'payable': false, 'type': 'function'}, {'constant': false, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'x', 'type': 'bytes32'}, {'name': 'y', 'type': 'bytes32'}], 'name': 'setPubkey', 'outputs': [], 'payable': false, 'type': 'function'}, {'constant': true, 'inputs': [{'name': 'node', 'type': 'bytes32'}], 'name': 'content', 'outputs': [{'name': 'ret', 'type': 'bytes32'}], 'payable': false, 'type': 'function'}, {'constant': true, 'inputs': [{'name': 'node', 'type': 'bytes32'}], 'name': 'addr', 'outputs': [{'name': 'ret', 'type': 'address'}], 'payable': false, 'type': 'function'}, {'constant': false, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'contentType', 'type': 'uint256'}, {'name': 'data', 'type': 'bytes'}], 'name': 'setABI', 'outputs': [], 'payable': false, 'type': 'function'}, {'constant': true, 'inputs': [{'name': 'node', 'type': 'bytes32'}], 'name': 'name', 'outputs': [{'name': 'ret', 'type': 'string'}], 'payable': false, 'type': 'function'}, {'constant': false, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'name', 'type': 'string'}], 'name': 'setName', 'outputs': [], 'payable': false, 'type': 'function'}, {'constant': false, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'hash', 'type': 'bytes32'}], 'name': 'setContent', 'outputs': [], 'payable': false, 'type': 'function'}, {'constant': true, 'inputs': [{'name': 'node', 'type': 'bytes32'}], 'name': 'pubkey', 'outputs': [{'name': 'x', 'type': 'bytes32'}, {'name': 'y', 'type': 'bytes32'}], 'payable': false, 'type': 'function'}, {'constant': false, 'inputs': [{'name': 'node', 'type': 'bytes32'}, {'name': 'addr', 'type': 'address'}], 'name': 'setAddr', 'outputs': [], 'payable': false, 'type': 'function'}, {'inputs': [{'name': 'ensAddr', 'type': 'address'}], 'payable': false, 'type': 'constructor'}, {'anonymous': false, 'inputs': [{'indexed': true, 'name': 'node', 'type': 'bytes32'}, {'indexed': false, 'name': 'a', 'type': 'address'}], 'name': 'AddrChanged', 'type': 'event'}, {'anonymous': false, 'inputs': [{'indexed': true, 'name': 'node', 'type': 'bytes32'}, {'indexed': false, 'name': 'hash', 'type': 'bytes32'}], 'name': 'ContentChanged', 'type': 'event'}, {'anonymous': false, 'inputs': [{'indexed': true, 'name': 'node', 'type': 'bytes32'}, {'indexed': false, 'name': 'name', 'type': 'string'}], 'name': 'NameChanged', 'type': 'event'}, {'anonymous': false, 'inputs': [{'indexed': true, 'name': 'node', 'type': 'bytes32'}, {'indexed': true, 'name': 'contentType', 'type': 'uint256'}], 'name': 'ABIChanged', 'type': 'event'}, {'anonymous': false, 'inputs': [{'indexed': true, 'name': 'node', 'type': 'bytes32'}, {'indexed': false, 'name': 'x', 'type': 'bytes32'}, {'indexed': false, 'name': 'y', 'type': 'bytes32'}], 'name': 'PubkeyChanged', 'type': 'event'}]

@ -0,0 +1,40 @@
const extension = require('extensionizer')
const resolver = require('./resolver.js')
module.exports = function (provider) {
extension.webRequest.onBeforeRequest.addListener(details => {
const urlhttpreplace = details.url.replace(/\w+?:\/\//, '')
const url = urlhttpreplace.replace(/[\\/].*/g, '') // eslint-disable-line no-useless-escape
let domainhtml = urlhttpreplace.match(/[\\/].*/g) // eslint-disable-line no-useless-escape
let clearTime = null
const name = url.replace(/\/$/g, '')
if (domainhtml === null) domainhtml = ['']
extension.tabs.getSelected(null, tab => {
extension.tabs.update(tab.id, { url: 'loading.html' })
clearTime = setTimeout(() => {
return extension.tabs.update(tab.id, { url: '404.html' })
}, 60000)
resolver.resolve(name, provider).then(ipfsHash => {
clearTimeout(clearTime)
let url = 'https://ipfs.infura.io/ipfs/' + ipfsHash + domainhtml[0]
return fetch(url, { method: 'HEAD' }).then(response => response.status).then(statusCode => {
if (statusCode !== 200) return extension.tabs.update(tab.id, { url: '404.html' })
extension.tabs.update(tab.id, { url: url })
})
.catch(err => {
url = 'https://ipfs.infura.io/ipfs/' + ipfsHash + domainhtml[0]
extension.tabs.update(tab.id, {url: url})
return err
})
})
.catch(err => {
clearTimeout(clearTime)
const url = err === 'unsupport' ? 'unsupport' : 'error'
extension.tabs.update(tab.id, {url: `${url}.html?name=${name}`})
})
})
return { cancel: true }
}, {urls: ['*://*.eth/', '*://*.eth/*']})
}

@ -26,15 +26,15 @@ class NotificationManager {
// bring focus to existing chrome popup // bring focus to existing chrome popup
extension.windows.update(popup.id, { focused: true }) extension.windows.update(popup.id, { focused: true })
} else { } else {
const cb = (currentPopup) => { this._popupId = currentPopup.id }
// create new notification popup // create new notification popup
extension.windows.create({ const creation = extension.windows.create({
url: 'notification.html', url: 'notification.html',
type: 'popup', type: 'popup',
width, width,
height, height,
}).then((currentPopup) => { }, cb)
this._popupId = currentPopup.id creation && creation.then && creation.then(cb)
})
} }
}) })
} }

@ -0,0 +1,71 @@
const namehash = require('eth-ens-namehash')
const multihash = require('multihashes')
const HttpProvider = require('ethjs-provider-http')
const Eth = require('ethjs-query')
const EthContract = require('ethjs-contract')
const registrarAbi = require('./contracts/registrar')
const resolverAbi = require('./contracts/resolver')
function ens (name, provider) {
const eth = new Eth(new HttpProvider(getProvider(provider.type)))
const hash = namehash.hash(name)
const contract = new EthContract(eth)
const Registrar = contract(registrarAbi).at(getRegistrar(provider.type))
return new Promise((resolve, reject) => {
if (provider.type === 'mainnet' || provider.type === 'ropsten') {
Registrar.resolver(hash).then((address) => {
if (address === '0x0000000000000000000000000000000000000000') {
reject(null)
} else {
const Resolver = contract(resolverAbi).at(address['0'])
return Resolver.content(hash)
}
}).then((contentHash) => {
if (contentHash['0'] === '0x0000000000000000000000000000000000000000000000000000000000000000') reject(null)
if (contentHash.ret !== '0x') {
const hex = contentHash['0'].substring(2)
const buf = multihash.fromHexString(hex)
resolve(multihash.toB58String(multihash.encode(buf, 'sha2-256')))
} else {
reject(null)
}
})
} else {
return reject('unsupport')
}
})
}
function getProvider (type) {
switch (type) {
case 'mainnet':
return 'https://mainnet.infura.io/'
case 'ropsten':
return 'https://ropsten.infura.io/'
default:
return 'http://localhost:8545/'
}
}
function getRegistrar (type) {
switch (type) {
case 'mainnet':
return '0x314159265dd8dbb310642f98f50c066173c1259b'
case 'ropsten':
return '0x112234455c3a32fd11230c42e7bccd4a84e02010'
default:
return '0x0000000000000000000000000000000000000000'
}
}
module.exports.resolve = function (name, provider) {
const path = name.split('.')
const tld = path[path.length - 1]
if (tld === 'eth') {
return ens(name, provider)
} else {
return new Promise((resolve, reject) => {
reject(null)
})
}
}

@ -405,7 +405,6 @@ module.exports = class MetamaskController extends EventEmitter {
} }
//============================================================================= //=============================================================================
// VAULT / KEYRING RELATED METHODS // VAULT / KEYRING RELATED METHODS
//============================================================================= //=============================================================================

@ -35,10 +35,10 @@ function transformState (state) {
if (transactions.length <= 40) return newState if (transactions.length <= 40) return newState
let reverseTxList = transactions.reverse() const reverseTxList = transactions.reverse()
let stripping = true let stripping = true
while (reverseTxList.length > 40 && stripping) { while (reverseTxList.length > 40 && stripping) {
let txIndex = reverseTxList.findIndex((txMeta) => { const txIndex = reverseTxList.findIndex((txMeta) => {
return (txMeta.status === 'failed' || return (txMeta.status === 'failed' ||
txMeta.status === 'rejected' || txMeta.status === 'rejected' ||
txMeta.status === 'confirmed' || txMeta.status === 'confirmed' ||

@ -0,0 +1,59 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>MetaMask</title>
</head>
<style>
*{
padding: 0;
margin: 0;
box-sizing: border-box;
}
img{
display: block;
}
html, body{
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}
@keyframes logoAmin{
from {transform: scale(1);}
50%{transform: scale(1.1);}
to {transform: scale(1);}
}
.unsupport{
width: 80%;
height: auto;
overflow: hidden;
padding: 10px;
}
.unsupport > img{
margin: 0 auto 31px auto;
width: 136px;
height: auto;
animation: logoAmin 1s infinite linear;
}
.unsupport > h1{
text-align: center;
font-family: Gotham;
font-size: 18px;
font-weight: 500;
font-style: normal;
font-stretch: normal;
line-height: normal;
letter-spacing: 1.3px;
color: #33559f;
}
</style>
<body>
<div class="unsupport">
<img src="./images/cancel.png" alt="">
<h1>ENS resolver only support on Ethereum mainnet</h1>
</div>
</body>
</html>

@ -7,6 +7,6 @@ var changelog = fs.readFileSync(path.join(__dirname, '..', 'CHANGELOG.md')).toSt
var log = changelog.split(version)[1].split('##')[0].trim() var log = changelog.split(version)[1].split('##')[0].trim()
let msg = `*MetaMask ${version}* now published! It should auto-update soon!\n${log}` const msg = `*MetaMask ${version}* now published! It should auto-update soon!\n${log}`
console.log(msg) console.log(msg)

@ -1,5 +1,5 @@
module.exports = { module.exports = {
"confirm sig requests": { 'confirm sig requests': {
signMessage: (msgData, cb) => { signMessage: (msgData, cb) => {
const stateUpdate = { const stateUpdate = {
unapprovedMsgs: {}, unapprovedMsgs: {},

@ -1,17 +1,14 @@
const beefy = require('beefy') const beefy = require('beefy')
const http = require('http') const http = require('http')
const fs = require('fs')
const path = require('path')
const port = 8124 const port = 8124
const handler = beefy({ const handler = beefy({
entries: {'mocker.js': 'bundle.js'} entries: {'mocker.js': 'bundle.js'},
, cwd: __dirname cwd: __dirname,
, live: true live: true,
, open: true open: true,
, quiet: false quiet: false,
, bundlerFlags: ['-t', 'brfs'] bundlerFlags: ['-t', 'brfs'],
}) })

@ -12,7 +12,6 @@
* To use, run `npm run mock`. * To use, run `npm run mock`.
*/ */
const extend = require('xtend')
const render = require('react-dom').render const render = require('react-dom').render
const h = require('react-hyperscript') const h = require('react-hyperscript')
const Root = require('../ui/app/root') const Root = require('../ui/app/root')
@ -24,7 +23,6 @@ const Selector = require('./selector')
const MetamaskController = require('../app/scripts/metamask-controller') const MetamaskController = require('../app/scripts/metamask-controller')
const firstTimeState = require('../app/scripts/first-time-state') const firstTimeState = require('../app/scripts/first-time-state')
const ExtensionPlatform = require('../app/scripts/platforms/extension') const ExtensionPlatform = require('../app/scripts/platforms/extension')
const extension = require('./mockExtension')
const noop = function () {} const noop = function () {}
const log = require('loglevel') const log = require('loglevel')
@ -81,7 +79,7 @@ const controller = new MetamaskController({
initState: firstTimeState, initState: firstTimeState,
}) })
global.metamaskController = controller global.metamaskController = controller
global.platform = new ExtensionPlatform global.platform = new ExtensionPlatform()
// //
// User Interface // User Interface

@ -39,6 +39,6 @@ extension.runtime.reload = noop
extension.tabs.create = noop extension.tabs.create = noop
extension.runtime.getManifest = function () { extension.runtime.getManifest = function () {
return { return {
version: 'development' version: 'development',
} }
} }

@ -11,7 +11,7 @@ function NewComponent () {
NewComponent.prototype.render = function () { NewComponent.prototype.render = function () {
const props = this.props const props = this.props
let { const {
states, states,
selectedKey, selectedKey,
actions, actions,

@ -1,6 +1,6 @@
const fs = require('fs') const fs = require('fs')
const { SourceMapConsumer } = require('source-map') const { SourceMapConsumer } = require('source-map')
const path = require('path')
// //
// Utility to help check if sourcemaps are working // Utility to help check if sourcemaps are working
// //
@ -11,9 +11,11 @@ const { SourceMapConsumer } = require('source-map')
start() start()
async function start () { async function start () {
const rawBuild = fs.readFileSync(__dirname + '/../dist/chrome/inpage.js', 'utf8') const rawBuild = fs.readFileSync(path.join(__dirname, '/../dist/chrome/', 'inpage.js')
const rawSourceMap = fs.readFileSync(__dirname + '/../dist/sourcemaps/inpage.js.map', 'utf8') , 'utf8')
const rawSourceMap = fs.readFileSync(path.join(__dirname, '/../dist/sourcemaps/', 'inpage.js.map'), 'utf8')
const consumer = await new SourceMapConsumer(rawSourceMap) const consumer = await new SourceMapConsumer(rawSourceMap)
console.log('hasContentsOfAllSources:', consumer.hasContentsOfAllSources(), '\n') console.log('hasContentsOfAllSources:', consumer.hasContentsOfAllSources(), '\n')
@ -43,7 +45,8 @@ async function start() {
} }
function indicesOf (substring, string) { function indicesOf (substring, string) {
var a=[],i=-1; var a = []
while((i=string.indexOf(substring,i+1)) >= 0) a.push(i); var i = -1
return a; while ((i = string.indexOf(substring, i + 1)) >= 0) a.push(i)
return a
} }

@ -29,9 +29,8 @@ log.setDefaultLevel(1)
// Query String // Query String
const qs = require('qs') const qs = require('qs')
let queryString = qs.parse(window.location.href.split('#')[1]) const queryString = qs.parse(window.location.href.split('#')[1])
let selectedView = queryString.view || 'first time' let selectedView = queryString.view || 'first time'
const firstState = states[selectedView]
updateQueryParams(selectedView) updateQueryParams(selectedView)
// CSS // CSS

@ -20,7 +20,7 @@ const specifiedLocale = process.argv[2]
if (specifiedLocale) { if (specifiedLocale) {
console.log(`Verifying selected locale "${specifiedLocale}":\n\n`) console.log(`Verifying selected locale "${specifiedLocale}":\n\n`)
const locale = localeIndex.find(localeMeta => localeMeta.code === specifiedLocale) const locale = localeIndex.find(localeMeta => localeMeta.code === specifiedLocale)
verifyLocale({ localeMeta }) verifyLocale({ locale })
} else { } else {
console.log('Verifying all locales:\n\n') console.log('Verifying all locales:\n\n')
localeIndex.forEach(localeMeta => { localeIndex.forEach(localeMeta => {
@ -30,16 +30,16 @@ if (specifiedLocale) {
} }
function verifyLocale ({ localeMeta }) { function verifyLocale ({ localeMeta }) {
const localeCode = localeMeta.code const localeCode = localeMeta.code
const localeName = localeMeta.name const localeName = localeMeta.name
let targetLocale, englishLocale
try { try {
const localeFilePath = path.join(process.cwd(), 'app', '_locales', localeCode, 'messages.json') const localeFilePath = path.join(process.cwd(), 'app', '_locales', localeCode, 'messages.json')
targetLocale = JSON.parse(fs.readFileSync(localeFilePath, 'utf8')); targetLocale = JSON.parse(fs.readFileSync(localeFilePath, 'utf8'))
} catch (e) { } catch (e) {
if (e.code == 'ENOENT') { if (e.code === 'ENOENT') {
console.log('Locale file not found') console.log('Locale file not found')
} else { } else {
console.log(`Error opening your locale ("${localeCode}") file: `, e) console.log(`Error opening your locale ("${localeCode}") file: `, e)
@ -49,9 +49,9 @@ function verifyLocale({ localeMeta }) {
try { try {
const englishFilePath = path.join(process.cwd(), 'app', '_locales', 'en', 'messages.json') const englishFilePath = path.join(process.cwd(), 'app', '_locales', 'en', 'messages.json')
englishLocale = JSON.parse(fs.readFileSync(englishFilePath, 'utf8')); englishLocale = JSON.parse(fs.readFileSync(englishFilePath, 'utf8'))
} catch (e) { } catch (e) {
if(e.code == 'ENOENT') { if (e.code === 'ENOENT') {
console.log('English File not found') console.log('English File not found')
} else { } else {
console.log('Error opening english locale file: ', e) console.log('Error opening english locale file: ', e)

@ -19,13 +19,13 @@ async function versionBump(bumpType, changelog, oldManifest) {
return { return {
version: newVersion, version: newVersion,
manifest: manifest, manifest: manifest,
changelog: logLines.join('\n') changelog: logLines.join('\n'),
} }
} }
function newVersionFrom (manifest, bumpType) { function newVersionFrom (manifest, bumpType) {
const string = manifest.version const string = manifest.version
let segments = string.split('.').map((str) => parseInt(str)) const segments = string.split('.').map((str) => parseInt(str))
switch (bumpType) { switch (bumpType) {
case 'major': case 'major':
@ -45,8 +45,4 @@ function newVersionFrom (manifest, bumpType) {
return segments.map(String).join('.') return segments.map(String).join('.')
} }
function bumpManifest (manifest, bumpType) {
}
module.exports = versionBump module.exports = versionBump

@ -1,6 +1,6 @@
const fs = require('fs') const fs = require('fs')
const async = require('async')
const path = require('path') const path = require('path')
const async = require('async')
const promisify = require('pify') const promisify = require('pify')
// start(/\.selectors.js/, generateSelectorTest).catch(console.error) // start(/\.selectors.js/, generateSelectorTest).catch(console.error)
@ -8,7 +8,6 @@ const promisify = require('pify')
startContainer(/\.container.js/, generateContainerTest).catch(console.error) startContainer(/\.container.js/, generateContainerTest).catch(console.error)
async function getAllFileNames (dirName) { async function getAllFileNames (dirName) {
const rootPath = path.join(__dirname, dirName)
const allNames = (await promisify(fs.readdir)(dirName)) const allNames = (await promisify(fs.readdir)(dirName))
const fileNames = allNames.filter(name => name.match(/^.+\./)) const fileNames = allNames.filter(name => name.match(/^.+\./))
const dirNames = allNames.filter(name => name.match(/^[^.]+$/)) const dirNames = allNames.filter(name => name.match(/^[^.]+$/))
@ -16,7 +15,7 @@ async function getAllFileNames (dirName) {
const fullPathDirNames = dirNames.map(d => `${dirName}/${d}`) const fullPathDirNames = dirNames.map(d => `${dirName}/${d}`)
const subNameArrays = await promisify(async.map)(fullPathDirNames, getAllFileNames) const subNameArrays = await promisify(async.map)(fullPathDirNames, getAllFileNames)
let subNames = [] let subNames = []
subNameArrays.forEach(subNameArray => subNames = [...subNames, ...subNameArray]) subNameArrays.forEach(subNameArray => { subNames = [...subNames, ...subNameArray] })
return [ return [
...fileNames.map(name => dirName + '/' + name), ...fileNames.map(name => dirName + '/' + name),
@ -24,6 +23,7 @@ async function getAllFileNames (dirName) {
] ]
} }
/*
async function start (fileRegEx, testGenerator) { async function start (fileRegEx, testGenerator) {
const fileNames = await getAllFileNames('./ui/app') const fileNames = await getAllFileNames('./ui/app')
const sFiles = fileNames.filter(name => name.match(fileRegEx)) const sFiles = fileNames.filter(name => name.match(fileRegEx))
@ -31,7 +31,7 @@ async function start (fileRegEx, testGenerator) {
let sFileMethodNames let sFileMethodNames
let testFilePath let testFilePath
async.each(sFiles, async (sFile, cb) => { async.each(sFiles, async (sFile, cb) => {
let [, sRootPath, sPath] = sFile.match(/^(.+\/)([^/]+)$/) const [, sRootPath, sPath] = sFile.match(/^(.+\/)([^/]+)$/)
sFileMethodNames = Object.keys(require(__dirname + '/' + sFile)) sFileMethodNames = Object.keys(require(__dirname + '/' + sFile))
testFilePath = sPath.replace('.', '-').replace('.', '.test.') testFilePath = sPath.replace('.', '-').replace('.', '.test.')
@ -46,23 +46,26 @@ async function start (fileRegEx, testGenerator) {
}) })
} }
*/
async function startContainer (fileRegEx, testGenerator) { async function startContainer (fileRegEx, testGenerator) {
const fileNames = await getAllFileNames('./ui/app') const fileNames = await getAllFileNames('./ui/app')
const sFiles = fileNames.filter(name => name.match(fileRegEx)) const sFiles = fileNames.filter(name => name.match(fileRegEx))
let sFileMethodNames
async.each(sFiles, async (sFile, cb) => { async.each(sFiles, async (sFile, cb) => {
console.log(`sFile`, sFile); console.log(`sFile`, sFile)
let [, sRootPath, sPath] = sFile.match(/^(.+\/)([^/]+)$/) const [, sRootPath, sPath] = sFile.match(/^(.+\/)([^/]+)$/)
let testFilePath = sPath.replace('.', '-').replace('.', '.test.') const testFilePath = sPath.replace('.', '-').replace('.', '.test.')
await promisify(fs.readFile)( await promisify(fs.readFile)(
__dirname + '/' + sFile, path.join(__dirname, sFile),
'utf8', 'utf8',
async (err, result) => { async (err, result) => {
console.log(`result`, result.length); if (err) {
console.log('Error: ', err)
} else {
console.log(`result`, result.length)
const returnObjectStrings = result const returnObjectStrings = result
.match(/return\s(\{[\s\S]+?})\n}/g) .match(/return\s(\{[\s\S]+?})\n}/g)
.map(str => { .map(str => {
@ -113,21 +116,22 @@ async function startContainer (fileRegEx, testGenerator) {
}) })
// console.log(`containerTest`, `${__dirname}/${sRootPath}tests/${testFilePath}`, containerTest); // console.log(`containerTest`, `${__dirname}/${sRootPath}tests/${testFilePath}`, containerTest);
console.log('----') console.log('----')
console.log(`sRootPath`, sRootPath); console.log(`sRootPath`, sRootPath)
console.log(`testFilePath`, testFilePath); console.log(`testFilePath`, testFilePath)
await promisify(fs.writeFile)( await promisify(fs.writeFile)(
`${__dirname}/${sRootPath}tests/${testFilePath}`, `${__dirname}/${sRootPath}tests/${testFilePath}`,
containerTest, containerTest,
'utf8' 'utf8'
) )
} }
}
) )
}, (err) => { }, (err) => {
console.log('123', err) console.log('123', err)
}) })
} }
/*
function generateMethodList (methodArray) { function generateMethodList (methodArray) {
return methodArray.map(n => ' ' + n).join(',\n') + ',' return methodArray.map(n => ' ' + n).join(',\n') + ','
} }
@ -143,7 +147,7 @@ function generateMethodDescribeBlock (methodName, index) {
})` })`
return describeBlock return describeBlock
} }
*/
function generateDispatchMethodDescribeBlock (methodName, index) { function generateDispatchMethodDescribeBlock (methodName, index) {
const describeBlock = const describeBlock =
`${index ? ' ' : ''}describe('${methodName}()', () => { `${index ? ' ' : ''}describe('${methodName}()', () => {
@ -154,12 +158,13 @@ function generateDispatchMethodDescribeBlock (methodName, index) {
})` })`
return describeBlock return describeBlock
} }
/*
function generateMethodDescribeBlocks (methodArray) { function generateMethodDescribeBlocks (methodArray) {
return methodArray return methodArray
.map((methodName, index) => generateMethodDescribeBlock(methodName, index)) .map((methodName, index) => generateMethodDescribeBlock(methodName, index))
.join('\n\n') .join('\n\n')
} }
*/
function generateDispatchMethodDescribeBlocks (methodArray) { function generateDispatchMethodDescribeBlocks (methodArray) {
return methodArray return methodArray
@ -167,6 +172,7 @@ function generateDispatchMethodDescribeBlocks (methodArray) {
.join('\n\n') .join('\n\n')
} }
/*
function generateSelectorTest (name, methodArray) { function generateSelectorTest (name, methodArray) {
return `import assert from 'assert' return `import assert from 'assert'
import { import {
@ -192,6 +198,7 @@ describe('${name.match(/^[^.]+/)} utils', () => {
})` })`
} }
*/
function generateContainerTest (sPath, { function generateContainerTest (sPath, {
mapStateToPropsAssertionObject, mapStateToPropsAssertionObject,

@ -13,21 +13,15 @@ const zip = require('gulp-zip')
const assign = require('lodash.assign') const assign = require('lodash.assign')
const livereload = require('gulp-livereload') const livereload = require('gulp-livereload')
const del = require('del') const del = require('del')
const eslint = require('gulp-eslint')
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
const manifest = require('./app/manifest.json') const manifest = require('./app/manifest.json')
const replace = require('gulp-replace')
const mkdirp = require('mkdirp') const mkdirp = require('mkdirp')
const asyncEach = require('async/each')
const exec = require('child_process').exec
const sass = require('gulp-sass') const sass = require('gulp-sass')
const autoprefixer = require('gulp-autoprefixer') const autoprefixer = require('gulp-autoprefixer')
const gulpStylelint = require('gulp-stylelint') const gulpStylelint = require('gulp-stylelint')
const stylefmt = require('gulp-stylefmt') const stylefmt = require('gulp-stylefmt')
const uglify = require('gulp-uglify-es').default const uglify = require('gulp-uglify-es').default
const babel = require('gulp-babel')
const debug = require('gulp-debug')
const pify = require('pify') const pify = require('pify')
const gulpMultiProcess = require('gulp-multi-process') const gulpMultiProcess = require('gulp-multi-process')
const endOfStream = pify(require('end-of-stream')) const endOfStream = pify(require('end-of-stream'))
@ -48,7 +42,7 @@ const commonPlatforms = [
// browser webapp // browser webapp
'mascara', 'mascara',
// browser extensions // browser extensions
...browserPlatforms ...browserPlatforms,
] ]
// browser reload // browser reload
@ -165,11 +159,11 @@ gulp.task('manifest:opera', function() {
return gulp.src('./dist/opera/manifest.json') return gulp.src('./dist/opera/manifest.json')
.pipe(jsoneditor(function (json) { .pipe(jsoneditor(function (json) {
json.permissions = [ json.permissions = [
"storage", 'storage',
"tabs", 'tabs',
"clipboardWrite", 'clipboardWrite',
"clipboardRead", 'clipboardRead',
"http://localhost:8545/" 'http://localhost:8545/',
] ]
return json return json
})) }))
@ -212,29 +206,6 @@ gulp.task('dev:copy',
) )
) )
// lint js
const lintTargets = ['app/**/*.json', 'app/**/*.js', '!app/scripts/vendor/**/*.js', 'ui/**/*.js', 'old-ui/**/*.js', 'mascara/src/*.js', 'mascara/server/*.js', '!node_modules/**', '!dist/firefox/**', '!docs/**', '!app/scripts/chromereload.js', '!mascara/test/jquery-3.1.0.min.js']
gulp.task('lint', function () {
// Ignoring node_modules, dist/firefox, and docs folders:
return gulp.src(lintTargets)
.pipe(eslint(fs.readFileSync(path.join(__dirname, '.eslintrc'))))
// eslint.format() outputs the lint results to the console.
// Alternatively use eslint.formatEach() (see Docs).
.pipe(eslint.format())
// To have the process exit with an error code (1) on
// lint error, return the stream and pipe to failAfterError last.
.pipe(eslint.failAfterError())
});
gulp.task('lint:fix', function () {
return gulp.src(lintTargets)
.pipe(eslint(Object.assign(fs.readFileSync(path.join(__dirname, '.eslintrc')), {fix: true})))
.pipe(eslint.format())
.pipe(eslint.failAfterError())
});
// scss compilation and autoprefixing tasks // scss compilation and autoprefixing tasks
gulp.task('build:scss', createScssBuildTask({ gulp.task('build:scss', createScssBuildTask({
@ -277,17 +248,17 @@ gulp.task('lint-scss', function() {
.src('ui/app/css/itcss/**/*.scss') .src('ui/app/css/itcss/**/*.scss')
.pipe(gulpStylelint({ .pipe(gulpStylelint({
reporters: [ reporters: [
{ formatter: 'string', console: true } { formatter: 'string', console: true },
], ],
fix: true, fix: true,
})); }))
}); })
gulp.task('fmt-scss', function () { gulp.task('fmt-scss', function () {
return gulp.src('ui/app/css/itcss/**/*.scss') return gulp.src('ui/app/css/itcss/**/*.scss')
.pipe(stylefmt()) .pipe(stylefmt())
.pipe(gulp.dest('ui/app/css/itcss')); .pipe(gulp.dest('ui/app/css/itcss'))
}); })
// build js // build js
@ -562,7 +533,7 @@ function bundleTask(opts) {
buildStream = buildStream buildStream = buildStream
.pipe(uglify({ .pipe(uglify({
mangle: { mangle: {
reserved: [ 'MetamaskInpageProvider' ] reserved: [ 'MetamaskInpageProvider' ],
}, },
})) }))
} }

@ -1,8 +1,8 @@
const express = require('express') const express = require('express')
const path = require('path')
const createMetamascaraServer = require('../server/') const createMetamascaraServer = require('../server/')
const createBundle = require('../server/util').createBundle const createBundle = require('../server/util').createBundle
const serveBundle = require('../server/util').serveBundle const serveBundle = require('../server/util').serveBundle
// //
// Iframe Server // Iframe Server
// //
@ -23,7 +23,7 @@ const dappServer = express()
// serve dapp bundle // serve dapp bundle
serveBundle(dappServer, '/app.js', createBundle(require.resolve('./app.js'))) serveBundle(dappServer, '/app.js', createBundle(require.resolve('./app.js')))
dappServer.use(express.static(__dirname + '/app/')) dappServer.use(express.static(path.join(__dirname, '/app/')))
// start the server // start the server
const dappPort = '9002' const dappPort = '9002'

@ -20,7 +20,7 @@ export default class Breadcrumbs extends Component {
/> />
))} ))}
</div> </div>
); )
} }
} }

@ -54,7 +54,7 @@ class BuyEtherScreen extends Component {
return ( return (
<div <div
className='buy-ether__do-it-later' className="buy-ether__do-it-later"
onClick={() => showAccountDetail(address)} onClick={() => showAccountDetail(address)}
> >
Do it later Do it later
@ -64,17 +64,17 @@ class BuyEtherScreen extends Component {
renderCoinbaseLogo () { renderCoinbaseLogo () {
return ( return (
<svg width='140px' height='49px' viewBox='0 0 579 126' version='1.1'> <svg width="140px" height="49px" viewBox="0 0 579 126" version="1.1">
<g id='Page-1' stroke='none' strokeWidth={1} fill='none' fillRule='evenodd'> <g id="Page-1" stroke="none" strokeWidth={1} fill="none" fillRule="evenodd">
<g id='Imported-Layers' fill='#0081C9'> <g id="Imported-Layers" fill="#0081C9">
<path d='M37.752,125.873 C18.824,125.873 0.369,112.307 0.369,81.549 C0.369,50.79 18.824,37.382 37.752,37.382 C47.059,37.382 54.315,39.749 59.52,43.219 L53.841,55.68 C50.371,53.156 45.166,51.579 39.961,51.579 C28.604,51.579 18.193,60.57 18.193,81.391 C18.193,102.212 28.919,111.361 39.961,111.361 C45.166,111.361 50.371,109.783 53.841,107.26 L59.52,120.036 C54.157,123.664 47.059,125.873 37.752,125.873' id='Fill-1' /> <path d="M37.752,125.873 C18.824,125.873 0.369,112.307 0.369,81.549 C0.369,50.79 18.824,37.382 37.752,37.382 C47.059,37.382 54.315,39.749 59.52,43.219 L53.841,55.68 C50.371,53.156 45.166,51.579 39.961,51.579 C28.604,51.579 18.193,60.57 18.193,81.391 C18.193,102.212 28.919,111.361 39.961,111.361 C45.166,111.361 50.371,109.783 53.841,107.26 L59.52,120.036 C54.157,123.664 47.059,125.873 37.752,125.873" id="Fill-1" />
<path d='M102.898,125.873 C78.765,125.873 65.515,106.786 65.515,81.549 C65.515,56.311 78.765,37.382 102.898,37.382 C127.032,37.382 140.282,56.311 140.282,81.549 C140.282,106.786 127.032,125.873 102.898,125.873 L102.898,125.873 Z M102.898,51.105 C89.491,51.105 82.866,63.093 82.866,81.391 C82.866,99.688 89.491,111.834 102.898,111.834 C116.306,111.834 122.931,99.688 122.931,81.391 C122.931,63.093 116.306,51.105 102.898,51.105 L102.898,51.105 Z' id='Fill-2' /> <path d="M102.898,125.873 C78.765,125.873 65.515,106.786 65.515,81.549 C65.515,56.311 78.765,37.382 102.898,37.382 C127.032,37.382 140.282,56.311 140.282,81.549 C140.282,106.786 127.032,125.873 102.898,125.873 L102.898,125.873 Z M102.898,51.105 C89.491,51.105 82.866,63.093 82.866,81.391 C82.866,99.688 89.491,111.834 102.898,111.834 C116.306,111.834 122.931,99.688 122.931,81.391 C122.931,63.093 116.306,51.105 102.898,51.105 L102.898,51.105 Z" id="Fill-2" />
<path d='M163.468,23.659 C157.79,23.659 153.215,19.243 153.215,13.88 C153.215,8.517 157.79,4.1 163.468,4.1 C169.146,4.1 173.721,8.517 173.721,13.88 C173.721,19.243 169.146,23.659 163.468,23.659 L163.468,23.659 Z M154.793,39.118 L172.144,39.118 L172.144,124.138 L154.793,124.138 L154.793,39.118 Z' id='Fill-3' /> <path d="M163.468,23.659 C157.79,23.659 153.215,19.243 153.215,13.88 C153.215,8.517 157.79,4.1 163.468,4.1 C169.146,4.1 173.721,8.517 173.721,13.88 C173.721,19.243 169.146,23.659 163.468,23.659 L163.468,23.659 Z M154.793,39.118 L172.144,39.118 L172.144,124.138 L154.793,124.138 L154.793,39.118 Z" id="Fill-3" />
<path d='M240.443,124.137 L240.443,67.352 C240.443,57.415 234.449,51.263 222.619,51.263 C216.31,51.263 210.473,52.367 207.003,53.787 L207.003,124.137 L189.81,124.137 L189.81,43.376 C198.328,39.906 209.212,37.382 222.461,37.382 C246.28,37.382 257.794,47.793 257.794,65.775 L257.794,124.137 L240.443,124.137' id='Fill-4' /> <path d="M240.443,124.137 L240.443,67.352 C240.443,57.415 234.449,51.263 222.619,51.263 C216.31,51.263 210.473,52.367 207.003,53.787 L207.003,124.137 L189.81,124.137 L189.81,43.376 C198.328,39.906 209.212,37.382 222.461,37.382 C246.28,37.382 257.794,47.793 257.794,65.775 L257.794,124.137 L240.443,124.137" id="Fill-4" />
<path d='M303.536,125.873 C292.494,125.873 281.611,123.191 274.986,119.879 L274.986,0.314 L292.179,0.314 L292.179,41.326 C296.28,39.433 302.905,37.856 308.741,37.856 C330.667,37.856 345.494,53.629 345.494,79.656 C345.494,111.676 328.931,125.873 303.536,125.873 L303.536,125.873 Z M305.744,51.263 C301.012,51.263 295.491,52.367 292.179,54.103 L292.179,109.941 C294.703,111.045 299.593,112.149 304.482,112.149 C318.205,112.149 328.301,102.685 328.301,80.918 C328.301,62.305 319.467,51.263 305.744,51.263 L305.744,51.263 Z' id='Fill-5' /> <path d="M303.536,125.873 C292.494,125.873 281.611,123.191 274.986,119.879 L274.986,0.314 L292.179,0.314 L292.179,41.326 C296.28,39.433 302.905,37.856 308.741,37.856 C330.667,37.856 345.494,53.629 345.494,79.656 C345.494,111.676 328.931,125.873 303.536,125.873 L303.536,125.873 Z M305.744,51.263 C301.012,51.263 295.491,52.367 292.179,54.103 L292.179,109.941 C294.703,111.045 299.593,112.149 304.482,112.149 C318.205,112.149 328.301,102.685 328.301,80.918 C328.301,62.305 319.467,51.263 305.744,51.263 L305.744,51.263 Z" id="Fill-5" />
<path d='M392.341,125.873 C367.892,125.873 355.589,115.935 355.589,99.215 C355.589,75.555 380.826,71.296 406.537,69.876 L406.537,64.513 C406.537,53.787 399.439,50.001 388.555,50.001 C380.511,50.001 370.731,52.525 365.053,55.207 L360.636,43.376 C367.419,40.379 378.933,37.382 390.29,37.382 C410.638,37.382 422.942,45.269 422.942,66.248 L422.942,119.879 C416.79,123.191 404.329,125.873 392.341,125.873 L392.341,125.873 Z M406.537,81.391 C389.186,82.337 371.835,83.757 371.835,98.9 C371.835,107.89 378.776,113.411 391.868,113.411 C397.389,113.411 403.856,112.465 406.537,111.203 L406.537,81.391 L406.537,81.391 Z' id='Fill-6' /> <path d="M392.341,125.873 C367.892,125.873 355.589,115.935 355.589,99.215 C355.589,75.555 380.826,71.296 406.537,69.876 L406.537,64.513 C406.537,53.787 399.439,50.001 388.555,50.001 C380.511,50.001 370.731,52.525 365.053,55.207 L360.636,43.376 C367.419,40.379 378.933,37.382 390.29,37.382 C410.638,37.382 422.942,45.269 422.942,66.248 L422.942,119.879 C416.79,123.191 404.329,125.873 392.341,125.873 L392.341,125.873 Z M406.537,81.391 C389.186,82.337 371.835,83.757 371.835,98.9 C371.835,107.89 378.776,113.411 391.868,113.411 C397.389,113.411 403.856,112.465 406.537,111.203 L406.537,81.391 L406.537,81.391 Z" id="Fill-6" />
<path d='M461.743,125.873 C451.806,125.873 441.395,123.191 435.244,119.879 L441.08,106.629 C445.496,109.31 454.803,112.149 461.27,112.149 C470.576,112.149 476.728,107.575 476.728,100.477 C476.728,92.748 470.261,89.751 461.586,86.596 C450.228,82.337 437.452,77.132 437.452,61.201 C437.452,47.162 448.336,37.382 467.264,37.382 C477.517,37.382 486.035,39.906 492.029,43.376 L486.665,55.364 C482.88,52.998 475.309,50.317 469.157,50.317 C460.166,50.317 455.118,55.049 455.118,61.201 C455.118,68.93 461.428,71.611 469.788,74.766 C481.618,79.183 494.71,84.072 494.71,100.635 C494.71,115.935 483.038,125.873 461.743,125.873' id='Fill-7' /> <path d="M461.743,125.873 C451.806,125.873 441.395,123.191 435.244,119.879 L441.08,106.629 C445.496,109.31 454.803,112.149 461.27,112.149 C470.576,112.149 476.728,107.575 476.728,100.477 C476.728,92.748 470.261,89.751 461.586,86.596 C450.228,82.337 437.452,77.132 437.452,61.201 C437.452,47.162 448.336,37.382 467.264,37.382 C477.517,37.382 486.035,39.906 492.029,43.376 L486.665,55.364 C482.88,52.998 475.309,50.317 469.157,50.317 C460.166,50.317 455.118,55.049 455.118,61.201 C455.118,68.93 461.428,71.611 469.788,74.766 C481.618,79.183 494.71,84.072 494.71,100.635 C494.71,115.935 483.038,125.873 461.743,125.873" id="Fill-7" />
<path d='M578.625,81.233 L522.155,89.12 C523.89,104.42 533.828,112.149 548.182,112.149 C556.699,112.149 565.848,110.099 571.684,106.944 L576.732,119.879 C570.107,123.349 558.75,125.873 547.078,125.873 C520.262,125.873 505.277,108.679 505.277,81.549 C505.277,55.522 519.789,37.382 543.607,37.382 C565.69,37.382 578.782,51.894 578.782,74.766 C578.782,76.816 578.782,79.025 578.625,81.233 L578.625,81.233 Z M543.292,50.001 C530.042,50.001 521.367,60.097 521.051,77.763 L562.22,72.084 C562.062,57.257 554.649,50.001 543.292,50.001 L543.292,50.001 Z' id='Fill-8' /> <path d="M578.625,81.233 L522.155,89.12 C523.89,104.42 533.828,112.149 548.182,112.149 C556.699,112.149 565.848,110.099 571.684,106.944 L576.732,119.879 C570.107,123.349 558.75,125.873 547.078,125.873 C520.262,125.873 505.277,108.679 505.277,81.549 C505.277,55.522 519.789,37.382 543.607,37.382 C565.69,37.382 578.782,51.894 578.782,74.766 C578.782,76.816 578.782,79.025 578.625,81.233 L578.625,81.233 Z M543.292,50.001 C530.042,50.001 521.367,60.097 521.051,77.763 L562.22,72.084 C562.062,57.257 554.649,50.001 543.292,50.001 L543.292,50.001 Z" id="Fill-8" />
</g> </g>
</g> </g>
</svg> </svg>
@ -85,13 +85,13 @@ class BuyEtherScreen extends Component {
const {goToCoinbase, address} = this.props const {goToCoinbase, address} = this.props
return ( return (
<div className='buy-ether__action-content-wrapper'> <div className="buy-ether__action-content-wrapper">
<div>{this.renderCoinbaseLogo()}</div> <div>{this.renderCoinbaseLogo()}</div>
<div className='buy-ether__body-text'>Coinbase is the worlds most popular way to buy and sell bitcoin, ethereum, and litecoin.</div> <div className="buy-ether__body-text">Coinbase is the worlds most popular way to buy and sell bitcoin, ethereum, and litecoin.</div>
<a className='first-time-flow__link buy-ether__faq-link'>What is Ethereum?</a> <a className="first-time-flow__link buy-ether__faq-link">What is Ethereum?</a>
<div className='buy-ether__buttons'> <div className="buy-ether__buttons">
<button <button
className='first-time-flow__button' className="first-time-flow__button"
onClick={() => goToCoinbase(address)} onClick={() => goToCoinbase(address)}
> >
Buy Buy
@ -114,23 +114,23 @@ class BuyEtherScreen extends Component {
return this.renderCoinbaseForm() return this.renderCoinbaseForm()
case OPTION_VALUES.SHAPESHIFT: case OPTION_VALUES.SHAPESHIFT:
return ( return (
<div className='buy-ether__action-content-wrapper'> <div className="buy-ether__action-content-wrapper">
<div className='shapeshift-logo' /> <div className="shapeshift-logo" />
<div className='buy-ether__body-text'> <div className="buy-ether__body-text">
Trade any leading blockchain asset for any other. Protection by Design. No Account Needed. Trade any leading blockchain asset for any other. Protection by Design. No Account Needed.
</div> </div>
<ShapeShiftForm btnClass='first-time-flow__button' /> <ShapeShiftForm btnClass="first-time-flow__button" />
</div> </div>
) )
case OPTION_VALUES.QR_CODE: case OPTION_VALUES.QR_CODE:
return ( return (
<div className='buy-ether__action-content-wrapper'> <div className="buy-ether__action-content-wrapper">
<div dangerouslySetInnerHTML={{ __html: qrImage.createTableTag(4) }} /> <div dangerouslySetInnerHTML={{ __html: qrImage.createTableTag(4) }} />
<div className='buy-ether__body-text'>Deposit Ether directly into your account.</div> <div className="buy-ether__body-text">Deposit Ether directly into your account.</div>
<div className='buy-ether__small-body-text'>(This is the account address that MetaMask created for you to recieve funds.)</div> <div className="buy-ether__small-body-text">(This is the account address that MetaMask created for you to recieve funds.)</div>
<div className='buy-ether__buttons'> <div className="buy-ether__buttons">
<button <button
className='first-time-flow__button' className="first-time-flow__button"
onClick={this.copyToClipboard} onClick={this.copyToClipboard}
disabled={justCopied} disabled={justCopied}
> >
@ -149,19 +149,19 @@ class BuyEtherScreen extends Component {
const { selectedOption } = this.state const { selectedOption } = this.state
return ( return (
<div className='buy-ether'> <div className="buy-ether">
<Identicon address={this.props.address} diameter={70} /> <Identicon address={this.props.address} diameter={70} />
<div className='buy-ether__title'>Deposit Ether</div> <div className="buy-ether__title">Deposit Ether</div>
<div className='buy-ether__body-text'> <div className="buy-ether__body-text">
MetaMask works best if you have Ether in your account to pay for transaction gas fees and more. To get Ether, choose from one of these methods. MetaMask works best if you have Ether in your account to pay for transaction gas fees and more. To get Ether, choose from one of these methods.
</div> </div>
<div className='buy-ether__content-wrapper'> <div className="buy-ether__content-wrapper">
<div className='buy-ether__content-headline-wrapper'> <div className="buy-ether__content-headline-wrapper">
<div className='buy-ether__content-headline'>Deposit Options</div> <div className="buy-ether__content-headline">Deposit Options</div>
{this.renderSkip()} {this.renderSkip()}
</div> </div>
<div className='buy-ether__content'> <div className="buy-ether__content">
<div className='buy-ether__side-panel'> <div className="buy-ether__side-panel">
{OPTIONS.map(({ name, value }) => ( {OPTIONS.map(({ name, value }) => (
<div <div
key={value} key={value}
@ -170,16 +170,16 @@ class BuyEtherScreen extends Component {
})} })}
onClick={() => this.setState({ selectedOption: value })} onClick={() => this.setState({ selectedOption: value })}
> >
<div className='buy-ether__side-panel-item-name'>{name}</div> <div className="buy-ether__side-panel-item-name">{name}</div>
{value === selectedOption && ( {value === selectedOption && (
<svg viewBox='0 0 574 1024' id='si-ant-right' width='15px' height='15px'> <svg viewBox="0 0 574 1024" id="si-ant-right" width="15px" height="15px">
<path d='M10 9Q0 19 0 32t10 23l482 457L10 969Q0 979 0 992t10 23q10 9 24 9t24-9l506-480q10-10 10-23t-10-23L58 9Q48 0 34 0T10 9z' /> <path d="M10 9Q0 19 0 32t10 23l482 457L10 969Q0 979 0 992t10 23q10 9 24 9t24-9l506-480q10-10 10-23t-10-23L58 9Q48 0 34 0T10 9z" />
</svg> </svg>
)} )}
</div> </div>
))} ))}
</div> </div>
<div className='buy-ether__action-content'> <div className="buy-ether__action-content">
{this.renderContent()} {this.renderContent()}
</div> </div>
</div> </div>

@ -79,11 +79,11 @@ export class ShapeShiftForm extends Component {
renderMetadata (label, value) { renderMetadata (label, value) {
return ( return (
<div className='shapeshift-form__metadata-wrapper'> <div className="shapeshift-form__metadata-wrapper">
<div className='shapeshift-form__metadata-label'> <div className="shapeshift-form__metadata-label">
{label}: {label}:
</div> </div>
<div className='shapeshift-form__metadata-value'> <div className="shapeshift-form__metadata-value">
{value} {value}
</div> </div>
</div> </div>
@ -101,7 +101,7 @@ export class ShapeShiftForm extends Component {
} = tokenExchangeRates[coinPair] || {} } = tokenExchangeRates[coinPair] || {}
return ( return (
<div className='shapeshift-form__metadata'> <div className="shapeshift-form__metadata">
{this.renderMetadata('Status', limit ? 'Available' : 'Unavailable')} {this.renderMetadata('Status', limit ? 'Available' : 'Unavailable')}
{this.renderMetadata('Limit', limit)} {this.renderMetadata('Limit', limit)}
{this.renderMetadata('Exchange Rate', rate)} {this.renderMetadata('Exchange Rate', rate)}
@ -117,13 +117,13 @@ export class ShapeShiftForm extends Component {
qrImage.make() qrImage.make()
return ( return (
<div className='shapeshift-form'> <div className="shapeshift-form">
<div className='shapeshift-form__deposit-instruction'> <div className="shapeshift-form__deposit-instruction">
Deposit your BTC to the address bellow: Deposit your BTC to the address bellow:
</div> </div>
<div className='shapeshift-form__qr-code'> <div className="shapeshift-form__qr-code">
{isLoading {isLoading
? <img src='images/loading.svg' style={{ width: '60px' }} /> ? <img src="images/loading.svg" style={{ width: '60px' }} />
: <div dangerouslySetInnerHTML={{ __html: qrImage.createTableTag(4) }} /> : <div dangerouslySetInnerHTML={{ __html: qrImage.createTableTag(4) }} />
} }
</div> </div>
@ -141,14 +141,14 @@ export class ShapeShiftForm extends Component {
return showQrCode ? this.renderQrCode() : ( return showQrCode ? this.renderQrCode() : (
<div> <div>
<div className='shapeshift-form'> <div className="shapeshift-form">
<div className='shapeshift-form__selectors'> <div className="shapeshift-form__selectors">
<div className='shapeshift-form__selector'> <div className="shapeshift-form__selector">
<div className='shapeshift-form__selector-label'> <div className="shapeshift-form__selector-label">
Deposit Deposit
</div> </div>
<select <select
className='shapeshift-form__selector-input' className="shapeshift-form__selector-input"
value={this.state.depositCoin} value={this.state.depositCoin}
onChange={this.onCoinChange} onChange={this.onCoinChange}
> >
@ -160,14 +160,14 @@ export class ShapeShiftForm extends Component {
</select> </select>
</div> </div>
<div <div
className='icon shapeshift-form__caret' className="icon shapeshift-form__caret"
style={{ backgroundImage: 'url(images/caret-right.svg)'}} style={{ backgroundImage: 'url(images/caret-right.svg)'}}
/> />
<div className='shapeshift-form__selector'> <div className="shapeshift-form__selector">
<div className='shapeshift-form__selector-label'> <div className="shapeshift-form__selector-label">
Receive Receive
</div> </div>
<div className='shapeshift-form__selector-input'> <div className="shapeshift-form__selector-input">
ETH ETH
</div> </div>
</div> </div>
@ -177,18 +177,18 @@ export class ShapeShiftForm extends Component {
'shapeshift-form__address-input-wrapper--error': errorMessage, 'shapeshift-form__address-input-wrapper--error': errorMessage,
})} })}
> >
<div className='shapeshift-form__address-input-label'> <div className="shapeshift-form__address-input-label">
Your Refund Address Your Refund Address
</div> </div>
<input <input
type='text' type="text"
className='shapeshift-form__address-input' className="shapeshift-form__address-input"
onChange={e => this.setState({ onChange={e => this.setState({
refundAddress: e.target.value, refundAddress: e.target.value,
errorMessage: '', errorMessage: '',
})} })}
/> />
<div className='shapeshift-form__address-input-error-message'> <div className="shapeshift-form__address-input-error-message">
{errorMessage} {errorMessage}
</div> </div>
</div> </div>

@ -1,4 +1,4 @@
function wait(time) { export default function wait (time) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
setTimeout(function () { setTimeout(function () {
resolve() resolve()

@ -1,9 +1,9 @@
var fs = require('fs') var fs = require('fs')
var path = require('path') var path = require('path')
var browserify = require('browserify'); var browserify = require('browserify')
var tests = fs.readdirSync(path.join(__dirname, 'lib')) var tests = fs.readdirSync(path.join(__dirname, 'lib'))
var bundlePath = path.join(__dirname, 'test-bundle.js') var bundlePath = path.join(__dirname, 'test-bundle.js')
var b = browserify(); var b = browserify()
// Remove old bundle // Remove old bundle
try { try {
@ -18,5 +18,5 @@ tests.forEach(function(fileName) {
b.add(path.join(__dirname, 'lib', fileName)) b.add(path.join(__dirname, 'lib', fileName))
}) })
b.bundle().pipe(writeStream); b.bundle().pipe(writeStream)

@ -1,5 +1,3 @@
const Helper = require('./util/mascara-test-helper.js')
window.addEventListener('load', () => { window.addEventListener('load', () => {
window.METAMASK_SKIP_RELOAD = true window.METAMASK_SKIP_RELOAD = true
// inject app container // inject app container

@ -2,23 +2,25 @@ const EventEmitter = require('events')
const IDB = require('idb-global') const IDB = require('idb-global')
const KEY = 'metamask-test-config' const KEY = 'metamask-test-config'
module.exports = class Helper extends EventEmitter { module.exports = class Helper extends EventEmitter {
constructor () {
super()
}
tryToCleanContext () { tryToCleanContext () {
this.unregister() this.unregister()
.then(() => this.clearDb()) .then(() => this.clearDb())
.then(() => super.emit('complete')) .then(() => super.emit('complete'))
.catch((err) => super.emit('complete')) .catch((err) => {
if (err) {
super.emit('complete')
}
})
} }
unregister () { unregister () {
return global.navigator.serviceWorker.getRegistration() return global.navigator.serviceWorker.getRegistration()
.then((registration) => { .then((registration) => {
if (registration) return registration.unregister() if (registration) {
return registration.unregister()
.then((b) => b ? Promise.resolve() : Promise.reject()) .then((b) => b ? Promise.resolve() : Promise.reject())
else return Promise.resolve() } else return Promise.resolve()
}) })
} }
clearDb () { clearDb () {
@ -33,7 +35,7 @@ module.exports = class Helper extends EventEmitter {
const db = new IDB({ const db = new IDB({
version: 2, version: 2,
key: KEY, key: KEY,
initialState: state initialState: state,
}) })
return db.open() return db.open()
} }

@ -1,5 +1,6 @@
// fs.readFileSync is inlined by browserify transform "brfs" // fs.readFileSync is inlined by browserify transform "brfs"
const fs = require('fs') const fs = require('fs')
const path = require('path')
module.exports = [ module.exports = [
{ {
@ -7,14 +8,14 @@ module.exports = [
read: false, read: false,
date: 'Thu Feb 09 2017', date: 'Thu Feb 09 2017',
title: 'Terms of Use', title: 'Terms of Use',
body: fs.readFileSync(__dirname + '/archive/notice_0.md', 'utf8'), body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_0.md'), 'utf8'),
}, },
{ {
id: 2, id: 2,
read: false, read: false,
date: 'Mon May 08 2017', date: 'Mon May 08 2017',
title: 'Privacy Notice', title: 'Privacy Notice',
body: fs.readFileSync(__dirname + '/archive/notice_2.md', 'utf8'), body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_2.md'), 'utf8'),
}, },
{ {
id: 3, id: 3,
@ -22,13 +23,13 @@ module.exports = [
date: 'Tue Nov 28 2017', date: 'Tue Nov 28 2017',
title: 'Seed Phrase Alert', title: 'Seed Phrase Alert',
firstVersion: '<=3.12.0', firstVersion: '<=3.12.0',
body: fs.readFileSync(__dirname + '/archive/notice_3.md', 'utf8'), body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_3.md'), 'utf8'),
}, },
{ {
id: 4, id: 4,
read: false, read: false,
date: 'Wed Jun 13 2018', date: 'Wed Jun 13 2018',
title: 'Phishing Warning', title: 'Phishing Warning',
body: fs.readFileSync(__dirname + '/archive/notice_4.md', 'utf8'), body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_4.md'), 'utf8'),
} },
] ]

@ -183,6 +183,7 @@ App.prototype.renderAppBar = function () {
this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen }) this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen })
}, },
}), }),
]), ]),
props.isUnlocked && h('div', { props.isUnlocked && h('div', {

@ -40,8 +40,8 @@ TransactionListItem.prototype.showRetryButton = function () {
const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce) const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce)
const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted') const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')
const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0] const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0]
const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
&& lastSubmittedTxWithCurrentNonce.id === transaction.id lastSubmittedTxWithCurrentNonce.id === transaction.id
return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000 return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000
} }

28947
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -38,8 +38,8 @@
"test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js", "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js",
"ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'", "ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'",
"sentry:publish": "node ./development/sentry-publish.js", "sentry:publish": "node ./development/sentry-publish.js",
"lint": "gulp lint", "lint": "eslint .",
"lint:fix": "gulp lint:fix", "lint:fix": "eslint . --fix",
"ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
"mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
"watch": "mocha watch --recursive \"test/unit/**/*.js\"", "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
@ -93,7 +93,7 @@
"ensnare": "^1.0.0", "ensnare": "^1.0.0",
"eslint-plugin-react": "^7.4.0", "eslint-plugin-react": "^7.4.0",
"eth-bin-to-ops": "^1.0.1", "eth-bin-to-ops": "^1.0.1",
"eth-contract-metadata": "^1.1.5", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master",
"eth-hd-keyring": "^1.2.1", "eth-hd-keyring": "^1.2.1",
"eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-filters": "^1.2.6",
"eth-json-rpc-infura": "^3.0.0", "eth-json-rpc-infura": "^3.0.0",
@ -107,7 +107,7 @@
"ethereumjs-wallet": "^0.6.0", "ethereumjs-wallet": "^0.6.0",
"etherscan-link": "^1.0.2", "etherscan-link": "^1.0.2",
"ethjs": "^0.4.0", "ethjs": "^0.4.0",
"ethjs-contract": "^0.2.0", "ethjs-contract": "^0.2.3",
"ethjs-ens": "^2.0.0", "ethjs-ens": "^2.0.0",
"ethjs-query": "^0.3.4", "ethjs-query": "^0.3.4",
"express": "^4.15.5", "express": "^4.15.5",
@ -192,7 +192,9 @@
"web3": "^0.20.1", "web3": "^0.20.1",
"web3-provider-engine": "^14.0.5", "web3-provider-engine": "^14.0.5",
"web3-stream-provider": "^3.0.1", "web3-stream-provider": "^3.0.1",
"xtend": "^4.0.1" "xtend": "^4.0.1",
"multihashes": "^0.4.12",
"eth-ens-namehash": "^2.0.8"
}, },
"devDependencies": { "devDependencies": {
"@sentry/cli": "^1.30.3", "@sentry/cli": "^1.30.3",
@ -209,7 +211,7 @@
"babel-register": "^6.7.2", "babel-register": "^6.7.2",
"babelify": "^8.0.0", "babelify": "^8.0.0",
"beefy": "^2.1.5", "beefy": "^2.1.5",
"brfs": "^1.4.3", "brfs": "^1.6.1",
"browserify": "^16.1.1", "browserify": "^16.1.1",
"chai": "^4.1.0", "chai": "^4.1.0",
"chromedriver": "2.36.0", "chromedriver": "2.36.0",
@ -233,13 +235,12 @@
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
"fs-promise": "^2.0.3", "fs-promise": "^2.0.3",
"ganache-cli": "^6.1.0", "ganache-cli": "^6.1.0",
"ganache-core": "^2.1.0", "ganache-core": "^2.1.3",
"geckodriver": "^1.11.0", "geckodriver": "^1.11.0",
"gh-pages": "^1.1.0", "gh-pages": "^1.2.0",
"gifencoder": "^1.1.0", "gifencoder": "^1.1.0",
"gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
"gulp-babel": "^7.0.0", "gulp-babel": "^7.0.0",
"gulp-eslint": "^4.0.0",
"gulp-json-editor": "^2.2.1", "gulp-json-editor": "^2.2.1",
"gulp-livereload": "^3.8.1", "gulp-livereload": "^3.8.1",
"gulp-multi-process": "^1.3.1", "gulp-multi-process": "^1.3.1",
@ -259,7 +260,7 @@
"jsdom": "^11.2.0", "jsdom": "^11.2.0",
"jsdom-global": "^3.0.2", "jsdom-global": "^3.0.2",
"jshint-stylish": "~2.2.1", "jshint-stylish": "~2.2.1",
"karma": "^2.0.0", "karma": "^2.0.4",
"karma-chrome-launcher": "^2.2.0", "karma-chrome-launcher": "^2.2.0",
"karma-cli": "^1.0.1", "karma-cli": "^1.0.1",
"karma-firefox-launcher": "^1.0.1", "karma-firefox-launcher": "^1.0.1",
@ -270,9 +271,9 @@
"mocha-jsdom": "^1.1.0", "mocha-jsdom": "^1.1.0",
"mocha-sinon": "^2.0.0", "mocha-sinon": "^2.0.0",
"nock": "^9.0.14", "nock": "^9.0.14",
"node-sass": "^4.7.2", "node-sass": "^4.9.0",
"nsp": "^3.2.1", "nsp": "^3.2.1",
"nyc": "^11.0.3", "nyc": "^13.0.0",
"open": "0.0.5", "open": "0.0.5",
"path": "^0.12.7", "path": "^0.12.7",
"png-file-stream": "^1.0.0", "png-file-stream": "^1.0.0",
@ -295,11 +296,11 @@
"style-loader": "^0.21.0", "style-loader": "^0.21.0",
"stylelint-config-standard": "^18.2.0", "stylelint-config-standard": "^18.2.0",
"tape": "^4.5.1", "tape": "^4.5.1",
"testem": "^2.0.0", "testem": "^2.8.0",
"through2": "^2.0.3", "through2": "^2.0.3",
"vinyl-buffer": "^1.0.1", "vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0", "vinyl-source-stream": "^2.0.0",
"watchify": "^3.9.0" "watchify": "^3.11.0"
}, },
"engines": { "engines": {
"node": ">=8.0.0" "node": ">=8.0.0"

@ -28,21 +28,24 @@ The `piggybankContract` is compiled from:
} }
*/ */
var piggybankContract = web3.eth.contract([{"constant":false,"inputs":[{"name":"withdrawAmount","type":"uint256"}],"name":"withdraw","outputs":[{"name":"remainingBal","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"deposit","outputs":[{"name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"}]); var piggybankContract = web3.eth.contract([{'constant': false, 'inputs': [{'name': 'withdrawAmount', 'type': 'uint256'}], 'name': 'withdraw', 'outputs': [{'name': 'remainingBal', 'type': 'uint256'}], 'payable': false, 'stateMutability': 'nonpayable', 'type': 'function'}, {'constant': true, 'inputs': [], 'name': 'owner', 'outputs': [{'name': '', 'type': 'address'}], 'payable': false, 'stateMutability': 'view', 'type': 'function'}, {'constant': false, 'inputs': [], 'name': 'deposit', 'outputs': [{'name': '', 'type': 'uint256'}], 'payable': true, 'stateMutability': 'payable', 'type': 'function'}, {'inputs': [], 'payable': false, 'stateMutability': 'nonpayable', 'type': 'constructor'}])
const deployButton = document.getElementById('deployButton')
const depositButton = document.getElementById('depositButton')
const withdrawButton = document.getElementById('withdrawButton')
deployButton.addEventListener('click', function (event) { deployButton.addEventListener('click', async function (event) {
var piggybank = piggybankContract.new( var piggybank = await piggybankContract.new(
{ {
from: web3.eth.accounts[0], from: web3.eth.accounts[0],
data: '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029', data: '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
gas: '4700000' gas: '4700000',
}, function (e, contract) { }, function (e, contract) {
console.log(e, contract); console.log(e, contract)
if (typeof contract.address !== 'undefined') { if (typeof contract.address !== 'undefined') {
console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash); console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash)
console.log(`contract`, contract); console.log(`contract`, contract)
depositButton.addEventListener('click', function (event) { depositButton.addEventListener('click', function (event) {
contract.deposit({ from: web3.eth.accounts[0], value: '0x29a2241af62c0000' }, function (result) { contract.deposit({ from: web3.eth.accounts[0], value: '0x29a2241af62c0000' }, function (result) {
@ -58,4 +61,6 @@ deployButton.addEventListener('click', function (event) {
} }
}) })
console.log(piggybank)
}) })

@ -12,7 +12,6 @@ const {
} = require('../func') } = require('../func')
const { const {
checkBrowserForConsoleErrors, checkBrowserForConsoleErrors,
loadExtension,
verboseReportOnFailure, verboseReportOnFailure,
findElement, findElement,
findElements, findElements,
@ -22,14 +21,12 @@ const {
describe('Using MetaMask with an existing account', function () { describe('Using MetaMask with an existing account', function () {
let extensionId let extensionId
let driver let driver
let tokenAddress
const testSeedPhrase = 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent' const testSeedPhrase = 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'
const testAddress = '0xE18035BF8712672935FDB4e5e431b1a0183d2DFC' const testAddress = '0xE18035BF8712672935FDB4e5e431b1a0183d2DFC'
const testPrivateKey2 = '14abe6f4aab7f9f626fe981c864d0adeb5685f289ac9270c27b8fd790b4235d6' const testPrivateKey2 = '14abe6f4aab7f9f626fe981c864d0adeb5685f289ac9270c27b8fd790b4235d6'
const regularDelayMs = 1000 const regularDelayMs = 1000
const largeDelayMs = regularDelayMs * 2 const largeDelayMs = regularDelayMs * 2
const waitingNewPageDelayMs = regularDelayMs * 10
this.timeout(0) this.timeout(0)
this.bail(true) this.bail(true)
@ -98,15 +95,16 @@ describe('Using MetaMask with an existing account', function () {
await delay(regularDelayMs) await delay(regularDelayMs)
// Close all other tabs // Close all other tabs
let [oldUi, infoPage, newUi] = await driver.getAllWindowHandles() const [oldUi, infoPage, newUi] = await driver.getAllWindowHandles()
newUi = newUi || infoPage
const newUiOrInfoPage = newUi || infoPage
await driver.switchTo().window(oldUi) await driver.switchTo().window(oldUi)
await driver.close() await driver.close()
if (infoPage !== newUi) { if (infoPage !== newUiOrInfoPage) {
await driver.switchTo().window(infoPage) await driver.switchTo().window(infoPage)
await driver.close() await driver.close()
} }
await driver.switchTo().window(newUi) await driver.switchTo().window(newUiOrInfoPage)
await delay(regularDelayMs) await delay(regularDelayMs)
const continueBtn = await findElement(driver, By.css('.welcome-screen__button')) const continueBtn = await findElement(driver, By.css('.welcome-screen__button'))

@ -28,7 +28,6 @@ describe('MetaMask', function () {
const tinyDelayMs = 1000 const tinyDelayMs = 1000
const regularDelayMs = tinyDelayMs * 2 const regularDelayMs = tinyDelayMs * 2
const largeDelayMs = regularDelayMs * 2 const largeDelayMs = regularDelayMs * 2
const waitingNewPageDelayMs = regularDelayMs * 30
this.timeout(0) this.timeout(0)
this.bail(true) this.bail(true)
@ -100,15 +99,21 @@ describe('MetaMask', function () {
await delay(regularDelayMs) await delay(regularDelayMs)
// Close all other tabs // Close all other tabs
let [oldUi, infoPage, newUi] = await driver.getAllWindowHandles() const [oldUi, tab1, tab2] = await driver.getAllWindowHandles()
newUi = newUi || infoPage
await driver.switchTo().window(oldUi) await driver.switchTo().window(oldUi)
await driver.close() await driver.close()
if (infoPage !== newUi) {
await driver.switchTo().window(infoPage) await driver.switchTo().window(tab1)
const tab1Url = await driver.getCurrentUrl()
if (tab1Url.match(/metamask.io/)) {
await driver.switchTo().window(tab1)
await driver.close()
await driver.switchTo().window(tab2)
} else if (tab2) {
await driver.switchTo().window(tab2)
await driver.close() await driver.close()
await driver.switchTo().window(tab1)
} }
await driver.switchTo().window(newUi)
await delay(regularDelayMs) await delay(regularDelayMs)
const continueBtn = await findElement(driver, By.css('.welcome-screen__button')) const continueBtn = await findElement(driver, By.css('.welcome-screen__button'))
@ -275,7 +280,7 @@ describe('MetaMask', function () {
await driver.findElement(By.css('.qr-wrapper')).isDisplayed() await driver.findElement(By.css('.qr-wrapper')).isDisplayed()
await delay(regularDelayMs) await delay(regularDelayMs)
let accountModal = await driver.findElement(By.css('span .modal')) const accountModal = await driver.findElement(By.css('span .modal'))
await driver.executeScript("document.querySelector('.account-modal-close').click()") await driver.executeScript("document.querySelector('.account-modal-close').click()")
@ -493,7 +498,7 @@ describe('MetaMask', function () {
await configureGas.click() await configureGas.click()
await delay(regularDelayMs) await delay(regularDelayMs)
let gasModal = await driver.findElement(By.css('span .modal')) const gasModal = await driver.findElement(By.css('span .modal'))
await driver.wait(until.elementLocated(By.css('.send-v2__customize-gas__title'))) await driver.wait(until.elementLocated(By.css('.send-v2__customize-gas__title')))
const [gasPriceInput, gasLimitInput] = await findElements(driver, By.css('.customize-gas-input')) const [gasPriceInput, gasLimitInput] = await findElements(driver, By.css('.customize-gas-input'))
@ -706,7 +711,7 @@ describe('MetaMask', function () {
it('sends an already created token', async () => { it('sends an already created token', async () => {
openNewPage(driver, `https://tokenfactory.surge.sh/#/token/${tokenAddress}`) openNewPage(driver, `https://tokenfactory.surge.sh/#/token/${tokenAddress}`)
const [extension, tokenFactory] = await driver.getAllWindowHandles() const [extension] = await driver.getAllWindowHandles()
const [ const [
transferToAddress, transferToAddress,

@ -75,7 +75,7 @@ async function runAddTokenFlowTest (assert, done) {
tokenWrapper[0].click() tokenWrapper[0].click()
// Click Next button // Click Next button
let nextButton = await queryAsync($, 'button.btn-primary.btn--large') const nextButton = await queryAsync($, 'button.btn-primary.btn--large')
assert.equal(nextButton[0].textContent, 'Next', 'next button rendered') assert.equal(nextButton[0].textContent, 'Next', 'next button rendered')
nextButton[0].click() nextButton[0].click()

@ -1,10 +1,7 @@
const reactTriggerChange = require('react-trigger-change') const reactTriggerChange = require('react-trigger-change')
const { const {
timeout,
queryAsync, queryAsync,
findAsync,
} = require('../../lib/util') } = require('../../lib/util')
const PASSWORD = 'password123'
QUnit.module('confirm sig requests') QUnit.module('confirm sig requests')
@ -17,7 +14,7 @@ QUnit.test('successful confirmation of sig requests', (assert) => {
}) })
async function runConfirmSigRequestsTest (assert, done) { async function runConfirmSigRequestsTest (assert, done) {
let selectState = await queryAsync($, 'select') const selectState = await queryAsync($, 'select')
selectState.val('confirm sig requests') selectState.val('confirm sig requests')
reactTriggerChange(selectState[0]) reactTriggerChange(selectState[0])
@ -32,7 +29,7 @@ async function runConfirmSigRequestsTest(assert, done) {
let confirmSigHeadline = await queryAsync($, '.request-signature__headline') let confirmSigHeadline = await queryAsync($, '.request-signature__headline')
assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested') assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested')
let confirmSigMessage = await queryAsync($, '.request-signature__notice') const confirmSigMessage = await queryAsync($, '.request-signature__notice')
assert.ok(confirmSigMessage[0].textContent.match(/^Signing\sthis\smessage/)) assert.ok(confirmSigMessage[0].textContent.match(/^Signing\sthis\smessage/))
let confirmSigRowValue = await queryAsync($, '.request-signature__row-value') let confirmSigRowValue = await queryAsync($, '.request-signature__row-value')
@ -45,7 +42,7 @@ async function runConfirmSigRequestsTest(assert, done) {
assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested') assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested')
confirmSigRowValue = await queryAsync($, '.request-signature__row-value') confirmSigRowValue = await queryAsync($, '.request-signature__row-value')
assert.ok(confirmSigRowValue[0].textContent.match(/^\#\sTerms\sof\sUse/)) assert.ok(confirmSigRowValue[0].textContent.match(/^#\sTerms\sof\sUse/))
confirmSigSignButton = await queryAsync($, 'button.btn-primary.btn--large') confirmSigSignButton = await queryAsync($, 'button.btn-primary.btn--large')
confirmSigSignButton[0].click() confirmSigSignButton[0].click()

@ -42,7 +42,7 @@ async function runFirstTimeUsageTest (assert, done) {
assert.equal(created.textContent, 'Your unique account image', 'unique image screen') assert.equal(created.textContent, 'Your unique account image', 'unique image screen')
// Agree button // Agree button
let button = (await findAsync(app, 'button'))[0] const button = (await findAsync(app, 'button'))[0]
assert.ok(button, 'button present') assert.ok(button, 'button present')
button.click() button.click()

@ -5,8 +5,6 @@ const {
findAsync, findAsync,
} = require('../../lib/util') } = require('../../lib/util')
const PASSWORD = 'password123'
QUnit.module('new ui send flow') QUnit.module('new ui send flow')
QUnit.test('successful send flow', (assert) => { QUnit.test('successful send flow', (assert) => {
@ -87,7 +85,7 @@ async function runSendFlowTest(assert, done) {
sendFromFieldItemAddress = await queryAsync($, '.account-list-item__account-name') sendFromFieldItemAddress = await queryAsync($, '.account-list-item__account-name')
assert.equal(sendFromFieldItemAddress[0].textContent, 'Send Account 2', 'send from field dropdown changes account name') assert.equal(sendFromFieldItemAddress[0].textContent, 'Send Account 2', 'send from field dropdown changes account name')
let sendToFieldInput = await queryAsync($, '.send-v2__to-autocomplete__input') const sendToFieldInput = await queryAsync($, '.send-v2__to-autocomplete__input')
sendToFieldInput[0].focus() sendToFieldInput[0].focus()
const sendToDropdownList = await queryAsync($, '.send-v2__from-dropdown__list') const sendToDropdownList = await queryAsync($, '.send-v2__from-dropdown__list')

@ -1,6 +1,5 @@
const reactTriggerChange = require('../../lib/react-trigger-change') const reactTriggerChange = require('../../lib/react-trigger-change')
const { const {
timeout,
queryAsync, queryAsync,
findAsync, findAsync,
} = require('../../lib/util') } = require('../../lib/util')

@ -31,6 +31,6 @@ module.exports = {
getRandomValues () { getRandomValues () {
return 'SOO RANDO!!!1' return 'SOO RANDO!!!1'
} },
} }

@ -17,14 +17,14 @@ class TxGenerator {
} }
generate (tx = {}, opts = {}) { generate (tx = {}, opts = {}) {
let { count, fromNonce } = opts const { count, fromNonce } = opts
let nonce = fromNonce || this.txs.length let nonce = fromNonce || this.txs.length
let txs = [] const txs = []
for (let i = 0; i < count; i++) { for (let i = 0; i < count; i++) {
txs.push(extend(template, { txs.push(extend(template, {
txParams: { txParams: {
nonce: hexify(nonce++), nonce: hexify(nonce++),
} },
}, tx)) }, tx))
} }
this.txs = this.txs.concat(txs) this.txs = this.txs.concat(txs)

@ -13,7 +13,7 @@
/* our tests can pass in chrome and firefox. */ /* our tests can pass in chrome and firefox. */
/** ************************************************/ /** ************************************************/
'use strict'; 'use strict'
// Constants and functions are declared inside the closure. // Constants and functions are declared inside the closure.
// In this way, reactTriggerChange can be passed directly to executeScript in Selenium. // In this way, reactTriggerChange can be passed directly to executeScript in Selenium.
@ -33,47 +33,47 @@ module.exports = function reactTriggerChange(node) {
text: true, text: true,
time: true, time: true,
url: true, url: true,
week: true week: true,
}; }
var nodeName = node.nodeName.toLowerCase(); var nodeName = node.nodeName.toLowerCase()
var type = node.type; var type = node.type
var event; var event
var descriptor; var descriptor
var initialValue; var initialValue
var initialChecked; var initialChecked
var initialCheckedRadio; var initialCheckedRadio
// Do not try to delete non-configurable properties. // Do not try to delete non-configurable properties.
// Value and checked properties on DOM elements are non-configurable in PhantomJS. // Value and checked properties on DOM elements are non-configurable in PhantomJS.
function deletePropertySafe (elem, prop) { function deletePropertySafe (elem, prop) {
var desc = Object.getOwnPropertyDescriptor(elem, prop); var desc = Object.getOwnPropertyDescriptor(elem, prop)
if (desc && desc.configurable) { if (desc && desc.configurable) {
delete elem[prop]; delete elem[prop]
} }
} }
function getCheckedRadio (radio) { function getCheckedRadio (radio) {
var name = radio.name; var name = radio.name
var radios; var radios
var i; var i
if (name) { if (name) {
radios = document.querySelectorAll('input[type="radio"][name="' + name + '"]'); radios = document.querySelectorAll('input[type="radio"][name="' + name + '"]')
for (i = 0; i < radios.length; i += 1) { for (i = 0; i < radios.length; i += 1) {
if (radios[i].checked) { if (radios[i].checked) {
return radios[i] !== radio ? radios[i] : null; return radios[i] !== radio ? radios[i] : null
} }
} }
} }
return null; return null
} }
function preventChecking (e) { function preventChecking (e) {
e.preventDefault(); e.preventDefault()
if (!initialChecked) { if (!initialChecked) {
e.target.checked = false; e.target.checked = false
} }
if (initialCheckedRadio) { if (initialCheckedRadio) {
initialCheckedRadio.checked = true; initialCheckedRadio.checked = true
} }
} }
@ -81,81 +81,81 @@ module.exports = function reactTriggerChange(node) {
(nodeName === 'input' && type === 'file')) { (nodeName === 'input' && type === 'file')) {
// IE9-IE11, non-IE // IE9-IE11, non-IE
// Dispatch change. // Dispatch change.
event = document.createEvent('HTMLEvents'); event = document.createEvent('HTMLEvents')
event.initEvent('change', true, false); event.initEvent('change', true, false)
node.dispatchEvent(event); node.dispatchEvent(event)
} else if ((nodeName === 'input' && supportedInputTypes[type]) || } else if ((nodeName === 'input' && supportedInputTypes[type]) ||
nodeName === 'textarea') { nodeName === 'textarea') {
// React 16 // React 16
// Cache artificial value property descriptor. // Cache artificial value property descriptor.
// Property doesn't exist in React <16, descriptor is undefined. // Property doesn't exist in React <16, descriptor is undefined.
descriptor = Object.getOwnPropertyDescriptor(node, 'value'); descriptor = Object.getOwnPropertyDescriptor(node, 'value')
// Update inputValueTracking cached value. // Update inputValueTracking cached value.
// Remove artificial value property. // Remove artificial value property.
// Restore initial value to trigger event with it. // Restore initial value to trigger event with it.
initialValue = node.value; initialValue = node.value
node.value = initialValue + '#'; node.value = initialValue + '#'
deletePropertySafe(node, 'value'); deletePropertySafe(node, 'value')
node.value = initialValue; node.value = initialValue
// React 0.14: IE10-IE11, non-IE // React 0.14: IE10-IE11, non-IE
// React 15: non-IE // React 15: non-IE
// React 16: IE10-IE11, non-IE // React 16: IE10-IE11, non-IE
event = document.createEvent('HTMLEvents'); event = document.createEvent('HTMLEvents')
event.initEvent('input', true, false); event.initEvent('input', true, false)
node.dispatchEvent(event); node.dispatchEvent(event)
// React 16 // React 16
// Restore artificial value property descriptor. // Restore artificial value property descriptor.
if (descriptor) { if (descriptor) {
Object.defineProperty(node, 'value', descriptor); Object.defineProperty(node, 'value', descriptor)
} }
} else if (nodeName === 'input' && type === 'checkbox') { } else if (nodeName === 'input' && type === 'checkbox') {
// Invert inputValueTracking cached value. // Invert inputValueTracking cached value.
node.checked = !node.checked; node.checked = !node.checked
// Dispatch click. // Dispatch click.
// Click event inverts checked value. // Click event inverts checked value.
event = document.createEvent('MouseEvents'); event = document.createEvent('MouseEvents')
event.initEvent('click', true, true); event.initEvent('click', true, true)
node.dispatchEvent(event); node.dispatchEvent(event)
} else if (nodeName === 'input' && type === 'radio') { } else if (nodeName === 'input' && type === 'radio') {
// Cache initial checked value. // Cache initial checked value.
initialChecked = node.checked; initialChecked = node.checked
// Find and cache initially checked radio in the group. // Find and cache initially checked radio in the group.
initialCheckedRadio = getCheckedRadio(node); initialCheckedRadio = getCheckedRadio(node)
// React 16 // React 16
// Cache property descriptor. // Cache property descriptor.
// Invert inputValueTracking cached value. // Invert inputValueTracking cached value.
// Remove artificial checked property. // Remove artificial checked property.
// Restore initial value, otherwise preventDefault will eventually revert the value. // Restore initial value, otherwise preventDefault will eventually revert the value.
descriptor = Object.getOwnPropertyDescriptor(node, 'checked'); descriptor = Object.getOwnPropertyDescriptor(node, 'checked')
node.checked = !initialChecked; node.checked = !initialChecked
deletePropertySafe(node, 'checked'); deletePropertySafe(node, 'checked')
node.checked = initialChecked; node.checked = initialChecked
// Prevent toggling during event capturing phase. // Prevent toggling during event capturing phase.
// Set checked value to false if initialChecked is false, // Set checked value to false if initialChecked is false,
// otherwise next listeners will see true. // otherwise next listeners will see true.
// Restore initially checked radio in the group. // Restore initially checked radio in the group.
node.addEventListener('click', preventChecking, true); node.addEventListener('click', preventChecking, true)
// Dispatch click. // Dispatch click.
// Click event inverts checked value. // Click event inverts checked value.
event = document.createEvent('MouseEvents'); event = document.createEvent('MouseEvents')
event.initEvent('click', true, true); event.initEvent('click', true, true)
node.dispatchEvent(event); node.dispatchEvent(event)
// Remove listener to stop further change prevention. // Remove listener to stop further change prevention.
node.removeEventListener('click', preventChecking, true); node.removeEventListener('click', preventChecking, true)
// React 16 // React 16
// Restore artificial checked property descriptor. // Restore artificial checked property descriptor.
if (descriptor) { if (descriptor) {
Object.defineProperty(node, 'checked', descriptor); Object.defineProperty(node, 'checked', descriptor)
}
} }
} }
};

@ -7,7 +7,7 @@ module.exports = function(config) {
settings.files.push('dist/mascara/ui.js') settings.files.push('dist/mascara/ui.js')
settings.files.push('dist/mascara/tests.js') settings.files.push('dist/mascara/tests.js')
// service worker background // service worker background
settings.files.push({ pattern: 'dist/mascara/background.js', watched: false, included: false, served: true }), settings.files.push({ pattern: 'dist/mascara/background.js', watched: false, included: false, served: true })
settings.proxies['/background.js'] = '/base/dist/mascara/background.js' settings.proxies['/background.js'] = '/base/dist/mascara/background.js'
// use this to keep the browser open for debugging // use this to keep the browser open for debugging

@ -12,7 +12,7 @@ const pngFileStream = require('png-file-stream')
const sizeOfPng = require('image-size/lib/types/png') const sizeOfPng = require('image-size/lib/types/png')
const By = webdriver.By const By = webdriver.By
const localesIndex = require('../../app/_locales/index.json') const localesIndex = require('../../app/_locales/index.json')
const { delay, buildChromeWebDriver, buildFirefoxWebdriver, installWebExt, getExtensionIdChrome, getExtensionIdFirefox } = require('../e2e/func') const { delay, buildChromeWebDriver, getExtensionIdChrome } = require('../e2e/func')
const eth = new Ethjs(new Ethjs.HttpProvider('http://localhost:8545')) const eth = new Ethjs(new Ethjs.HttpProvider('http://localhost:8545'))
@ -43,9 +43,7 @@ captureAllScreens()
async function captureAllScreens () { async function captureAllScreens () {
// common names // common names
let button
let tabs let tabs
let element
await cleanScreenShotDir() await cleanScreenShotDir()
@ -108,7 +106,7 @@ async function captureAllScreens() {
await captureLanguageScreenShots('terms') await captureLanguageScreenShots('terms')
await delay(300) await delay(300)
element = driver.findElement(By.linkText('Attributions')) const element = driver.findElement(By.linkText('Attributions'))
await driver.executeScript('arguments[0].scrollIntoView(true)', element) await driver.executeScript('arguments[0].scrollIntoView(true)', element)
await delay(300) await delay(300)
await captureLanguageScreenShots('terms-scrolled') await captureLanguageScreenShots('terms-scrolled')
@ -134,7 +132,7 @@ async function captureAllScreens() {
// enter seed phrase // enter seed phrase
const seedPhraseButtons = await driver.findElements(By.css('.backup-phrase__confirm-seed-options > button')) const seedPhraseButtons = await driver.findElements(By.css('.backup-phrase__confirm-seed-options > button'))
const seedPhraseButtonWords = await Promise.all(seedPhraseButtons.map(button => button.getText())) const seedPhraseButtonWords = await Promise.all(seedPhraseButtons.map(button => button.getText()))
for (let targetWord of seedPhraseWords) { for (const targetWord of seedPhraseWords) {
const wordIndex = seedPhraseButtonWords.indexOf(targetWord) const wordIndex = seedPhraseButtonWords.indexOf(targetWord)
if (wordIndex === -1) throw new Error(`Captured seed phrase word "${targetWord}" not in found seed phrase button options ${seedPhraseButtonWords.join(' ')}`) if (wordIndex === -1) throw new Error(`Captured seed phrase word "${targetWord}" not in found seed phrase button options ${seedPhraseButtonWords.join(' ')}`)
await driver.findElement(By.css(`.backup-phrase__confirm-seed-options > button:nth-child(${wordIndex + 1})`)).click() await driver.findElement(By.css(`.backup-phrase__confirm-seed-options > button:nth-child(${wordIndex + 1})`)).click()
@ -195,7 +193,7 @@ async function captureLanguageScreenShots(label) {
const nonEnglishLocales = localesIndex.filter(localeMeta => localeMeta.code !== 'en') const nonEnglishLocales = localesIndex.filter(localeMeta => localeMeta.code !== 'en')
// take english shot // take english shot
await captureScreenShot(`${label} (en)`) await captureScreenShot(`${label} (en)`)
for (let localeMeta of nonEnglishLocales) { for (const localeMeta of nonEnglishLocales) {
// set locale and take shot // set locale and take shot
await setLocale(localeMeta.code) await setLocale(localeMeta.code)
await delay(300) await delay(300)

@ -1,5 +1,4 @@
const assert = require('assert') const assert = require('assert')
const path = require('path')
const ethUtil = require('ethereumjs-util') const ethUtil = require('ethereumjs-util')
const accountImporter = require('../../../app/scripts/account-import-strategies/index') const accountImporter = require('../../../app/scripts/account-import-strategies/index')
const { assertRejects } = require('../test-utils') const { assertRejects } = require('../test-utils')

@ -12,7 +12,7 @@ const stubPreferencesStore = {
}, },
} }
}, },
}; }
describe('address-book-controller', function () { describe('address-book-controller', function () {
var addressBookController var addressBookController

@ -5,9 +5,6 @@ const {
getNetworkDisplayName, getNetworkDisplayName,
} = require('../../../../app/scripts/controllers/network/util') } = require('../../../../app/scripts/controllers/network/util')
const { createTestProviderTools } = require('../../../stub/provider')
const providerResultStub = {}
describe('# Network Controller', function () { describe('# Network Controller', function () {
let networkController let networkController
const noop = () => {} const noop = () => {}

@ -1,12 +1,10 @@
const assert = require('assert') const assert = require('assert')
const NonceTracker = require('../../../../../app/scripts/controllers/transactions/nonce-tracker') const NonceTracker = require('../../../../../app/scripts/controllers/transactions/nonce-tracker')
const MockTxGen = require('../../../../lib/mock-tx-gen') const MockTxGen = require('../../../../lib/mock-tx-gen')
let providerResultStub = {} const providerResultStub = {}
describe('Nonce Tracker', function () { describe('Nonce Tracker', function () {
let nonceTracker, provider let nonceTracker, pendingTxs, confirmedTxs
let getPendingTransactions, pendingTxs
let getConfirmedTransactions, confirmedTxs
describe('#getNonceLock', function () { describe('#getNonceLock', function () {
@ -182,8 +180,8 @@ describe('Nonce Tracker', function () {
describe('When all three return different values', function () { describe('When all three return different values', function () {
beforeEach(function () { beforeEach(function () {
const txGen = new MockTxGen() const txGen = new MockTxGen()
const confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 10 }) confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 10 })
const pendingTxs = txGen.generate({ pendingTxs = txGen.generate({
status: 'submitted', status: 'submitted',
nonce: 100, nonce: 100,
}, { count: 1 }) }, { count: 1 })
@ -202,8 +200,8 @@ describe('Nonce Tracker', function () {
describe('Faq issue 67', function () { describe('Faq issue 67', function () {
beforeEach(function () { beforeEach(function () {
const txGen = new MockTxGen() const txGen = new MockTxGen()
const confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 64 }) confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 64 })
const pendingTxs = txGen.generate({ pendingTxs = txGen.generate({
status: 'submitted', status: 'submitted',
}, { count: 10 }) }, { count: 10 })
// 0x40 is 64 in hex: // 0x40 is 64 in hex:

@ -1,20 +1,12 @@
const assert = require('assert') const assert = require('assert')
const ethUtil = require('ethereumjs-util')
const EthTx = require('ethereumjs-tx')
const ObservableStore = require('obs-store')
const clone = require('clone')
const { createTestProviderTools } = require('../../../../stub/provider') const { createTestProviderTools } = require('../../../../stub/provider')
const PendingTransactionTracker = require('../../../../../app/scripts/controllers/transactions/pending-tx-tracker') const PendingTransactionTracker = require('../../../../../app/scripts/controllers/transactions/pending-tx-tracker')
const MockTxGen = require('../../../../lib/mock-tx-gen') const MockTxGen = require('../../../../lib/mock-tx-gen')
const sinon = require('sinon') const sinon = require('sinon')
const noop = () => true
const currentNetworkId = 42
const otherNetworkId = 36
const privKey = new Buffer('8718b9618a37d1fc78c436511fc6df3c8258d3250635bba617f33003270ec03e', 'hex')
describe('PendingTransactionTracker', function () { describe('PendingTransactionTracker', function () {
let pendingTxTracker, txMeta, txMetaNoHash, txMetaNoRawTx, providerResultStub, let pendingTxTracker, txMeta, txMetaNoHash, providerResultStub,
provider, txMeta3, txList, knownErrors provider, txMeta3, txList, knownErrors
this.timeout(10000) this.timeout(10000)
beforeEach(function () { beforeEach(function () {
@ -34,11 +26,7 @@ describe('PendingTransactionTracker', function () {
status: 'signed', status: 'signed',
txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d'}, txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d'},
} }
txMetaNoRawTx = {
hash: '0x0593ee121b92e10d63150ad08b4b8f9c7857d1bd160195ee648fb9a0f8d00eeb',
status: 'signed',
txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d'},
}
providerResultStub = {} providerResultStub = {}
provider = createTestProviderTools({ scaffold: providerResultStub }).provider provider = createTestProviderTools({ scaffold: providerResultStub }).provider
@ -47,7 +35,7 @@ describe('PendingTransactionTracker', function () {
nonceTracker: { nonceTracker: {
getGlobalLock: async () => { getGlobalLock: async () => {
return { releaseLock: () => {} } return { releaseLock: () => {} }
} },
}, },
getPendingTransactions: () => { return [] }, getPendingTransactions: () => { return [] },
getCompletedTransactions: () => { return [] }, getCompletedTransactions: () => { return [] },
@ -133,22 +121,20 @@ describe('PendingTransactionTracker', function () {
}) })
describe('#queryPendingTxs', function () { describe('#queryPendingTxs', function () {
it('should call #_checkPendingTxs if their is no oldBlock', function (done) { it('should call #_checkPendingTxs if their is no oldBlock', function (done) {
let newBlock, oldBlock let oldBlock
newBlock = { number: '0x01' } const newBlock = { number: '0x01' }
pendingTxTracker._checkPendingTxs = done pendingTxTracker._checkPendingTxs = done
pendingTxTracker.queryPendingTxs({ oldBlock, newBlock }) pendingTxTracker.queryPendingTxs({ oldBlock, newBlock })
}) })
it('should call #_checkPendingTxs if oldBlock and the newBlock have a diff of greater then 1', function (done) { it('should call #_checkPendingTxs if oldBlock and the newBlock have a diff of greater then 1', function (done) {
let newBlock, oldBlock const oldBlock = { number: '0x01' }
oldBlock = { number: '0x01' } const newBlock = { number: '0x03' }
newBlock = { number: '0x03' }
pendingTxTracker._checkPendingTxs = done pendingTxTracker._checkPendingTxs = done
pendingTxTracker.queryPendingTxs({ oldBlock, newBlock }) pendingTxTracker.queryPendingTxs({ oldBlock, newBlock })
}) })
it('should not call #_checkPendingTxs if oldBlock and the newBlock have a diff of 1 or less', function (done) { it('should not call #_checkPendingTxs if oldBlock and the newBlock have a diff of 1 or less', function (done) {
let newBlock, oldBlock const oldBlock = { number: '0x1' }
oldBlock = { number: '0x1' } const newBlock = { number: '0x2' }
newBlock = { number: '0x2' }
pendingTxTracker._checkPendingTxs = () => { pendingTxTracker._checkPendingTxs = () => {
const err = new Error('should not call #_checkPendingTxs if oldBlock and the newBlock have a diff of 1 or less') const err = new Error('should not call #_checkPendingTxs if oldBlock and the newBlock have a diff of 1 or less')
done(err) done(err)
@ -197,7 +183,6 @@ describe('PendingTransactionTracker', function () {
it('should warp all txMeta\'s in #_checkPendingTx', function (done) { it('should warp all txMeta\'s in #_checkPendingTx', function (done) {
pendingTxTracker.getPendingTransactions = () => txList pendingTxTracker.getPendingTransactions = () => txList
pendingTxTracker._checkPendingTx = (tx) => { tx.resolve(tx) } pendingTxTracker._checkPendingTx = (tx) => { tx.resolve(tx) }
const list = txList.map
Promise.all(txList.map((tx) => tx.processed)) Promise.all(txList.map((tx) => tx.processed))
.then((txCompletedList) => done()) .then((txCompletedList) => done())
.catch(done) .catch(done)
@ -207,7 +192,7 @@ describe('PendingTransactionTracker', function () {
}) })
describe('#resubmitPendingTxs', function () { describe('#resubmitPendingTxs', function () {
const blockStub = { number: '0x0' }; const blockStub = { number: '0x0' }
beforeEach(function () { beforeEach(function () {
const txMeta2 = txMeta3 = txMeta const txMeta2 = txMeta3 = txMeta
txList = [txMeta, txMeta2, txMeta3].map((tx) => { txList = [txMeta, txMeta2, txMeta3].map((tx) => {
@ -275,7 +260,7 @@ describe('PendingTransactionTracker', function () {
}) })
describe('#_resubmitTx', function () { describe('#_resubmitTx', function () {
const mockFirstRetryBlockNumber = '0x1' const mockFirstRetryBlockNumber = '0x1'
let txMetaToTestExponentialBackoff let txMetaToTestExponentialBackoff, enoughBalance
beforeEach(() => { beforeEach(() => {
pendingTxTracker.getBalance = (address) => { pendingTxTracker.getBalance = (address) => {
@ -298,7 +283,7 @@ describe('PendingTransactionTracker', function () {
}) })
it('should publish the transaction', function (done) { it('should publish the transaction', function (done) {
const enoughBalance = '0x100000' enoughBalance = '0x100000'
// Stubbing out current account state: // Stubbing out current account state:
// Adding the fake tx: // Adding the fake tx:
@ -313,7 +298,7 @@ describe('PendingTransactionTracker', function () {
}) })
it('should not publish the transaction if the limit of retries has been exceeded', function (done) { it('should not publish the transaction if the limit of retries has been exceeded', function (done) {
const enoughBalance = '0x100000' enoughBalance = '0x100000'
const mockLatestBlockNumber = '0x5' const mockLatestBlockNumber = '0x5'
pendingTxTracker._resubmitTx(txMetaToTestExponentialBackoff, mockLatestBlockNumber) pendingTxTracker._resubmitTx(txMetaToTestExponentialBackoff, mockLatestBlockNumber)
@ -327,7 +312,7 @@ describe('PendingTransactionTracker', function () {
}) })
it('should publish the transaction if the number of blocks since last retry exceeds the last set limit', function (done) { it('should publish the transaction if the number of blocks since last retry exceeds the last set limit', function (done) {
const enoughBalance = '0x100000' enoughBalance = '0x100000'
const mockLatestBlockNumber = '0x11' const mockLatestBlockNumber = '0x11'
pendingTxTracker._resubmitTx(txMetaToTestExponentialBackoff, mockLatestBlockNumber) pendingTxTracker._resubmitTx(txMetaToTestExponentialBackoff, mockLatestBlockNumber)
@ -343,7 +328,7 @@ describe('PendingTransactionTracker', function () {
describe('#_checkIfNonceIsTaken', function () { describe('#_checkIfNonceIsTaken', function () {
beforeEach(function () { beforeEach(function () {
let confirmedTxList = [{ const confirmedTxList = [{
id: 1, id: 1,
hash: '0x0593ee121b92e10d63150ad08b4b8f9c7857d1bd160195ee648fb9a0f8d00eeb', hash: '0x0593ee121b92e10d63150ad08b4b8f9c7857d1bd160195ee648fb9a0f8d00eeb',
status: 'confirmed', status: 'confirmed',

@ -28,7 +28,7 @@ describe('Recipient Blacklist Checker', function () {
it('does not fail on test networks', function () { it('does not fail on test networks', function () {
let callCount = 0 let callCount = 0
const networks = [ROPSTEN_CODE, RINKEYBY_CODE, KOVAN_CODE] const networks = [ROPSTEN_CODE, RINKEYBY_CODE, KOVAN_CODE]
for (let networkId in networks) { for (const networkId in networks) {
publicAccounts.forEach((account) => { publicAccounts.forEach((account) => {
recipientBlackListChecker.checkAccount(networkId, account) recipientBlackListChecker.checkAccount(networkId, account)
callCount++ callCount++

@ -1,20 +1,17 @@
const assert = require('assert') const assert = require('assert')
const ethUtil = require('ethereumjs-util') const ethUtil = require('ethereumjs-util')
const EthTx = require('ethereumjs-tx') const EthTx = require('ethereumjs-tx')
const EthjsQuery = require('ethjs-query')
const ObservableStore = require('obs-store') const ObservableStore = require('obs-store')
const sinon = require('sinon') const sinon = require('sinon')
const TransactionController = require('../../../../../app/scripts/controllers/transactions') const TransactionController = require('../../../../../app/scripts/controllers/transactions')
const TxGasUtils = require('../../../../../app/scripts/controllers/transactions/tx-gas-utils')
const { createTestProviderTools, getTestAccounts } = require('../../../../stub/provider') const { createTestProviderTools, getTestAccounts } = require('../../../../stub/provider')
const noop = () => true const noop = () => true
const currentNetworkId = 42 const currentNetworkId = 42
const otherNetworkId = 36
describe('Transaction Controller', function () { describe('Transaction Controller', function () {
let txController, provider, providerResultStub, query, fromAccount let txController, provider, providerResultStub, fromAccount
beforeEach(function () { beforeEach(function () {
providerResultStub = { providerResultStub = {
@ -24,7 +21,6 @@ describe('Transaction Controller', function () {
eth_getCode: '0x', eth_getCode: '0x',
} }
provider = createTestProviderTools({ scaffold: providerResultStub }).provider provider = createTestProviderTools({ scaffold: providerResultStub }).provider
query = new EthjsQuery(provider)
fromAccount = getTestAccounts()[0] fromAccount = getTestAccounts()[0]
txController = new TransactionController({ txController = new TransactionController({
@ -388,7 +384,7 @@ describe('Transaction Controller', function () {
describe('#retryTransaction', function () { describe('#retryTransaction', function () {
it('should create a new txMeta with the same txParams as the original one', function (done) { it('should create a new txMeta with the same txParams as the original one', function (done) {
let txParams = { const txParams = {
nonce: '0x00', nonce: '0x00',
from: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4', from: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4',
to: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4', to: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4',

@ -1,6 +1,5 @@
const assert = require('assert') const assert = require('assert')
const Transaction = require('ethereumjs-tx') const Transaction = require('ethereumjs-tx')
const BN = require('bn.js')
const { hexToBn, bnToHex } = require('../../../../../app/scripts/lib/util') const { hexToBn, bnToHex } = require('../../../../../app/scripts/lib/util')

@ -9,9 +9,9 @@ describe ('Transaction state history helper', function () {
const input = { const input = {
foo: { foo: {
bar: { bar: {
bam: 'baz' bam: 'baz',
} },
} },
} }
const output = txStateHistoryHelper.snapshotFromTxMeta(input) const output = txStateHistoryHelper.snapshotFromTxMeta(input)
assert('foo' in output, 'has a foo key') assert('foo' in output, 'has a foo key')
@ -50,14 +50,14 @@ describe ('Transaction state history helper', function () {
it('replaying history does not mutate the original obj', function () { it('replaying history does not mutate the original obj', function () {
const initialState = { test: true, message: 'hello', value: 1 } const initialState = { test: true, message: 'hello', value: 1 }
const diff1 = [{ const diff1 = [{
"op": "replace", 'op': 'replace',
"path": "/message", 'path': '/message',
"value": "haay", 'value': 'haay',
}] }]
const diff2 = [{ const diff2 = [{
"op": "replace", 'op': 'replace',
"path": "/value", 'path': '/value',
"value": 2, 'value': 2,
}] }]
const history = [initialState, diff1, diff2] const history = [initialState, diff1, diff2]
@ -78,9 +78,9 @@ describe ('Transaction state history helper', function () {
someValue: 'value 1', someValue: 'value 1',
foo: { foo: {
bar: { bar: {
bam: 'baz' bam: 'baz',
} },
} },
} }
const nextState = { const nextState = {
@ -89,9 +89,9 @@ describe ('Transaction state history helper', function () {
foo: { foo: {
newPropFirstLevel: 'new property - first level', newPropFirstLevel: 'new property - first level',
bar: { bar: {
bam: 'baz' bam: 'baz',
} },
} },
} }
const before = new Date().getTime() const before = new Date().getTime()
@ -106,8 +106,7 @@ describe ('Transaction state history helper', function () {
assert.equal(result[0].path, expectedEntry1.path) assert.equal(result[0].path, expectedEntry1.path)
assert.equal(result[0].value, expectedEntry1.value) assert.equal(result[0].value, expectedEntry1.value)
assert.equal(result[0].value, expectedEntry1.value) assert.equal(result[0].value, expectedEntry1.value)
if (note) if (note) { assert.equal(result[0].note, note) }
assert.equal(result[0].note, note)
assert.ok(result[0].timestamp >= before && result[0].timestamp <= after) assert.ok(result[0].timestamp >= before && result[0].timestamp <= after)

@ -1,6 +1,4 @@
const assert = require('assert') const assert = require('assert')
const clone = require('clone')
const ObservableStore = require('obs-store')
const TxStateManager = require('../../../../../app/scripts/controllers/transactions/tx-state-manager') const TxStateManager = require('../../../../../app/scripts/controllers/transactions/tx-state-manager')
const txStateHistoryHelper = require('../../../../../app/scripts/controllers/transactions/lib/tx-state-history-helper') const txStateHistoryHelper = require('../../../../../app/scripts/controllers/transactions/lib/tx-state-history-helper')
const noop = () => true const noop = () => true
@ -16,23 +14,23 @@ describe('TransactionStateManager', function () {
transactions: [], transactions: [],
}, },
txHistoryLimit: 10, txHistoryLimit: 10,
getNetwork: () => currentNetworkId getNetwork: () => currentNetworkId,
}) })
}) })
describe('#setTxStatusSigned', function () { describe('#setTxStatusSigned', function () {
it('sets the tx status to signed', function () { it('sets the tx status to signed', function () {
let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} } const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
txStateManager.addTx(tx, noop) txStateManager.addTx(tx, noop)
txStateManager.setTxStatusSigned(1) txStateManager.setTxStatusSigned(1)
let result = txStateManager.getTxList() const result = txStateManager.getTxList()
assert.ok(Array.isArray(result)) assert.ok(Array.isArray(result))
assert.equal(result.length, 1) assert.equal(result.length, 1)
assert.equal(result[0].status, 'signed') assert.equal(result[0].status, 'signed')
}) })
it('should emit a signed event to signal the exciton of callback', (done) => { it('should emit a signed event to signal the exciton of callback', (done) => {
let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} } const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
const noop = function () { const noop = function () {
assert(true, 'event listener has been triggered and noop executed') assert(true, 'event listener has been triggered and noop executed')
done() done()
@ -46,19 +44,22 @@ describe('TransactionStateManager', function () {
describe('#setTxStatusRejected', function () { describe('#setTxStatusRejected', function () {
it('sets the tx status to rejected', function () { it('sets the tx status to rejected', function () {
let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} } const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
txStateManager.addTx(tx) txStateManager.addTx(tx)
txStateManager.setTxStatusRejected(1) txStateManager.setTxStatusRejected(1)
let result = txStateManager.getTxList() const result = txStateManager.getTxList()
assert.ok(Array.isArray(result)) assert.ok(Array.isArray(result))
assert.equal(result.length, 1) assert.equal(result.length, 1)
assert.equal(result[0].status, 'rejected') assert.equal(result[0].status, 'rejected')
}) })
it('should emit a rejected event to signal the exciton of callback', (done) => { it('should emit a rejected event to signal the exciton of callback', (done) => {
let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} } const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
txStateManager.addTx(tx) txStateManager.addTx(tx)
const noop = function (err, txId) { const noop = function (err, txId) {
if (err) {
console.log('Error: ', err)
}
assert(true, 'event listener has been triggered and noop executed') assert(true, 'event listener has been triggered and noop executed')
done() done()
} }
@ -69,7 +70,7 @@ describe('TransactionStateManager', function () {
describe('#getFullTxList', function () { describe('#getFullTxList', function () {
it('when new should return empty array', function () { it('when new should return empty array', function () {
let result = txStateManager.getTxList() const result = txStateManager.getTxList()
assert.ok(Array.isArray(result)) assert.ok(Array.isArray(result))
assert.equal(result.length, 0) assert.equal(result.length, 0)
}) })
@ -77,7 +78,7 @@ describe('TransactionStateManager', function () {
describe('#getTxList', function () { describe('#getTxList', function () {
it('when new should return empty array', function () { it('when new should return empty array', function () {
let result = txStateManager.getTxList() const result = txStateManager.getTxList()
assert.ok(Array.isArray(result)) assert.ok(Array.isArray(result))
assert.equal(result.length, 0) assert.equal(result.length, 0)
}) })
@ -85,21 +86,21 @@ describe('TransactionStateManager', function () {
describe('#addTx', function () { describe('#addTx', function () {
it('adds a tx returned in getTxList', function () { it('adds a tx returned in getTxList', function () {
let tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} } const tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
txStateManager.addTx(tx, noop) txStateManager.addTx(tx, noop)
let result = txStateManager.getTxList() const result = txStateManager.getTxList()
assert.ok(Array.isArray(result)) assert.ok(Array.isArray(result))
assert.equal(result.length, 1) assert.equal(result.length, 1)
assert.equal(result[0].id, 1) assert.equal(result[0].id, 1)
}) })
it('does not override txs from other networks', function () { it('does not override txs from other networks', function () {
let tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} } const tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
let tx2 = { id: 2, status: 'confirmed', metamaskNetworkId: otherNetworkId, txParams: {} } const tx2 = { id: 2, status: 'confirmed', metamaskNetworkId: otherNetworkId, txParams: {} }
txStateManager.addTx(tx, noop) txStateManager.addTx(tx, noop)
txStateManager.addTx(tx2, noop) txStateManager.addTx(tx2, noop)
let result = txStateManager.getFullTxList() const result = txStateManager.getFullTxList()
let result2 = txStateManager.getTxList() const result2 = txStateManager.getTxList()
assert.equal(result.length, 2, 'txs were deleted') assert.equal(result.length, 2, 'txs were deleted')
assert.equal(result2.length, 1, 'incorrect number of txs on network.') assert.equal(result2.length, 1, 'incorrect number of txs on network.')
}) })
@ -110,7 +111,7 @@ describe('TransactionStateManager', function () {
const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} } const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
txStateManager.addTx(tx, noop) txStateManager.addTx(tx, noop)
} }
let result = txStateManager.getTxList() const result = txStateManager.getTxList()
assert.equal(result.length, limit, `limit of ${limit} txs enforced`) assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
assert.equal(result[0].id, 1, 'early txs truncted') assert.equal(result[0].id, 1, 'early txs truncted')
}) })
@ -121,20 +122,20 @@ describe('TransactionStateManager', function () {
const tx = { id: i, time: new Date(), status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {} } const tx = { id: i, time: new Date(), status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {} }
txStateManager.addTx(tx, noop) txStateManager.addTx(tx, noop)
} }
let result = txStateManager.getTxList() const result = txStateManager.getTxList()
assert.equal(result.length, limit, `limit of ${limit} txs enforced`) assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
assert.equal(result[0].id, 1, 'early txs truncted') assert.equal(result[0].id, 1, 'early txs truncted')
}) })
it('cuts off early txs beyond a limit but does not cut unapproved txs', function () { it('cuts off early txs beyond a limit but does not cut unapproved txs', function () {
let unconfirmedTx = { id: 0, time: new Date(), status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} } const unconfirmedTx = { id: 0, time: new Date(), status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
txStateManager.addTx(unconfirmedTx, noop) txStateManager.addTx(unconfirmedTx, noop)
const limit = txStateManager.txHistoryLimit const limit = txStateManager.txHistoryLimit
for (let i = 1; i < limit + 1; i++) { for (let i = 1; i < limit + 1; i++) {
const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} } const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
txStateManager.addTx(tx, noop) txStateManager.addTx(tx, noop)
} }
let result = txStateManager.getTxList() const result = txStateManager.getTxList()
assert.equal(result.length, limit, `limit of ${limit} txs enforced`) assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
assert.equal(result[0].id, 0, 'first tx should still be there') assert.equal(result[0].id, 0, 'first tx should still be there')
assert.equal(result[0].status, 'unapproved', 'first tx should be unapproved') assert.equal(result[0].status, 'unapproved', 'first tx should be unapproved')
@ -149,7 +150,7 @@ describe('TransactionStateManager', function () {
const txMeta = txStateManager.getTx('1') const txMeta = txStateManager.getTx('1')
txMeta.hash = 'foo' txMeta.hash = 'foo'
txStateManager.updateTx(txMeta) txStateManager.updateTx(txMeta)
let result = txStateManager.getTx('1') const result = txStateManager.getTx('1')
assert.equal(result.hash, 'foo') assert.equal(result.hash, 'foo')
}) })
@ -166,8 +167,6 @@ describe('TransactionStateManager', function () {
}, },
} }
const updatedMeta = clone(txMeta)
txStateManager.addTx(txMeta) txStateManager.addTx(txMeta)
const updatedTx = txStateManager.getTx('1') const updatedTx = txStateManager.getTx('1')
// verify tx was initialized correctly // verify tx was initialized correctly

@ -27,7 +27,7 @@ describe('txUtils', function () {
describe('#normalizeTxParams', () => { describe('#normalizeTxParams', () => {
it('should normalize txParams', () => { it('should normalize txParams', () => {
let txParams = { const txParams = {
chainId: '0x1', chainId: '0x1',
from: 'a7df1beDBF813f57096dF77FCd515f0B3900e402', from: 'a7df1beDBF813f57096dF77FCd515f0B3900e402',
to: null, to: null,

@ -11,7 +11,7 @@ global.crypto = global.crypto || {
array[i] = Math.random() * 100 array[i] = Math.random() * 100
} }
return array return array
} },
} }
describe('EdgeEncryptor', function () { describe('EdgeEncryptor', function () {
@ -33,10 +33,10 @@ describe('EdgeEncryptor', function () {
it('should return proper format.', function (done) { it('should return proper format.', function (done) {
edgeEncryptor.encrypt(password, data) edgeEncryptor.encrypt(password, data)
.then(function (encryptedData) { .then(function (encryptedData) {
let encryptedObject = JSON.parse(encryptedData) const encryptedObject = JSON.parse(encryptedData)
assert.ok(encryptedObject.data, 'there is no data') assert.ok(encryptedObject.data, 'there is no data')
assert.ok(encryptedObject.iv && encryptedObject.iv.length != 0, 'there is no iv') assert.ok(encryptedObject.iv && encryptedObject.iv.length !== 0, 'there is no iv')
assert.ok(encryptedObject.salt && encryptedObject.salt.length != 0, 'there is no salt') assert.ok(encryptedObject.salt && encryptedObject.salt.length !== 0, 'there is no salt')
done() done()
}).catch(function (err) { }).catch(function (err) {
done(err) done(err)

@ -13,8 +13,12 @@ describe('nodeify', function () {
it('should retain original context', function (done) { it('should retain original context', function (done) {
var nodified = nodeify(obj.promiseFunc, obj) var nodified = nodeify(obj.promiseFunc, obj)
nodified('baz', function (err, res) { nodified('baz', function (err, res) {
if (!err) {
assert.equal(res, 'barbaz') assert.equal(res, 'barbaz')
done() done()
} else {
done(new Error(err.toString()))
}
}) })
}) })

@ -2,7 +2,6 @@ const assert = require('assert')
const PendingBalanceCalculator = require('../../../app/scripts/lib/pending-balance-calculator') const PendingBalanceCalculator = require('../../../app/scripts/lib/pending-balance-calculator')
const MockTxGen = require('../../lib/mock-tx-gen') const MockTxGen = require('../../lib/mock-tx-gen')
const BN = require('ethereumjs-util').BN const BN = require('ethereumjs-util').BN
let providerResultStub = {}
const zeroBn = new BN(0) const zeroBn = new BN(0)
const etherBn = new BN(String(1e18)) const etherBn = new BN(String(1e18))
@ -20,7 +19,7 @@ describe('PendingBalanceCalculator', function () {
value: ether, value: ether,
gasPrice: '0x0', gasPrice: '0x0',
gas: '0x0', gas: '0x0',
} },
}, { count: 1 }) }, { count: 1 })
const balanceCalculator = generateBalanceCalcWith([], zeroBn) const balanceCalculator = generateBalanceCalcWith([], zeroBn)
@ -36,7 +35,7 @@ describe('PendingBalanceCalculator', function () {
value: '0x0', value: '0x0',
gasPrice: '0x2', gasPrice: '0x2',
gas: '0x3', gas: '0x3',
} },
}, { count: 1 }) }, { count: 1 })
const balanceCalculator = generateBalanceCalcWith([], zeroBn) const balanceCalculator = generateBalanceCalcWith([], zeroBn)
@ -66,7 +65,7 @@ describe('PendingBalanceCalculator', function () {
value: ether, value: ether,
gasPrice: '0x0', gasPrice: '0x0',
gas: '0x0', gas: '0x0',
} },
}, { count: 1 }) }, { count: 1 })
balanceCalculator = generateBalanceCalcWith(pendingTxs, etherBn) balanceCalculator = generateBalanceCalcWith(pendingTxs, etherBn)

@ -9,11 +9,10 @@ describe('SeedPhraseVerifier', function () {
describe('verifyAccounts', function () { describe('verifyAccounts', function () {
let password = 'passw0rd1' const password = 'passw0rd1'
let hdKeyTree = 'HD Key Tree' const hdKeyTree = 'HD Key Tree'
let keyringController let keyringController
let vault
let primaryKeyring let primaryKeyring
beforeEach(async function () { beforeEach(async function () {
@ -24,60 +23,60 @@ describe('SeedPhraseVerifier', function () {
assert(keyringController) assert(keyringController)
vault = await keyringController.createNewVaultAndKeychain(password) await keyringController.createNewVaultAndKeychain(password)
primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
}) })
it('should be able to verify created account with seed words', async function () { it('should be able to verify created account with seed words', async function () {
let createdAccounts = await primaryKeyring.getAccounts() const createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1) assert.equal(createdAccounts.length, 1)
let serialized = await primaryKeyring.serialize() const serialized = await primaryKeyring.serialize()
let seedWords = serialized.mnemonic const seedWords = serialized.mnemonic
assert.notEqual(seedWords.length, 0) assert.notEqual(seedWords.length, 0)
let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords) await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
}) })
it('should be able to verify created account (upper case) with seed words', async function () { it('should be able to verify created account (upper case) with seed words', async function () {
let createdAccounts = await primaryKeyring.getAccounts() const createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1) assert.equal(createdAccounts.length, 1)
let upperCaseAccounts = [createdAccounts[0].toUpperCase()] const upperCaseAccounts = [createdAccounts[0].toUpperCase()]
let serialized = await primaryKeyring.serialize() const serialized = await primaryKeyring.serialize()
let seedWords = serialized.mnemonic const seedWords = serialized.mnemonic
assert.notEqual(seedWords.length, 0) assert.notEqual(seedWords.length, 0)
let result = await seedPhraseVerifier.verifyAccounts(upperCaseAccounts, seedWords) await seedPhraseVerifier.verifyAccounts(upperCaseAccounts, seedWords)
}) })
it('should be able to verify created account (lower case) with seed words', async function () { it('should be able to verify created account (lower case) with seed words', async function () {
let createdAccounts = await primaryKeyring.getAccounts() const createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1) assert.equal(createdAccounts.length, 1)
let lowerCaseAccounts = [createdAccounts[0].toLowerCase()] const lowerCaseAccounts = [createdAccounts[0].toLowerCase()]
let serialized = await primaryKeyring.serialize() const serialized = await primaryKeyring.serialize()
let seedWords = serialized.mnemonic const seedWords = serialized.mnemonic
assert.notEqual(seedWords.length, 0) assert.notEqual(seedWords.length, 0)
let result = await seedPhraseVerifier.verifyAccounts(lowerCaseAccounts, seedWords) await seedPhraseVerifier.verifyAccounts(lowerCaseAccounts, seedWords)
}) })
it('should return error with good but different seed words', async function () { it('should return error with good but different seed words', async function () {
let createdAccounts = await primaryKeyring.getAccounts() const createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1) assert.equal(createdAccounts.length, 1)
let serialized = await primaryKeyring.serialize() await primaryKeyring.serialize()
let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium' const seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
try { try {
let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords) await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
assert.fail("Should reject") assert.fail('Should reject')
} catch (err) { } catch (err) {
assert.ok(err.message.indexOf('Not identical accounts!') >= 0, 'Wrong error message') assert.ok(err.message.indexOf('Not identical accounts!') >= 0, 'Wrong error message')
} }
@ -85,15 +84,15 @@ describe('SeedPhraseVerifier', function () {
it('should return error with undefined existing accounts', async function () { it('should return error with undefined existing accounts', async function () {
let createdAccounts = await primaryKeyring.getAccounts() const createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1) assert.equal(createdAccounts.length, 1)
let serialized = await primaryKeyring.serialize() await primaryKeyring.serialize()
let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium' const seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
try { try {
let result = await seedPhraseVerifier.verifyAccounts(undefined, seedWords) await seedPhraseVerifier.verifyAccounts(undefined, seedWords)
assert.fail("Should reject") assert.fail('Should reject')
} catch (err) { } catch (err) {
assert.equal(err.message, 'No created accounts defined.') assert.equal(err.message, 'No created accounts defined.')
} }
@ -101,15 +100,15 @@ describe('SeedPhraseVerifier', function () {
it('should return error with empty accounts array', async function () { it('should return error with empty accounts array', async function () {
let createdAccounts = await primaryKeyring.getAccounts() const createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 1) assert.equal(createdAccounts.length, 1)
let serialized = await primaryKeyring.serialize() await primaryKeyring.serialize()
let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium' const seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
try { try {
let result = await seedPhraseVerifier.verifyAccounts([], seedWords) await seedPhraseVerifier.verifyAccounts([], seedWords)
assert.fail("Should reject") assert.fail('Should reject')
} catch (err) { } catch (err) {
assert.equal(err.message, 'No created accounts defined.') assert.equal(err.message, 'No created accounts defined.')
} }
@ -117,17 +116,17 @@ describe('SeedPhraseVerifier', function () {
it('should be able to verify more than one created account with seed words', async function () { it('should be able to verify more than one created account with seed words', async function () {
const keyState = await keyringController.addNewAccount(primaryKeyring) await keyringController.addNewAccount(primaryKeyring)
const keyState2 = await keyringController.addNewAccount(primaryKeyring) await keyringController.addNewAccount(primaryKeyring)
let createdAccounts = await primaryKeyring.getAccounts() const createdAccounts = await primaryKeyring.getAccounts()
assert.equal(createdAccounts.length, 3) assert.equal(createdAccounts.length, 3)
let serialized = await primaryKeyring.serialize() const serialized = await primaryKeyring.serialize()
let seedWords = serialized.mnemonic const seedWords = serialized.mnemonic
assert.notEqual(seedWords.length, 0) assert.notEqual(seedWords.length, 0)
let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords) await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
}) })
}) })
}) })

@ -8,7 +8,7 @@ const mockState = {
accounts: { abc: {} }, accounts: { abc: {} },
network: 1, network: 1,
selectedAddress: 'abc', selectedAddress: 'abc',
} },
} }
describe('BalanceComponent', function () { describe('BalanceComponent', function () {

@ -52,13 +52,13 @@ describe('BnInput', function () {
it('can tolerate wei precision', function (done) { it('can tolerate wei precision', function (done) {
const renderer = ReactTestUtils.createRenderer() const renderer = ReactTestUtils.createRenderer()
let valueStr = '1000000000' const valueStr = '1000000000'
const value = new BN(valueStr, 10) const value = new BN(valueStr, 10)
const inputStr = '1.000000001' const inputStr = '1.000000001'
let targetStr = '1000000001' const targetStr = '1000000001'
const target = new BN(targetStr, 10) const target = new BN(targetStr, 10)

@ -13,7 +13,7 @@ const mockState = {
identities, identities,
conversionRate: 10, conversionRate: 10,
selectedAddress: 'abc', selectedAddress: 'abc',
} },
} }
describe('PendingTx', function () { describe('PendingTx', function () {

@ -2,14 +2,14 @@ const assert = require('assert')
const migration22 = require('../../../app/scripts/migrations/022') const migration22 = require('../../../app/scripts/migrations/022')
const properTime = (new Date()).getTime() const properTime = (new Date()).getTime()
const storage = { const storage = {
"meta": {}, 'meta': {},
"data": { 'data': {
"TransactionController": { 'TransactionController': {
"transactions": [ 'transactions': [
{ "status": "submitted" }, { 'status': 'submitted' },
{ "status": "submitted", "submittedTime": properTime }, { 'status': 'submitted', 'submittedTime': properTime },
{"status": "confirmed"}, {'status': 'confirmed'},
] ],
}, },
}, },
} }

@ -1,12 +1,11 @@
const assert = require('assert') const assert = require('assert')
const migration23 = require('../../../app/scripts/migrations/023') const migration23 = require('../../../app/scripts/migrations/023')
const properTime = (new Date()).getTime()
const storage = { const storage = {
"meta": {}, 'meta': {},
"data": { 'data': {
"TransactionController": { 'TransactionController': {
"transactions": [ 'transactions': [
] ],
}, },
}, },
} }
@ -53,7 +52,6 @@ while (transactions20.length < 20) {
} }
storage.data.TransactionController.transactions = transactions storage.data.TransactionController.transactions = transactions
describe('storage is migrated successfully and the proper transactions are remove from state', () => { describe('storage is migrated successfully and the proper transactions are remove from state', () => {

@ -4,13 +4,12 @@ const firstTimeState = {
meta: {}, meta: {},
data: require('../../../app/scripts/first-time-state'), data: require('../../../app/scripts/first-time-state'),
} }
const properTime = (new Date()).getTime()
const storage = { const storage = {
"meta": {}, 'meta': {},
"data": { 'data': {
"TransactionController": { 'TransactionController': {
"transactions": [ 'transactions': [
] ],
}, },
}, },
} }

@ -6,11 +6,11 @@ const firstTimeState = {
} }
const storage = { const storage = {
"meta": {}, 'meta': {},
"data": { 'data': {
"TransactionController": { 'TransactionController': {
"transactions": [ 'transactions': [
] ],
}, },
}, },
} }

@ -1,6 +1,5 @@
const assert = require('assert') const assert = require('assert')
const migrationTemplate = require('../../../app/scripts/migrations/template') const migrationTemplate = require('../../../app/scripts/migrations/template')
const properTime = (new Date()).getTime()
const storage = { const storage = {
meta: {}, meta: {},
data: {}, data: {},

@ -1,24 +1,24 @@
const assert = require('assert'); const assert = require('assert')
const h = require('react-hyperscript'); const h = require('react-hyperscript')
const sinon = require('sinon'); const sinon = require('sinon')
const path = require('path'); const path = require('path')
const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdowns', 'index.js')).Dropdown; const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdowns', 'index.js')).Dropdown
const { createMockStore } = require('redux-test-utils') const { createMockStore } = require('redux-test-utils')
const { mountWithStore } = require('../../../lib/shallow-with-store') const { mountWithStore } = require('../../../lib/shallow-with-store')
const mockState = { const mockState = {
metamask: { metamask: {
} },
} }
describe('Dropdown components', function () { describe('Dropdown components', function () {
let onClickOutside; let onClickOutside
let closeMenu; let closeMenu
let onClick; let onClick
let dropdownComponentProps = { const dropdownComponentProps = {
isOpen: true, isOpen: true,
zIndex: 11, zIndex: 11,
onClickOutside, onClickOutside,
@ -34,9 +34,9 @@ describe('Dropdown components', function () {
let store let store
let component let component
beforeEach(function () { beforeEach(function () {
onClickOutside = sinon.spy(); onClickOutside = sinon.spy()
closeMenu = sinon.spy(); closeMenu = sinon.spy()
onClick = sinon.spy(); onClick = sinon.spy()
store = createMockStore(mockState) store = createMockStore(mockState)
component = mountWithStore(h( component = mountWithStore(h(
@ -61,21 +61,21 @@ describe('Dropdown components', function () {
}) })
it('can render two items', function () { it('can render two items', function () {
const items = dropdownComponent.find('li'); const items = dropdownComponent.find('li')
assert.equal(items.length, 2); assert.equal(items.length, 2)
}); })
it('closes when item clicked', function () { it('closes when item clicked', function () {
const items = dropdownComponent.find('li'); const items = dropdownComponent.find('li')
const node = items.at(0); const node = items.at(0)
node.simulate('click'); node.simulate('click')
assert.equal(node.props().closeMenu, closeMenu); assert.equal(node.props().closeMenu, closeMenu)
}); })
it('invokes click handler when item clicked', function () { it('invokes click handler when item clicked', function () {
const items = dropdownComponent.find('li'); const items = dropdownComponent.find('li')
const node = items.at(0); const node = items.at(0)
node.simulate('click'); node.simulate('click')
assert.equal(onClick.calledOnce, true); assert.equal(onClick.calledOnce, true)
}); })
}); })

@ -31,8 +31,6 @@ const {
} = require('../../conversion-util') } = require('../../conversion-util')
const { const {
getGasPrice,
getGasLimit,
getGasIsLoading, getGasIsLoading,
getForceGasMin, getForceGasMin,
conversionRateSelector, conversionRateSelector,
@ -44,6 +42,11 @@ const {
getSendMaxModeState, getSendMaxModeState,
} = require('../../selectors') } = require('../../selectors')
const {
getGasPrice,
getGasLimit,
} = require('../send_/send.selectors')
function mapStateToProps (state) { function mapStateToProps (state) {
const selectedToken = getSelectedToken(state) const selectedToken = getSelectedToken(state)
const currentAccount = getSendFrom(state) || getCurrentAccountWithSendEtherInfo(state) const currentAccount = getSendFrom(state) || getCurrentAccountWithSendEtherInfo(state)

@ -109,12 +109,13 @@ class JsonImportSubview extends Component {
.then(({ selectedAddress }) => { .then(({ selectedAddress }) => {
if (selectedAddress) { if (selectedAddress) {
history.push(DEFAULT_ROUTE) history.push(DEFAULT_ROUTE)
displayWarning(null)
} else { } else {
displayWarning('Error importing account.') displayWarning('Error importing account.')
setSelectedAddress(firstAddress) setSelectedAddress(firstAddress)
} }
}) })
.catch(err => displayWarning(err)) .catch(err => err && displayWarning(err.message || err))
} }
} }

@ -99,10 +99,11 @@ PrivateKeyImportView.prototype.createNewKeychain = function () {
.then(({ selectedAddress }) => { .then(({ selectedAddress }) => {
if (selectedAddress) { if (selectedAddress) {
history.push(DEFAULT_ROUTE) history.push(DEFAULT_ROUTE)
displayWarning(null)
} else { } else {
displayWarning('Error importing account.') displayWarning('Error importing account.')
setSelectedAddress(firstAddress) setSelectedAddress(firstAddress)
} }
}) })
.catch(err => displayWarning(err)) .catch(err => err && displayWarning(err.message || err))
} }

@ -2,6 +2,7 @@ const Component = require('react').Component
const h = require('react-hyperscript') const h = require('react-hyperscript')
const inherits = require('util').inherits const inherits = require('util').inherits
const { conversionUtil, multiplyCurrencies } = require('../../conversion-util') const { conversionUtil, multiplyCurrencies } = require('../../conversion-util')
const { removeLeadingZeroes } = require('../send_/send.utils')
const currencyFormatter = require('currency-formatter') const currencyFormatter = require('currency-formatter')
const currencies = require('currency-formatter/currencies') const currencies = require('currency-formatter/currencies')
const ethUtil = require('ethereumjs-util') const ethUtil = require('ethereumjs-util')
@ -92,10 +93,6 @@ CurrencyDisplay.prototype.getConvertedValueToRender = function (nonFormattedValu
: convertedValue : convertedValue
} }
function removeLeadingZeroes (str) {
return str.replace(/^0*(?=\d)/, '')
}
CurrencyDisplay.prototype.handleChange = function (newVal) { CurrencyDisplay.prototype.handleChange = function (newVal) {
this.setState({ valueToRender: removeLeadingZeroes(newVal) }) this.setState({ valueToRender: removeLeadingZeroes(newVal) })
this.props.onChange(this.getAmount(newVal)) this.props.onChange(this.getAmount(newVal))

@ -33,6 +33,7 @@ module.exports = {
getToAddressForGasUpdate, getToAddressForGasUpdate,
isBalanceSufficient, isBalanceSufficient,
isTokenBalanceSufficient, isTokenBalanceSufficient,
removeLeadingZeroes,
} }
function calcGasTotal (gasLimit, gasPrice) { function calcGasTotal (gasLimit, gasPrice) {
@ -276,3 +277,7 @@ function estimateGasPriceFromRecentBlocks (recentBlocks) {
function getToAddressForGasUpdate (...addresses) { function getToAddressForGasUpdate (...addresses) {
return [...addresses, ''].find(str => str !== undefined && str !== null).toLowerCase() return [...addresses, ''].find(str => str !== undefined && str !== null).toLowerCase()
} }
function removeLeadingZeroes (str) {
return str.replace(/^0*(?=\d)/, '')
}

@ -0,0 +1,30 @@
import assert from 'assert'
import { removeLeadingZeroes } from './send.utils'
describe('send utils', () => {
describe('removeLeadingZeroes()', () => {
it('should remove leading zeroes from int when user types', () => {
assert.equal(removeLeadingZeroes('0'), '0')
assert.equal(removeLeadingZeroes('1'), '1')
assert.equal(removeLeadingZeroes('00'), '0')
assert.equal(removeLeadingZeroes('01'), '1')
})
it('should remove leading zeroes from int when user copy/paste', () => {
assert.equal(removeLeadingZeroes('001'), '1')
})
it('should remove leading zeroes from float when user types', () => {
assert.equal(removeLeadingZeroes('0.'), '0.')
assert.equal(removeLeadingZeroes('0.0'), '0.0')
assert.equal(removeLeadingZeroes('0.00'), '0.00')
assert.equal(removeLeadingZeroes('0.001'), '0.001')
assert.equal(removeLeadingZeroes('0.10'), '0.10')
})
it('should remove leading zeroes from float when user copy/paste', () => {
assert.equal(removeLeadingZeroes('00.1'), '0.1')
})
})
})

@ -140,7 +140,7 @@ const addCurrencies = (a, b, options = {}) => {
bBase, bBase,
...conversionOptions ...conversionOptions
} = options } = options
const value = (new BigNumber(a, aBase)).add(b, bBase) const value = (new BigNumber(a.toString(), aBase)).add(b.toString(), bBase)
return converter({ return converter({
value, value,

@ -0,0 +1,22 @@
import assert from 'assert'
import {addCurrencies} from './conversion-util'
describe('conversion utils', () => {
describe('addCurrencies()', () => {
it('add whole numbers', () => {
const result = addCurrencies(3, 9)
assert.equal(result.toNumber(), 12)
})
it('add decimals', () => {
const result = addCurrencies(1.3, 1.9)
assert.equal(result.toNumber(), 3.2)
})
it('add repeating decimals', () => {
const result = addCurrencies(1 / 3, 1 / 9)
assert.equal(result.toNumber(), 0.4444444444444444)
})
})
})

@ -17,8 +17,6 @@ const selectors = {
accountsWithSendEtherInfoSelector, accountsWithSendEtherInfoSelector,
getCurrentAccountWithSendEtherInfo, getCurrentAccountWithSendEtherInfo,
getGasIsLoading, getGasIsLoading,
getGasPrice,
getGasLimit,
getForceGasMin, getForceGasMin,
getAddressBook, getAddressBook,
getSendFrom, getSendFrom,
@ -122,14 +120,6 @@ function getGasIsLoading (state) {
return state.appState.gasIsLoading return state.appState.gasIsLoading
} }
function getGasPrice (state) {
return state.metamask.send.gasPrice
}
function getGasLimit (state) {
return state.metamask.send.gasLimit
}
function getForceGasMin (state) { function getForceGasMin (state) {
return state.metamask.send.forceGasMin return state.metamask.send.forceGasMin
} }

Loading…
Cancel
Save