a
/
otterscan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/v2021.08.02-otterscan'

This commit is contained in:
Willian Mitsuda 2021-08-13 00:20:09 -03:00
parent 8bdf1fd457 022ff35975
commit ca1d60df47
47 changed files with 712 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
4bytes

@ -1 +1 @@
Subproject commit 81138213c12364db38d5acbb40c0cf46f2ecdbfe Subproject commit 79965318da56eed67366cf399ee5661b51af49cb

532
package-lock.json generated
View File

@ -14,10 +14,10 @@
"@fontsource/roboto": "^4.5.0", "@fontsource/roboto": "^4.5.0",
"@fontsource/roboto-mono": "^4.5.0", "@fontsource/roboto-mono": "^4.5.0",
"@fontsource/space-grotesk": "^4.5.0", "@fontsource/space-grotesk": "^4.5.0",
"@fortawesome/fontawesome-svg-core": "^1.2.35", "@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-brands-svg-icons": "^5.15.3", "@fortawesome/free-brands-svg-icons": "^5.15.4",
"@fortawesome/free-regular-svg-icons": "^5.15.3", "@fortawesome/free-regular-svg-icons": "^5.15.4",
"@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/react-fontawesome": "^0.1.15", "@fortawesome/react-fontawesome": "^0.1.15",
"@headlessui/react": "^1.4.0", "@headlessui/react": "^1.4.0",
"@testing-library/jest-dom": "^5.14.1", "@testing-library/jest-dom": "^5.14.1",
@ -25,7 +25,7 @@
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^12.1.10",
"@types/jest": "^26.0.24", "@types/jest": "^26.0.24",
"@types/node": "^14.17.5", "@types/node": "^14.17.5",
"@types/react": "^17.0.15", "@types/react": "^17.0.16",
"@types/react-blockies": "^1.4.1", "@types/react-blockies": "^1.4.1",
"@types/react-dom": "^17.0.9", "@types/react-dom": "^17.0.9",
"@types/react-router-dom": "^5.1.8", "@types/react-router-dom": "^5.1.8",
@ -48,6 +48,7 @@
"devDependencies": { "devDependencies": {
"autoprefixer": "^9.8.6", "autoprefixer": "^9.8.6",
"postcss": "^7.0.36", "postcss": "^7.0.36",
"source-map-explorer": "^2.5.2",
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.6" "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.6"
} }
}, },
@ -2012,57 +2013,57 @@
"integrity": "sha512-Kdnq5m31DsJ8l/VCpZGz4QpIxLLvNVh4MyVGY0PmDh7aY9aM5rmO2NF49dJ0749gLPgMW6Moc/xjgW95G0MbMg==" "integrity": "sha512-Kdnq5m31DsJ8l/VCpZGz4QpIxLLvNVh4MyVGY0PmDh7aY9aM5rmO2NF49dJ0749gLPgMW6Moc/xjgW95G0MbMg=="
}, },
"node_modules/@fortawesome/fontawesome-common-types": { "node_modules/@fortawesome/fontawesome-common-types": {
"version": "0.2.35", "version": "0.2.36",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
"integrity": "sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==", "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==",
"hasInstallScript": true, "hasInstallScript": true,
"engines": { "engines": {
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/@fortawesome/fontawesome-svg-core": { "node_modules/@fortawesome/fontawesome-svg-core": {
"version": "1.2.35", "version": "1.2.36",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz",
"integrity": "sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==", "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-common-types": "^0.2.35" "@fortawesome/fontawesome-common-types": "^0.2.36"
}, },
"engines": { "engines": {
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/@fortawesome/free-brands-svg-icons": { "node_modules/@fortawesome/free-brands-svg-icons": {
"version": "5.15.3", "version": "5.15.4",
"resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.3.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.4.tgz",
"integrity": "sha512-1hirPcbjj72ZJtFvdnXGPbAbpn3Ox6mH3g5STbANFp3vGSiE5u5ingAKV06mK6ZVqNYxUPlh4DlTnaIvLtF2kw==", "integrity": "sha512-f1witbwycL9cTENJegcmcZRYyawAFbm8+c6IirLmwbbpqz46wyjbQYLuxOc7weXFXfB7QR8/Vd2u5R3q6JYD9g==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-common-types": "^0.2.35" "@fortawesome/fontawesome-common-types": "^0.2.36"
}, },
"engines": { "engines": {
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/@fortawesome/free-regular-svg-icons": { "node_modules/@fortawesome/free-regular-svg-icons": {
"version": "5.15.3", "version": "5.15.4",
"resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.4.tgz",
"integrity": "sha512-q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==", "integrity": "sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-common-types": "^0.2.35" "@fortawesome/fontawesome-common-types": "^0.2.36"
}, },
"engines": { "engines": {
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/@fortawesome/free-solid-svg-icons": { "node_modules/@fortawesome/free-solid-svg-icons": {
"version": "5.15.3", "version": "5.15.4",
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz",
"integrity": "sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==", "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-common-types": "^0.2.35" "@fortawesome/fontawesome-common-types": "^0.2.36"
}, },
"engines": { "engines": {
"node": ">=6" "node": ">=6"
@ -3062,9 +3063,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/react": { "node_modules/@types/react": {
"version": "17.0.15", "version": "17.0.16",
"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.15.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.16.tgz",
"integrity": "sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==", "integrity": "sha512-3kCUiOOlQTwUUvjNFkbBTWMTxdTGybz/PfjCw9JmaRGcEDBQh+nGMg7/E9P2rklhJuYVd25IYLNcvqgSPCPksg==",
"dependencies": { "dependencies": {
"@types/prop-types": "*", "@types/prop-types": "*",
"@types/scheduler": "*", "@types/scheduler": "*",
@ -5268,6 +5269,18 @@
"node-int64": "^0.4.0" "node-int64": "^0.4.0"
} }
}, },
"node_modules/btoa": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
"integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
"dev": true,
"bin": {
"btoa": "bin/btoa.js"
},
"engines": {
"node": ">= 0.4.0"
}
},
"node_modules/buffer": { "node_modules/buffer": {
"version": "4.9.2", "version": "4.9.2",
"license": "MIT", "license": "MIT",
@ -8437,6 +8450,15 @@
"license": "MIT", "license": "MIT",
"optional": true "optional": true
}, },
"node_modules/filelist": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
"integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
"dev": true,
"dependencies": {
"minimatch": "^3.0.4"
}
},
"node_modules/filesize": { "node_modules/filesize": {
"version": "6.1.0", "version": "6.1.0",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
@ -10115,6 +10137,77 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/jake": {
"version": "10.8.2",
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
"integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
"dev": true,
"dependencies": {
"async": "0.9.x",
"chalk": "^2.4.2",
"filelist": "^1.0.1",
"minimatch": "^3.0.4"
},
"bin": {
"jake": "bin/cli.js"
},
"engines": {
"node": "*"
}
},
"node_modules/jake/node_modules/ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"dependencies": {
"color-convert": "^1.9.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/jake/node_modules/async": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
"dev": true
},
"node_modules/jake/node_modules/chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
"dev": true,
"dependencies": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
"supports-color": "^5.3.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/jake/node_modules/escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
"dev": true,
"engines": {
"node": ">=0.8.0"
}
},
"node_modules/jake/node_modules/supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"dev": true,
"dependencies": {
"has-flag": "^3.0.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/jest": { "node_modules/jest": {
"version": "26.6.0", "version": "26.6.0",
"license": "MIT", "license": "MIT",
@ -16156,6 +16249,136 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/source-map-explorer": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.5.2.tgz",
"integrity": "sha512-gBwOyCcHPHcdLbgw6Y6kgoH1uLKL6hN3zz0xJcNI2lpnElZliIlmSYAjUVwAWnc7+HscoTyh1ScR7ITtFuEnxg==",
"dev": true,
"dependencies": {
"btoa": "^1.2.1",
"chalk": "^4.1.0",
"convert-source-map": "^1.7.0",
"ejs": "^3.1.5",
"escape-html": "^1.0.3",
"glob": "^7.1.6",
"gzip-size": "^6.0.0",
"lodash": "^4.17.20",
"open": "^7.3.1",
"source-map": "^0.7.3",
"temp": "^0.9.4",
"yargs": "^16.2.0"
},
"bin": {
"sme": "bin/cli.js",
"source-map-explorer": "bin/cli.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/source-map-explorer/node_modules/cliui": {
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
"dev": true,
"dependencies": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
"wrap-ansi": "^7.0.0"
}
},
"node_modules/source-map-explorer/node_modules/ejs": {
"version": "3.1.6",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
"integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
"dev": true,
"dependencies": {
"jake": "^10.6.1"
},
"bin": {
"ejs": "bin/cli.js"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/source-map-explorer/node_modules/gzip-size": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
"integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
"dev": true,
"dependencies": {
"duplexer": "^0.1.2"
},
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/source-map-explorer/node_modules/source-map": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
"dev": true,
"engines": {
"node": ">= 8"
}
},
"node_modules/source-map-explorer/node_modules/wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
"dev": true,
"dependencies": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
"strip-ansi": "^6.0.0"
},
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
"node_modules/source-map-explorer/node_modules/y18n": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true,
"engines": {
"node": ">=10"
}
},
"node_modules/source-map-explorer/node_modules/yargs": {
"version": "16.2.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dev": true,
"dependencies": {
"cliui": "^7.0.2",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.0",
"y18n": "^5.0.5",
"yargs-parser": "^20.2.2"
},
"engines": {
"node": ">=10"
}
},
"node_modules/source-map-explorer/node_modules/yargs-parser": {
"version": "20.2.9",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
"dev": true,
"engines": {
"node": ">=10"
}
},
"node_modules/source-map-js": { "node_modules/source-map-js": {
"version": "0.6.2", "version": "0.6.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
@ -17138,6 +17361,19 @@
"node": ">=10" "node": ">=10"
} }
}, },
"node_modules/temp": {
"version": "0.9.4",
"resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz",
"integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
"dev": true,
"dependencies": {
"mkdirp": "^0.5.1",
"rimraf": "~2.6.2"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/temp-dir": { "node_modules/temp-dir": {
"version": "1.0.0", "version": "1.0.0",
"license": "MIT", "license": "MIT",
@ -17145,6 +17381,18 @@
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/temp/node_modules/rimraf": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"dev": true,
"dependencies": {
"glob": "^7.1.3"
},
"bin": {
"rimraf": "bin.js"
}
},
"node_modules/tempy": { "node_modules/tempy": {
"version": "0.3.0", "version": "0.3.0",
"license": "MIT", "license": "MIT",
@ -20450,40 +20698,40 @@
"integrity": "sha512-Kdnq5m31DsJ8l/VCpZGz4QpIxLLvNVh4MyVGY0PmDh7aY9aM5rmO2NF49dJ0749gLPgMW6Moc/xjgW95G0MbMg==" "integrity": "sha512-Kdnq5m31DsJ8l/VCpZGz4QpIxLLvNVh4MyVGY0PmDh7aY9aM5rmO2NF49dJ0749gLPgMW6Moc/xjgW95G0MbMg=="
}, },
"@fortawesome/fontawesome-common-types": { "@fortawesome/fontawesome-common-types": {
"version": "0.2.35", "version": "0.2.36",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
"integrity": "sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==" "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
}, },
"@fortawesome/fontawesome-svg-core": { "@fortawesome/fontawesome-svg-core": {
"version": "1.2.35", "version": "1.2.36",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz",
"integrity": "sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==", "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "^0.2.35" "@fortawesome/fontawesome-common-types": "^0.2.36"
} }
}, },
"@fortawesome/free-brands-svg-icons": { "@fortawesome/free-brands-svg-icons": {
"version": "5.15.3", "version": "5.15.4",
"resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.3.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.4.tgz",
"integrity": "sha512-1hirPcbjj72ZJtFvdnXGPbAbpn3Ox6mH3g5STbANFp3vGSiE5u5ingAKV06mK6ZVqNYxUPlh4DlTnaIvLtF2kw==", "integrity": "sha512-f1witbwycL9cTENJegcmcZRYyawAFbm8+c6IirLmwbbpqz46wyjbQYLuxOc7weXFXfB7QR8/Vd2u5R3q6JYD9g==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "^0.2.35" "@fortawesome/fontawesome-common-types": "^0.2.36"
} }
}, },
"@fortawesome/free-regular-svg-icons": { "@fortawesome/free-regular-svg-icons": {
"version": "5.15.3", "version": "5.15.4",
"resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.4.tgz",
"integrity": "sha512-q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==", "integrity": "sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "^0.2.35" "@fortawesome/fontawesome-common-types": "^0.2.36"
} }
}, },
"@fortawesome/free-solid-svg-icons": { "@fortawesome/free-solid-svg-icons": {
"version": "5.15.3", "version": "5.15.4",
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz",
"integrity": "sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==", "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "^0.2.35" "@fortawesome/fontawesome-common-types": "^0.2.36"
} }
}, },
"@fortawesome/react-fontawesome": { "@fortawesome/react-fontawesome": {
@ -21129,9 +21377,9 @@
"version": "1.5.4" "version": "1.5.4"
}, },
"@types/react": { "@types/react": {
"version": "17.0.15", "version": "17.0.16",
"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.15.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.16.tgz",
"integrity": "sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==", "integrity": "sha512-3kCUiOOlQTwUUvjNFkbBTWMTxdTGybz/PfjCw9JmaRGcEDBQh+nGMg7/E9P2rklhJuYVd25IYLNcvqgSPCPksg==",
"requires": { "requires": {
"@types/prop-types": "*", "@types/prop-types": "*",
"@types/scheduler": "*", "@types/scheduler": "*",
@ -22688,6 +22936,12 @@
"node-int64": "^0.4.0" "node-int64": "^0.4.0"
} }
}, },
"btoa": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
"integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
"dev": true
},
"buffer": { "buffer": {
"version": "4.9.2", "version": "4.9.2",
"requires": { "requires": {
@ -24808,6 +25062,15 @@
"version": "1.0.0", "version": "1.0.0",
"optional": true "optional": true
}, },
"filelist": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
"integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
"dev": true,
"requires": {
"minimatch": "^3.0.4"
}
},
"filesize": { "filesize": {
"version": "6.1.0" "version": "6.1.0"
}, },
@ -25855,6 +26118,61 @@
"istanbul-lib-report": "^3.0.0" "istanbul-lib-report": "^3.0.0"
} }
}, },
"jake": {
"version": "10.8.2",
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
"integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
"dev": true,
"requires": {
"async": "0.9.x",
"chalk": "^2.4.2",
"filelist": "^1.0.1",
"minimatch": "^3.0.4"
},
"dependencies": {
"ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"requires": {
"color-convert": "^1.9.0"
}
},
"async": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
"dev": true
},
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
"dev": true,
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
"supports-color": "^5.3.0"
}
},
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
"dev": true
},
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"dev": true,
"requires": {
"has-flag": "^3.0.0"
}
}
}
},
"jest": { "jest": {
"version": "26.6.0", "version": "26.6.0",
"requires": { "requires": {
@ -29964,6 +30282,101 @@
"source-map": { "source-map": {
"version": "0.6.1" "version": "0.6.1"
}, },
"source-map-explorer": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.5.2.tgz",
"integrity": "sha512-gBwOyCcHPHcdLbgw6Y6kgoH1uLKL6hN3zz0xJcNI2lpnElZliIlmSYAjUVwAWnc7+HscoTyh1ScR7ITtFuEnxg==",
"dev": true,
"requires": {
"btoa": "^1.2.1",
"chalk": "^4.1.0",
"convert-source-map": "^1.7.0",
"ejs": "^3.1.5",
"escape-html": "^1.0.3",
"glob": "^7.1.6",
"gzip-size": "^6.0.0",
"lodash": "^4.17.20",
"open": "^7.3.1",
"source-map": "^0.7.3",
"temp": "^0.9.4",
"yargs": "^16.2.0"
},
"dependencies": {
"cliui": {
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
"dev": true,
"requires": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
"wrap-ansi": "^7.0.0"
}
},
"ejs": {
"version": "3.1.6",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
"integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
"dev": true,
"requires": {
"jake": "^10.6.1"
}
},
"gzip-size": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
"integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
"dev": true,
"requires": {
"duplexer": "^0.1.2"
}
},
"source-map": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
"dev": true
},
"wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
"dev": true,
"requires": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
"strip-ansi": "^6.0.0"
}
},
"y18n": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true
},
"yargs": {
"version": "16.2.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dev": true,
"requires": {
"cliui": "^7.0.2",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.0",
"y18n": "^5.0.5",
"yargs-parser": "^20.2.2"
}
},
"yargs-parser": {
"version": "20.2.9",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
"dev": true
}
}
},
"source-map-js": { "source-map-js": {
"version": "0.6.2", "version": "0.6.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
@ -30657,6 +31070,27 @@
} }
} }
}, },
"temp": {
"version": "0.9.4",
"resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz",
"integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
"dev": true,
"requires": {
"mkdirp": "^0.5.1",
"rimraf": "~2.6.2"
},
"dependencies": {
"rimraf": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"dev": true,
"requires": {
"glob": "^7.1.3"
}
}
}
},
"temp-dir": { "temp-dir": {
"version": "1.0.0" "version": "1.0.0"
}, },

