From ec962d426e4d039f18134225413d288263636b27 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Fri, 22 Feb 2019 10:10:03 +0100 Subject: [PATCH 01/12] downgrade web3 to 1.0.0-beta.38 --- package.json | 2 +- yarn.lock | 374 +++++++++++++++++++++++---------------------------- 2 files changed, 172 insertions(+), 204 deletions(-) diff --git a/package.json b/package.json index b9e7d27f..04425e79 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "trezor-bridge-communicator": "1.0.2", "trezor-connect": "7.0.0-beta.2", "wallet-address-validator": "^0.2.4", - "web3": "1.0.0-beta.43", + "web3": "1.0.0-beta.38", "webpack": "^4.29.3", "webpack-build-notifier": "^0.1.30", "webpack-bundle-analyzer": "^3.0.3", diff --git a/yarn.lock b/yarn.lock index f42ab115..1019879b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -725,7 +725,7 @@ pirates "^4.0.0" source-map-support "^0.5.9" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1": +"@babel/runtime@^7.1.2": version "7.3.1" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a" integrity sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA== @@ -927,13 +927,6 @@ resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.18.tgz#6a60435d4663e290f3709898a4f75014f279c4d6" integrity sha512-OTPWHmsyW18BhrnG5x8F7PzeZ2nFxmHGb42bZn79P9hl+GI5cMzyPgQTwNjbem0lJhoru/8vtjAFCUOu3+gE2w== -"@types/bn.js@^4.11.4": - version "4.11.4" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.4.tgz#a7bed5bdef9f16b25c92ba27745ab261374787d7" - integrity sha512-AO8WW+aRcKWKQAYTfKLzwnpL6U+TfPqS+haRrhCy5ff04Da8WZud3ZgVjspQXaEXJDcTlsjUEVvL39wegDek5w== - dependencies: - "@types/node" "*" - "@types/chai-jquery@1.1.35": version "1.1.35" resolved "https://registry.yarnpkg.com/@types/chai-jquery/-/chai-jquery-1.1.35.tgz#9a8f0a39ec0851b2768a8f8c764158c2a2568d04" @@ -984,7 +977,7 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.44.tgz#1d4a798e53f35212fd5ad4d04050620171cd5b5e" integrity sha512-k2tWTQU8G4+iSMvqKi0Q9IIsWAp/n8xzdZS4Q4YVIltApoMA00wFBFdlJnmoaK1/z7B0Cy0yPe6GgXteSmdUNw== -"@types/node@*", "@types/node@^10.1.0", "@types/node@^10.12.18", "@types/node@^10.3.2": +"@types/node@*", "@types/node@^10.1.0", "@types/node@^10.3.2": version "10.12.21" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e" integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ== @@ -11056,194 +11049,175 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -web3-bzz@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.43.tgz#6c2ee480fe74212c70c1c712a20516c64cfb086b" - integrity sha512-5h0MCfJaguwI2TbqSp9elmbZs201uiorRqSxl/TUqeZkzj7hvBjI4nzaCipNxUDoJq2N9Z4J4qVEppj9SsyVLg== +web3-bzz@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.38.tgz#9011fb9fd6a334de082df3a2ca35f13c3699cda4" + integrity sha512-V9ftqYLl+2ZUuyS9loHKY9VB++oLM9tnRD1RFLSdQlnJsRxWTjw+GWFd7r4JEa3qoImRFB1dsRC6cGcfBLYeXg== dependencies: - "@babel/runtime" "^7.3.1" - "@types/node" "^10.12.18" lodash "^4.17.11" swarm-js "^0.1.39" -web3-core-helpers@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.43.tgz#4dfd75e21fd1dff55d8d526512afb9c0a6830e70" - integrity sha512-AtDS3elq03vCj4YsivP9WM27BKGEpGg1y6zmbe+gXY8i0MGOiUo3yrolIoeAw5hZzwEyRdBgCzfkL8Mfb7aABA== +web3-core-helpers@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.38.tgz#acdcfa440e9e09238625510517bfd8af2faedd52" + integrity sha512-pbXQJ+IiMQZLZ64uYqyqqrWDStJ3814jrKm8ZYp5wkFRQhYaWQ4evUScbtq2KvvkUM9b0OdXpZj7jm1KcTXF5g== dependencies: - "@babel/runtime" "^7.3.1" lodash "^4.17.11" - web3-eth-iban "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" + web3-eth-iban "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" -web3-core-method@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.43.tgz#e2e7f3751f806ca87758fb43b7181c73378e8547" - integrity sha512-lZvU1FAEdBIm65KmqpYDWIqFaK5aqoNtgLgxqPs6xMEDX1MCqzoimKlNaGZn3oLxt2wpCawtaCymqE4v2KBf9w== +web3-core-method@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.38.tgz#15f8d7cd2fda00fb763b16886e5c2278d64bb63a" + integrity sha512-o5MJXmrAGa2W6b8kcyHudRvvpTFvOtXCvs0ZSc5gTUuLC+6bwF3NVK3ZriwcpMzJRA4sbRE7YupB8A8bYHa0nw== dependencies: - "@babel/runtime" "^7.3.1" eventemitter3 "3.1.0" - lodash "^4.17.11" - web3-core "1.0.0-beta.43" - web3-core-helpers "1.0.0-beta.43" - web3-core-promievent "1.0.0-beta.43" - web3-core-subscriptions "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" - -web3-core-promievent@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.43.tgz#759ee03d8db179e8c439ade69b863c9b79c34d29" - integrity sha512-HaQY6FuP+I0cn+Wi87Us24P4tAjUbhoDVtzE4K9CtmFTY1lvIQSLn+pzGhbwDYyKyovQpVMS/oroaI8QI46N1A== - dependencies: - "@babel/runtime" "^7.3.1" + web3-core "1.0.0-beta.38" + web3-core-helpers "1.0.0-beta.38" + web3-core-promievent "1.0.0-beta.38" + web3-core-subscriptions "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" + +web3-core-promievent@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.38.tgz#6f2bc40919c151d09951a8e464678e4f2140a062" + integrity sha512-nm/hV5YSBUCAx2as4blnc8ypR7MiX6rmFr1WaUmQwf94capqNaiP/IQWHKZZ6rNZQmQxmltsN/lrU951SMeWCQ== + dependencies: eventemitter3 "^3.1.0" -web3-core-subscriptions@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.43.tgz#c0ac44558fc2769ab7f4ade07c3be5643b920bbd" - integrity sha512-M7XuypZZvkPZNQg415j6CZ4Q0Mukydpup4aKiUwpQreJ2CnM05etaNkyhKydVRiAB3v7m63MLTz+LyHBsDjZKA== +web3-core-subscriptions@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.38.tgz#fa0ce652527e82c9e9368b9533253138b4ceb076" + integrity sha512-edVN264mncw9ApM9EqJZ7A5MehCLh6qnoGdcsU+F03X7uFzBZogLLNv3ZFtMHvrz7TnMSRF611lALLaU/l8rxg== dependencies: - "@babel/runtime" "^7.3.1" eventemitter3 "^3.1.0" lodash "^4.17.11" - web3-core-helpers "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" + web3-core-helpers "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" -web3-core@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.43.tgz#e6337e4f1d08b102b45c418376f1488e62aa688e" - integrity sha512-YkLehXkKpI0jyVqyEsuYR1JUeCcuCs2ihXbV4bPyM9DNbw+RryYZoyb7tMP3LtRuXFIDfBxn+rw3TrKiiAfgMQ== +web3-core@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.38.tgz#d11ed226b427350607289bcae6c36ed07af4cde5" + integrity sha512-2hTYzk1dGkFiswcFKxYJYdkpAREY4fuccJIth2nMhddyt8vIxY58WodFijJkZaMGuUEDq+leMhbCF/8kiQckfg== dependencies: - "@babel/runtime" "^7.3.1" - "@types/node" "^10.12.18" lodash "^4.17.11" - web3-utils "1.0.0-beta.43" + web3-utils "1.0.0-beta.38" -web3-eth-abi@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.43.tgz#fd07ad664f9a2030a451f8128a65e426ff407490" - integrity sha512-2ghl2N6XHkHlUjkJFIOk8atiNYUFh+fijNci+lxMzeY7RoYA4lIF+o3Z422FhKlZdw8ySPaILTQ8wcwjiiuaEw== +web3-eth-abi@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.38.tgz#0c660e48bb9b2600fab537cb8d2ffa4a34023851" + integrity sha512-lMlb0tfuAhYn25Aw5wkBTsj3/7UXvRn7quFy5koicv7tEn7JA3QarRY3qjB6gpQY6miGyyHbhpGJ89TVmzMWHg== dependencies: - "@babel/runtime" "^7.3.1" ethers "^4.0.0" lodash "^4.17.11" - web3-utils "1.0.0-beta.43" + web3-utils "1.0.0-beta.38" -web3-eth-accounts@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.43.tgz#abbcda793b058211c912127e89247639165aa5b0" - integrity sha512-GaHW0ELydWkbd6uiSsjagd9egeGNG9kaAeSjuwNlcouXMMuaC+TkYTwvy7vVFhk+/qusxdw0jWr+PBWcc0q6/g== +web3-eth-accounts@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.38.tgz#962e31c94ab432971a91d2f2d58adabfefa56f79" + integrity sha512-MMNaWifbz9kTksXllxXBmIUsQCw97j6j1EN30pvlno0XyqmXpoYPmCjpF7uEhzT9qOSFFN32c3IjZRGTghXI5A== dependencies: - "@babel/runtime" "^7.3.1" crypto-browserify "3.12.0" eth-lib "0.2.8" lodash "^4.17.11" scrypt.js "0.2.0" uuid "3.3.2" - web3-core "1.0.0-beta.43" - web3-core-helpers "1.0.0-beta.43" - web3-core-method "1.0.0-beta.43" - web3-providers "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" - -web3-eth-contract@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.43.tgz#59cfac2ecaa86fadff84d7df7cd37a077fbe84b7" - integrity sha512-/ydJTHgM2yzOF8N2lLbMOp31d6ne/KdAC/EAujWeT0i5kf78X4cWGe0payGYbZ10Qj0S1OsfBS6RBqih7s2neA== - dependencies: - "@babel/runtime" "^7.3.1" + web3-core "1.0.0-beta.38" + web3-core-helpers "1.0.0-beta.38" + web3-core-method "1.0.0-beta.38" + web3-providers "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" + +web3-eth-contract@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.38.tgz#ee5466779ab4099a9fd9d25feee7a10c4d687117" + integrity sha512-JnLoA0AsL+/eTq3zxugthpQrNj5Jx/WXPeuxuwxLWlZWAz0sRcf9+Bc5gHVOWvDyqkaAeY2zFaYhTjtiQH7K+A== + dependencies: lodash "^4.17.11" - web3-core "1.0.0-beta.43" - web3-core-helpers "1.0.0-beta.43" - web3-core-method "1.0.0-beta.43" - web3-core-promievent "1.0.0-beta.43" - web3-core-subscriptions "1.0.0-beta.43" - web3-eth-abi "1.0.0-beta.43" - web3-eth-accounts "1.0.0-beta.43" - web3-providers "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" - -web3-eth-ens@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.43.tgz#894332725418c4582b0a6a727cc69b1ab6bceac0" - integrity sha512-SVpukYXhGOJTdGxztzvzAOZJMbjn9kItV8iBAUtTnffMvA09BPI+VcC4KYvmKfruhbkm3EJnKox8PrY36MukNQ== - dependencies: - "@babel/runtime" "^7.3.1" + web3-core "1.0.0-beta.38" + web3-core-helpers "1.0.0-beta.38" + web3-core-method "1.0.0-beta.38" + web3-core-promievent "1.0.0-beta.38" + web3-core-subscriptions "1.0.0-beta.38" + web3-eth-abi "1.0.0-beta.38" + web3-eth-accounts "1.0.0-beta.38" + web3-providers "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" + +web3-eth-ens@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.38.tgz#0ea2a044dbb3edca6d038508b37a78f5bd3d560c" + integrity sha512-Xth9ThCnE00h19P6FDVjxsyX4/ItSXxQFXteidSlah1zElbMAJlEI2EvWz6ekZbU5Y2NNHcWRdUp2BMlUsO3lw== + dependencies: eth-ens-namehash "2.0.8" lodash "^4.17.11" - web3-core "1.0.0-beta.43" - web3-core-helpers "1.0.0-beta.43" - web3-core-method "1.0.0-beta.43" - web3-core-promievent "1.0.0-beta.43" - web3-eth-abi "1.0.0-beta.43" - web3-eth-contract "1.0.0-beta.43" - web3-net "1.0.0-beta.43" - web3-providers "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" - -web3-eth-iban@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.43.tgz#d48aa1c11707a6dddd168e3bf2ab00b766a79a55" - integrity sha512-qJMzjWWlHJuWFFYO4meoPfUQMBaUZ4RZnD2jUPAtjnoVa5s4Kc1j4MiSPsAbxSjVdy0gRrCydIufAtBVYCV8eg== - dependencies: - "@babel/runtime" "^7.3.1" + web3-core "1.0.0-beta.38" + web3-core-helpers "1.0.0-beta.38" + web3-core-method "1.0.0-beta.38" + web3-core-promievent "1.0.0-beta.38" + web3-eth-abi "1.0.0-beta.38" + web3-eth-contract "1.0.0-beta.38" + web3-net "1.0.0-beta.38" + web3-providers "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" + +web3-eth-iban@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.38.tgz#0f1fdab09131aa06a0c63a0c1c1840cc5fa2966f" + integrity sha512-9bhJDDeeRucICteEgr/wmMFRQANf+nNxn+lAdAi+kHRfI3LoTHII3yP9yM2GuUG4NdRzcIXlZXTn2j6gVV+TsA== + dependencies: bn.js "4.11.8" - web3-utils "1.0.0-beta.43" - -web3-eth-personal@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.43.tgz#8dc8eeb95479e6c57db489f494c66223fa82b1ce" - integrity sha512-NoPZHaetrFaVSCLpjIOG8DQvPPVpSf41Z5PM4VMRGLXC1Ofkomwr+MF3ewdHMjjRTUxJam/ksCFHbsNDxOM54w== - dependencies: - "@babel/runtime" "^7.3.1" - web3-core "1.0.0-beta.43" - web3-core-helpers "1.0.0-beta.43" - web3-core-method "1.0.0-beta.43" - web3-net "1.0.0-beta.43" - web3-providers "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" - -web3-eth@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.43.tgz#754448452b168611c574a2f838e273a8a728ec56" - integrity sha512-RUxbgPY4lyYozYwdI6ClyJrLACoY1JNywjM/wwno212B2/aDnzOMKPeZdi5py7pPh/RKlfEPOdsT6kVYf79S3A== - dependencies: - "@babel/runtime" "^7.3.1" - web3-core "1.0.0-beta.43" - web3-core-helpers "1.0.0-beta.43" - web3-core-method "1.0.0-beta.43" - web3-core-promievent "1.0.0-beta.43" - web3-core-subscriptions "1.0.0-beta.43" - web3-eth-abi "1.0.0-beta.43" - web3-eth-accounts "1.0.0-beta.43" - web3-eth-contract "1.0.0-beta.43" - web3-eth-ens "1.0.0-beta.43" - web3-eth-iban "1.0.0-beta.43" - web3-eth-personal "1.0.0-beta.43" - web3-net "1.0.0-beta.43" - web3-providers "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" - -web3-net@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.43.tgz#43635466a100ff3f6702a784223c24965a48dc21" - integrity sha512-fWoTlXneRG/4yOTQ+c6iwDcu63OE4PnB+PRnBFLtArTPVr6U1ndQwRUOzlm8PgkGd6ieHZuFnrj3uGcUR6ZU9A== - dependencies: - "@babel/runtime" "^7.3.1" + web3-utils "1.0.0-beta.38" + +web3-eth-personal@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.38.tgz#2510de0250726e570355f67c91acf0b53c8b590b" + integrity sha512-nPVxN6OiZmstusBoJTRehdE9ETPLXPnzmRJrhxS+reRNQCsba8uG2pEdfNogY9suZlxLi0THOpG6cWKZ2EJkcA== + dependencies: + web3-core "1.0.0-beta.38" + web3-core-helpers "1.0.0-beta.38" + web3-core-method "1.0.0-beta.38" + web3-net "1.0.0-beta.38" + web3-providers "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" + +web3-eth@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.38.tgz#8bac935aaa9c4698c2e4364fd1d63a540c838bd7" + integrity sha512-hPwM439QgMbDGaxVk9s+YG4x/yhVmg/8J+/sDZzQ2xTP9eg8KGFlgJ9krpQM2gDKlZzPt8c3idKbE66rw4kHDQ== + dependencies: + web3-core "1.0.0-beta.38" + web3-core-helpers "1.0.0-beta.38" + web3-core-method "1.0.0-beta.38" + web3-core-promievent "1.0.0-beta.38" + web3-core-subscriptions "1.0.0-beta.38" + web3-eth-abi "1.0.0-beta.38" + web3-eth-accounts "1.0.0-beta.38" + web3-eth-contract "1.0.0-beta.38" + web3-eth-ens "1.0.0-beta.38" + web3-eth-iban "1.0.0-beta.38" + web3-eth-personal "1.0.0-beta.38" + web3-net "1.0.0-beta.38" + web3-providers "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" + +web3-net@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.38.tgz#8bb397b83d5a1763c27da9738396dd7009171bdf" + integrity sha512-XxV/3G/9q0seoNK0mzokgZypRwoo0yXluvwzsoF0/TTUo0AbH5o/UOB3T4vQrJ9F8W698fb7+qlHcYoCPqiwXg== + dependencies: lodash "^4.17.11" - web3-core "1.0.0-beta.43" - web3-core-helpers "1.0.0-beta.43" - web3-core-method "1.0.0-beta.43" - web3-providers "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" - -web3-providers@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-providers/-/web3-providers-1.0.0-beta.43.tgz#158f4a0ac8325b484c7383a01d1d7a3ab638926a" - integrity sha512-1BMXNLzmQ9HlX8lBq9Eze4yE1VMFekp/fp85hL+garX3fVEeIDVNtA7/AnWGaoe19UMNx8WGAPL19pgUnkoCCQ== - dependencies: - "@babel/runtime" "^7.3.1" - "@types/node" "^10.12.18" + web3-core "1.0.0-beta.38" + web3-core-helpers "1.0.0-beta.38" + web3-core-method "1.0.0-beta.38" + web3-providers "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" + +web3-providers@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-providers/-/web3-providers-1.0.0-beta.38.tgz#a8621a7e10da5d10be79209ce3fa0055c9e0a734" + integrity sha512-K82NnuaJ1YmNnCvVNqqnBTM0OCMHWK/ief6ifg8caiIg4LxgvqbDFG7SlbaCV8h9eZiVfCF5bSCPYY2sQ3qTVQ== + dependencies: eventemitter3 "3.1.0" lodash "^4.17.11" oboe "2.1.4" @@ -11251,28 +11225,24 @@ web3-providers@1.0.0-beta.43: websocket "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible" xhr2-cookies "1.1.0" -web3-shh@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.43.tgz#2231540323946e29f590bbfe36bae9c47b4c4fd9" - integrity sha512-S4Petfrb+998persyS/zuK4Qhc8BDqefVpMhAyMiF8tCbOSvP667L4cOV6FCq5peAJ/hJk1HEC3WUJlX5m6SBw== - dependencies: - "@babel/runtime" "^7.3.1" - web3-core "1.0.0-beta.43" - web3-core-helpers "1.0.0-beta.43" - web3-core-method "1.0.0-beta.43" - web3-core-subscriptions "1.0.0-beta.43" - web3-net "1.0.0-beta.43" - web3-providers "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" - -web3-utils@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.43.tgz#a8f167c7bc9ab0632e43ba3de5cf0aca12038d96" - integrity sha512-fdV3TELMnbzV75awcRFFzbfpt+FhJrKUHFRmE1KSxFIPSDFTgTBo3KpCvS5D4PajXOAnNb0QbSML9ekSqKtx/A== - dependencies: - "@babel/runtime" "^7.3.1" - "@types/bn.js" "^4.11.4" - "@types/node" "^10.12.18" +web3-shh@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.38.tgz#d9396fa860a47ff6ae154c7022124cfc5f6c5df4" + integrity sha512-lcokXr2+VSyYiIJT/uJVyOPhMAWuOlJuGsRchM0Opi2UexNQkKkmOUC4hVWvz/aNVjArdDw3+nuMdn10rsYJvA== + dependencies: + web3-core "1.0.0-beta.38" + web3-core-helpers "1.0.0-beta.38" + web3-core-method "1.0.0-beta.38" + web3-core-subscriptions "1.0.0-beta.38" + web3-net "1.0.0-beta.38" + web3-providers "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" + +web3-utils@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.38.tgz#8c805eb7c84ba4adf2a54038c4318c447c26cce1" + integrity sha512-cZJUNduERfwn/kcirM1OSo326nNDEI+ZSE79iUjGOsfjtFnI04VT7JxPOVRDXvzCc4vLZwNDt7MIa5YTCwbHvQ== + dependencies: bn.js "4.11.8" eth-lib "0.2.8" ethjs-unit "^0.1.6" @@ -11281,23 +11251,21 @@ web3-utils@1.0.0-beta.43: randomhex "0.1.5" utf8 "2.1.1" -web3@1.0.0-beta.43: - version "1.0.0-beta.43" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.43.tgz#e378315a3262a90b93b453529ada7c82db5d76b1" - integrity sha512-jEQJ4NHoMI3dPum/kiFiVapOa16Pi5dZ5WWg3A7IpRPlalmaQTV2EGffYmfLbLt0UbbpBhF2M2yXnaGLy4izLQ== - dependencies: - "@babel/runtime" "^7.3.1" - "@types/node" "^10.12.18" - web3-bzz "1.0.0-beta.43" - web3-core "1.0.0-beta.43" - web3-core-helpers "1.0.0-beta.43" - web3-core-method "1.0.0-beta.43" - web3-eth "1.0.0-beta.43" - web3-eth-personal "1.0.0-beta.43" - web3-net "1.0.0-beta.43" - web3-providers "1.0.0-beta.43" - web3-shh "1.0.0-beta.43" - web3-utils "1.0.0-beta.43" +web3@1.0.0-beta.38: + version "1.0.0-beta.38" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.38.tgz#1f0925f13c5217607b315bf85c2d664a93c4e76d" + integrity sha512-+Jc/lgMHvUBoKLCWFaUGWMGh+BqbT4rTVS9sLrWP03dQznpTuHxCk9dAUIEpO26qWcH6DHL7/jvY0ZWOjVg2aQ== + dependencies: + web3-bzz "1.0.0-beta.38" + web3-core "1.0.0-beta.38" + web3-core-helpers "1.0.0-beta.38" + web3-core-method "1.0.0-beta.38" + web3-eth "1.0.0-beta.38" + web3-eth-personal "1.0.0-beta.38" + web3-net "1.0.0-beta.38" + web3-providers "1.0.0-beta.38" + web3-shh "1.0.0-beta.38" + web3-utils "1.0.0-beta.38" webidl-conversions@^4.0.2: version "4.0.2" From bbde7481e4c102e92f1e089b5ed4afb4e601af2f Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Mon, 25 Feb 2019 01:43:34 +0100 Subject: [PATCH 02/12] fix hide anim firing on page load --- src/components/Header/index.js | 2 +- src/reducers/WalletReducer.js | 4 ++-- .../components/LeftNavigation/components/Sidebar/index.js | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/Header/index.js b/src/components/Header/index.js index e6a1cef2..53792edb 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -114,7 +114,7 @@ const A = styled.a` type Props = { sidebarEnabled?: boolean, - sidebarOpened?: boolean, + sidebarOpened?: ?boolean, toggleSidebar?: toggleSidebarType, }; diff --git a/src/reducers/WalletReducer.js b/src/reducers/WalletReducer.js index 2bd6d657..0277ee4d 100644 --- a/src/reducers/WalletReducer.js +++ b/src/reducers/WalletReducer.js @@ -15,7 +15,7 @@ type State = { online: boolean; dropdownOpened: boolean; showBetaDisclaimer: boolean; - showSidebar: boolean; + showSidebar: ?boolean; initialParams: ?RouterLocationState; initialPathname: ?string; firstLocationChange: boolean; @@ -29,7 +29,7 @@ const initialState: State = { dropdownOpened: false, firstLocationChange: true, showBetaDisclaimer: false, - showSidebar: false, + showSidebar: null, initialParams: null, initialPathname: null, disconnectRequest: null, diff --git a/src/views/Wallet/components/LeftNavigation/components/Sidebar/index.js b/src/views/Wallet/components/LeftNavigation/components/Sidebar/index.js index a149cf8f..46cca306 100644 --- a/src/views/Wallet/components/LeftNavigation/components/Sidebar/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/Sidebar/index.js @@ -9,7 +9,7 @@ import { SLIDE_RIGHT, SLIDE_LEFT } from 'config/animations'; type Props = { children?: React.Node, - isOpen: boolean, + isOpen: ?boolean, } type State = { @@ -32,6 +32,9 @@ const AbsoluteWrapper = styled.aside` height: calc(100vh - 52px); z-index: 200; top: 52px; + /* Prevents firing SLIDE_LEFT anim on page load. */ + /* isOpen is null until user clicks on menu toggler */ + display: ${props => (props.isOpen === null ? 'none' : 'block')}; animation: ${props => (props.isOpen ? SLIDE_RIGHT : SLIDE_LEFT)} 0.25s cubic-bezier(0.17, 0.04, 0.03, 0.94) forwards; } From 057724601d0309518cae431237a00bb25ff1f295 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 25 Feb 2019 12:47:42 +0100 Subject: [PATCH 03/12] Removed webpack plugin --- package.json | 1 - webpack/dev.babel.js | 3 --- webpack/production.babel.js | 2 -- yarn.lock | 21 --------------------- 4 files changed, 27 deletions(-) diff --git a/package.json b/package.json index 04425e79..74ec7d3d 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "ethereumjs-units": "^0.2.0", "ethereumjs-util": "^6.0.0", "express": "^4.16.4", - "friendly-errors-webpack-plugin": "^1.7.0", "git-revision-webpack-plugin": "^3.0.3", "hdkey": "^1.1.0", "history": "^4.7.2", diff --git a/webpack/dev.babel.js b/webpack/dev.babel.js index 5c770fc9..374bb271 100644 --- a/webpack/dev.babel.js +++ b/webpack/dev.babel.js @@ -1,7 +1,6 @@ import webpack from 'webpack'; import GitRevisionPlugin from 'git-revision-webpack-plugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; -import FriendlyErrorsWebpackPlugin from 'friendly-errors-webpack-plugin'; import WebpackBuildNotifierPlugin from 'webpack-build-notifier'; import packageJson from '../package.json'; @@ -35,7 +34,6 @@ module.exports = { https: false, quiet: true, port: PORT, - stats: 'minimal', inline: true, }, module: { @@ -123,6 +121,5 @@ module.exports = { new webpack.NoEmitOnErrorsPlugin(), new webpack.HotModuleReplacementPlugin(), new webpack.NamedModulesPlugin(), - new FriendlyErrorsWebpackPlugin(), ], }; diff --git a/webpack/production.babel.js b/webpack/production.babel.js index 9be7e0b5..2cef0afa 100644 --- a/webpack/production.babel.js +++ b/webpack/production.babel.js @@ -1,7 +1,6 @@ import webpack from 'webpack'; import GitRevisionPlugin from 'git-revision-webpack-plugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; -import FriendlyErrorsWebpackPlugin from 'friendly-errors-webpack-plugin'; import CopyWebpackPlugin from 'copy-webpack-plugin'; import packageJson from '../package.json'; import { SRC, BUILD, PUBLIC } from './constants'; @@ -82,6 +81,5 @@ module.exports = { new webpack.optimize.OccurrenceOrderPlugin(), new webpack.NoEmitOnErrorsPlugin(), new webpack.NamedModulesPlugin(), - new FriendlyErrorsWebpackPlugin(), ], }; diff --git a/yarn.lock b/yarn.lock index 1019879b..ef448946 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3825,13 +3825,6 @@ error-stack-parser@^1.3.6: dependencies: stackframe "^0.3.1" -error-stack-parser@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.2.tgz#4ae8dbaa2bf90a8b450707b9149dcabca135520d" - integrity sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw== - dependencies: - stackframe "^1.0.4" - es-abstract@^1.11.0, es-abstract@^1.5.1: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" @@ -4813,15 +4806,6 @@ fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" -friendly-errors-webpack-plugin@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz#efc86cbb816224565861a1be7a9d84d0aafea136" - integrity sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw== - dependencies: - chalk "^1.1.3" - error-stack-parser "^2.0.0" - string-width "^2.0.0" - from2@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" @@ -9950,11 +9934,6 @@ stackframe@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-0.3.1.tgz#33aa84f1177a5548c8935533cbfeb3420975f5a4" -stackframe@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b" - integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw== - state-toggle@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz#c3cb0974f40a6a0f8e905b96789eb41afa1cde3a" From 4076efeabac7e5aac47b51c56b071d09b4b03be4 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 25 Feb 2019 12:48:41 +0100 Subject: [PATCH 04/12] Show erros again --- webpack/dev.babel.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webpack/dev.babel.js b/webpack/dev.babel.js index 374bb271..32db02ec 100644 --- a/webpack/dev.babel.js +++ b/webpack/dev.babel.js @@ -30,9 +30,10 @@ module.exports = { SRC, PUBLIC, ], + stats: 'minimal', hot: true, https: false, - quiet: true, + quiet: false, port: PORT, inline: true, }, From f8f6609f3fe76a49dbfaec1417d65f551119643c Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 25 Feb 2019 14:30:57 +0100 Subject: [PATCH 05/12] Device tests simplified --- .../__snapshots__/device.test.js.snap | 67 -------- src/utils/__tests__/device.test.js | 157 ++++++++---------- 2 files changed, 66 insertions(+), 158 deletions(-) delete mode 100644 src/utils/__tests__/__snapshots__/device.test.js.snap diff --git a/src/utils/__tests__/__snapshots__/device.test.js.snap b/src/utils/__tests__/__snapshots__/device.test.js.snap deleted file mode 100644 index d7109016..00000000 --- a/src/utils/__tests__/__snapshots__/device.test.js.snap +++ /dev/null @@ -1,67 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`device utils get status 1`] = `"disconnected"`; - -exports[`device utils get status 2`] = `"unavailable"`; - -exports[`device utils get status 3`] = `"unavailable"`; - -exports[`device utils get status 4`] = `"connected"`; - -exports[`device utils get status 5`] = `"unacquired"`; - -exports[`device utils get status 6`] = `"used-in-other-window"`; - -exports[`device utils get status color 1`] = `"#494949"`; - -exports[`device utils get status color 2`] = `"#494949"`; - -exports[`device utils get status color 3`] = `"#494949"`; - -exports[`device utils get status color 4`] = `"#EB8A00"`; - -exports[`device utils get status color 5`] = `"#01B757"`; - -exports[`device utils get status color 6`] = `"#EB8A00"`; - -exports[`device utils get status color 7`] = `"#ED1212"`; - -exports[`device utils get status color 8`] = `"#ED1212"`; - -exports[`device utils get status name 1`] = `"Status unknown"`; - -exports[`device utils get status name 2`] = `"Status unknown"`; - -exports[`device utils get status name 3`] = `"Status unknown"`; - -exports[`device utils get status name 4`] = `"Used in other window"`; - -exports[`device utils get status name 5`] = `"Connected"`; - -exports[`device utils get status name 6`] = `"Used in other window"`; - -exports[`device utils get status name 7`] = `"Disconnected"`; - -exports[`device utils get status name 8`] = `"Unavailable"`; - -exports[`device utils get version 1`] = `"One"`; - -exports[`device utils get version 2`] = `"One"`; - -exports[`device utils get version 3`] = `"One"`; - -exports[`device utils get version 4`] = `"One"`; - -exports[`device utils get version 5`] = `"One"`; - -exports[`device utils get version 6`] = `"T"`; - -exports[`device utils isDisabled 1`] = `false`; - -exports[`device utils isDisabled 2`] = `true`; - -exports[`device utils isWebUSB 1`] = `true`; - -exports[`device utils isWebUSB 2`] = `false`; - -exports[`device utils isWebUSB 3`] = `true`; diff --git a/src/utils/__tests__/device.test.js b/src/utils/__tests__/device.test.js index aa38e5f3..52b1aec2 100644 --- a/src/utils/__tests__/device.test.js +++ b/src/utils/__tests__/device.test.js @@ -1,112 +1,87 @@ -import * as dUtils from 'utils/device'; +import * as utils from 'utils/device'; describe('device utils', () => { it('get status', () => { - const deviceMock = [ - { - connected: false, - }, - { - connected: true, - available: false, - }, - { - connected: true, - available: false, - type: null, - }, - { - connected: true, - available: true, - type: 'acquired', - }, - { - connected: true, - available: true, - type: 'unacquired', - }, - { - connected: true, - available: true, - type: 'acquired', - status: 'occupied', - }, - ]; + expect(utils.getStatus({ connected: false })) + .toBe('disconnected'); + + expect(utils.getStatus({ connected: true, available: false })) + .toBe('unavailable'); + + expect(utils.getStatus({ + connected: true, + available: false, + type: null, + })).toBe('unavailable'); - deviceMock.forEach((device) => { - expect(dUtils.getStatus(device)).toMatchSnapshot(); - }); + expect(utils.getStatus({ + connected: true, + available: true, + type: 'acquired', + })).toBe('connected'); + + expect(utils.getStatus({ + connected: true, + available: true, + type: 'unacquired', + })).toBe('unacquired'); + + expect(utils.getStatus({ + connected: true, + available: true, + type: 'acquired', + status: 'occupied', + })).toBe('used-in-other-window'); }); it('isWebUSB', () => { - const data = [ - { transport: { type: 'webusb', version: '1.6.0' } }, - { transport: { type: null, version: 'aaaaaa' } }, - { transport: { type: 'webusb' } }, - ]; - - data.forEach((item) => { - expect(dUtils.isWebUSB(item.transport)).toMatchSnapshot(); - }); + expect(utils.isWebUSB({ type: 'webusb', version: '1.6.0' })).toBe(true); + expect(utils.isWebUSB({ type: 'aaaa', version: 'aaaaaa' })).toBe(false); + expect(utils.isWebUSB({ type: 'webusb' })).toBe(true); }); it('isDisabled', () => { - const data = [ - { selectedDevice: { features: null }, devices: [1, 2, 3], transport: { version: 'webusb' } }, - { selectedDevice: { features: null }, devices: [], transport: { version: 'test' } }, - ]; + expect(utils.isDisabled( + { selectedDevice: { features: null } }, + [1, 2, 3], + { + version: 'webusb', + }, + )).toBe(false); - data.forEach((item) => { - expect(dUtils.isDisabled(item.selectedDevice, item.devices, item.transport)).toMatchSnapshot(); - }); + expect(utils.isDisabled( + { features: null }, [], { version: 'test' }, + )).toBe(true); }); it('get version', () => { - const deviceMock = [ - { }, - { features: {} }, - { features: { major_version: null } }, - { features: { major_version: 0 } }, - { features: { major_version: 1 } }, - { features: { major_version: 2 } }, - ]; - - deviceMock.forEach((device) => { - expect(dUtils.getVersion(device)).toMatchSnapshot(); - }); + expect(utils.getVersion({})).toBe('One'); + expect(utils.getVersion({ features: {} })).toBe('One'); + expect(utils.getVersion({ features: { major_version: null } })).toBe('One'); + expect(utils.getVersion({ features: { major_version: 0 } })).toBe('One'); + expect(utils.getVersion({ features: { major_version: 1 } })).toBe('One'); + expect(utils.getVersion({ features: { major_version: 2 } })).toBe('T'); }); it('get status color', () => { - const entry = [ - 0, - null, - 'sdsdsdsd', - 'used-in-other-window', - 'connected', - 'unacquired', - 'disconnected', - 'unavailable', - ]; - - entry.forEach((status) => { - expect(dUtils.getStatusColor(status)).toMatchSnapshot(); - }); + expect(utils.getStatusColor(0)).toBe('#494949'); + expect(utils.getStatusColor(null)).toBe('#494949'); + expect(utils.getStatusColor('sdsdsdsd')).toBe('#494949'); + expect(utils.getStatusColor('used-in-other-window')).toBe('#EB8A00'); + expect(utils.getStatusColor('connected')).toBe('#01B757'); + expect(utils.getStatusColor('unacquired')).toBe('#EB8A00'); + expect(utils.getStatusColor('disconnected')).toBe('#ED1212'); + expect(utils.getStatusColor('unavailable')).toBe('#ED1212'); }); it('get status name', () => { - const entry = [ - 0, - null, - 'sdsdsdsd', - 'used-in-other-window', - 'connected', - 'unacquired', - 'disconnected', - 'unavailable', - ]; - - entry.forEach((status) => { - expect(dUtils.getStatusName(status)).toMatchSnapshot(); - }); + expect(utils.getStatusName(0)).toBe('Status unknown'); + expect(utils.getStatusName(null)).toBe('Status unknown'); + expect(utils.getStatusName('sdsdsdsd')).toBe('Status unknown'); + expect(utils.getStatusName('used-in-other-window')).toBe('Used in other window'); + expect(utils.getStatusName('connected')).toBe('Connected'); + expect(utils.getStatusName('unacquired')).toBe('Used in other window'); + expect(utils.getStatusName('disconnected')).toBe('Disconnected'); + expect(utils.getStatusName('unavailable')).toBe('Unavailable'); }); -}); +}); \ No newline at end of file From 6d790d9e31fbdf0cd2578d86e708b5a2dc1226f7 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 25 Feb 2019 14:40:46 +0100 Subject: [PATCH 06/12] Notifications tests simplified --- .../__snapshots__/notification.test.js.snap | 41 ------------------- src/utils/__tests__/notification.test.js | 38 ++++------------- 2 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 src/utils/__tests__/__snapshots__/notification.test.js.snap diff --git a/src/utils/__tests__/__snapshots__/notification.test.js.snap b/src/utils/__tests__/__snapshots__/notification.test.js.snap deleted file mode 100644 index 35cabc6c..00000000 --- a/src/utils/__tests__/__snapshots__/notification.test.js.snap +++ /dev/null @@ -1,41 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`device utils get icon 1`] = ` -Array [ - "M693.024 330.944c-99.968-99.936-262.080-99.936-362.048 0s-99.968 262.112 0 362.080c99.968 100 262.144 99.936 362.048 0 99.968-99.904 99.968-262.176 0-362.080zM507.904 300.192c27.008 0 48.992 21.984 48.992 49.088 0 27.296-21.984 49.472-48.992 49.472-27.264 0-49.536-22.176-49.536-49.472 0-27.552 21.728-49.088 49.536-49.088zM586.656 660.8c0 10.304-4.96 15.328-15.264 15.328h-126.464c-10.304 0-15.328-5.024-15.328-15.328v-32.256c0-10.304 5.024-15.264 15.328-15.264h23.36v-136.064h-23.872c-10.304 0-15.264-5.024-15.264-15.328v-32.224c0-10.304 4.96-15.264 15.264-15.264h88.288c10.304 0 15.264 4.96 15.264 15.264v183.648h23.424c10.304 0 15.264 4.96 15.264 15.264v32.224z", -] -`; - -exports[`device utils get icon 2`] = ` -Array [ - "M693.12 330.88c-46.317-46.267-110.276-74.88-180.919-74.88-141.385 0-256 114.615-256 256s114.615 256 256 256c70.642 0 134.602-28.613 180.921-74.882l-0.002 0.002c46.387-46.337 75.081-110.377 75.081-181.12s-28.694-134.783-75.079-181.118l-0.002-0.002zM494.080 344.32h53.12c16 0 18.24 9.28 18.24 14.72v10.24l-10.88 194.56c0 14.4-8 17.28-18.88 17.28h-28.16c-10.56 0-17.28-2.88-18.88-17.92l-10.88-193.92v-10.56c-1.28-4.8 2.24-14.080 16.32-14.080zM521.28 717.76c-0.095 0.001-0.207 0.001-0.319 0.001-27.747 0-50.24-22.493-50.24-50.24s22.493-50.24 50.24-50.24c27.747 0 50.24 22.493 50.24 50.24 0 0.112 0 0.224-0.001 0.336v-0.017c0 0 0 0.001 0 0.001 0 27.634-22.311 50.057-49.903 50.239h-0.017z", -] -`; - -exports[`device utils get icon 3`] = ` -Array [ - "M795.616 735.008l-264.896-465.44c-10.272-18.080-27.168-18.080-37.504 0l-264.864 465.44c-10.272 18.176-1.696 32.992 19.040 32.992h529.184c20.8 0 29.376-14.816 19.040-32.992zM549.76 673.12c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-37.952c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v37.952zM549.76 559.264c0 10.464-8.48 18.976-18.912 18.976h-37.792c-10.336 0-18.912-8.512-18.912-18.976v-113.856c0-10.464 8.576-18.976 18.912-18.976h37.792c10.4 0 18.912 8.544 18.912 18.976v113.856z", -] -`; - -exports[`device utils get icon 4`] = ` -Array [ - "M692.8 313.92l-1.92-1.92c-6.246-7.057-15.326-11.484-25.44-11.484s-19.194 4.427-25.409 11.448l-0.031 0.036-196.48 224-3.84 1.6-3.84-1.92-48.64-57.28c-7.010-7.905-17.193-12.862-28.533-12.862-21.031 0-38.080 17.049-38.080 38.080 0 7.495 2.165 14.485 5.905 20.377l-0.092-0.155 100.8 148.16c5.391 8.036 14.386 13.292 24.618 13.44h8.662c17.251-0.146 32.385-9.075 41.163-22.529l0.117-0.191 195.2-296.32c4.473-6.632 7.141-14.803 7.141-23.597 0-11.162-4.297-21.32-11.326-28.911l0.025 0.028z", -] -`; - -exports[`device utils get icon 5`] = `undefined`; - -exports[`device utils get icon 6`] = `undefined`; - -exports[`device utils get status 1`] = `"#1E7FF0"`; - -exports[`device utils get status 2`] = `"#ED1212"`; - -exports[`device utils get status 3`] = `"#EB8A00"`; - -exports[`device utils get status 4`] = `"#01B757"`; - -exports[`device utils get status 5`] = `null`; - -exports[`device utils get status 6`] = `null`; diff --git a/src/utils/__tests__/notification.test.js b/src/utils/__tests__/notification.test.js index d6626311..f145bee3 100644 --- a/src/utils/__tests__/notification.test.js +++ b/src/utils/__tests__/notification.test.js @@ -1,32 +1,12 @@ -import * as nUtils from 'utils/notification'; +import * as utils from 'utils/notification'; -describe('device utils', () => { - it('get status', () => { - const types = [ - 'info', - 'error', - 'warning', - 'success', - 'kdsjflds', - '', - ]; - - types.forEach((type) => { - expect(nUtils.getPrimaryColor(type)).toMatchSnapshot(); - }); - }); - it('get icon', () => { - const types = [ - 'info', - 'error', - 'warning', - 'success', - 'kdsjflds', - '', - ]; - - types.forEach((type) => { - expect(nUtils.getIcon(type)).toMatchSnapshot(); - }); +describe('notification utils', () => { + it('get colors from status', () => { + expect(utils.getPrimaryColor('info')).toBe('#1E7FF0'); + expect(utils.getPrimaryColor('warning')).toBe('#EB8A00'); + expect(utils.getPrimaryColor('error')).toBe('#ED1212'); + expect(utils.getPrimaryColor('success')).toBe('#01B757'); + expect(utils.getPrimaryColor('kdsjflds')).toBe(null); + expect(utils.getPrimaryColor('')).toBe(null); }); }); From d4a19b51339e9f24b5282e7561f5ef33ace76437 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 25 Feb 2019 14:51:55 +0100 Subject: [PATCH 07/12] Eth utils tests refactored --- .../__snapshots__/ethUtils.test.js.snap | 45 --------------- src/utils/__tests__/ethUtils.test.js | 57 ++++++++----------- 2 files changed, 24 insertions(+), 78 deletions(-) delete mode 100644 src/utils/__tests__/__snapshots__/ethUtils.test.js.snap diff --git a/src/utils/__tests__/__snapshots__/ethUtils.test.js.snap b/src/utils/__tests__/__snapshots__/ethUtils.test.js.snap deleted file mode 100644 index ad90b78c..00000000 --- a/src/utils/__tests__/__snapshots__/ethUtils.test.js.snap +++ /dev/null @@ -1,45 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`eth utils calcGasPrice 1`] = `"89090990901"`; - -exports[`eth utils decimalToHex 1`] = `"0"`; - -exports[`eth utils decimalToHex 2`] = `"1"`; - -exports[`eth utils decimalToHex 3`] = `"2"`; - -exports[`eth utils decimalToHex 4`] = `"64"`; - -exports[`eth utils decimalToHex 5`] = `"2540be3ff"`; - -exports[`eth utils hexToDecimal 1`] = `"9999999999"`; - -exports[`eth utils hexToDecimal 2`] = `"100"`; - -exports[`eth utils hexToDecimal 3`] = `"2"`; - -exports[`eth utils hexToDecimal 4`] = `"1"`; - -exports[`eth utils hexToDecimal 5`] = `"0"`; - -exports[`eth utils hexToDecimal 6`] = `"null"`; - -exports[`eth utils padLeftEven 1`] = `"02540be3ff"`; - -exports[`eth utils sanitizeHex 1`] = `"0x02540be3ff"`; - -exports[`eth utils sanitizeHex 2`] = `"0x01"`; - -exports[`eth utils sanitizeHex 3`] = `"0x02"`; - -exports[`eth utils sanitizeHex 4`] = `"0x0100"`; - -exports[`eth utils sanitizeHex 5`] = `"0x0999"`; - -exports[`eth utils sanitizeHex 6`] = `""`; - -exports[`eth utils strip 1`] = `""`; - -exports[`eth utils strip 2`] = `"02540be3ff"`; - -exports[`eth utils strip 3`] = `"02540be3ff"`; diff --git a/src/utils/__tests__/ethUtils.test.js b/src/utils/__tests__/ethUtils.test.js index 119b90e5..e3fb8c1b 100644 --- a/src/utils/__tests__/ethUtils.test.js +++ b/src/utils/__tests__/ethUtils.test.js @@ -1,53 +1,44 @@ import BigNumber from 'bignumber.js'; -import * as ethUtils from '../ethUtils'; +import * as utils from '../ethUtils'; describe('eth utils', () => { it('decimalToHex', () => { - const input = [0, 1, 2, 100, 9999999999]; - - input.forEach((entry) => { - expect(ethUtils.decimalToHex(entry)).toMatchSnapshot(); - }); + expect(utils.decimalToHex(0)).toBe('0'); + expect(utils.decimalToHex(1)).toBe('1'); + expect(utils.decimalToHex(2)).toBe('2'); + expect(utils.decimalToHex(100)).toBe('64'); + expect(utils.decimalToHex(9999999999)).toBe('2540be3ff'); }); + // TODO: decimal as string ????? it('hexToDecimal', () => { - const input = ['2540be3ff', '64', '2', '1', '0', '']; - - input.forEach((entry) => { - expect(ethUtils.hexToDecimal(entry)).toMatchSnapshot(); - }); + expect(utils.hexToDecimal('2540be3ff')).toBe('9999999999'); + expect(utils.hexToDecimal(64)).toBe('100'); + expect(utils.hexToDecimal(2)).toBe('2'); + expect(utils.hexToDecimal(1)).toBe('1'); + expect(utils.hexToDecimal(0)).toBe('0'); }); it('padLeftEven', () => { - const input = ['2540be3ff']; - - input.forEach((entry) => { - expect(ethUtils.padLeftEven(entry)).toMatchSnapshot(); - }); + expect(utils.padLeftEven('2540be3ff')).toBe('02540be3ff'); }); it('sanitizeHex', () => { - const input = ['0x2540be3ff', '1', '2', '100', '999', '']; - - input.forEach((entry) => { - expect(ethUtils.sanitizeHex(entry)).toMatchSnapshot(); - }); + expect(utils.sanitizeHex('0x2540be3ff')).toBe('0x02540be3ff'); + expect(utils.sanitizeHex('1')).toBe('0x01'); + expect(utils.sanitizeHex('2')).toBe('0x02'); + expect(utils.sanitizeHex('100')).toBe('0x0100'); + expect(utils.sanitizeHex('999')).toBe('0x0999'); + expect(utils.sanitizeHex('')).toBe(''); }); - it('strip', () => { - const input = ['0x', '0x2540be3ff', '2540be3ff']; - - input.forEach((entry) => { - expect(ethUtils.strip(entry)).toMatchSnapshot(); - }); + expect(utils.strip('0x')).toBe(''); + expect(utils.strip('0x2540be3ff')).toBe('02540be3ff'); + expect(utils.strip('2540be3ff')).toBe('02540be3ff'); }); - it('calcGasPrice', () => { - const input = [{ price: new BigNumber(9898998989), limit: '9' }]; - - input.forEach((entry) => { - expect(ethUtils.calcGasPrice(entry.price, entry.limit)).toMatchSnapshot(); - }); + it('calculate gas price', () => { + expect(utils.calcGasPrice(new BigNumber(9898998989), 9)).toBe('89090990901'); }); }); From ced81e550350490efe31b37e325b6b8240978a99 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 25 Feb 2019 15:05:01 +0100 Subject: [PATCH 08/12] Format utils tests refactored --- .../__snapshots__/formatUtils.test.js.snap | 45 -------------- src/utils/__tests__/formatUtils.test.js | 61 ++++++++----------- 2 files changed, 26 insertions(+), 80 deletions(-) delete mode 100644 src/utils/__tests__/__snapshots__/formatUtils.test.js.snap diff --git a/src/utils/__tests__/__snapshots__/formatUtils.test.js.snap b/src/utils/__tests__/__snapshots__/formatUtils.test.js.snap deleted file mode 100644 index 448a338a..00000000 --- a/src/utils/__tests__/__snapshots__/formatUtils.test.js.snap +++ /dev/null @@ -1,45 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`format utils btckb2satoshib 1`] = `0`; - -exports[`format utils btckb2satoshib 2`] = `100000`; - -exports[`format utils btckb2satoshib 3`] = `200000`; - -exports[`format utils btckb2satoshib 4`] = `10000000`; - -exports[`format utils btckb2satoshib 5`] = `99900000`; - -exports[`format utils formatAmount 1`] = `"0 btc"`; - -exports[`format utils formatAmount 2`] = `"10 mBTC"`; - -exports[`format utils formatAmount 3`] = `"0.000005 mBTC"`; - -exports[`format utils formatAmount 4`] = `"1e-8 eth"`; - -exports[`format utils formatAmount 5`] = `"0.00099999 tau"`; - -exports[`format utils formatTime 1`] = `"No time estimate"`; - -exports[`format utils formatTime 2`] = `"1 minutes"`; - -exports[`format utils formatTime 3`] = `"2 minutes"`; - -exports[`format utils formatTime 4`] = `"1 hour 40 minutes"`; - -exports[`format utils formatTime 5`] = `"16 hours 39 minutes"`; - -exports[`format utils formatTime 6`] = `"45 minutes"`; - -exports[`format utils hexToString 1`] = `"test"`; - -exports[`format utils hexToString 2`] = `"0001"`; - -exports[`format utils hexToString 3`] = `"test99999"`; - -exports[`format utils stringToHex 1`] = `"0074006500730074"`; - -exports[`format utils stringToHex 2`] = `"0030003000300031"`; - -exports[`format utils stringToHex 3`] = `"007400650073007400390039003900390039"`; diff --git a/src/utils/__tests__/formatUtils.test.js b/src/utils/__tests__/formatUtils.test.js index eb1d026d..2f9071d5 100644 --- a/src/utils/__tests__/formatUtils.test.js +++ b/src/utils/__tests__/formatUtils.test.js @@ -1,49 +1,40 @@ -import * as formatUtils from '../formatUtils'; +import * as utils from '../formatUtils'; describe('format utils', () => { it('formatAmount', () => { - const input = [ - { amount: 0, coinInfo: { isBitcoin: true, currencyUnits: 'mbtc', shortcut: 'btc' } }, - { amount: 1000000, coinInfo: { isBitcoin: true, currencyUnits: 'mbtc', shortcut: 'btc' } }, - { amount: 0.5, coinInfo: { isBitcoin: true, currencyUnits: 'mbtc', shortcut: 'btc' } }, - { amount: 1, coinInfo: { isBitcoin: false, shortcut: 'eth' } }, - { amount: 99999, coinInfo: { isBitcoin: false, shortcut: 'tau' } }, - ]; - - input.forEach((entry) => { - expect(formatUtils.formatAmount(entry.amount, entry.coinInfo, entry.coinInfo.currencyUnits)).toMatchSnapshot(); - }); + expect(utils.formatAmount(0, { isBitcoin: true }, 'mbtc')).toMatchSnapshot('0 btc'); + expect(utils.formatAmount(1000000, { isBitcoin: true }, 'mbtc')).toMatchSnapshot('10 mBTC'); + expect(utils.formatAmount(0.5, { isBitcoin: true }, 'mbtc')).toMatchSnapshot('0.000005 mBTC'); + expect(utils.formatAmount(1, { isBitcoin: false, shortcut: 'eth' }, null)).toMatchSnapshot('1e-8 eth'); + expect(utils.formatAmount(99999, { isBitcoin: false, shortcut: 'tau' }, null)).toMatchSnapshot('0.00099999 tau'); }); - it('formatTime', () => { - const input = [0, 1, 2, 100, 999, 45]; - - input.forEach((entry) => { - expect(formatUtils.formatTime(entry)).toMatchSnapshot(); - }); + it('format time', () => { + expect(utils.formatTime(0)).toBe('No time estimate'); + expect(utils.formatTime(1)).toBe('1 minutes'); // TODO: should be minute + expect(utils.formatTime(2)).toBe('2 minutes'); + expect(utils.formatTime(45)).toBe('45 minutes'); + expect(utils.formatTime(100)).toBe('1 hour 40 minutes'); + expect(utils.formatTime(999)).toBe('16 hours 39 minutes'); }); it('btckb2satoshib', () => { - const input = [0, 1, 2, 100, 999]; - - input.forEach((entry) => { - expect(formatUtils.btckb2satoshib(entry)).toMatchSnapshot(); - }); + expect(utils.btckb2satoshib(0)).toBe(0); + expect(utils.btckb2satoshib(1)).toBe(100000); + expect(utils.btckb2satoshib(2)).toBe(200000); + expect(utils.btckb2satoshib(100)).toBe(10000000); + expect(utils.btckb2satoshib(999)).toBe(99900000); }); - it('stringToHex', () => { - const input = ['test', '0001', 'test99999']; - - input.forEach((entry) => { - expect(formatUtils.stringToHex(entry)).toMatchSnapshot(); - }); + it('string to hex', () => { + expect(utils.stringToHex('test')).toBe('0074006500730074'); + expect(utils.stringToHex('0001')).toBe('0030003000300031'); + expect(utils.stringToHex('test99999')).toBe('007400650073007400390039003900390039'); }); - it('hexToString', () => { - const input = ['0074006500730074', '0030003000300031', '007400650073007400390039003900390039']; - - input.forEach((entry) => { - expect(formatUtils.hexToString(entry)).toMatchSnapshot(); - }); + it('hex to string', () => { + expect(utils.hexToString('0074006500730074')).toBe('test'); + expect(utils.hexToString('0030003000300031')).toBe('0001'); + expect(utils.hexToString('007400650073007400390039003900390039')).toBe('test99999'); }); }); From be3efd183544bb2d51be50057c2ce4b240b85b33 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 25 Feb 2019 15:08:09 +0100 Subject: [PATCH 09/12] Format utils tests refactored 2 --- src/utils/__tests__/formatUtils.test.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/utils/__tests__/formatUtils.test.js b/src/utils/__tests__/formatUtils.test.js index 2f9071d5..f83776e4 100644 --- a/src/utils/__tests__/formatUtils.test.js +++ b/src/utils/__tests__/formatUtils.test.js @@ -1,12 +1,13 @@ import * as utils from '../formatUtils'; describe('format utils', () => { + // TODO: check this weird function it('formatAmount', () => { - expect(utils.formatAmount(0, { isBitcoin: true }, 'mbtc')).toMatchSnapshot('0 btc'); - expect(utils.formatAmount(1000000, { isBitcoin: true }, 'mbtc')).toMatchSnapshot('10 mBTC'); - expect(utils.formatAmount(0.5, { isBitcoin: true }, 'mbtc')).toMatchSnapshot('0.000005 mBTC'); - expect(utils.formatAmount(1, { isBitcoin: false, shortcut: 'eth' }, null)).toMatchSnapshot('1e-8 eth'); - expect(utils.formatAmount(99999, { isBitcoin: false, shortcut: 'tau' }, null)).toMatchSnapshot('0.00099999 tau'); + expect(utils.formatAmount(0, { isBitcoin: false, shortcut: 'mbtc' }, 'mbtc')).toBe('0 mbtc'); + expect(utils.formatAmount(1000000, { isBitcoin: true }, 'mbtc')).toBe('10 mBTC'); + expect(utils.formatAmount(0.5, { isBitcoin: true }, 'mbtc')).toBe('0.000005 mBTC'); + expect(utils.formatAmount(1, { isBitcoin: false, shortcut: 'eth' }, null)).toBe('1e-8 eth'); + expect(utils.formatAmount(99999, { isBitcoin: false, shortcut: 'tau' }, null)).toBe('0.00099999 tau'); }); it('format time', () => { From d43426bade0a024da2b81c3b41234ff4495191d2 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Mon, 25 Feb 2019 17:46:25 +0100 Subject: [PATCH 10/12] renamed read more to learn more --- src/components/Tooltip/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Tooltip/index.js b/src/components/Tooltip/index.js index 17cb2344..920073e3 100644 --- a/src/components/Tooltip/index.js +++ b/src/components/Tooltip/index.js @@ -43,7 +43,7 @@ const Tooltip = ({ {content} {readMoreLink && ( - Read more + Learn more ) } From 8db40190869bbbf422abe17d3a839787ceba59b4 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Mon, 25 Feb 2019 17:47:28 +0100 Subject: [PATCH 11/12] update destination tag explanation and learn more link --- .../Account/Send/ripple/components/AdvancedForm/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js b/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js index 883533d7..7257b3be 100644 --- a/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js +++ b/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js @@ -165,11 +165,11 @@ const AdvancedForm = (props: Props) => { - An arbitrary unsigned 32-bit integer that identifies a reason for payment or a non-Ripple account. + Destination tag is an arbitrary number which serves as a unique identifier of your transaction. Some services may require this to process your transaction. )} maxWidth={200} - readMoreLink="https://developers.ripple.com/rippleapi-reference.html#payment" + readMoreLink="https://wiki.trezor.io/Ripple_(XRP)" placement="top" > Date: Mon, 25 Feb 2019 18:07:24 +0100 Subject: [PATCH 12/12] update text for xrp minimum acc reserve notification --- src/components/Notification/index.js | 2 +- .../notifications/Context/components/Static/index.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/components/Notification/index.js b/src/components/Notification/index.js index 721a7463..8ced6cce 100644 --- a/src/components/Notification/index.js +++ b/src/components/Notification/index.js @@ -17,7 +17,7 @@ type Props = { cancelable?: boolean; title: string; className?: string; - message?: ?string; + message?: ?React.Node; actions?: Array; isActionInProgress?: boolean; close?: typeof NotificationActions.close, diff --git a/src/components/notifications/Context/components/Static/index.js b/src/components/notifications/Context/components/Static/index.js index 912569cf..a6867a0e 100644 --- a/src/components/notifications/Context/components/Static/index.js +++ b/src/components/notifications/Context/components/Static/index.js @@ -3,7 +3,7 @@ import * as React from 'react'; import Notification from 'components/Notification'; import Bignumber from 'bignumber.js'; - +import Link from 'components/Link'; import type { Props } from '../../index'; export default (props: Props) => { @@ -25,7 +25,12 @@ export default (props: Props) => { key="xrp-warning" type="warning" title="Minimum account reserve required" - message={`The Base Reserve is a minimum amount of XRP that is required for every address in the ledger. Currently, this is ${bigReserve.toString()} XRP.`} + message={( + <> + {`Ripple addresses require a minimum balance of ${bigReserve.toString()} XRP to activate and maintain the account. `} + Learn more + + )} />, ); }