diff --git a/package-lock.json b/package-lock.json
index e42b0a9e..9ff635ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1000,77 +1000,77 @@
       }
     },
     "@sentry/apm": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@sentry/apm/-/apm-5.21.1.tgz",
-      "integrity": "sha512-mxMOCpeXULbQCC/f9SwPqW+g12mk3nWRNjeAUm5dyiKHY13agtQBSSYs4ROEH190YxmwTZr3vxhlR2jNSdSZcg==",
+      "version": "5.21.3",
+      "resolved": "https://registry.npmjs.org/@sentry/apm/-/apm-5.21.3.tgz",
+      "integrity": "sha512-5Hl/ZJV9dm1a/SskwdaTX34GsgmrWGMeGPIHTkrI5iXMHObHUjbnSuPgIld/Ffi19GpjPsjEV3kxA3AQnHQCqg==",
       "dev": true,
       "requires": {
-        "@sentry/browser": "5.21.1",
-        "@sentry/hub": "5.21.1",
-        "@sentry/minimal": "5.21.1",
-        "@sentry/types": "5.21.1",
-        "@sentry/utils": "5.21.1",
+        "@sentry/browser": "5.21.3",
+        "@sentry/hub": "5.21.3",
+        "@sentry/minimal": "5.21.3",
+        "@sentry/types": "5.21.3",
+        "@sentry/utils": "5.21.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/browser": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.21.1.tgz",
-      "integrity": "sha512-sUxsW545klZxJE4iBAYQ8SuVS85HTOGNmIIIZWFUogB5oW3O0L+nJluXEqf/pHU82LnjDIzqsWCYQ0cRUaeYow==",
+      "version": "5.21.3",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.21.3.tgz",
+      "integrity": "sha512-suY3vn0kJcy+SK87dAwKakXrFb5DQ30jS5MqfTFByS54aiB9Sn9dr9jKqvkvjBsGz9hmnmtH87Llv+vT/qK8pg==",
       "dev": true,
       "requires": {
-        "@sentry/core": "5.21.1",
-        "@sentry/types": "5.21.1",
-        "@sentry/utils": "5.21.1",
+        "@sentry/core": "5.21.3",
+        "@sentry/types": "5.21.3",
+        "@sentry/utils": "5.21.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/core": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.21.1.tgz",
-      "integrity": "sha512-Luulwx3GLUiY0gmHOhU+4eSga28Ce8DwoBcRq9GkGuhPu9r80057d5urxrDLp/leIZBXVvpY7tvmSN/rMtvF9w==",
+      "version": "5.21.3",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.21.3.tgz",
+      "integrity": "sha512-t1jFVoQXs817HlEw+iJLeygePALJ3dMkxHtQoeexEE50V7uh+ZkMT+OEOAYRm4w70I318HBATLwD/pE4DOLWFg==",
       "dev": true,
       "requires": {
-        "@sentry/hub": "5.21.1",
-        "@sentry/minimal": "5.21.1",
-        "@sentry/types": "5.21.1",
-        "@sentry/utils": "5.21.1",
+        "@sentry/hub": "5.21.3",
+        "@sentry/minimal": "5.21.3",
+        "@sentry/types": "5.21.3",
+        "@sentry/utils": "5.21.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/hub": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.21.1.tgz",
-      "integrity": "sha512-x5i9Ggi5ZYMhBYL5kyTu2fUJ6owjKH2tgJL3UExoZdRyZkbLAFZb+DtfSnteWgQ6wriGfgPD3r/hAIEdaomk2A==",
+      "version": "5.21.3",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.21.3.tgz",
+      "integrity": "sha512-BBCPJcHi7vcby1OCYTQpRlqBjixLKhp4VxCsbJ+97jWFY5/JEkbD5spFEjomm40a6DCAZBTuGBV4ykr5mv0LBQ==",
       "dev": true,
       "requires": {
-        "@sentry/types": "5.21.1",
-        "@sentry/utils": "5.21.1",
+        "@sentry/types": "5.21.3",
+        "@sentry/utils": "5.21.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/minimal": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.21.1.tgz",
-      "integrity": "sha512-OBVPASZ+mcXMKajvJon9RjEZ+ny3+VGhOI66acoP1hmYxKvji1OC2bYEuP1r4qtHxWVLAdV7qFj3EQ9ckErZmQ==",
+      "version": "5.21.3",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.21.3.tgz",
+      "integrity": "sha512-0im2QDgmXiyd5U5q2F7uBfn24vVBkS/qcLKBNFGaSEiHidDVOtFx1snspkBxO8LF5lqzmJO4eMMAjSZbcMReVw==",
       "dev": true,
       "requires": {
-        "@sentry/hub": "5.21.1",
-        "@sentry/types": "5.21.1",
+        "@sentry/hub": "5.21.3",
+        "@sentry/types": "5.21.3",
         "tslib": "^1.9.3"
       }
     },
     "@sentry/node": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.21.1.tgz",
-      "integrity": "sha512-+QLqGz6+/gtShv0F16nI2+AuVEDZG2k9L25BVCNoysYzH1J1/QIKHsl7YF2trDMlWM4T7cbu5Fh8AhK6an+5/g==",
+      "version": "5.21.3",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.21.3.tgz",
+      "integrity": "sha512-b4lX2qKUUopWgdFHkeTBbcWavK19FF6WdBfLiLdoNZRUnqF0Yb/RDkBVsBFfHom0UO3p6ZF6qgi2sldsT45ZJg==",
       "dev": true,
       "requires": {
-        "@sentry/apm": "5.21.1",
-        "@sentry/core": "5.21.1",
-        "@sentry/hub": "5.21.1",
-        "@sentry/types": "5.21.1",
-        "@sentry/utils": "5.21.1",
+        "@sentry/apm": "5.21.3",
+        "@sentry/core": "5.21.3",
+        "@sentry/hub": "5.21.3",
+        "@sentry/types": "5.21.3",
+        "@sentry/utils": "5.21.3",
         "cookie": "^0.4.1",
         "https-proxy-agent": "^5.0.0",
         "lru_map": "^0.3.3",
@@ -1078,18 +1078,18 @@
       }
     },
     "@sentry/types": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.21.1.tgz",
-      "integrity": "sha512-hFN4aDduMpjj6vZSIIp+9kSr8MglcKO/UmbuUXN6hKLewhxt+Zj2wjXN7ulSs5OK5mjXP9QLA5YJvVQsl2//qw==",
+      "version": "5.21.3",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.21.3.tgz",
+      "integrity": "sha512-GU0lFZkeGJuCuNN3D8lXyBku6M1UtZzV8f8U4a4nGGFS0R3VqxDHrC3eupRc8Vut/1xfgvFz1qCkPstXUrEBuA==",
       "dev": true
     },
     "@sentry/utils": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.21.1.tgz",
-      "integrity": "sha512-p5vPuc7+GfOmW8CXxWd0samS77Q00YrN8q5TC/ztF8nBhEF18GiMeWAdQnlSwt3iWal3q3gSSrbF4c9guIugng==",
+      "version": "5.21.3",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.21.3.tgz",
+      "integrity": "sha512-JethkNMHA32gvKQWkTl8uccW0XP+FCJazIIbYFqVc3qJVhOnzfqgPuhLWt0f9/YvHJKG3SLEs+Li5bpiBDyURQ==",
       "dev": true,
       "requires": {
-        "@sentry/types": "5.21.1",
+        "@sentry/types": "5.21.3",
         "tslib": "^1.9.3"
       }
     },