12
package.json
View File

@ -10,10 +10,10 @@
"@fontsource/roboto": "^4.5.0", "@fontsource/roboto": "^4.5.0",
"@fontsource/roboto-mono": "^4.5.0", "@fontsource/roboto-mono": "^4.5.0",
"@fontsource/space-grotesk": "^4.5.0", "@fontsource/space-grotesk": "^4.5.0",
"@fortawesome/fontawesome-svg-core": "^1.2.35", "@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-brands-svg-icons": "^5.15.3", "@fortawesome/free-brands-svg-icons": "^5.15.4",
"@fortawesome/free-regular-svg-icons": "^5.15.3", "@fortawesome/free-regular-svg-icons": "^5.15.4",
"@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/react-fontawesome": "^0.1.15", "@fortawesome/react-fontawesome": "^0.1.15",
"@headlessui/react": "^1.4.0", "@headlessui/react": "^1.4.0",
"@testing-library/jest-dom": "^5.14.1", "@testing-library/jest-dom": "^5.14.1",
@ -21,7 +21,7 @@
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^12.1.10",
"@types/jest": "^26.0.24", "@types/jest": "^26.0.24",
"@types/node": "^14.17.5", "@types/node": "^14.17.5",
"@types/react": "^17.0.15", "@types/react": "^17.0.16",
"@types/react-blockies": "^1.4.1", "@types/react-blockies": "^1.4.1",
"@types/react-dom": "^17.0.9", "@types/react-dom": "^17.0.9",
"@types/react-router-dom": "^5.1.8", "@types/react-router-dom": "^5.1.8",
@ -46,6 +46,7 @@
"build": "craco build", "build": "craco build",
"test": "craco test", "test": "craco test",
"eject": "react-scripts eject", "eject": "react-scripts eject",
"source-map-explorer": "source-map-explorer build/static/js/*.js",
"assets-start": "docker run --rm -p 3001:80 --name otterscan-assets -d -v$(pwd)/4bytes/signatures:/usr/share/nginx/html/signatures/ -v$(pwd)/trustwallet/blockchains/ethereum/assets:/usr/share/nginx/html/assets -v$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf nginx:1.21.1-alpine", "assets-start": "docker run --rm -p 3001:80 --name otterscan-assets -d -v$(pwd)/4bytes/signatures:/usr/share/nginx/html/signatures/ -v$(pwd)/trustwallet/blockchains/ethereum/assets:/usr/share/nginx/html/assets -v$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf nginx:1.21.1-alpine",
"assets-stop": "docker stop otterscan-assets", "assets-stop": "docker stop otterscan-assets",
"docker-build": "DOCKER_BUILDKIT=1 docker build -t otterscan -f Dockerfile .", "docker-build": "DOCKER_BUILDKIT=1 docker build -t otterscan -f Dockerfile .",
@ -73,6 +74,7 @@
"devDependencies": { "devDependencies": {
"autoprefixer": "^9.8.6", "autoprefixer": "^9.8.6",
"postcss": "^7.0.36", "postcss": "^7.0.36",
"source-map-explorer": "^2.5.2",
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.6" "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.6"
} }
} }

