diff --git a/package-lock.json b/package-lock.json
index 514f1b91bd..9637366950 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1853,14 +1853,6 @@
"requires": {
"scryptsy": "^2.1.0",
"semver": "^6.3.0"
- },
- "dependencies": {
- "scryptsy": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz",
- "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==",
- "dev": true
- }
}
},
"@web3-js/websocket": {
@@ -2014,8 +2006,7 @@
"aes-js": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz",
- "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=",
- "dev": true
+ "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0="
},
"agent-base": {
"version": "2.1.1",
@@ -3433,8 +3424,7 @@
"chownr": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
- "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
- "dev": true
+ "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="
},
"ci-info": {
"version": "1.6.0",
@@ -6673,7 +6663,6 @@
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
"integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
- "dev": true,
"requires": {
"minipass": "^2.6.0"
}
@@ -7247,6 +7236,23 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
"dev": true
+ },
+ "yargs": {
+ "version": "13.2.4",
+ "bundled": true,
+ "requires": {
+ "require-directory": "^2.1.1",
+ "set-blocking": "^2.0.0",
+ "which-module": "^2.0.0",
+ "yargs-parser": "^13.1.0"
+ }
+ },
+ "yargs-parser": {
+ "version": "13.1.1",
+ "bundled": true,
+ "requires": {
+ "decamelize": "^1.2.0"
+ }
}
}
},
@@ -7773,8 +7779,7 @@
},
"safe-buffer": {
"version": "5.2.0",
- "bundled": true,
- "dev": true
+ "bundled": true
},
"secp256k1": {
"version": "3.7.1",
@@ -7792,7 +7797,7 @@
}
},
"semver": {
- "version": "5.7.0",
+ "version": "5.7.1",
"bundled": true,
"dev": true
},
@@ -7865,12 +7870,17 @@
"bundled": true,
"dev": true
},
- "strip-hex-prefix": {
- "version": "1.0.0",
+ "tar": {
+ "version": "4.4.13",
"bundled": true,
- "dev": true,
"requires": {
- "is-hex-prefixed": "1.0.0"
+ "chownr": "^1.1.1",
+ "fs-minipass": "^1.2.5",
+ "minipass": "^2.8.6",
+ "minizlib": "^1.2.1",
+ "mkdirp": "^0.5.0",
+ "safe-buffer": "^5.1.2",
+ "yallist": "^3.0.3"
}
},
"which": {
@@ -7903,12 +7913,19 @@
},
"y18n": {
"version": "4.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
"dev": true
},
+ "yallist": {
+ "version": "3.1.1",
+ "bundled": true,
+ "optional": true
+ },
"yargs": {
"version": "13.2.4",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+ "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
"dev": true,
"requires": {
"cliui": "^5.0.0",
@@ -7926,7 +7943,8 @@
},
"yargs-parser": {
"version": "13.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+ "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
@@ -9354,8 +9372,7 @@
"js-sha3": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
- "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
- "dev": true
+ "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc="
},
"js-tokens": {
"version": "3.0.2",
@@ -10584,7 +10601,6 @@
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
"integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
- "dev": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -10593,8 +10609,7 @@
"yallist": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
- "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
- "dev": true
+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
}
}
},
@@ -10608,7 +10623,6 @@
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
"integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
- "dev": true,
"requires": {
"minipass": "^2.9.0"
}
@@ -11181,17 +11195,20 @@
"dependencies": {
"ansi-regex": {
"version": "2.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true
},
"code-point-at": {
"version": "1.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true
},
"cross-spawn": {
"version": "5.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
"dev": true,
"requires": {
"lru-cache": "^4.0.1",
@@ -11201,12 +11218,14 @@
},
"decamelize": {
"version": "1.2.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
"dev": true
},
"execa": {
"version": "0.7.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
"dev": true,
"requires": {
"cross-spawn": "^5.0.1",
@@ -11220,7 +11239,8 @@
},
"find-up": {
"version": "2.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"dev": true,
"requires": {
"locate-path": "^2.0.0"
@@ -11228,22 +11248,26 @@
},
"get-caller-file": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+ "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
"dev": true
},
"get-stream": {
"version": "3.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+ "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
"dev": true
},
"invert-kv": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+ "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
"dev": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
"number-is-nan": "^1.0.0"
@@ -11251,17 +11275,20 @@
},
"is-stream": {
"version": "1.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
"dev": true
},
"isexe": {
"version": "2.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
"dev": true
},
"lcid": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
"dev": true,
"requires": {
"invert-kv": "^1.0.0"
@@ -11269,7 +11296,8 @@
},
"locate-path": {
"version": "2.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"dev": true,
"requires": {
"p-locate": "^2.0.0",
@@ -11278,7 +11306,8 @@
},
"lru-cache": {
"version": "4.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+ "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
"dev": true,
"requires": {
"pseudomap": "^1.0.2",
@@ -11287,7 +11316,8 @@
},
"mem": {
"version": "1.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
"dev": true,
"requires": {
"mimic-fn": "^1.0.0"
@@ -11295,17 +11325,20 @@
},
"mimic-fn": {
"version": "1.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+ "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
"dev": true
},
"minimist": {
"version": "0.0.8",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
},
"mkdirp": {
"version": "0.5.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"requires": {
"minimist": "0.0.8"
@@ -11313,7 +11346,8 @@
},
"npm-run-path": {
"version": "2.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
"dev": true,
"requires": {
"path-key": "^2.0.0"
@@ -11321,12 +11355,14 @@
},
"number-is-nan": {
"version": "1.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true
},
"os-locale": {
"version": "2.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
"dev": true,
"requires": {
"execa": "^0.7.0",
@@ -11336,17 +11372,20 @@
},
"p-finally": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
"dev": true
},
"p-limit": {
"version": "1.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
+ "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
"dev": true
},
"p-locate": {
"version": "2.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"dev": true,
"requires": {
"p-limit": "^1.1.0"
@@ -11354,37 +11393,44 @@
},
"path-exists": {
"version": "3.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
"dev": true
},
"path-key": {
"version": "2.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
"dev": true
},
"pseudomap": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
"dev": true
},
"require-directory": {
"version": "2.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
"dev": true
},
"require-main-filename": {
"version": "1.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
"dev": true
},
"set-blocking": {
"version": "2.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"dev": true
},
"shebang-command": {
"version": "1.2.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
"dev": true,
"requires": {
"shebang-regex": "^1.0.0"
@@ -11392,17 +11438,20 @@
},
"shebang-regex": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
"dev": true
},
"signal-exit": {
"version": "3.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true
},
"string-width": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
"code-point-at": "^1.0.0",
@@ -11412,7 +11461,8 @@
},
"strip-ansi": {
"version": "3.0.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
"ansi-regex": "^2.0.0"
@@ -11420,12 +11470,14 @@
},
"strip-eof": {
"version": "1.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
"dev": true
},
"which": {
"version": "1.3.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+ "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
@@ -11433,12 +11485,14 @@
},
"which-module": {
"version": "2.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
"wrap-ansi": {
"version": "2.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"dev": true,
"requires": {
"string-width": "^1.0.1",
@@ -11447,17 +11501,20 @@
},
"y18n": {
"version": "3.2.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+ "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
"dev": true
},
"yallist": {
"version": "2.1.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
"dev": true
},
"yargs": {
"version": "10.0.3",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz",
+ "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==",
"dev": true,
"requires": {
"cliui": "^3.2.0",
@@ -11476,12 +11533,14 @@
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true
},
"cliui": {
"version": "3.2.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
"dev": true,
"requires": {
"string-width": "^1.0.1",
@@ -11491,7 +11550,8 @@
"dependencies": {
"string-width": {
"version": "1.0.2",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
"code-point-at": "^1.0.0",
@@ -11503,7 +11563,8 @@
},
"string-width": {
"version": "2.1.1",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"dev": true,
"requires": {
"is-fullwidth-code-point": "^2.0.0",
@@ -11512,12 +11573,14 @@
"dependencies": {
"is-fullwidth-code-point": {
"version": "2.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
"dev": true
},
"strip-ansi": {
"version": "4.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
"ansi-regex": "^3.0.0"
@@ -11529,7 +11592,8 @@
},
"yargs-parser": {
"version": "8.0.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz",
+ "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=",
"dev": true,
"requires": {
"camelcase": "^4.1.0"
@@ -11537,7 +11601,8 @@
"dependencies": {
"camelcase": {
"version": "4.1.0",
- "bundled": true,
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
"dev": true
}
}
@@ -11713,6 +11778,68 @@
"requires": {
"define-properties": "^1.1.3",
"es-abstract": "^1.17.0-next.1"
+ },
+ "dependencies": {
+ "es-abstract": {
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz",
+ "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==",
+ "dev": true,
+ "requires": {
+ "es-to-primitive": "^1.2.1",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-symbols": "^1.0.1",
+ "is-callable": "^1.1.5",
+ "is-regex": "^1.0.5",
+ "object-inspect": "^1.7.0",
+ "object-keys": "^1.1.1",
+ "object.assign": "^4.1.0",
+ "string.prototype.trimleft": "^2.1.1",
+ "string.prototype.trimright": "^2.1.1"
+ }
+ },
+ "is-callable": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+ "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+ "dev": true
+ },
+ "is-regex": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+ "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+ "dev": true,
+ "requires": {
+ "has": "^1.0.3"
+ }
+ },
+ "object-keys": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+ "dev": true
+ },
+ "string.prototype.trimleft": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
+ "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.3",
+ "function-bind": "^1.1.1"
+ }
+ },
+ "string.prototype.trimright": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
+ "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.3",
+ "function-bind": "^1.1.1"
+ }
+ }
}
},
"object.omit": {
@@ -13086,6 +13213,77 @@
"dev": true,
"requires": {
"remix-lib": "0.4.22"
+ },
+ "dependencies": {
+ "ethereumjs-vm": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-4.1.1.tgz",
+ "integrity": "sha512-Bh2avDY9Hyon9TvJ/fmkdyd5JDnmTudLJ5oKhmTfXn0Jjq7UzP4YRNp7e5PWoWXSmdXAGXU9W0DXK5TV9Qy/NQ==",
+ "dev": true,
+ "requires": {
+ "async": "^2.1.2",
+ "async-eventemitter": "^0.2.2",
+ "core-js-pure": "^3.0.1",
+ "ethereumjs-account": "^3.0.0",
+ "ethereumjs-block": "^2.2.1",
+ "ethereumjs-blockchain": "^4.0.2",
+ "ethereumjs-common": "^1.3.2",
+ "ethereumjs-tx": "^2.1.1",
+ "ethereumjs-util": "~6.1.0",
+ "fake-merkle-patricia-tree": "^1.0.1",
+ "functional-red-black-tree": "^1.0.1",
+ "merkle-patricia-tree": "^2.3.2",
+ "rustbn.js": "~0.2.0",
+ "safe-buffer": "^5.1.1",
+ "util.promisify": "^1.0.0"
+ },
+ "dependencies": {
+ "ethereumjs-util": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
+ "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
+ "dev": true,
+ "requires": {
+ "bn.js": "^4.11.0",
+ "create-hash": "^1.1.2",
+ "ethjs-util": "0.1.6",
+ "keccak": "^1.0.2",
+ "rlp": "^2.0.0",
+ "safe-buffer": "^5.1.1",
+ "secp256k1": "^3.0.1"
+ }
+ }
+ }
+ },
+ "keccak": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz",
+ "integrity": "sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw==",
+ "dev": true,
+ "requires": {
+ "bindings": "^1.2.1",
+ "inherits": "^2.0.3",
+ "nan": "^2.2.1",
+ "safe-buffer": "^5.1.0"
+ }
+ },
+ "remix-lib": {
+ "version": "0.4.19",
+ "resolved": "https://registry.npmjs.org/remix-lib/-/remix-lib-0.4.19.tgz",
+ "integrity": "sha512-TJ2PATzCsXIRR+khB6nBIjhPAY1c9lxhKyp+csbrkoYTUw+LcifAvvQA3W0FPRgoWZI3JFE2Vbt0WMvVOMLjhA==",
+ "dev": true,
+ "requires": {
+ "async": "^2.1.2",
+ "ethereumjs-block": "^2.2.1",
+ "ethereumjs-tx": "^2.1.1",
+ "ethereumjs-util": "^6.2.0",
+ "ethereumjs-vm": "4.1.1",
+ "ethers": "^4.0.40",
+ "events": "^3.0.0",
+ "solc": "^0.6.0",
+ "web3": "^1.2.4"
+ }
+ }
}
},
"remix-debug": {
@@ -13849,6 +14047,50 @@
"websocket": "^1.0.24"
},
"dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "eventemitter3": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.1.1.tgz",
+ "integrity": "sha1-R3hr2qCHyvext15zq8XH1UAVjNA="
+ },
+ "got": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+ "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+ "requires": {
+ "decompress-response": "^3.2.0",
+ "duplexer3": "^0.1.4",
+ "get-stream": "^3.0.0",
+ "is-plain-obj": "^1.1.0",
+ "is-retry-allowed": "^1.0.0",
+ "is-stream": "^1.0.0",
+ "isurl": "^1.0.0-alpha5",
+ "lowercase-keys": "^1.0.0",
+ "p-cancelable": "^0.3.0",
+ "p-timeout": "^1.1.1",
+ "safe-buffer": "^5.0.1",
+ "timed-out": "^4.0.0",
+ "url-parse-lax": "^1.0.0",
+ "url-to-options": "^1.0.1"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ },
+ "uuid": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
+ "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w="
+ },
"web3": {
"version": "1.0.0-beta.27",
"resolved": "https://registry.npmjs.org/web3/-/web3-1.0.0-beta.27.tgz",
@@ -13862,44 +14104,315 @@
"web3-shh": "1.0.0-beta.27",
"web3-utils": "1.0.0-beta.27"
}
- }
- }
- },
- "remove-trailing-separator": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
- "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
- },
- "repeat-element": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
- "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
- },
- "repeat-string": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
- "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
- },
- "repeating": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
- "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
- "requires": {
- "is-finite": "^1.0.0"
- }
- },
- "request": {
- "version": "2.88.0",
- "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
- "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
- "requires": {
- "aws-sign2": "~0.7.0",
- "aws4": "^1.8.0",
- "caseless": "~0.12.0",
- "combined-stream": "~1.0.6",
- "extend": "~3.0.2",
- "forever-agent": "~0.6.1",
- "form-data": "~2.3.2",
+ },
+ "web3-bzz": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.0.0-beta.27.tgz",
+ "integrity": "sha1-Tmggpc/nOqsG2CV59FBFD76YIqM=",
+ "requires": {
+ "got": "7.1.0",
+ "swarm-js": "0.1.37",
+ "underscore": "1.8.3"
+ }
+ },
+ "web3-core": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.0.0-beta.27.tgz",
+ "integrity": "sha1-TQCb9x5Yt5F2E0EpF+/5ERO0N8M=",
+ "requires": {
+ "web3-core-helpers": "1.0.0-beta.27",
+ "web3-core-method": "1.0.0-beta.27",
+ "web3-core-requestmanager": "1.0.0-beta.27",
+ "web3-utils": "1.0.0-beta.27"
+ }
+ },
+ "web3-core-helpers": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.27.tgz",
+ "integrity": "sha1-6wlPrTfJ3B1wZt11Zimi1u+6B6I=",
+ "requires": {
+ "underscore": "1.8.3",
+ "web3-eth-iban": "1.0.0-beta.27",
+ "web3-utils": "1.0.0-beta.27"
+ }
+ },
+ "web3-core-method": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.0.0-beta.27.tgz",
+ "integrity": "sha1-3hTlQL1qdTfXBGcLSeY/BSYgG6o=",
+ "requires": {
+ "underscore": "1.8.3",
+ "web3-core-helpers": "1.0.0-beta.27",
+ "web3-core-promievent": "1.0.0-beta.27",
+ "web3-core-subscriptions": "1.0.0-beta.27",
+ "web3-utils": "1.0.0-beta.27"
+ }
+ },
+ "web3-core-promievent": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.27.tgz",
+ "integrity": "sha1-0lx9e75NU9+/3KBJ+e1LCmlUvrw=",
+ "requires": {
+ "bluebird": "3.3.1",
+ "eventemitter3": "1.1.1"
+ },
+ "dependencies": {
+ "bluebird": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.3.1.tgz",
+ "integrity": "sha1-+Xrhlw9B2FF3KDBT6aEgFg5mxh0="
+ }
+ }
+ },
+ "web3-core-requestmanager": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.27.tgz",
+ "integrity": "sha1-Vk7uJEoxCq5abGgyzeLA49wwHpg=",
+ "requires": {
+ "underscore": "1.8.3",
+ "web3-core-helpers": "1.0.0-beta.27",
+ "web3-providers-http": "1.0.0-beta.27",
+ "web3-providers-ipc": "1.0.0-beta.27",
+ "web3-providers-ws": "1.0.0-beta.27"
+ }
+ },
+ "web3-core-subscriptions": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.27.tgz",
+ "integrity": "sha1-VvKRy1Sn7PgNRzTXL1Sky8uJdzc=",
+ "requires": {
+ "eventemitter3": "1.1.1",
+ "underscore": "1.8.3",
+ "web3-core-helpers": "1.0.0-beta.27"
+ }
+ },
+ "web3-eth": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.0.0-beta.27.tgz",
+ "integrity": "sha1-hV3Q4BqU1Xhx/9j0n22eyqMXIas=",
+ "requires": {
+ "underscore": "1.8.3",
+ "web3-core": "1.0.0-beta.27",
+ "web3-core-helpers": "1.0.0-beta.27",
+ "web3-core-method": "1.0.0-beta.27",
+ "web3-core-subscriptions": "1.0.0-beta.27",
+ "web3-eth-abi": "1.0.0-beta.27",
+ "web3-eth-accounts": "1.0.0-beta.27",
+ "web3-eth-contract": "1.0.0-beta.27",
+ "web3-eth-iban": "1.0.0-beta.27",
+ "web3-eth-personal": "1.0.0-beta.27",
+ "web3-net": "1.0.0-beta.27",
+ "web3-utils": "1.0.0-beta.27"
+ }
+ },
+ "web3-eth-abi": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.27.tgz",
+ "integrity": "sha1-RS6dk3YVYL4yNE7juJddD7JLvb4=",
+ "requires": {
+ "bn.js": "4.11.6",
+ "underscore": "1.8.3",
+ "web3-core-helpers": "1.0.0-beta.27",
+ "web3-utils": "1.0.0-beta.27"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.11.6",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
+ }
+ }
+ },
+ "web3-eth-accounts": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.27.tgz",
+ "integrity": "sha1-mUDCjl48kg1nz2iH6pxS8c3Re3k=",
+ "requires": {
+ "bluebird": "3.3.1",
+ "crypto-browserify": "^3.12.0",
+ "eth-lib": "0.2.5",
+ "scrypt.js": "0.2.0",
+ "underscore": "1.8.3",
+ "uuid": "2.0.1",
+ "web3-core": "1.0.0-beta.27",
+ "web3-core-helpers": "1.0.0-beta.27",
+ "web3-core-method": "1.0.0-beta.27",
+ "web3-utils": "1.0.0-beta.27"
+ },
+ "dependencies": {
+ "bluebird": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.3.1.tgz",
+ "integrity": "sha1-+Xrhlw9B2FF3KDBT6aEgFg5mxh0="
+ },
+ "eth-lib": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.5.tgz",
+ "integrity": "sha512-pXs4ryU+7S8MPpkQpNqG4JlXEec87kbXowQbYzRVV+c5XUccrO6WOxVPDicxql1AXSBzfmBSFVkvvG+H4htuxg==",
+ "requires": {
+ "bn.js": "^4.11.6",
+ "elliptic": "^6.4.0",
+ "xhr-request-promise": "^0.1.2"
+ }
+ }
+ }
+ },
+ "web3-eth-contract": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.27.tgz",
+ "integrity": "sha1-AS96XVnaZ+KWxzWo8pcK7N0gfn0=",
+ "requires": {
+ "underscore": "1.8.3",
+ "web3-core": "1.0.0-beta.27",
+ "web3-core-helpers": "1.0.0-beta.27",
+ "web3-core-method": "1.0.0-beta.27",
+ "web3-core-promievent": "1.0.0-beta.27",
+ "web3-core-subscriptions": "1.0.0-beta.27",
+ "web3-eth-abi": "1.0.0-beta.27",
+ "web3-utils": "1.0.0-beta.27"
+ }
+ },
+ "web3-eth-iban": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.27.tgz",
+ "integrity": "sha1-RDPCj0F8Oa+WMzoGpK+h/NSqaEI=",
+ "requires": {
+ "bn.js": "^4.11.6",
+ "web3-utils": "1.0.0-beta.27"
+ }
+ },
+ "web3-eth-personal": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.27.tgz",
+ "integrity": "sha1-ukiaNIdkpKswOItcwcblm9bq7Ks=",
+ "requires": {
+ "web3-core": "1.0.0-beta.27",
+ "web3-core-helpers": "1.0.0-beta.27",
+ "web3-core-method": "1.0.0-beta.27",
+ "web3-net": "1.0.0-beta.27",
+ "web3-utils": "1.0.0-beta.27"
+ }
+ },
+ "web3-net": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.0.0-beta.27.tgz",
+ "integrity": "sha1-eulTbsOf7Rou6zjALm48jt/oq30=",
+ "requires": {
+ "web3-core": "1.0.0-beta.27",
+ "web3-core-method": "1.0.0-beta.27",
+ "web3-utils": "1.0.0-beta.27"
+ }
+ },
+ "web3-providers-http": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.0.0-beta.27.tgz",
+ "integrity": "sha1-LwrhYJvF5KNb4lgYzX/HfeBitqY=",
+ "requires": {
+ "web3-core-helpers": "1.0.0-beta.27",
+ "xhr2": "0.1.4"
+ }
+ },
+ "web3-providers-ipc": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.27.tgz",
+ "integrity": "sha1-oFwkIe/+TEfxX0efeSUTWtCUJ2I=",
+ "requires": {
+ "oboe": "2.1.3",
+ "underscore": "1.8.3",
+ "web3-core-helpers": "1.0.0-beta.27"
+ }
+ },
+ "web3-providers-ws": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.27.tgz",
+ "integrity": "sha1-bUZ4Geoi3foba6FJjTHZVU4rBt0=",
+ "requires": {
+ "underscore": "1.8.3",
+ "web3-core-helpers": "1.0.0-beta.27",
+ "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
+ },
+ "dependencies": {
+ "websocket": {
+ "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
+ "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
+ "requires": {
+ "debug": "^2.2.0",
+ "nan": "^2.3.3",
+ "typedarray-to-buffer": "^3.1.2",
+ "yaeti": "^0.0.6"
+ }
+ }
+ }
+ },
+ "web3-shh": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.0.0-beta.27.tgz",
+ "integrity": "sha1-b3bW6yoma769zwqjDFo62J82e38=",
+ "requires": {
+ "web3-core": "1.0.0-beta.27",
+ "web3-core-method": "1.0.0-beta.27",
+ "web3-core-subscriptions": "1.0.0-beta.27",
+ "web3-net": "1.0.0-beta.27"
+ }
+ },
+ "web3-utils": {
+ "version": "1.0.0-beta.27",
+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.27.tgz",
+ "integrity": "sha1-0JfVwzaha59sqbYK9o3RXAZDIUs=",
+ "requires": {
+ "bn.js": "4.11.6",
+ "eth-lib": "^0.1.27",
+ "ethjs-unit": "0.1.6",
+ "number-to-bn": "1.7.0",
+ "randomhex": "0.1.5",
+ "underscore": "1.8.3",
+ "utf8": "2.1.1"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.11.6",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+ "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
+ }
+ }
+ }
+ }
+ },
+ "remove-trailing-separator": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+ "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+ },
+ "repeat-element": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+ "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+ },
+ "repeat-string": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+ },
+ "repeating": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+ "requires": {
+ "is-finite": "^1.0.0"
+ }
+ },
+ "request": {
+ "version": "2.88.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+ "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+ "requires": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
"har-validator": "~5.1.0",
"http-signature": "~1.2.0",
"is-typedarray": "~1.0.0",
@@ -14122,15 +14635,23 @@
"requires": {
"scrypt": "^6.0.2",
"scryptsy": "^1.2.1"
+ },
+ "dependencies": {
+ "scryptsy": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-1.2.1.tgz",
+ "integrity": "sha1-oyJfpLJST4AnAHYeKFW987LZIWM=",
+ "requires": {
+ "pbkdf2": "^3.0.3"
+ }
+ }
}
},
"scryptsy": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-1.2.1.tgz",
- "integrity": "sha1-oyJfpLJST4AnAHYeKFW987LZIWM=",
- "requires": {
- "pbkdf2": "^3.0.3"
- }
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz",
+ "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==",
+ "dev": true
},
"secp256k1": {
"version": "3.8.0",
@@ -17082,213 +17603,6 @@
}
}
},
- "web3-bzz": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.0.0-beta.27.tgz",
- "integrity": "sha1-Tmggpc/nOqsG2CV59FBFD76YIqM=",
- "requires": {
- "got": "7.1.0",
- "swarm-js": "0.1.37",
- "underscore": "1.8.3"
- },
- "dependencies": {
- "got": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
- "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
- "requires": {
- "decompress-response": "^3.2.0",
- "duplexer3": "^0.1.4",
- "get-stream": "^3.0.0",
- "is-plain-obj": "^1.1.0",
- "is-retry-allowed": "^1.0.0",
- "is-stream": "^1.0.0",
- "isurl": "^1.0.0-alpha5",
- "lowercase-keys": "^1.0.0",
- "p-cancelable": "^0.3.0",
- "p-timeout": "^1.1.1",
- "safe-buffer": "^5.0.1",
- "timed-out": "^4.0.0",
- "url-parse-lax": "^1.0.0",
- "url-to-options": "^1.0.1"
- }
- }
- }
- },
- "web3-core": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.0.0-beta.27.tgz",
- "integrity": "sha1-TQCb9x5Yt5F2E0EpF+/5ERO0N8M=",
- "requires": {
- "web3-core-helpers": "1.0.0-beta.27",
- "web3-core-method": "1.0.0-beta.27",
- "web3-core-requestmanager": "1.0.0-beta.27",
- "web3-utils": "1.0.0-beta.27"
- }
- },
- "web3-core-helpers": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.27.tgz",
- "integrity": "sha1-6wlPrTfJ3B1wZt11Zimi1u+6B6I=",
- "requires": {
- "underscore": "1.8.3",
- "web3-eth-iban": "1.0.0-beta.27",
- "web3-utils": "1.0.0-beta.27"
- }
- },
- "web3-core-method": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.0.0-beta.27.tgz",
- "integrity": "sha1-3hTlQL1qdTfXBGcLSeY/BSYgG6o=",
- "requires": {
- "underscore": "1.8.3",
- "web3-core-helpers": "1.0.0-beta.27",
- "web3-core-promievent": "1.0.0-beta.27",
- "web3-core-subscriptions": "1.0.0-beta.27",
- "web3-utils": "1.0.0-beta.27"
- }
- },
- "web3-core-promievent": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.27.tgz",
- "integrity": "sha1-0lx9e75NU9+/3KBJ+e1LCmlUvrw=",
- "requires": {
- "bluebird": "3.3.1",
- "eventemitter3": "1.1.1"
- },
- "dependencies": {
- "bluebird": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.3.1.tgz",
- "integrity": "sha1-+Xrhlw9B2FF3KDBT6aEgFg5mxh0="
- },
- "eventemitter3": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.1.1.tgz",
- "integrity": "sha1-R3hr2qCHyvext15zq8XH1UAVjNA="
- }
- }
- },
- "web3-core-requestmanager": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.27.tgz",
- "integrity": "sha1-Vk7uJEoxCq5abGgyzeLA49wwHpg=",
- "requires": {
- "underscore": "1.8.3",
- "web3-core-helpers": "1.0.0-beta.27",
- "web3-providers-http": "1.0.0-beta.27",
- "web3-providers-ipc": "1.0.0-beta.27",
- "web3-providers-ws": "1.0.0-beta.27"
- }
- },
- "web3-core-subscriptions": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.27.tgz",
- "integrity": "sha1-VvKRy1Sn7PgNRzTXL1Sky8uJdzc=",
- "requires": {
- "eventemitter3": "1.1.1",
- "underscore": "1.8.3",
- "web3-core-helpers": "1.0.0-beta.27"
- },
- "dependencies": {
- "eventemitter3": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.1.1.tgz",
- "integrity": "sha1-R3hr2qCHyvext15zq8XH1UAVjNA="
- }
- }
- },
- "web3-eth": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.0.0-beta.27.tgz",
- "integrity": "sha1-hV3Q4BqU1Xhx/9j0n22eyqMXIas=",
- "requires": {
- "underscore": "1.8.3",
- "web3-core": "1.0.0-beta.27",
- "web3-core-helpers": "1.0.0-beta.27",
- "web3-core-method": "1.0.0-beta.27",
- "web3-core-subscriptions": "1.0.0-beta.27",
- "web3-eth-abi": "1.0.0-beta.27",
- "web3-eth-accounts": "1.0.0-beta.27",
- "web3-eth-contract": "1.0.0-beta.27",
- "web3-eth-iban": "1.0.0-beta.27",
- "web3-eth-personal": "1.0.0-beta.27",
- "web3-net": "1.0.0-beta.27",
- "web3-utils": "1.0.0-beta.27"
- }
- },
- "web3-eth-abi": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.27.tgz",
- "integrity": "sha1-RS6dk3YVYL4yNE7juJddD7JLvb4=",
- "requires": {
- "bn.js": "4.11.6",
- "underscore": "1.8.3",
- "web3-core-helpers": "1.0.0-beta.27",
- "web3-utils": "1.0.0-beta.27"
- },
- "dependencies": {
- "bn.js": {
- "version": "4.11.6",
- "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
- "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
- }
- }
- },
- "web3-eth-accounts": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.27.tgz",
- "integrity": "sha1-mUDCjl48kg1nz2iH6pxS8c3Re3k=",
- "requires": {
- "bluebird": "3.3.1",
- "crypto-browserify": "^3.12.0",
- "eth-lib": "0.2.5",
- "scrypt.js": "0.2.0",
- "underscore": "1.8.3",
- "uuid": "2.0.1",
- "web3-core": "1.0.0-beta.27",
- "web3-core-helpers": "1.0.0-beta.27",
- "web3-core-method": "1.0.0-beta.27",
- "web3-utils": "1.0.0-beta.27"
- },
- "dependencies": {
- "bluebird": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.3.1.tgz",
- "integrity": "sha1-+Xrhlw9B2FF3KDBT6aEgFg5mxh0="
- },
- "eth-lib": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.5.tgz",
- "integrity": "sha512-pXs4ryU+7S8MPpkQpNqG4JlXEec87kbXowQbYzRVV+c5XUccrO6WOxVPDicxql1AXSBzfmBSFVkvvG+H4htuxg==",
- "requires": {
- "bn.js": "^4.11.6",
- "elliptic": "^6.4.0",
- "xhr-request-promise": "^0.1.2"
- }
- },
- "uuid": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz",
- "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w="
- }
- }
- },
- "web3-eth-contract": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.27.tgz",
- "integrity": "sha1-AS96XVnaZ+KWxzWo8pcK7N0gfn0=",
- "requires": {
- "underscore": "1.8.3",
- "web3-core": "1.0.0-beta.27",
- "web3-core-helpers": "1.0.0-beta.27",
- "web3-core-method": "1.0.0-beta.27",
- "web3-core-promievent": "1.0.0-beta.27",
- "web3-core-subscriptions": "1.0.0-beta.27",
- "web3-eth-abi": "1.0.0-beta.27",
- "web3-utils": "1.0.0-beta.27"
- }
- },
"web3-eth-ens": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.2.4.tgz",
@@ -17576,123 +17890,6 @@
}
}
},
- "web3-eth-iban": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.27.tgz",
- "integrity": "sha1-RDPCj0F8Oa+WMzoGpK+h/NSqaEI=",
- "requires": {
- "bn.js": "^4.11.6",
- "web3-utils": "1.0.0-beta.27"
- }
- },
- "web3-eth-personal": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.27.tgz",
- "integrity": "sha1-ukiaNIdkpKswOItcwcblm9bq7Ks=",
- "requires": {
- "web3-core": "1.0.0-beta.27",
- "web3-core-helpers": "1.0.0-beta.27",
- "web3-core-method": "1.0.0-beta.27",
- "web3-net": "1.0.0-beta.27",
- "web3-utils": "1.0.0-beta.27"
- }
- },
- "web3-net": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.0.0-beta.27.tgz",
- "integrity": "sha1-eulTbsOf7Rou6zjALm48jt/oq30=",
- "requires": {
- "web3-core": "1.0.0-beta.27",
- "web3-core-method": "1.0.0-beta.27",
- "web3-utils": "1.0.0-beta.27"
- }
- },
- "web3-providers-http": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.0.0-beta.27.tgz",
- "integrity": "sha1-LwrhYJvF5KNb4lgYzX/HfeBitqY=",
- "requires": {
- "web3-core-helpers": "1.0.0-beta.27",
- "xhr2": "0.1.4"
- }
- },
- "web3-providers-ipc": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.27.tgz",
- "integrity": "sha1-oFwkIe/+TEfxX0efeSUTWtCUJ2I=",
- "requires": {
- "oboe": "2.1.3",
- "underscore": "1.8.3",
- "web3-core-helpers": "1.0.0-beta.27"
- }
- },
- "web3-providers-ws": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.27.tgz",
- "integrity": "sha1-bUZ4Geoi3foba6FJjTHZVU4rBt0=",
- "requires": {
- "underscore": "1.8.3",
- "web3-core-helpers": "1.0.0-beta.27",
- "websocket": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible"
- },
- "dependencies": {
- "debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "requires": {
- "ms": "2.0.0"
- }
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
- },
- "websocket": {
- "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
- "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
- "requires": {
- "debug": "^2.2.0",
- "nan": "^2.3.3",
- "typedarray-to-buffer": "^3.1.2",
- "yaeti": "^0.0.6"
- }
- }
- }
- },
- "web3-shh": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.0.0-beta.27.tgz",
- "integrity": "sha1-b3bW6yoma769zwqjDFo62J82e38=",
- "requires": {
- "web3-core": "1.0.0-beta.27",
- "web3-core-method": "1.0.0-beta.27",
- "web3-core-subscriptions": "1.0.0-beta.27",
- "web3-net": "1.0.0-beta.27"
- }
- },
- "web3-utils": {
- "version": "1.0.0-beta.27",
- "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.27.tgz",
- "integrity": "sha1-0JfVwzaha59sqbYK9o3RXAZDIUs=",
- "requires": {
- "bn.js": "4.11.6",
- "eth-lib": "^0.1.27",
- "ethjs-unit": "0.1.6",
- "number-to-bn": "1.7.0",
- "randomhex": "0.1.5",
- "underscore": "1.8.3",
- "utf8": "2.1.1"
- },
- "dependencies": {
- "bn.js": {
- "version": "4.11.6",
- "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
- "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
- }
- }
- },
"websocket": {
"version": "1.0.31",
"resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz",
@@ -17937,8 +18134,7 @@
"xmlhttprequest": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
- "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
- "dev": true
+ "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="
},
"xregexp": {
"version": "2.0.0",
diff --git a/src/app/tabs/runTab/model/recorder.js b/src/app/tabs/runTab/model/recorder.js
index e56cdb5374..1925de0358 100644
--- a/src/app/tabs/runTab/model/recorder.js
+++ b/src/app/tabs/runTab/model/recorder.js
@@ -212,6 +212,8 @@ class Recorder {
fnABI = txHelper.getConstructorInterface(abi)
} else if (tx.record.type === 'fallback') {
fnABI = txHelper.getFallbackInterface(abi)
+ } else if (tx.record.type === 'receive') {
+ fnABI = txHelper.getReceiveInterface(abi)
} else {
fnABI = txHelper.getFunction(abi, record.name + record.inputs)
}
diff --git a/src/app/ui/multiParamManager.js b/src/app/ui/multiParamManager.js
index ab56d80b83..8c1d9bb780 100644
--- a/src/app/ui/multiParamManager.js
+++ b/src/app/ui/multiParamManager.js
@@ -113,7 +113,7 @@ class MultiParamManager {
} else if (this.funABI.name) {
title = this.funABI.name
} else {
- title = '(fallback)'
+ title = this.funABI.type === 'receive' ? '(receive)' : '(fallback)'
}
this.basicInputField = yo``
@@ -121,7 +121,7 @@ class MultiParamManager {
this.basicInputField.setAttribute('title', this.inputs)
this.basicInputField.setAttribute('style', 'flex: 4')
- var onClick = (domEl) => {
+ var onClick = () => {
this.clickCallBack(this.funABI.inputs, this.basicInputField.value)
}
let funcButton = yo``
@@ -204,8 +204,9 @@ class MultiParamManager {
if (this.funABI.inputs && this.funABI.inputs.length > 0) {
contractProperty.classList.add(css.hasArgs)
- } else if (this.funABI.type === 'fallback') {
+ } else if (this.funABI.type === 'fallback' || this.funABI.type === 'receive') {
contractProperty.classList.add(css.hasArgs)
+ this.basicInputField.setAttribute('title', `'(${this.funABI.type}')`) // probably should pass name instead
this.contractActionsContainerSingle.querySelector('i').style.visibility = 'hidden'
} else {
this.contractActionsContainerSingle.querySelector('i').style.visibility = 'hidden'
diff --git a/src/app/ui/universal-dapp-ui.js b/src/app/ui/universal-dapp-ui.js
index a02e616280..b797f96b1b 100644
--- a/src/app/ui/universal-dapp-ui.js
+++ b/src/app/ui/universal-dapp-ui.js
@@ -112,17 +112,6 @@ UniversalDAppUI.prototype.renderInstanceFromABI = function (contractABI, address
instance.appendChild(title)
instance.appendChild(contractActionsWrapper)
- // Add the fallback function
- var fallback = self.udapp.getFallbackInterface(contractABI)
- if (fallback) {
- contractActionsWrapper.appendChild(this.getCallButton({
- funABI: fallback,
- address: address,
- contractAbi: contractABI,
- contractName: contractName
- }))
- }
-
$.each(contractABI, (i, funABI) => {
if (funABI.type !== 'function') {
return
@@ -136,6 +125,108 @@ UniversalDAppUI.prototype.renderInstanceFromABI = function (contractABI, address
}))
})
+ this.calldataInput = yo`
+
+ `
+ this.amountInput = yo`
+
+ `
+ this.llIError = yo`
+
+ `
+ // constract LLInteractions elements
+ const lowLevelInteracions = yo`
+
+
+
+
+
+
+
+
+ ${this.amountInput}
+
+
+
+
+ ${this.calldataInput}
+
+
+
+
+ ${this.llIError}
+
+
${multiParamManager.render()}
`
+ contractActionsContainer.appendChild(outputOverride)
- const confirmationCb = (network, tx, gasEstimation, continueTxExecution, cancelCb) => {
- if (network.name !== 'Main') {
- return continueTxExecution(null)
- }
- var amount = Web3.utils.fromWei(typeConversion.toInt(tx.value), 'ether')
- var content = confirmDialog(tx, amount, gasEstimation, self.udapp,
- (gasPrice, cb) => {
- let txFeeText, priceStatus
- // TODO: this try catch feels like an anti pattern, can/should be
- // removed, but for now keeping the original logic
+ return contractActionsContainer
+}
+
+UniversalDAppUI.prototype.clickButton = function (args, valArr, inputsValue) {
+ let self = this
+ // check if it's a special function and add a name in case it is
+ const fuctionName = args.contractName +
+ (args.funABI.name ? args.funABI.name : args.funABI.type === 'receive' ? '(receive)' : '(fallback)')
+
+ const lookupOnly = args.funABI.stateMutability === 'view' || args.funABI.stateMutability === 'pure' || !!args.funABI.constant
+ const logMsg = lookupOnly ? `transact to ${fuctionName}` : `call to ${fuctionName}`
+
+ var value = inputsValue
+
+ const confirmationCb = (network, tx, gasEstimation, continueTxExecution, cancelCb) => {
+ if (network.name !== 'Main') {
+ return continueTxExecution(null)
+ }
+ var amount = Web3.utils.fromWei(typeConversion.toInt(tx.value), 'ether')
+ var content = confirmDialog(tx, amount, gasEstimation, self.udapp,
+ (gasPrice, cb) => {
+ let txFeeText, priceStatus
+ // TODO: this try catch feels like an anti pattern, can/should be
+ // removed, but for now keeping the original logic
+ try {
+ var fee = Web3.utils.toBN(tx.gas).mul(Web3.utils.toBN(Web3.utils.toWei(gasPrice.toString(10), 'gwei')))
+ txFeeText = ' ' + Web3.utils.fromWei(fee.toString(10), 'ether') + ' Ether'
+ priceStatus = true
+ } catch (e) {
+ txFeeText = ' Please fix this issue before sending any transaction. ' + e.message
+ priceStatus = false
+ }
+ cb(txFeeText, priceStatus)
+ },
+ (cb) => {
+ self.executionContext.web3().eth.getGasPrice((error, gasPrice) => {
+ const warnMessage = ' Please fix this issue before sending any transaction. '
+ if (error) {
+ return cb('Unable to retrieve the current network gas price.' + warnMessage + error)
+ }
try {
- var fee = Web3.utils.toBN(tx.gas).mul(Web3.utils.toBN(Web3.utils.toWei(gasPrice.toString(10), 'gwei')))
- txFeeText = ' ' + Web3.utils.fromWei(fee.toString(10), 'ether') + ' Ether'
- priceStatus = true
+ var gasPriceValue = Web3.utils.fromWei(gasPrice.toString(10), 'gwei')
+ cb(null, gasPriceValue)
} catch (e) {
- txFeeText = ' Please fix this issue before sending any transaction. ' + e.message
- priceStatus = false
+ cb(warnMessage + e.message, null, false)
+ }
+ })
+ }
+ )
+ modalDialog(
+ 'Confirm transaction',
+ content,
+ { label: 'Confirm',
+ fn: () => {
+ self.udapp.config.setUnpersistedProperty(
+ 'doNotShowTransactionConfirmationAgain',
+ content.querySelector('input#confirmsetting').checked
+ )
+ // TODO: check if this is check is still valid given the refactor
+ if (!content.gasPriceStatus) {
+ cancelCb('Given gas price is not correct')
+ } else {
+ var gasPrice = Web3.utils.toWei(content.querySelector('#gasprice').value, 'gwei')
+ continueTxExecution(gasPrice)
+ }
+ }}, {
+ label: 'Cancel',
+ fn: () => {
+ return cancelCb('Transaction canceled by user.')
}
- cb(txFeeText, priceStatus)
- },
- (cb) => {
- self.executionContext.web3().eth.getGasPrice((error, gasPrice) => {
- const warnMessage = ' Please fix this issue before sending any transaction. '
- if (error) {
- return cb('Unable to retrieve the current network gas price.' + warnMessage + error)
- }
- try {
- var gasPriceValue = Web3.utils.fromWei(gasPrice.toString(10), 'gwei')
- cb(null, gasPriceValue)
- } catch (e) {
- cb(warnMessage + e.message, null, false)
- }
- })
}
)
+ }
+
+ const continueCb = (error, continueTxExecution, cancelCb) => {
+ if (error) {
+ const msg = typeof error !== 'string' ? error.message : error
modalDialog(
- 'Confirm transaction',
- content,
- { label: 'Confirm',
- fn: () => {
- self.udapp.config.setUnpersistedProperty(
- 'doNotShowTransactionConfirmationAgain',
- content.querySelector('input#confirmsetting').checked
- )
- // TODO: check if this is check is still valid given the refactor
- if (!content.gasPriceStatus) {
- cancelCb('Given gas price is not correct')
- } else {
- var gasPrice = Web3.utils.toWei(content.querySelector('#gasprice').value, 'gwei')
- continueTxExecution(gasPrice)
- }
- }}, {
- label: 'Cancel',
- fn: () => {
- return cancelCb('Transaction canceled by user.')
- }
- }
- )
+ 'Gas estimation failed',
+ yo`
+ Gas estimation errored with the following message (see below).
+ The transaction execution will likely fail. Do you want to force sending?
${msg}
+ `,
+ {
+ label: 'Send Transaction',
+ fn: () => continueTxExecution()
+ },
+ {
+ label: 'Cancel Transaction',
+ fn: () => cancelCb()
+ }
+ )
+ } else {
+ continueTxExecution()
}
+ }
- const continueCb = (error, continueTxExecution, cancelCb) => {
- if (error) {
- const msg = typeof error !== 'string' ? error.message : error
- modalDialog(
- 'Gas estimation failed',
- yo`
- Gas estimation errored with the following message (see below).
- The transaction execution will likely fail. Do you want to force sending?
${msg}
- `,
- {
- label: 'Send Transaction',
- fn: () => continueTxExecution()
- },
- {
- label: 'Cancel Transaction',
- fn: () => cancelCb()
- }
- )
- } else {
- continueTxExecution()
- }
- }
+ const outputCb = (decoded) => {
+ outputOverride.innerHTML = ''
+ outputOverride.appendChild(decoded)
+ }
- const outputCb = (decoded) => {
- outputOverride.innerHTML = ''
- outputOverride.appendChild(decoded)
- }
+ const promptCb = (okCb, cancelCb) => {
+ modalCustom.promptPassphrase('Passphrase requested', 'Personal mode is enabled. Please provide passphrase of account', '', okCb, cancelCb)
+ }
- const promptCb = (okCb, cancelCb) => {
- modalCustom.promptPassphrase('Passphrase requested', 'Personal mode is enabled. Please provide passphrase of account', '', okCb, cancelCb)
- }
+ const isSpecialFunction = args.funABI.type === 'fallback' || args.funABI.type === 'receive'
- // contractsDetails is used to resolve libraries
- txFormat.buildData(args.contractName, args.contractAbi, {}, false, args.funABI, args.funABI.type !== 'fallback' ? value : '', (error, data) => {
+ // contractsDetails is used to resolve libraries
+ txFormat.buildData(
+ args.contractName,
+ args.contractAbi,
+ {},
+ false,
+ args.funABI,
+ !isSpecialFunction ? value : '', // input parameters for the function to call
+ (error, data) => {
if (!error) {
if (!lookupOnly) {
self.logCallback(`${logMsg} pending ... `)
} else {
self.logCallback(`${logMsg}`)
}
- if (args.funABI.type === 'fallback') data.dataHex = value
+ if (isSpecialFunction) data.dataHex = value
self.udapp.callFunction(args.address, data, args.funABI, confirmationCb, continueCb, promptCb, (error, txResult) => {
if (!error) {
var isVM = self.executionContext.isVM()
@@ -286,17 +397,8 @@ UniversalDAppUI.prototype.getCallButton = function (args) {
}, (data, runTxCallback) => {
// called for libraries deployment
self.udapp.runTx(data, confirmationCb, runTxCallback)
- })
- }
-
- const multiParamManager = new MultiParamManager(lookupOnly, args.funABI, (valArray, inputsValues, domEl) => {
- clickButton(valArray, inputsValues, domEl)
- }, self.udapp.getInputs(args.funABI))
-
- const contractActionsContainer = yo`${multiParamManager.render()}
`
- contractActionsContainer.appendChild(outputOverride)
-
- return contractActionsContainer
+ }
+ )
}
module.exports = UniversalDAppUI