@@ -1934,9 +1934,9 @@
       }
     },
     "@types/sinon": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-9.0.4.tgz",
-      "integrity": "sha512-sJmb32asJZY6Z2u09bl0G2wglSxDlROlAejCjsnor+LzBMz17gu8IU7vKC/vWDnv9zEq2wqADHVXFjf4eE8Gdw==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-9.0.5.tgz",
+      "integrity": "sha512-4CnkGdM/5/FXDGqL32JQ1ttVrGvhOoesLLF7VnTh4KdjK5N5VQOtxaylFqqTjnHx55MnD9O02Nbk5c1ELC8wlQ==",
       "dev": true,
       "requires": {
         "@types/sinonjs__fake-timers": "*"
@@ -3039,15 +3039,6 @@
         }
       }
     },
-    "config": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/config/-/config-3.3.1.tgz",
-      "integrity": "sha512-+2/KaaaAzdwUBE3jgZON11L1ggLLhpf2FsGrfqYFHZW22ySGv/HqYIXrBwKKvn+XZh1UBUjHwAcrfsSkSygT+Q==",
-      "dev": true,
-      "requires": {
-        "json5": "^2.1.1"
-      }
-    },
     "config-chain": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
@@ -3135,14 +3126,14 @@
       },
       "dependencies": {
         "parse-json": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz",
-          "integrity": "sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+          "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.0.0",
             "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1",
+            "json-parse-even-better-errors": "^2.3.0",
             "lines-and-columns": "^1.1.6"
           }
         },