6
src/AddressTransactions.tsx
View File

@ -1,6 +1,6 @@
import React, { useState, useEffect, useMemo, useContext } from "react"; import React, { useState, useEffect, useMemo, useContext } from "react";
import { useParams, useLocation, useHistory } from "react-router-dom"; import { useParams, useLocation, useHistory } from "react-router-dom";
import { ethers } from "ethers"; import { getAddress, isAddress } from "@ethersproject/address";
import queryString from "query-string"; import queryString from "query-string";
import Blockies from "react-blockies"; import Blockies from "react-blockies";
import StandardFrame from "./StandardFrame"; import StandardFrame from "./StandardFrame";
@ -43,12 +43,12 @@ const AddressTransactions: React.FC = () => {
// If it looks like it is an ENS name, try to resolve it // If it looks like it is an ENS name, try to resolve it
useEffect(() => { useEffect(() => {
if (ethers.utils.isAddress(params.addressOrName)) { if (isAddress(params.addressOrName)) {
setENS(false); setENS(false);
setError(false); setError(false);
// Normalize to checksummed address // Normalize to checksummed address
const _checksummedAddress = ethers.utils.getAddress(params.addressOrName); const _checksummedAddress = getAddress(params.addressOrName);
if (_checksummedAddress !== params.addressOrName) { if (_checksummedAddress !== params.addressOrName) {
// Request came with a non-checksummed address; fix the URL // Request came with a non-checksummed address; fix the URL
history.replace( history.replace(

22
src/Block.tsx
View File

@ -1,8 +1,10 @@
import React, { useEffect, useMemo, useContext } from "react"; import React, { useEffect, useMemo, useContext } from "react";
import { useParams, NavLink } from "react-router-dom"; import { useParams, NavLink } from "react-router-dom";
import { BigNumber, ethers } from "ethers"; import { BigNumber } from "@ethersproject/bignumber";
import { commify } from "@ethersproject/units";
import { toUtf8String } from "@ethersproject/strings";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faBurn } from "@fortawesome/free-solid-svg-icons"; import { faBurn } from "@fortawesome/free-solid-svg-icons/faBurn";
import StandardFrame from "./StandardFrame"; import StandardFrame from "./StandardFrame";
import StandardSubtitle from "./StandardSubtitle"; import StandardSubtitle from "./StandardSubtitle";
import NavBlock from "./block/NavBlock"; import NavBlock from "./block/NavBlock";
@ -38,7 +40,7 @@ const Block: React.FC = () => {
const extraStr = useMemo(() => { const extraStr = useMemo(() => {
try { try {
return block && ethers.utils.toUtf8String(block.extraData); return block && toUtf8String(block.extraData);
} catch (err) { } catch (err) {
console.error("Error while converting block extra data to string"); console.error("Error while converting block extra data to string");
console.error(err); console.error(err);
@ -71,9 +73,7 @@ const Block: React.FC = () => {
{block && ( {block && (
<ContentFrame> <ContentFrame>
<InfoRow title="Block Height"> <InfoRow title="Block Height">
<span className="font-bold"> <span className="font-bold">{commify(block.number)}</span>
{ethers.utils.commify(block.number)}
</span>
</InfoRow> </InfoRow>
<InfoRow title="Timestamp"> <InfoRow title="Timestamp">
<Timestamp value={block.timestamp} /> <Timestamp value={block.timestamp} />
@ -109,9 +109,7 @@ const Block: React.FC = () => {
<InfoRow title="Uncles Reward"> <InfoRow title="Uncles Reward">
<TransactionValue value={block.unclesReward} /> <TransactionValue value={block.unclesReward} />
</InfoRow> </InfoRow>
<InfoRow title="Size"> <InfoRow title="Size">{commify(block.size)} bytes</InfoRow>
{ethers.utils.commify(block.size)} bytes
</InfoRow>
{block.baseFeePerGas && ( {block.baseFeePerGas && (
<InfoRow title="Base Fee"> <InfoRow title="Base Fee">
<span> <span>
@ -156,11 +154,9 @@ const Block: React.FC = () => {
<span className="font-data">{block.extraData}</span>) <span className="font-data">{block.extraData}</span>)
</InfoRow> </InfoRow>
<InfoRow title="Ether Price">N/A</InfoRow> <InfoRow title="Ether Price">N/A</InfoRow>
<InfoRow title="Difficult"> <InfoRow title="Difficult">{commify(block.difficulty)}</InfoRow>
{ethers.utils.commify(block.difficulty)}
</InfoRow>
<InfoRow title="Total Difficult"> <InfoRow title="Total Difficult">
{ethers.utils.commify(block.totalDifficulty.toString())} {commify(block.totalDifficulty.toString())}
</InfoRow> </InfoRow>
<InfoRow title="Hash"> <InfoRow title="Hash">
<HexValue value={block.hash} /> <HexValue value={block.hash} />

4
src/BlockTransactions.tsx
View File

@ -1,6 +1,6 @@
import React, { useMemo, useContext } from "react"; import React, { useMemo, useContext } from "react";
import { useParams, useLocation } from "react-router"; import { useParams, useLocation } from "react-router";
import { ethers } from "ethers"; import { BigNumber } from "@ethersproject/bignumber";
import queryString from "query-string"; import queryString from "query-string";
import StandardFrame from "./StandardFrame"; import StandardFrame from "./StandardFrame";
import BlockTransactionHeader from "./block/BlockTransactionHeader"; import BlockTransactionHeader from "./block/BlockTransactionHeader";
@ -30,7 +30,7 @@ const BlockTransactions: React.FC = () => {
} }
const blockNumber = useMemo( const blockNumber = useMemo(
() => ethers.BigNumber.from(params.blockNumber), () => BigNumber.from(params.blockNumber),
[params.blockNumber] [params.blockNumber]
); );

8
src/ConnectionErrorPanel.tsx
View File

@ -1,10 +1,8 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { import { faClock } from "@fortawesome/free-solid-svg-icons/faClock";
faClock, import { faCheckCircle } from "@fortawesome/free-solid-svg-icons/faCheckCircle";
faCheckCircle, import { faTimesCircle } from "@fortawesome/free-solid-svg-icons/faTimesCircle";
faTimesCircle,
} from "@fortawesome/free-solid-svg-icons";
import { ConnectionStatus } from "./types"; import { ConnectionStatus } from "./types";
import { OtterscanConfig } from "./useConfig"; import { OtterscanConfig } from "./useConfig";

6
src/Home.tsx
View File

@ -1,8 +1,8 @@
import React, { useState, useContext } from "react"; import React, { useState, useContext } from "react";
import { NavLink, useHistory } from "react-router-dom"; import { NavLink, useHistory } from "react-router-dom";
import { ethers } from "ethers"; import { commify } from "@ethersproject/units";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faBurn } from "@fortawesome/free-solid-svg-icons"; import { faBurn } from "@fortawesome/free-solid-svg-icons/faBurn";
import Logo from "./Logo"; import Logo from "./Logo";
import Timestamp from "./components/Timestamp"; import Timestamp from "./components/Timestamp";
import { RuntimeContext } from "./useRuntime"; import { RuntimeContext } from "./useRuntime";
@ -74,7 +74,7 @@ const Home: React.FC = () => {
className="mx-auto flex flex-col items-center space-y-1 mt-5 text-sm text-gray-500 hover:text-link-blue" className="mx-auto flex flex-col items-center space-y-1 mt-5 text-sm text-gray-500 hover:text-link-blue"
to={blockURL(latestBlock.number)} to={blockURL(latestBlock.number)}
> >
<div>Latest block: {ethers.utils.commify(latestBlock.number)}</div> <div>Latest block: {commify(latestBlock.number)}</div>
<Timestamp value={latestBlock.timestamp} /> <Timestamp value={latestBlock.timestamp} />
</NavLink> </NavLink>
)} )}

17
src/PriceBox.tsx
View File

@ -1,7 +1,8 @@
import React, { useState, useEffect, useMemo, useContext } from "react"; import React, { useState, useEffect, useMemo, useContext } from "react";
import { ethers } from "ethers"; import { Contract } from "@ethersproject/contracts";
import { commify, formatUnits } from "@ethersproject/units";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faGasPump } from "@fortawesome/free-solid-svg-icons"; import { faGasPump } from "@fortawesome/free-solid-svg-icons/faGasPump";
import AggregatorV3Interface from "@chainlink/contracts/abi/v0.8/AggregatorV3Interface.json"; import AggregatorV3Interface from "@chainlink/contracts/abi/v0.8/AggregatorV3Interface.json";
import { RuntimeContext } from "./useRuntime"; import { RuntimeContext } from "./useRuntime";
import { formatValue } from "./components/formatter"; import { formatValue } from "./components/formatter";
@ -19,17 +20,13 @@ const PriceBox: React.FC = () => {
const ethFeed = useMemo( const ethFeed = useMemo(
() => () =>
provider && provider &&
new ethers.Contract("eth-usd.data.eth", AggregatorV3Interface, provider), new Contract("eth-usd.data.eth", AggregatorV3Interface, provider),
[provider] [provider]
); );
const gasFeed = useMemo( const gasFeed = useMemo(
() => () =>
provider && provider &&
new ethers.Contract( new Contract("fast-gas-gwei.data.eth", AggregatorV3Interface, provider),
"fast-gas-gwei.data.eth",
AggregatorV3Interface,
provider
),
[provider] [provider]
); );
@ -57,9 +54,7 @@ const PriceBox: React.FC = () => {
} }
const price = latestPriceData.answer.div(10 ** (ETH_FEED_DECIMALS - 2)); const price = latestPriceData.answer.div(10 ** (ETH_FEED_DECIMALS - 2));
const formattedPrice = ethers.utils.commify( const formattedPrice = commify(formatUnits(price, 2));
ethers.utils.formatUnits(price, 2)
);
const timestamp = new Date(latestPriceData.updatedAt * 1000); const timestamp = new Date(latestPriceData.updatedAt * 1000);
return [formattedPrice, timestamp]; return [formattedPrice, timestamp];

7
src/Search.tsx
View File

@ -1,5 +1,6 @@
import { useLocation, useHistory } from "react-router-dom"; import { useLocation, useHistory } from "react-router-dom";
import { ethers } from "ethers"; import { isAddress } from "@ethersproject/address";
import { isHexString } from "@ethersproject/bytes";
import queryString from "query-string"; import queryString from "query-string";
type SearchParams = { type SearchParams = {
@ -12,11 +13,11 @@ const Search: React.FC = () => {
const qs = queryString.parse(location.search); const qs = queryString.parse(location.search);
const q = (qs.q ?? "").toString(); const q = (qs.q ?? "").toString();
if (ethers.utils.isAddress(q)) { if (isAddress(q)) {
history.replace(`/address/${q}`); history.replace(`/address/${q}`);
return <></>; return <></>;
} }
if (ethers.utils.isHexString(q, 32)) { if (isHexString(q, 32)) {
history.replace(`/tx/${q}`); history.replace(`/tx/${q}`);
return <></>; return <></>;
} }

2
src/TokenTransferItem.tsx
View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faCaretRight } from "@fortawesome/free-solid-svg-icons"; import { faCaretRight } from "@fortawesome/free-solid-svg-icons/faCaretRight";
import AddressHighlighter from "./components/AddressHighlighter"; import AddressHighlighter from "./components/AddressHighlighter";
import ValueHighlighter from "./components/ValueHighlighter"; import ValueHighlighter from "./components/ValueHighlighter";
import DecoratedAddressLink from "./components/DecoratedAddressLink"; import DecoratedAddressLink from "./components/DecoratedAddressLink";

4
src/block/BlockTransactionHeader.tsx
View File

@ -1,5 +1,5 @@
import React, { useContext } from "react"; import React, { useContext } from "react";
import { ethers } from "ethers"; import { BlockTag } from "@ethersproject/abstract-provider";
import StandardSubtitle from "../StandardSubtitle"; import StandardSubtitle from "../StandardSubtitle";
import BlockLink from "../components/BlockLink"; import BlockLink from "../components/BlockLink";
import NavBlock from "./NavBlock"; import NavBlock from "./NavBlock";
@ -8,7 +8,7 @@ import { useLatestBlockNumber } from "../useLatestBlock";
import { blockTxsURL } from "../url"; import { blockTxsURL } from "../url";
type BlockTransactionHeaderProps = { type BlockTransactionHeaderProps = {
blockTag: ethers.providers.BlockTag; blockTag: BlockTag;
}; };
const BlockTransactionHeader: React.FC<BlockTransactionHeaderProps> = ({ const BlockTransactionHeader: React.FC<BlockTransactionHeaderProps> = ({

10
src/block/NavBlock.tsx
View File

@ -1,16 +1,14 @@
import React from "react"; import React from "react";
import { ethers } from "ethers"; import { BlockTag } from "@ethersproject/abstract-provider";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { import { faChevronLeft } from "@fortawesome/free-solid-svg-icons/faChevronLeft";
faChevronLeft, import { faChevronRight } from "@fortawesome/free-solid-svg-icons/faChevronRight";
faChevronRight,
} from "@fortawesome/free-solid-svg-icons";
import NavButton from "./NavButton"; import NavButton from "./NavButton";
type NavBlockProps = { type NavBlockProps = {
blockNumber: number; blockNumber: number;
latestBlockNumber: number | undefined; latestBlockNumber: number | undefined;
urlBuilder?: (blockNumber: ethers.providers.BlockTag) => string; urlBuilder?: (blockNumber: BlockTag) => string;
}; };
const NavBlock: React.FC<NavBlockProps> = ({ const NavBlock: React.FC<NavBlockProps> = ({

4
src/block/NavButton.tsx
View File

@ -1,11 +1,11 @@
import { ethers } from "ethers";
import { NavLink } from "react-router-dom"; import { NavLink } from "react-router-dom";
import { BlockTag } from "@ethersproject/abstract-provider";
import { blockURL } from "../url"; import { blockURL } from "../url";
type NavButtonProps = { type NavButtonProps = {
blockNum: number; blockNum: number;
disabled?: boolean; disabled?: boolean;
urlBuilder?: (blockNumber: ethers.providers.BlockTag) => string; urlBuilder?: (blockNumber: BlockTag) => string;
}; };
const NavButton: React.FC<NavButtonProps> = ({ const NavButton: React.FC<NavButtonProps> = ({

7
src/components/BlockLink.tsx
View File

@ -1,17 +1,18 @@
import React from "react"; import React from "react";
import { NavLink } from "react-router-dom"; import { NavLink } from "react-router-dom";
import { ethers } from "ethers"; import { BlockTag } from "@ethersproject/abstract-provider";
import { commify } from "@ethersproject/units";
import { blockURL } from "../url"; import { blockURL } from "../url";
type BlockLinkProps = { type BlockLinkProps = {
blockTag: ethers.providers.BlockTag; blockTag: BlockTag;
}; };
const BlockLink: React.FC<BlockLinkProps> = ({ blockTag }) => { const BlockLink: React.FC<BlockLinkProps> = ({ blockTag }) => {
const isNum = typeof blockTag === "number"; const isNum = typeof blockTag === "number";
let text = blockTag; let text = blockTag;
if (isNum) { if (isNum) {
text = ethers.utils.commify(blockTag); text = commify(blockTag);
} }
return ( return (

5
src/components/Copy.tsx
View File

@ -1,7 +1,8 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faCopy, faCheckCircle } from "@fortawesome/free-regular-svg-icons"; import { faCopy } from "@fortawesome/free-regular-svg-icons/faCopy";
import { faCheck } from "@fortawesome/free-solid-svg-icons"; import { faCheckCircle } from "@fortawesome/free-regular-svg-icons/faCheckCircle";
import { faCheck } from "@fortawesome/free-solid-svg-icons/faCheck";
type CopyProps = { type CopyProps = {
value: string; value: string;

12
src/components/DecoratedAddressLink.tsx
View File

@ -1,12 +1,10 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { import { faStar } from "@fortawesome/free-solid-svg-icons/faStar";
faStar, import { faBomb } from "@fortawesome/free-solid-svg-icons/faBomb";
faBomb, import { faMoneyBillAlt } from "@fortawesome/free-solid-svg-icons/faMoneyBillAlt";
faMoneyBillAlt, import { faBurn } from "@fortawesome/free-solid-svg-icons/faBurn";
faBurn, import { faCoins } from "@fortawesome/free-solid-svg-icons/faCoins";
faCoins,
} from "@fortawesome/free-solid-svg-icons";
import TokenLogo from "./TokenLogo"; import TokenLogo from "./TokenLogo";
import AddressOrENSName from "./AddressOrENSName"; import AddressOrENSName from "./AddressOrENSName";
import { AddressContext, TokenMeta, ZERO_ADDRESS } from "../types"; import { AddressContext, TokenMeta, ZERO_ADDRESS } from "../types";

2
src/components/ExternalLink.tsx
View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons"; import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons/faExternalLinkAlt";
type ExternalLinkProps = { type ExternalLinkProps = {
href: string; href: string;

7
src/components/FormattedBalance.tsx
View File

@ -1,5 +1,6 @@
import React from "react"; import React from "react";
import { ethers, BigNumber } from "ethers"; import { BigNumber } from "@ethersproject/bignumber";
import { commify, formatUnits } from "@ethersproject/units";
type FormatterBalanceProps = { type FormatterBalanceProps = {
value: BigNumber; value: BigNumber;
@ -10,9 +11,7 @@ const FormattedBalance: React.FC<FormatterBalanceProps> = ({
value, value,
decimals = 18, decimals = 18,
}) => { }) => {
const formatted = ethers.utils.commify( const formatted = commify(formatUnits(value, decimals));
ethers.utils.formatUnits(value, decimals)
);
const stripZeroDec = formatted.endsWith(".0") const stripZeroDec = formatted.endsWith(".0")
? formatted.slice(0, formatted.length - 2) ? formatted.slice(0, formatted.length - 2)
: formatted; : formatted;

5
src/components/GasValue.tsx
View File

@ -1,12 +1,13 @@
import React from "react"; import React from "react";
import { BigNumber, ethers } from "ethers"; import { BigNumber } from "@ethersproject/bignumber";
import { commify, formatUnits } from "@ethersproject/units";
type GasValueProps = { type GasValueProps = {
value: BigNumber; value: BigNumber;
}; };
const GasValue: React.FC<GasValueProps> = ({ value }) => { const GasValue: React.FC<GasValueProps> = ({ value }) => {
return <>{ethers.utils.commify(ethers.utils.formatUnits(value, 0))}</>; return <>{commify(formatUnits(value, 0))}</>;
}; };
export default React.memo(GasValue); export default React.memo(GasValue);

2
src/components/InternalCreate.tsx
View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faAngleRight } from "@fortawesome/free-solid-svg-icons"; import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight";
import AddressHighlighter from "./AddressHighlighter"; import AddressHighlighter from "./AddressHighlighter";
import DecoratedAddressLink from "./DecoratedAddressLink"; import DecoratedAddressLink from "./DecoratedAddressLink";
import { TransactionData, InternalOperation } from "../types"; import { TransactionData, InternalOperation } from "../types";

6
src/components/InternalSelfDestruct.tsx
View File

@ -1,7 +1,7 @@
import React, { useContext } from "react"; import React, { useContext } from "react";
import { ethers } from "ethers"; import { formatEther } from "@ethersproject/units";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faAngleRight } from "@fortawesome/free-solid-svg-icons"; import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight";
import AddressHighlighter from "./AddressHighlighter"; import AddressHighlighter from "./AddressHighlighter";
import DecoratedAddressLink from "./DecoratedAddressLink"; import DecoratedAddressLink from "./DecoratedAddressLink";
import { RuntimeContext } from "../useRuntime"; import { RuntimeContext } from "../useRuntime";
@ -48,7 +48,7 @@ const InternalSelfDestruct: React.FC<InternalSelfDestructProps> = ({
<span className="text-gray-500"> <span className="text-gray-500">
<FontAwesomeIcon icon={faAngleRight} size="1x" /> TRANSFER <FontAwesomeIcon icon={faAngleRight} size="1x" /> TRANSFER
</span> </span>
<span>{ethers.utils.formatEther(internalOp.value)} Ether</span> <span>{formatEther(internalOp.value)} Ether</span>
<div className="flex items-baseline"> <div className="flex items-baseline">
<span className="text-gray-500">To</span> <span className="text-gray-500">To</span>
<AddressHighlighter address={internalOp.to}> <AddressHighlighter address={internalOp.to}>

6
src/components/InternalTransfer.tsx
View File

@ -1,7 +1,7 @@
import React from "react"; import React from "react";
import { ethers } from "ethers"; import { formatEther } from "@ethersproject/units";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faAngleRight } from "@fortawesome/free-solid-svg-icons"; import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight";
import AddressHighlighter from "./AddressHighlighter"; import AddressHighlighter from "./AddressHighlighter";
import DecoratedAddressLink from "./DecoratedAddressLink"; import DecoratedAddressLink from "./DecoratedAddressLink";
import { TransactionData, InternalOperation } from "../types"; import { TransactionData, InternalOperation } from "../types";
@ -24,7 +24,7 @@ const InternalTransfer: React.FC<InternalTransferProps> = ({
<span className="text-gray-500"> <span className="text-gray-500">
<FontAwesomeIcon icon={faAngleRight} size="1x" /> TRANSFER <FontAwesomeIcon icon={faAngleRight} size="1x" /> TRANSFER
</span> </span>
<span>{ethers.utils.formatEther(internalOp.value)} Ether</span> <span>{formatEther(internalOp.value)} Ether</span>
<div className="flex items-baseline"> <div className="flex items-baseline">
<span className="text-gray-500">From</span> <span className="text-gray-500">From</span>
<AddressHighlighter address={internalOp.from}> <AddressHighlighter address={internalOp.from}>

2
src/components/Nonce.tsx
View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faArrowUp } from "@fortawesome/free-solid-svg-icons"; import { faArrowUp } from "@fortawesome/free-solid-svg-icons/faArrowUp";
type NonceProps = { type NonceProps = {
value: number; value: number;

18
src/components/PercentageGauge.tsx
View File

@ -2,29 +2,29 @@ import React from "react";
type PercentageGaugeProps = { type PercentageGaugeProps = {
perc: number; perc: number;
bgFull: string; bgColor: string;
bgPerc: string; bgColorPerc: string;
textPerc: string; textColor: string;
}; };
const PercentageGauge: React.FC<PercentageGaugeProps> = ({ const PercentageGauge: React.FC<PercentageGaugeProps> = ({
perc, perc,
bgFull, bgColor,
bgPerc, bgColorPerc,
textPerc, textColor,
}) => ( }) => (
<div className="w-60 h-6 border-l-2 border-gray-400 relative"> <div className="w-60 h-6 border-l-2 border-gray-400 relative">
<div className="flex absolute w-full h-full"> <div className="flex absolute w-full h-full">
<div className={`my-auto h-5 rounded-r-lg w-full ${bgFull}`}></div> <div className={`my-auto h-5 rounded-r-lg w-full ${bgColor}`}></div>
</div> </div>
<div className="flex absolute w-full h-full"> <div className="flex absolute w-full h-full">
<div <div
className={`my-auto h-5 rounded-r-lg ${bgPerc}`} className={`my-auto h-5 rounded-r-lg ${bgColorPerc}`}
style={{ width: `${perc}%` }} style={{ width: `${perc}%` }}
></div> ></div>
</div> </div>
<div <div
className={`flex absolute w-full h-full mix-blend-multiply text-sans ${textPerc}`} className={`flex absolute w-full h-full mix-blend-multiply text-sans ${textColor}`}
> >
<span className="m-auto">{perc}%</span> <span className="m-auto">{perc}%</span>
</div> </div>

2
src/components/Timestamp.tsx
View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faClock } from "@fortawesome/free-regular-svg-icons"; import { faClock } from "@fortawesome/free-regular-svg-icons/faClock";
import TimestampAge from "./TimestampAge"; import TimestampAge from "./TimestampAge";
type TimestampProps = { type TimestampProps = {

8
src/components/TransactionDirection.tsx
View File

@ -1,9 +1,7 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { import { faCoins } from "@fortawesome/free-solid-svg-icons/faCoins";
faCoins, import { faLongArrowAltRight } from "@fortawesome/free-solid-svg-icons/faLongArrowAltRight";
faLongArrowAltRight,
} from "@fortawesome/free-solid-svg-icons";
export enum Direction { export enum Direction {
IN, IN,
@ -41,7 +39,7 @@ const TransactionDirection: React.FC<TransactionDirectionProps> = ({
msg = "SELF"; msg = "SELF";
} else if (direction === Direction.INTERNAL) { } else if (direction === Direction.INTERNAL) {
msg = "INT"; msg = "INT";
bgColor = "bg-green-100" bgColor = "bg-green-100";
} }
if (flags === Flags.MINER) { if (flags === Flags.MINER) {

2
src/components/TransactionValue.tsx
View File

@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { BigNumber } from "ethers"; import { BigNumber } from "@ethersproject/bignumber";
import { formatValue } from "./formatter"; import { formatValue } from "./formatter";
type TransactionValueProps = { type TransactionValueProps = {

2
src/components/ValueHighlighter.tsx
View File

@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import { BigNumber } from "ethers"; import { BigNumber } from "@ethersproject/bignumber";
import { useSelectionContext } from "../useSelection"; import { useSelectionContext } from "../useSelection";
type ValueHighlighterProps = React.PropsWithChildren<{ type ValueHighlighterProps = React.PropsWithChildren<{

7
src/components/formatter.ts
View File

@ -1,9 +1,8 @@
import { ethers, BigNumber } from "ethers"; import { BigNumber } from "@ethersproject/bignumber";
import { commify, formatUnits } from "@ethersproject/units";
export const formatValue = (value: BigNumber, decimals: number): string => { export const formatValue = (value: BigNumber, decimals: number): string => {
const formatted = ethers.utils.commify( const formatted = commify(formatUnits(value, decimals));
ethers.utils.formatUnits(value, decimals)
);
return formatted.endsWith(".0") return formatted.endsWith(".0")
? formatted.slice(0, formatted.length - 2) ? formatted.slice(0, formatted.length - 2)
: formatted; : formatted;

9
src/nodeFunctions.ts
View File

@ -1,8 +1,9 @@
import { ethers } from "ethers"; import { JsonRpcProvider } from "@ethersproject/providers";
import { getAddress } from "@ethersproject/address";
import { InternalOperation } from "./types"; import { InternalOperation } from "./types";
export const getInternalOperations = async ( export const getInternalOperations = async (
provider: ethers.providers.JsonRpcProvider, provider: JsonRpcProvider,
txHash: string txHash: string
) => { ) => {
const rawTransfers = await provider.send("ots_getInternalOperations", [ const rawTransfers = await provider.send("ots_getInternalOperations", [
@ -13,8 +14,8 @@ export const getInternalOperations = async (
for (const t of rawTransfers) { for (const t of rawTransfers) {
_transfers.push({ _transfers.push({
type: t.type, type: t.type,
from: ethers.utils.getAddress(t.from), from: getAddress(t.from),
to: ethers.utils.getAddress(t.to), to: getAddress(t.to),
value: t.value, value: t.value,
}); });
} }

2
src/search/TransactionItem.tsx
View File

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faExclamationCircle } from "@fortawesome/free-solid-svg-icons"; import { faExclamationCircle } from "@fortawesome/free-solid-svg-icons/faExclamationCircle";
import MethodName from "../components/MethodName"; import MethodName from "../components/MethodName";
import BlockLink from "../components/BlockLink"; import BlockLink from "../components/BlockLink";
import TransactionLink from "../components/TransactionLink"; import TransactionLink from "../components/TransactionLink";

25
src/search/search.ts
View File

@ -1,4 +1,4 @@
import { ethers } from "ethers"; import { JsonRpcProvider, TransactionResponse } from "@ethersproject/providers";
import { PAGE_SIZE } from "../params"; import { PAGE_SIZE } from "../params";
import { ProcessedTransaction, TransactionChunk } from "../types"; import { ProcessedTransaction, TransactionChunk } from "../types";
@ -26,12 +26,9 @@ export class SearchController {
} }
} }
private static rawToProcessed = ( private static rawToProcessed = (provider: JsonRpcProvider, _rawRes: any) => {
provider: ethers.providers.JsonRpcProvider, const _res: TransactionResponse[] = _rawRes.txs.map((t: any) =>
_rawRes: any provider.formatter.transactionResponse(t)
) => {
const _res: ethers.providers.TransactionResponse[] = _rawRes.txs.map(
(t: any) => provider.formatter.transactionResponse(t)
); );
return { return {
@ -59,7 +56,7 @@ export class SearchController {
}; };
private static async readBackPage( private static async readBackPage(
provider: ethers.providers.JsonRpcProvider, provider: JsonRpcProvider,
address: string, address: string,
baseBlock: number baseBlock: number
): Promise<TransactionChunk> { ): Promise<TransactionChunk> {
@ -72,7 +69,7 @@ export class SearchController {
} }
private static async readForwardPage( private static async readForwardPage(
provider: ethers.providers.JsonRpcProvider, provider: JsonRpcProvider,
address: string, address: string,
baseBlock: number baseBlock: number
): Promise<TransactionChunk> { ): Promise<TransactionChunk> {
@ -85,7 +82,7 @@ export class SearchController {
} }
static async firstPage( static async firstPage(
provider: ethers.providers.JsonRpcProvider, provider: JsonRpcProvider,
address: string address: string
): Promise<SearchController> { ): Promise<SearchController> {
const newTxs = await SearchController.readBackPage(provider, address, 0); const newTxs = await SearchController.readBackPage(provider, address, 0);
@ -99,7 +96,7 @@ export class SearchController {
} }
static async middlePage( static async middlePage(
provider: ethers.providers.JsonRpcProvider, provider: JsonRpcProvider,
address: string, address: string,
hash: string, hash: string,
next: boolean next: boolean
@ -122,7 +119,7 @@ export class SearchController {
} }
static async lastPage( static async lastPage(
provider: ethers.providers.JsonRpcProvider, provider: JsonRpcProvider,
address: string address: string
): Promise<SearchController> { ): Promise<SearchController> {
const newTxs = await SearchController.readForwardPage(provider, address, 0); const newTxs = await SearchController.readForwardPage(provider, address, 0);
@ -140,7 +137,7 @@ export class SearchController {
} }
async prevPage( async prevPage(
provider: ethers.providers.JsonRpcProvider, provider: JsonRpcProvider,
hash: string hash: string
): Promise<SearchController> { ): Promise<SearchController> {
// Already on this page // Already on this page
@ -169,7 +166,7 @@ export class SearchController {
} }
async nextPage( async nextPage(
provider: ethers.providers.JsonRpcProvider, provider: JsonRpcProvider,
hash: string hash: string
): Promise<SearchController> { ): Promise<SearchController> {
// Already on this page // Already on this page

14
src/special/london/BlockRow.tsx
View File

@ -1,5 +1,6 @@
import React from "react"; import React from "react";
import { ethers, FixedNumber } from "ethers"; import { FixedNumber } from "@ethersproject/bignumber";
import { commify, formatEther } from "@ethersproject/units";
import BlockLink from "../../components/BlockLink"; import BlockLink from "../../components/BlockLink";
import TimestampAge from "../../components/TimestampAge"; import TimestampAge from "../../components/TimestampAge";
import { ExtendedBlock } from "../../useErigonHooks"; import { ExtendedBlock } from "../../useErigonHooks";
@ -34,10 +35,10 @@ const BlockRow: React.FC<BlockRowProps> = ({ now, block, baseFeeDelta }) => {
: "" : ""
}`} }`}
> >
{ethers.utils.commify(block.gasUsed.toString())} {commify(block.gasUsed.toString())}
</div> </div>
<div className="text-right text-gray-400"> <div className="text-right text-gray-400">
{ethers.utils.commify(gasTarget.toString())} {commify(gasTarget.toString())}
</div> </div>
<div className="text-right"> <div className="text-right">
<div className="relative"> <div className="relative">
@ -52,13 +53,10 @@ const BlockRow: React.FC<BlockRowProps> = ({ now, block, baseFeeDelta }) => {
</div> </div>
</div> </div>
<div className="text-right col-span-2"> <div className="text-right col-span-2">
{ethers.utils.commify(ethers.utils.formatEther(totalReward))} Ether {commify(formatEther(totalReward))} Ether
</div> </div>
<div className="text-right col-span-2 line-through text-orange-500"> <div className="text-right col-span-2 line-through text-orange-500">
{ethers.utils.commify( {commify(formatEther(block.gasUsed.mul(block.baseFeePerGas!)))} Ether
ethers.utils.formatEther(block.gasUsed.mul(block.baseFeePerGas!))
)}{" "}
Ether
</div> </div>
<div className="text-right text-gray-400"> <div className="text-right text-gray-400">
<TimestampAge now={now / 1000} timestamp={block.timestamp} /> <TimestampAge now={now / 1000} timestamp={block.timestamp} />

17
src/special/london/Blocks.tsx
View File

@ -5,17 +5,16 @@ import React, {
useMemo, useMemo,
useCallback, useCallback,
} from "react"; } from "react";
import { ethers, FixedNumber } from "ethers"; import { Block } from "@ethersproject/abstract-provider";
import { FixedNumber } from "@ethersproject/bignumber";
import { Line } from "react-chartjs-2"; import { Line } from "react-chartjs-2";
import { Transition } from "@headlessui/react"; import { Transition } from "@headlessui/react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { import { faBurn } from "@fortawesome/free-solid-svg-icons/faBurn";
faBurn, import { faCoins } from "@fortawesome/free-solid-svg-icons/faCoins";
faCoins, import { faCube } from "@fortawesome/free-solid-svg-icons/faCube";
faCube, import { faGasPump } from "@fortawesome/free-solid-svg-icons/faGasPump";
faGasPump, import { faHistory } from "@fortawesome/free-solid-svg-icons/faHistory";
faHistory,
} from "@fortawesome/free-solid-svg-icons";
import BlockRow from "./BlockRow"; import BlockRow from "./BlockRow";
import { ExtendedBlock, readBlock } from "../../useErigonHooks"; import { ExtendedBlock, readBlock } from "../../useErigonHooks";
import { RuntimeContext } from "../../useRuntime"; import { RuntimeContext } from "../../useRuntime";
@ -31,7 +30,7 @@ const MAX_BLOCK_HISTORY = 20;
const PREV_BLOCK_COUNT = 15; const PREV_BLOCK_COUNT = 15;
type BlocksProps = { type BlocksProps = {
latestBlock: ethers.providers.Block; latestBlock: Block;
targetBlockNumber: number; targetBlockNumber: number;
}; };

13
src/special/london/Countdown.tsx
View File

@ -1,9 +1,10 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { ethers } from "ethers"; import { JsonRpcProvider, Block } from "@ethersproject/providers";
import { commify } from "@ethersproject/units";
type CountdownProps = { type CountdownProps = {
provider: ethers.providers.JsonRpcProvider; provider: JsonRpcProvider;
currentBlock: ethers.providers.Block; currentBlock: Block;
targetBlock: number; targetBlock: number;
}; };
@ -31,12 +32,12 @@ const Countdown: React.FC<CountdownProps> = ({
<div className="m-auto text-center"> <div className="m-auto text-center">
<h1 className="text-6xl mb-10">London Network Upgrade</h1> <h1 className="text-6xl mb-10">London Network Upgrade</h1>
<h2 className="text-5xl"> <h2 className="text-5xl">
{ethers.utils.commify(targetBlock - currentBlock.number)} {commify(targetBlock - currentBlock.number)}
</h2> </h2>
<h6 className="text-sm mb-10">Blocks remaining</h6> <h6 className="text-sm mb-10">Blocks remaining</h6>
<h2 className="inline-flex space-x-10 text-base mb-10"> <h2 className="inline-flex space-x-10 text-base mb-10">
<div>Current block: {ethers.utils.commify(currentBlock.number)}</div> <div>Current block: {commify(currentBlock.number)}</div>
<div>Target block: {ethers.utils.commify(targetBlock)}</div> <div>Target block: {commify(targetBlock)}</div>
</h2> </h2>
{targetTimestamp && ( {targetTimestamp && (
<div className="text-lg"> <div className="text-lg">

6
src/special/london/chart.ts
View File

@ -1,4 +1,4 @@
import { ethers } from "ethers"; import { commify } from "@ethersproject/units";
import { ChartData, ChartOptions } from "chart.js"; import { ChartData, ChartOptions } from "chart.js";
import { ExtendedBlock } from "../../useErigonHooks"; import { ExtendedBlock } from "../../useErigonHooks";
@ -14,7 +14,7 @@ export const burntFeesChartOptions: ChartOptions = {
ticks: { ticks: {
callback: function (v) { callback: function (v) {
// @ts-ignore // @ts-ignore
return ethers.utils.commify(this.getLabelForValue(v)); return commify(this.getLabelForValue(v));
}, },
}, },
}, },
@ -84,7 +84,7 @@ export const gasChartOptions: ChartOptions = {
ticks: { ticks: {
callback: function (v) { callback: function (v) {
// @ts-ignore // @ts-ignore
return ethers.utils.commify(this.getLabelForValue(v)); return commify(this.getLabelForValue(v));
}, },
}, },
}, },

48
src/transaction/Details.tsx
View File

@ -1,11 +1,10 @@
import React from "react"; import React, { useMemo, useState } from "react";
import { ethers } from "ethers"; import { formatEther } from "@ethersproject/units";
import { toUtf8String } from "@ethersproject/strings";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { import { faCheckCircle } from "@fortawesome/free-solid-svg-icons/faCheckCircle";
faCheckCircle, import { faCube } from "@fortawesome/free-solid-svg-icons/faCube";
faCube, import { faTimesCircle } from "@fortawesome/free-solid-svg-icons/faTimesCircle";
faTimesCircle,
} from "@fortawesome/free-solid-svg-icons";
import ContentFrame from "../ContentFrame"; import ContentFrame from "../ContentFrame";
import InfoRow from "../components/InfoRow"; import InfoRow from "../components/InfoRow";
import BlockLink from "../components/BlockLink"; import BlockLink from "../components/BlockLink";
@ -42,6 +41,17 @@ const Details: React.FC<DetailsProps> = ({
const hasEIP1559 = const hasEIP1559 =
txData.blockBaseFeePerGas !== undefined && txData.blockBaseFeePerGas !== undefined &&
txData.blockBaseFeePerGas !== null; txData.blockBaseFeePerGas !== null;
const [inputMode, setInputMode] = useState<number>(0);
const utfInput = useMemo(() => {
try {
return txData && toUtf8String(txData.data);
} catch (err) {
console.error("Error while converting input data to string");
console.error(err);
return "<can't decode>";
}
}, [txData]);
return ( return (
<ContentFrame tabs> <ContentFrame tabs>
@ -161,7 +171,7 @@ const Details: React.FC<DetailsProps> = ({
)} )}
<InfoRow title="Value"> <InfoRow title="Value">
<span className="rounded bg-gray-100 px-2 py-1 text-xs"> <span className="rounded bg-gray-100 px-2 py-1 text-xs">
{ethers.utils.formatEther(txData.value)} Ether {formatEther(txData.value)} Ether
</span> </span>
</InfoRow> </InfoRow>
<InfoRow <InfoRow
@ -254,11 +264,31 @@ const Details: React.FC<DetailsProps> = ({
</InfoRow> </InfoRow>
<InfoRow title="Ether Price">N/A</InfoRow> <InfoRow title="Ether Price">N/A</InfoRow>
<InfoRow title="Input Data"> <InfoRow title="Input Data">
<div className="space-y-1">
<div className="flex space-x-1">
<button
className={`border rounded-lg px-2 py-1 bg-gray-100 hover:bg-gray-200 hover:shadow text-xs text-gray-500 hover:text-gray-600 ${
inputMode === 0 ? "border-blue-300" : ""
}`}
onClick={() => setInputMode(0)}
>
Raw
</button>
<button
className={`border rounded-lg px-2 py-1 bg-gray-100 hover:bg-gray-200 hover:shadow text-xs text-gray-500 hover:text-gray-600 ${
inputMode === 1 ? "border-blue-300" : ""
}`}
onClick={() => setInputMode(1)}
>
UTF-8
</button>
</div>
<textarea <textarea
className="w-full h-40 bg-gray-50 text-gray-500 font-mono focus:outline-none border rounded p-2" className="w-full h-40 bg-gray-50 text-gray-500 font-mono focus:outline-none border rounded p-2"
value={txData.data} value={inputMode === 0 ? txData.data : utfInput}
readOnly readOnly
/> />
</div>
</InfoRow> </InfoRow>
</ContentFrame> </ContentFrame>
); );

25
src/transaction/RewardSplit.tsx
View File

@ -1,6 +1,7 @@
import React from "react"; import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faBurn, faCoins } from "@fortawesome/free-solid-svg-icons"; import { faBurn } from "@fortawesome/free-solid-svg-icons/faBurn";
import { faCoins } from "@fortawesome/free-solid-svg-icons/faCoins";
import FormattedBalance from "../components/FormattedBalance"; import FormattedBalance from "../components/FormattedBalance";
import { TransactionData } from "../types"; import { TransactionData } from "../types";
import PercentageGauge from "../components/PercentageGauge"; import PercentageGauge from "../components/PercentageGauge";
@ -10,20 +11,22 @@ type RewardSplitProps = {
}; };
const RewardSplit: React.FC<RewardSplitProps> = ({ txData }) => { const RewardSplit: React.FC<RewardSplitProps> = ({ txData }) => {
const paidFees = txData.gasPrice.mul(txData.gasUsed);
const burntFees = txData.blockBaseFeePerGas!.mul(txData.gasUsed); const burntFees = txData.blockBaseFeePerGas!.mul(txData.gasUsed);
const minerReward = txData.gasPrice.mul(txData.gasUsed).sub(burntFees);
const minerReward = paidFees.sub(burntFees);
const burntPerc = const burntPerc =
burntFees.mul(10000).div(txData.gasPrice.mul(txData.gasUsed)).toNumber() / Math.round(burntFees.mul(10000).div(paidFees).toNumber()) / 100;
100; const minerPerc = Math.round((100 - burntPerc) * 100) / 100;
return ( return (
<div className="inline-block"> <div className="inline-block">
<div className="grid grid-cols-2 gap-x-2 gap-y-1 items-center text-sm"> <div className="grid grid-cols-2 gap-x-2 gap-y-1 items-center text-sm">
<PercentageGauge <PercentageGauge
perc={burntPerc} perc={burntPerc}
bgFull="bg-orange-100" bgColor="bg-orange-100"
bgPerc="bg-orange-500" bgColorPerc="bg-orange-500"
textPerc="text-orange-800" textColor="text-orange-800"
/> />
<div className="flex items-baseline space-x-1"> <div className="flex items-baseline space-x-1">
<span className="flex space-x-1 text-orange-500"> <span className="flex space-x-1 text-orange-500">
@ -39,10 +42,10 @@ const RewardSplit: React.FC<RewardSplitProps> = ({ txData }) => {
</span> </span>
</div> </div>
<PercentageGauge <PercentageGauge
perc={100 - burntPerc} perc={minerPerc}
bgFull="bg-yellow-100" bgColor="bg-yellow-100"
bgPerc="bg-yellow-300" bgColorPerc="bg-yellow-300"
textPerc="text-yellow-700" textColor="text-yellow-700"
/> />
<div className="flex items-baseline space-x-1"> <div className="flex items-baseline space-x-1">
<span className="flex space-x-1"> <span className="flex space-x-1">

5
src/types.ts
View File

@ -1,4 +1,5 @@
import { ethers, BigNumber } from "ethers"; import { BigNumber } from "@ethersproject/bignumber";
import { Log } from "@ethersproject/providers";
export enum ConnectionStatus { export enum ConnectionStatus {
CONNECTING, CONNECTING,
@ -60,7 +61,7 @@ export type TransactionData = {
gasLimit: BigNumber; gasLimit: BigNumber;
nonce: number; nonce: number;
data: string; data: string;
logs: ethers.providers.Log[]; logs: Log[];
}; };
// The VOID... // The VOID...

8
src/url.ts
View File

@ -1,4 +1,4 @@
import { ethers } from "ethers"; import { BlockTag } from "@ethersproject/abstract-provider";
export const fourBytesURL = ( export const fourBytesURL = (
assetsURLPrefix: string, assetsURLPrefix: string,
@ -10,8 +10,6 @@ export const tokenLogoURL = (
address: string address: string
): string => `${assetsURLPrefix}/assets/${address}/logo.png`; ): string => `${assetsURLPrefix}/assets/${address}/logo.png`;
export const blockURL = (blockNum: ethers.providers.BlockTag) => export const blockURL = (blockNum: BlockTag) => `/block/${blockNum}`;
`/block/${blockNum}`;
export const blockTxsURL = (blockNum: ethers.providers.BlockTag) => export const blockTxsURL = (blockNum: BlockTag) => `/block/${blockNum}/txs`;
`/block/${blockNum}/txs`;

34
src/useErigonHooks.ts
View File

@ -1,6 +1,10 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { ethers, BigNumber } from "ethers"; import { Block, BlockWithTransactions } from "@ethersproject/abstract-provider";
import { BlockWithTransactions } from "@ethersproject/abstract-provider"; import { JsonRpcProvider } from "@ethersproject/providers";
import { getAddress } from "@ethersproject/address";
import { Contract } from "@ethersproject/contracts";
import { BigNumber } from "@ethersproject/bignumber";
import { arrayify, hexDataSlice, isHexString } from "@ethersproject/bytes";
import { getInternalOperations } from "./nodeFunctions"; import { getInternalOperations } from "./nodeFunctions";
import { import {
TokenMetas, TokenMetas,
@ -15,7 +19,7 @@ import erc20 from "./erc20.json";
const TRANSFER_TOPIC = const TRANSFER_TOPIC =
"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"; "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef";
export interface ExtendedBlock extends ethers.providers.Block { export interface ExtendedBlock extends Block {
blockReward: BigNumber; blockReward: BigNumber;
unclesReward: BigNumber; unclesReward: BigNumber;
feeReward: BigNumber; feeReward: BigNumber;
@ -27,11 +31,11 @@ export interface ExtendedBlock extends ethers.providers.Block {
} }
export const readBlock = async ( export const readBlock = async (
provider: ethers.providers.JsonRpcProvider, provider: JsonRpcProvider,
blockNumberOrHash: string blockNumberOrHash: string
) => { ) => {
let blockPromise: Promise<any>; let blockPromise: Promise<any>;
if (ethers.utils.isHexString(blockNumberOrHash, 32)) { if (isHexString(blockNumberOrHash, 32)) {
// TODO: fix // TODO: fix
blockPromise = provider.send("eth_getBlockByHash", [ blockPromise = provider.send("eth_getBlockByHash", [
blockNumberOrHash, blockNumberOrHash,
@ -65,7 +69,7 @@ export const readBlock = async (
}; };
export const useBlockTransactions = ( export const useBlockTransactions = (
provider: ethers.providers.JsonRpcProvider | undefined, provider: JsonRpcProvider | undefined,
blockNumber: number, blockNumber: number,
pageNumber: number, pageNumber: number,
pageSize: number pageSize: number
@ -129,7 +133,7 @@ export const useBlockTransactions = (
(op) => (op) =>
op.type === OperationType.TRANSFER && op.type === OperationType.TRANSFER &&
res.miner !== undefined && res.miner !== undefined &&
res.miner === ethers.utils.getAddress(op.to) res.miner === getAddress(op.to)
) !== -1 ) !== -1
); );
}) })
@ -149,7 +153,7 @@ export const useBlockTransactions = (
}; };
export const useBlockData = ( export const useBlockData = (
provider: ethers.providers.JsonRpcProvider | undefined, provider: JsonRpcProvider | undefined,
blockNumberOrHash: string blockNumberOrHash: string
) => { ) => {
const [block, setBlock] = useState<ExtendedBlock>(); const [block, setBlock] = useState<ExtendedBlock>();
@ -169,7 +173,7 @@ export const useBlockData = (
}; };
export const useTxData = ( export const useTxData = (
provider: ethers.providers.JsonRpcProvider | undefined, provider: JsonRpcProvider | undefined,
txhash: string txhash: string
): TransactionData | undefined => { ): TransactionData | undefined => {
const [txData, setTxData] = useState<TransactionData>(); const [txData, setTxData] = useState<TransactionData>();
@ -198,12 +202,8 @@ export const useTxData = (
} }
tokenTransfers.push({ tokenTransfers.push({
token: l.address, token: l.address,
from: ethers.utils.getAddress( from: getAddress(hexDataSlice(arrayify(l.topics[1]), 12)),
ethers.utils.hexDataSlice(ethers.utils.arrayify(l.topics[1]), 12) to: getAddress(hexDataSlice(arrayify(l.topics[2]), 12)),
),
to: ethers.utils.getAddress(
ethers.utils.hexDataSlice(ethers.utils.arrayify(l.topics[2]), 12)
),
value: BigNumber.from(l.data), value: BigNumber.from(l.data),
}); });
} }
@ -214,7 +214,7 @@ export const useTxData = (
if (tokenMetas[t.token]) { if (tokenMetas[t.token]) {
continue; continue;
} }
const erc20Contract = new ethers.Contract(t.token, erc20, provider); const erc20Contract = new Contract(t.token, erc20, provider);
const [name, symbol, decimals] = await Promise.all([ const [name, symbol, decimals] = await Promise.all([
erc20Contract.name(), erc20Contract.name(),
erc20Contract.symbol(), erc20Contract.symbol(),
@ -262,7 +262,7 @@ export const useTxData = (
}; };
export const useInternalOperations = ( export const useInternalOperations = (
provider: ethers.providers.JsonRpcProvider | undefined, provider: JsonRpcProvider | undefined,
txData: TransactionData | undefined txData: TransactionData | undefined
): InternalOperation[] | undefined => { ): InternalOperation[] | undefined => {
const [intTransfers, setIntTransfers] = useState<InternalOperation[]>(); const [intTransfers, setIntTransfers] = useState<InternalOperation[]>();

11
src/useLatestBlock.ts
View File

@ -1,8 +1,9 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { ethers } from "ethers"; import { Block } from "@ethersproject/abstract-provider";
import { JsonRpcProvider } from "@ethersproject/providers";
export const useLatestBlock = (provider?: ethers.providers.JsonRpcProvider) => { export const useLatestBlock = (provider?: JsonRpcProvider) => {
const [latestBlock, setLatestBlock] = useState<ethers.providers.Block>(); const [latestBlock, setLatestBlock] = useState<Block>();
useEffect(() => { useEffect(() => {
if (!provider) { if (!provider) {
@ -34,9 +35,7 @@ export const useLatestBlock = (provider?: ethers.providers.JsonRpcProvider) => {
return latestBlock; return latestBlock;
}; };
export const useLatestBlockNumber = ( export const useLatestBlockNumber = (provider?: JsonRpcProvider) => {
provider?: ethers.providers.JsonRpcProvider
) => {
const [latestBlock, setLatestBlock] = useState<number>(); const [latestBlock, setLatestBlock] = useState<number>();
useEffect(() => { useEffect(() => {

14
src/useProvider.ts
View File

@ -1,5 +1,5 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { ethers } from "ethers"; import { JsonRpcProvider, WebSocketProvider } from "@ethersproject/providers";
import { ConnectionStatus } from "./types"; import { ConnectionStatus } from "./types";
import { MIN_API_LEVEL } from "./params"; import { MIN_API_LEVEL } from "./params";
@ -7,7 +7,7 @@ export const DEFAULT_ERIGON_URL = "http://127.0.0.1:8545";
export const useProvider = ( export const useProvider = (
erigonURL?: string erigonURL?: string
): [ConnectionStatus, ethers.providers.JsonRpcProvider | undefined] => { ): [ConnectionStatus, JsonRpcProvider | undefined] => {
const [connStatus, setConnStatus] = useState<ConnectionStatus>( const [connStatus, setConnStatus] = useState<ConnectionStatus>(
ConnectionStatus.CONNECTING ConnectionStatus.CONNECTING
); );
@ -21,9 +21,7 @@ export const useProvider = (
} }
} }
const [provider, setProvider] = useState< const [provider, setProvider] = useState<JsonRpcProvider | undefined>();
ethers.providers.JsonRpcProvider | undefined
>();
useEffect(() => { useEffect(() => {
if (erigonURL === undefined) { if (erigonURL === undefined) {
setConnStatus(ConnectionStatus.NOT_ETH_NODE); setConnStatus(ConnectionStatus.NOT_ETH_NODE);
@ -33,11 +31,11 @@ export const useProvider = (
setConnStatus(ConnectionStatus.CONNECTING); setConnStatus(ConnectionStatus.CONNECTING);
const tryToConnect = async () => { const tryToConnect = async () => {
let provider: ethers.providers.JsonRpcProvider; let provider: JsonRpcProvider;
if (erigonURL?.startsWith("ws://") || erigonURL?.startsWith("wss://")) { if (erigonURL?.startsWith("ws://") || erigonURL?.startsWith("wss://")) {
provider = new ethers.providers.WebSocketProvider(erigonURL); provider = new WebSocketProvider(erigonURL);
} else { } else {
provider = new ethers.providers.JsonRpcProvider(erigonURL); provider = new JsonRpcProvider(erigonURL);
} }
// Check if it is at least a regular ETH node // Check if it is at least a regular ETH node

4
src/useReverseCache.ts
View File

@ -1,9 +1,9 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { ethers } from "ethers"; import { JsonRpcProvider } from "@ethersproject/providers";
import { ENSReverseCache, ProcessedTransaction } from "./types"; import { ENSReverseCache, ProcessedTransaction } from "./types";
export const useENSCache = ( export const useENSCache = (
provider?: ethers.providers.JsonRpcProvider, provider?: JsonRpcProvider,
page?: ProcessedTransaction[] page?: ProcessedTransaction[]
) => { ) => {
const [reverseCache, setReverseCache] = useState<ENSReverseCache>(); const [reverseCache, setReverseCache] = useState<ENSReverseCache>();

4
src/useRuntime.ts
View File

@ -1,5 +1,5 @@
import React, { useMemo } from "react"; import React, { useMemo } from "react";
import { ethers } from "ethers"; import { JsonRpcProvider } from "@ethersproject/providers";
import { OtterscanConfig, useConfig } from "./useConfig"; import { OtterscanConfig, useConfig } from "./useConfig";
import { useProvider } from "./useProvider"; import { useProvider } from "./useProvider";
import { ConnectionStatus } from "./types"; import { ConnectionStatus } from "./types";
@ -7,7 +7,7 @@ import { ConnectionStatus } from "./types";
export type OtterscanRuntime = { export type OtterscanRuntime = {
config?: OtterscanConfig; config?: OtterscanConfig;
connStatus: ConnectionStatus; connStatus: ConnectionStatus;
provider?: ethers.providers.JsonRpcProvider; provider?: JsonRpcProvider;
}; };
export const useRuntime = (): OtterscanRuntime => { export const useRuntime = (): OtterscanRuntime => {

2
trustwallet

@ -1 +1 @@
Subproject commit 5b803d37011ff89b287630a9ce90f96f8ed3311f Subproject commit 9bc40f37d95234810bc7e176513c8366c81080ce