@@ -4576,9 +4567,9 @@
       },
       "dependencies": {
         "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
+          "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
           "dev": true
         }
       }
@@ -7494,7 +7485,6 @@
             "anymatch": "^2.0.0",
             "async-each": "^1.0.1",
             "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
             "glob-parent": "^3.1.0",
             "inherits": "^2.0.3",
             "is-binary-path": "^1.0.0",
@@ -9961,17 +9951,6 @@
           "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "dev": true
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
         "function-bind": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -13195,7 +13174,6 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "scrypt": "^6.0.2",
             "scryptsy": "^1.2.1"
           }
         },
@@ -16385,10 +16363,10 @@
       "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
       "dev": true
     },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+    "json-parse-even-better-errors": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.0.tgz",
+      "integrity": "sha512-o3aP+RsWDJZayj1SbHNQAI8x0v3T3SKiGoZlNYfbUP1S3omJQ6i9CnqADqkSPaOAxwua4/1YWx5CM7oiChJt2Q==",
       "dev": true
     },
     "json-schema": {
@@ -16409,15 +16387,6 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
       "dev": true
     },
-    "json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -17411,6 +17380,12 @@
       "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==",
       "dev": true
     },
+    "node-config": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/node-config/-/node-config-0.0.2.tgz",
+      "integrity": "sha1-RrQNz7yw5m1GoV+BtU6sITD7FQ0=",
+      "dev": true
+    },
     "node-emoji": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
@@ -18624,16 +18599,6 @@
         }
       }
     },
-    "scrypt": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/scrypt/-/scrypt-6.0.3.tgz",
-      "integrity": "sha1-BOAUpWgrU/pQwtXM4WfXGcBthw0=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "^2.0.8"
-      }
-    },
     "scrypt-js": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
@@ -19766,9 +19731,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz",
-      "integrity": "sha512-RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q==",
+      "version": "3.10.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz",
+      "integrity": "sha512-GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow==",
       "dev": true,
       "optional": true
     },
diff --git a/package.json b/package.json
index e49eb20e..5a1be4ac 100644
--- a/package.json
+++ b/package.json
@@ -6,10 +6,10 @@
     "run-env": "npm i && tail -f /dev/null",
     "buidler": "buidler",
     "buidler:aave": "POOL=aave buidler",
+    "buidler:uniswap": "POOL=uniswap buidler",
     "buidler:aave:kovan": "npm run buidler:aave -- --network kovan",
     "buidler:aave:ropsten": "npm run buidler:aave -- --network ropsten",
     "buidler:aave:main": "npm run buidler:aave -- --network main",
-    "buidler:uniswap": "POOL=uniswap buidler",
     "buidler:uniswap:kovan": "npm run buidler:uniswap -- --network kovan",
     "buidler:uniswap:ropsten": "npm run buidler:uniswap --network ropsten",
     "buidler:uniswap:main": "npm run buidler:uniswap --network main",