diff --git a/package-lock.json b/package-lock.json
index 3df57971..4db3faf0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,13 +14,14 @@
         "cross-fetch": "^3.1.4",
         "crypto-js": "^4.0.0",
         "decimal.js": "^10.2.1",
+        "ethereumjs-util": "^7.1.3",
         "fs": "0.0.1-security",
         "lzma": "^2.3.2",
         "node-abort-controller": "^2.0.0",
         "save-file": "^2.3.1",
         "underscore": "^1.13.1",
         "uuid": "^8.3.2",
-        "web3": "^1.6.1",
+        "web3": ">=1.3.5",
         "web3-core": "^1.6.1",
         "web3-eth-contract": "^1.6.1"
       },
@@ -491,9 +492,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.16.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.5.tgz",
-      "integrity": "sha512-+Ce7T5iPNWzfu9C1aB5tN3Lyafs5xb3Ic7vBWyZL2KXT3QSdD1dD3CvgOzPmQKoNNRt6uauc0XwNJTQtXC2/Mw==",
+      "version": "7.16.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+      "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -3037,7 +3038,7 @@
     "node_modules/@oceanprotocol/contracts": {
       "name": "hardhat-project",
       "version": "v1.0.0-alpha.1",
-      "resolved": "git+ssh://git@github.com/oceanprotocol/contracts.git#9c6034f13f5c6951c22a360a1987f6067b8aa631",
+      "resolved": "git+ssh://git@github.com/oceanprotocol/contracts.git#25ca73bbe44bf6d1782e971b75a42e5ba65f197b",
       "dependencies": {
         "@openzeppelin/contracts": "^4.3.3",
         "@openzeppelin/test-helpers": "^0.5.15",
@@ -3202,9 +3203,9 @@
       }
     },
     "node_modules/@openzeppelin/contracts": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.4.0.tgz",
-      "integrity": "sha512-dlKiZmDvJnGRLHojrDoFZJmsQVeltVeoiRN7RK+cf2FmkhASDEblE0RiaYdxPNsUZa6mRG8393b9bfyp+V5IAw=="
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.4.1.tgz",
+      "integrity": "sha512-o+pHCf/yMLSlV5MkDQEzEQL402i6SoRnktru+0rdSxVEFZcTzzGhZCAtZjUFyKGazMSv1TilzMg+RbED1N8XHQ=="
     },
     "node_modules/@openzeppelin/test-helpers": {
       "version": "0.5.15",
@@ -3521,9 +3522,9 @@
       }
     },
     "node_modules/@truffle/abi-utils": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@truffle/abi-utils/-/abi-utils-0.2.4.tgz",
-      "integrity": "sha512-ICr5Sger6r5uj2G5GN9Zp9OQDCaCqe2ZyAEyvavDoFB+jX0zZFUCfDnv5jllGRhgzdYJ3mec2390mjUyz9jSZA==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@truffle/abi-utils/-/abi-utils-0.2.5.tgz",
+      "integrity": "sha512-eKDIn9LqUFP8MnHVohe8ncuza4p9bszz1NtJWc+sr5zUogtmWnnf8Ajyj7JJpNKhLNDVZVbLowVEVxWzSSpMHw==",
       "dependencies": {
         "change-case": "3.0.2",
         "faker": "^5.3.1",
@@ -3536,12 +3537,12 @@
       "integrity": "sha512-BFo/nyxwhoHqPrqBQA1EAmSxeNnspGLiOCMa9pAL7WYSjyNBlrHaqCMO/F2O87G+NUK/u06E70DiSP2BFP0ZZw=="
     },
     "node_modules/@truffle/codec": {
-      "version": "0.11.20",
-      "resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.11.20.tgz",
-      "integrity": "sha512-OJtP/AEaYH0QNoq/Z0Pyo4muN0piJDTXQlWPSTb+SI+ypgzd0RT5QOcpmtc6Q24mfeWRB3QbJxQP0ZSeyo1MVA==",
+      "version": "0.11.21",
+      "resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.11.21.tgz",
+      "integrity": "sha512-ZDzaEPCUFWmQuFsXA3KzXmU4w4lpxSWZTGUcEDHxn6IqAmL7FY8mmdbR6LQ1wTRAa9oPf84PcehMpTNY47HVcg==",
       "dependencies": {
-        "@truffle/abi-utils": "^0.2.4",
-        "@truffle/compile-common": "^0.7.22",
+        "@truffle/abi-utils": "^0.2.5",
+        "@truffle/compile-common": "^0.7.23",
         "big.js": "^5.2.2",
         "bn.js": "^5.1.3",
         "cbor": "^5.1.0",
@@ -3604,7 +3605,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
       "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "bn.js": "^4.11.9",
         "eth-lib": "0.2.8",
@@ -3629,23 +3629,23 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/@truffle/compile-common": {
-      "version": "0.7.22",
-      "resolved": "https://registry.npmjs.org/@truffle/compile-common/-/compile-common-0.7.22.tgz",
-      "integrity": "sha512-afFKh0Wphn8JrCSjOORKjO8/E1X0EtQv6GpFJpQCAWo3/i4VGcSVKR1rjkknnExtjEGe9PJH/Ym/opGH3pQyDw==",
+      "version": "0.7.23",
+      "resolved": "https://registry.npmjs.org/@truffle/compile-common/-/compile-common-0.7.23.tgz",
+      "integrity": "sha512-LWzeboJ9HmSZVgx5DMmKArOo96V4QZhS/+8beDOfeNT1W4QeKfkuVbAM0R77cXjiLnUsNjjFVXehnco6HiF8ww==",
       "dependencies": {
         "@truffle/error": "^0.0.14",
         "colors": "^1.4.0"
       }
     },
     "node_modules/@truffle/contract": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.4.0.tgz",
-      "integrity": "sha512-k/YbwIOJsRAn3+VseG/lOlFiqjValHYwXdEyCT5D1HRQ0MQZ7JPabR05+dAlY88BK5o9ejUXCh+TDc0CRDn/eQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.4.1.tgz",
+      "integrity": "sha512-KVpG9alKxdNzWOcRN97crZXXmmnnShq1SkM9hQN2fOckszzrmy6ctOhnZKNAb8tzfHBgODDCmiGQbTqaYizcrA==",
       "dependencies": {
         "@ensdomains/ensjs": "^2.0.1",
         "@truffle/blockchain-utils": "^0.0.31",
-        "@truffle/contract-schema": "^3.4.3",
-        "@truffle/debug-utils": "^6.0.1",
+        "@truffle/contract-schema": "^3.4.4",
+        "@truffle/debug-utils": "^6.0.2",
         "@truffle/error": "^0.0.14",
         "@truffle/interface-adapter": "^0.5.8",
         "bignumber.js": "^7.2.1",
@@ -3659,9 +3659,9 @@
       }
     },
     "node_modules/@truffle/contract-schema": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/@truffle/contract-schema/-/contract-schema-3.4.3.tgz",
-      "integrity": "sha512-pgaTgF4CKIpkqVYZVr2qGTxZZQOkNCWOXW9VQpKvLd4G0SNF2Y1gyhrFbBhoOUtYlbbSty+IEFFHsoAqpqlvpQ==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@truffle/contract-schema/-/contract-schema-3.4.4.tgz",
+      "integrity": "sha512-xWgrm6WRM2jmT04w7dP7aVbS2qyP9XPmH/mybQtFXMjJ/8BZlp0yltC8QOs8sGl6q8Ws7acp19YtRkLdK6SsmQ==",
       "dependencies": {
         "ajv": "^6.10.0",
         "debug": "^4.3.1"
@@ -3695,9 +3695,9 @@
       }
     },
     "node_modules/@truffle/contract/node_modules/@types/node": {
-      "version": "12.20.37",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-      "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+      "version": "12.20.38",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+      "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
     },
     "node_modules/@truffle/contract/node_modules/cacheable-request": {
       "version": "6.1.0",
@@ -3860,7 +3860,6 @@
       "resolved": "https://registry.npmjs.org/web3/-/web3-1.5.3.tgz",
       "integrity": "sha512-eyBg/1K44flfv0hPjXfKvNwcUfIVDI4NX48qHQe6wd7C8nPSdbWqo9vLy6ksZIt9NLa90HjI8HsGYgnMSUxn6w==",
       "hasInstallScript": true,
-      "license": "LGPL-3.0",
       "dependencies": {
         "web3-bzz": "1.5.3",
         "web3-core": "1.5.3",
@@ -3892,7 +3891,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.5.3.tgz",
       "integrity": "sha512-ACTbu8COCu+0eUNmd9pG7Q9EVsNkAg2w3Y7SqhDr+zjTgbSHZV01jXKlapm9z+G3AN/BziV3zGwudClJ4u4xXQ==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "@types/bn.js": "^4.11.5",
         "@types/node": "^12.12.6",
@@ -4004,7 +4002,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.5.3.tgz",
       "integrity": "sha512-Gdlt1L6cdHe83k7SdV6xhqCytVtOZkjD0kY/15x441AuuJ4JLubCHuqu69k2Dr3tWifHYVys/vG8QE/W16syGg==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "@types/bn.js": "^4.11.5",
         "web3-core": "1.5.3",
@@ -4122,7 +4119,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
       "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "bn.js": "^4.11.9",
         "eth-lib": "0.2.8",
@@ -4137,11 +4133,11 @@
       }
     },
     "node_modules/@truffle/debug-utils": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-6.0.1.tgz",
-      "integrity": "sha512-ntuLPYwKNOIeWfeb2emO9Tu2v1aH6mCLGBrKRrDX4ofMUbPyN3ujxiCg/FCxbkL9cpkbH9zOHLmu2ubNlZ3gvA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-6.0.2.tgz",
+      "integrity": "sha512-gMZ2IHPS9cvWGinUwVMoZedOYJz4sSekUXGC5FQkBnR0XDVriPmuja4rdgXhkA9EFSqZdXu4JAL8IiEHp/1YIw==",
       "dependencies": {
-        "@truffle/codec": "^0.11.20",
+        "@truffle/codec": "^0.11.21",
         "@trufflesuite/chromafi": "^2.2.2",
         "bn.js": "^5.1.3",
         "chalk": "^2.4.2",
@@ -4234,9 +4230,9 @@
       }
     },
     "node_modules/@truffle/interface-adapter/node_modules/@types/node": {
-      "version": "12.20.37",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-      "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+      "version": "12.20.38",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+      "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
     },
     "node_modules/@truffle/interface-adapter/node_modules/bignumber.js": {
       "version": "9.0.2",
@@ -4417,7 +4413,6 @@
       "resolved": "https://registry.npmjs.org/web3/-/web3-1.5.3.tgz",
       "integrity": "sha512-eyBg/1K44flfv0hPjXfKvNwcUfIVDI4NX48qHQe6wd7C8nPSdbWqo9vLy6ksZIt9NLa90HjI8HsGYgnMSUxn6w==",
       "hasInstallScript": true,
-      "license": "LGPL-3.0",
       "dependencies": {
         "web3-bzz": "1.5.3",
         "web3-core": "1.5.3",
@@ -4449,7 +4444,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.5.3.tgz",
       "integrity": "sha512-ACTbu8COCu+0eUNmd9pG7Q9EVsNkAg2w3Y7SqhDr+zjTgbSHZV01jXKlapm9z+G3AN/BziV3zGwudClJ4u4xXQ==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "@types/bn.js": "^4.11.5",
         "@types/node": "^12.12.6",
@@ -4553,7 +4547,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.5.3.tgz",
       "integrity": "sha512-Gdlt1L6cdHe83k7SdV6xhqCytVtOZkjD0kY/15x441AuuJ4JLubCHuqu69k2Dr3tWifHYVys/vG8QE/W16syGg==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "@types/bn.js": "^4.11.5",
         "web3-core": "1.5.3",
@@ -4671,7 +4664,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
       "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "bn.js": "^4.11.9",
         "eth-lib": "0.2.8",
@@ -5031,9 +5023,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.11.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz",
-      "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="
+      "version": "16.11.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.15.tgz",
+      "integrity": "sha512-LMGR7iUjwZRxoYnfc9+YELxwqkaLmkJlo4/HUvOMyGvw9DaHO0gtAbH2FUdoFE6PXBTYZIT7x610r7kdo8o1fQ=="
     },
     "node_modules/@types/node-fetch": {
       "version": "3.0.3",
@@ -6022,9 +6014,9 @@
       }
     },
     "node_modules/babel-plugin-transform-async-to-promises": {
-      "version": "0.8.16",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-promises/-/babel-plugin-transform-async-to-promises-0.8.16.tgz",
-      "integrity": "sha512-mm0UMekJVOTuIlkGIEH1fpnExyTIIJ2/L5ixTTI1zAVdMpbG7Em3LiS92p0TCWKiMkHhYYinz/zn2D/BPPJaxA==",
+      "version": "0.8.17",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-promises/-/babel-plugin-transform-async-to-promises-0.8.17.tgz",
+      "integrity": "sha512-MAijrdLcXjZBkET+n4GA9g96Wt5AibTHRKHWU3Zuuenvkge3QgrYiYfXsNcHZbQzJ6XO73l4MRMDNP+ZE77u5A==",
       "dev": true
     },
     "node_modules/babel-plugin-transform-replace-expressions": {
@@ -6550,9 +6542,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.0.tgz",
-      "integrity": "sha512-JGHzm73ei2OnAcobcQ61GXNnN6vDCg5Oz5MayudL+FyzjoLnCzUWnuLtDLMIYw8aXgQzzdCZMVky+fftD5jbtA==",
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+      "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
       "dependencies": {
         "caniuse-lite": "^1.0.30001286",
         "electron-to-chromium": "^1.4.17",
@@ -6803,9 +6795,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001286",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz",
-      "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==",
+      "version": "1.0.30001291",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001291.tgz",
+      "integrity": "sha512-roMV5V0HNGgJ88s42eE70sstqGW/gwFndosYrikHthw98N5tLnOTxFqMLQjZVRxTWFlJ4rn+MsgXrR7MDPY4jA==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/browserslist"
@@ -7139,6 +7131,7 @@
       "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",
@@ -7149,6 +7142,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -7157,6 +7151,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -7215,9 +7210,9 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "node_modules/colord": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz",
-      "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
+      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
       "dev": true
     },
     "node_modules/colors": {
@@ -7326,21 +7321,16 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
     },
     "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dependencies": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
     "node_modules/content-hash": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/content-hash/-/content-hash-2.5.2.tgz",
@@ -7376,7 +7366,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
       "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
-      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -7401,9 +7390,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.3.tgz",
-      "integrity": "sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.0.tgz",
+      "integrity": "sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==",
       "dev": true,
       "hasInstallScript": true,
       "funding": {
@@ -7412,11 +7401,11 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.3.tgz",
-      "integrity": "sha512-59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.0.tgz",
+      "integrity": "sha512-relrah5h+sslXssTTOkvqcC/6RURifB0W5yhYBdBkaPYa5/2KBMiog3XiD+s3TwEHWxInWVv4Jx2/Lw0vng+IQ==",
       "dependencies": {
-        "browserslist": "^4.18.1",
+        "browserslist": "^4.19.1",
         "semver": "7.0.0"
       },
       "funding": {
@@ -7433,9 +7422,9 @@
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.3.tgz",
-      "integrity": "sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.0.tgz",
+      "integrity": "sha512-qsrbIwWSEEYOM7z616jAVgwhuDDtPLwZSpUsU3vyUkHYqKTf/uwOJBZg2V7lMurYWkpVlaVOxBrfX0Q3ppvjfg==",
       "hasInstallScript": true,
       "peer": true,
       "funding": {
@@ -7644,15 +7633,15 @@
       }
     },
     "node_modules/css-select": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.0.tgz",
+      "integrity": "sha512-6YVG6hsH9yIb/si3Th/is8Pex7qnVHO6t7q7U6TIUnkQASGbS8tnUDBftnPynLNnuUl/r2+PTd0ekiiq7R0zJw==",
       "dependencies": {
         "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
+        "css-what": "^5.1.0",
+        "domhandler": "^4.3.0",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/fb55"
@@ -7704,13 +7693,12 @@
       }
     },
     "node_modules/cssnano": {
-      "version": "5.0.12",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.12.tgz",
-      "integrity": "sha512-U38V4x2iJ3ijPdeWqUrEr4eKBB5PbEKsNP5T8xcik2Au3LeMtiMHX0i2Hu9k51FcKofNZumbrcdC6+a521IUHg==",
+      "version": "5.0.14",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.14.tgz",
+      "integrity": "sha512-qzhRkFvBhv08tbyKCIfWbxBXmkIpLl1uNblt8SpTHkgLfON5OCPX/CCnkdNmEosvo8bANQYmTTMEgcVBlisHaw==",
       "dev": true,
       "dependencies": {
-        "cssnano-preset-default": "^5.1.8",
-        "is-resolvable": "^1.1.0",
+        "cssnano-preset-default": "^5.1.9",
         "lilconfig": "^2.0.3",
         "yaml": "^1.10.2"
       },
@@ -7726,15 +7714,15 @@
       }
     },
     "node_modules/cssnano-preset-default": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.8.tgz",
-      "integrity": "sha512-zWMlP0+AMPBVE852SqTrP0DnhTcTA2C1wAF92TKZ3Va+aUVqLIhkqKlnJIXXdqXD7RN+S1ujuWmNpvrJBiM/vg==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.9.tgz",
+      "integrity": "sha512-RhkEucqlQ+OxEi14K1p8gdXcMQy1mSpo7P1oC44oRls7BYIj8p+cht4IFBFV3W4iOjTP8EUB33XV1fX9KhDzyA==",
       "dev": true,
       "dependencies": {
         "css-declaration-sorter": "^6.0.3",
         "cssnano-utils": "^2.0.1",
         "postcss-calc": "^8.0.0",
-        "postcss-colormin": "^5.2.1",
+        "postcss-colormin": "^5.2.2",
         "postcss-convert-values": "^5.0.2",
         "postcss-discard-comments": "^5.0.1",
         "postcss-discard-duplicates": "^5.0.1",
@@ -7753,7 +7741,7 @@
         "postcss-normalize-string": "^5.0.1",
         "postcss-normalize-timing-functions": "^5.0.1",
         "postcss-normalize-unicode": "^5.0.1",
-        "postcss-normalize-url": "^5.0.3",
+        "postcss-normalize-url": "^5.0.4",
         "postcss-normalize-whitespace": "^5.0.1",
         "postcss-ordered-values": "^5.0.2",
         "postcss-reduce-initial": "^5.0.2",
@@ -8253,9 +8241,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.17",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.17.tgz",
-      "integrity": "sha512-zhk1MravPtq/KBhmGB7TLBILmXTgRG9TFSI3qS3DbgyfHzIl72iiTE37r/BHIbPCJJlWIo5rySyxiH4vWhu2ZA=="
+      "version": "1.4.25",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.25.tgz",
+      "integrity": "sha512-bTwub9Y/76EiNmfaiJih+hAy6xn7Ns95S4KvI2NuKNOz8TEEKKQUu44xuy0PYMudjM9zdjKRS1bitsUvHTfuUg=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -10531,16 +10519,16 @@
       "optional": true
     },
     "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.2.tgz",
+      "integrity": "sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==",
       "dependencies": {
         "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.19.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.4.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -10554,13 +10542,13 @@
         "on-finished": "~2.3.0",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.9.6",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.17.2",
+        "serve-static": "1.14.2",
+        "setprototypeof": "1.2.0",
         "statuses": "~1.5.0",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
@@ -10570,42 +10558,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/express/node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -10614,69 +10566,20 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/express/node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/express/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "node_modules/express/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "version": "6.9.6",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
+      "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==",
       "engines": {
         "node": ">=0.6"
-      }
-    },
-    "node_modules/express/node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
       },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/express/node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
-    "node_modules/express/node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "engines": {
-        "node": ">=0.6"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/ext": {
@@ -11328,7 +11231,104 @@
       "bundleDependencies": [
         "source-map-support",
         "yargs",
-        "ethereumjs-util"
+        "ethereumjs-util",
+        "@types/bn.js",
+        "@types/node",
+        "@types/pbkdf2",
+        "@types/secp256k1",
+        "ansi-regex",
+        "ansi-styles",
+        "base-x",
+        "blakejs",
+        "bn.js",
+        "brorand",
+        "browserify-aes",
+        "bs58",
+        "bs58check",
+        "buffer-from",
+        "buffer-xor",
+        "camelcase",
+        "cipher-base",
+        "cliui",
+        "color-convert",
+        "color-name",
+        "create-hash",
+        "create-hmac",
+        "cross-spawn",
+        "decamelize",
+        "elliptic",
+        "emoji-regex",
+        "end-of-stream",
+        "ethereum-cryptography",
+        "ethjs-util",
+        "evp_bytestokey",
+        "execa",
+        "find-up",
+        "get-caller-file",
+        "get-stream",
+        "hash-base",
+        "hash.js",
+        "hmac-drbg",
+        "inherits",
+        "invert-kv",
+        "is-fullwidth-code-point",
+        "is-hex-prefixed",
+        "is-stream",
+        "isexe",
+        "keccak",
+        "lcid",
+        "locate-path",
+        "map-age-cleaner",
+        "md5.js",
+        "mem",
+        "mimic-fn",
+        "minimalistic-assert",
+        "minimalistic-crypto-utils",
+        "nice-try",
+        "node-addon-api",
+        "node-gyp-build",
+        "npm-run-path",
+        "once",
+        "os-locale",
+        "p-defer",
+        "p-finally",
+        "p-is-promise",
+        "p-limit",
+        "p-locate",
+        "p-try",
+        "path-exists",
+        "path-key",
+        "pbkdf2",
+        "pump",
+        "randombytes",
+        "readable-stream",
+        "require-directory",
+        "require-main-filename",
+        "ripemd160",
+        "rlp",
+        "safe-buffer",
+        "scrypt-js",
+        "secp256k1",
+        "semver",
+        "set-blocking",
+        "setimmediate",
+        "sha.js",
+        "shebang-command",
+        "shebang-regex",
+        "signal-exit",
+        "source-map",
+        "string_decoder",
+        "string-width",
+        "strip-ansi",
+        "strip-eof",
+        "strip-hex-prefix",
+        "util-deprecate",
+        "which",
+        "which-module",
+        "wrap-ansi",
+        "wrappy",
+        "y18n",
+        "yargs-parser"
       ],
       "dependencies": {
         "ethereumjs-util": "6.2.1",
@@ -12599,9 +12599,9 @@
       }
     },
     "node_modules/hardhat": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.7.1.tgz",
-      "integrity": "sha512-zmyQe9tOMI9UmFXNnDzdrKMezmKyAawVxU0oIipWPbl9D3zvQJEKaOaNgc9gG31dgkh4WqWCnUR/QxV1U6ctzA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.8.0.tgz",
+      "integrity": "sha512-A2L5F+B7HgdvfcuEWBXyokzP3biSlu4UeIvNR/lgSC0Og/2kbP9cjMMkIH42V1W8nQEZk70VuryhVKX2uHwSYw==",
       "peer": true,
       "dependencies": {
         "@ethereumjs/block": "^3.6.0",
@@ -12660,9 +12660,9 @@
       }
     },
     "node_modules/hardhat-contract-sizer": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/hardhat-contract-sizer/-/hardhat-contract-sizer-2.1.1.tgz",
-      "integrity": "sha512-QgfuwdUkKT7Ugn6Zja26Eie7h6OLcBfWBewaaQtYMCzyglNafQPgUIznN2C42/iFmGrlqFPbqv4B98Iev89KSQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hardhat-contract-sizer/-/hardhat-contract-sizer-2.2.0.tgz",
+      "integrity": "sha512-H9YS935e9FE/gdiZN++/Eet34fkBHSLB4JpeOx7LMRZFneMM5WOrcIYE392hzG45FvA2Bfgw1jhoFi5/Ybr50w==",
       "dependencies": {
         "cli-table3": "^0.6.0",
         "colors": "^1.4.0"
@@ -13707,9 +13707,9 @@
       }
     },
     "node_modules/highlightjs-solidity": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.2.tgz",
-      "integrity": "sha512-q0aYUKiZ9MPQg41qx/KpXKaCpqql50qTvmwGYyLFfcjt9AE/+C9CwjVIdJZc7EYj6NGgJuFJ4im1gfgrzUU1fQ=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.3.tgz",
+      "integrity": "sha512-tjFm5dtIE61VQBzjlZmkCtY5fLs3CaEABbVuUNyXeW+UuOCsxMg3MsPFy0kCelHP74hPpkoqDejLrbnV1axAIw=="
     },
     "node_modules/hmac-drbg": {
       "version": "1.0.1",
@@ -13889,9 +13889,9 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -14169,15 +14169,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/is-absolute-url": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -14610,12 +14601,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
     "node_modules/is-retry-allowed": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
@@ -17512,9 +17497,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -18565,15 +18550,15 @@
       }
     },
     "node_modules/postcss-colormin": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.1.tgz",
-      "integrity": "sha512-VVwMrEYLcHYePUYV99Ymuoi7WhKrMGy/V9/kTS0DkCoJYmmjdOMneyhzYUxcNgteKDVbrewOkSM7Wje/MFwxzA==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.2.tgz",
+      "integrity": "sha512-tSEe3NpqWARUTidDlF0LntPkdlhXqfDFuA1yslqpvvGAfpZ7oBaw+/QXd935NKm2U9p4PED0HDZlzmMk7fVC6g==",
       "dev": true,
       "dependencies": {
         "browserslist": "^4.16.6",
         "caniuse-api": "^3.0.0",
         "colord": "^2.9.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14.0"
@@ -18956,14 +18941,13 @@
       }
     },
     "node_modules/postcss-normalize-url": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.3.tgz",
-      "integrity": "sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.4.tgz",
+      "integrity": "sha512-cNj3RzK2pgQQyNp7dzq0dqpUpQ/wYtdDZM3DepPmFjCmYIfceuD9VIAcOdvrNetjIU65g1B4uwdP/Krf6AFdXg==",
       "dev": true,
       "dependencies": {
-        "is-absolute-url": "^3.0.3",
         "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14.0"
@@ -20705,9 +20689,9 @@
       }
     },
     "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.17.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
+      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -20716,9 +20700,9 @@
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "1.8.1",
         "mime": "1.6.0",
-        "ms": "2.1.1",
+        "ms": "2.1.3",
         "on-finished": "~2.3.0",
         "range-parser": "~1.2.1",
         "statuses": "~1.5.0"
@@ -20740,38 +20724,10 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "node_modules/send/node_modules/http-errors": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-    },
-    "node_modules/send/node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
-    "node_modules/send/node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "engines": {
-        "node": ">=0.6"
-      }
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/sentence-case": {
       "version": "2.1.1",
@@ -20792,14 +20748,14 @@
       }
     },
     "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
+      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.17.2"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -22831,9 +22787,9 @@
       }
     },
     "node_modules/underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz",
+      "integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
@@ -23694,7 +23650,6 @@
       "resolved": "https://registry.npmjs.org/web3/-/web3-1.6.1.tgz",
       "integrity": "sha512-c299lLiyb2/WOcxh7TinwvbATaMmrgNIeAzbLbmOKHI0LcwyfsB1eu2ReOIrfrCYDYRW2KAjYr7J7gHawqDNPQ==",
       "hasInstallScript": true,
-      "license": "LGPL-3.0",
       "dependencies": {
         "web3-bzz": "1.6.1",
         "web3-core": "1.6.1",
@@ -23742,9 +23697,9 @@
       }
     },
     "node_modules/web3-bzz/node_modules/@types/node": {
-      "version": "12.20.37",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-      "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+      "version": "12.20.38",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+      "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
     },
     "node_modules/web3-bzz/node_modules/cacheable-request": {
       "version": "6.1.0",
@@ -23882,7 +23837,6 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.6.1.tgz",
       "integrity": "sha512-m+b7UfYvU5cQUAh6NRfxRzH/5B3to1AdEQi1HIQt570cDWlObOOmoO9tY6iJnI5w4acxIO19LqjDMqEJGBYyRQ==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "@types/bn.js": "^4.11.5",
         "@types/node": "^12.12.6",
@@ -23922,7 +23876,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
       "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "bn.js": "^4.11.9",
         "eth-lib": "0.2.8",
@@ -24096,9 +24049,9 @@
       }
     },
     "node_modules/web3-core/node_modules/@types/node": {
-      "version": "12.20.37",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-      "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+      "version": "12.20.38",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+      "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
     },
     "node_modules/web3-core/node_modules/bignumber.js": {
       "version": "9.0.2",
@@ -24196,7 +24149,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
       "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "bn.js": "^4.11.9",
         "eth-lib": "0.2.8",
@@ -24278,7 +24230,6 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.6.1.tgz",
       "integrity": "sha512-GXqTe3mF6kpbOAakiNc7wtJ120/gpuKMTZjuGFKeeY8aobRLfbfgKzM9IpyqVZV2v5RLuGXDuurVN2KPgtu3hQ==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "@types/bn.js": "^4.11.5",
         "web3-core": "1.6.1",
@@ -24481,7 +24432,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz",
       "integrity": "sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "bn.js": "^4.11.9",
         "eth-lib": "0.2.8",
@@ -24512,9 +24462,9 @@
       }
     },
     "node_modules/web3-eth-personal/node_modules/@types/node": {
-      "version": "12.20.37",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-      "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+      "version": "12.20.38",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+      "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
     },
     "node_modules/web3-eth-personal/node_modules/web3-core-helpers": {
       "version": "1.6.1",
@@ -24738,7 +24688,6 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.6.1.tgz",
       "integrity": "sha512-RidGKv5kOkcerI6jQqDFDoTllQQqV+rPhTzZHhmbqtFObbYpU93uc+yG1LHivRTQhA6llIx67iudc/vzisgO+w==",
-      "license": "LGPL-3.0",
       "dependencies": {
         "bn.js": "^4.11.9",
         "ethereum-bloom-filters": "^1.0.6",
@@ -25516,6 +25465,7 @@
       "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",
@@ -25532,6 +25482,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -25540,6 +25491,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -25554,6 +25506,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -25564,12 +25517,14 @@
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/wrap-ansi/node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -25715,6 +25670,7 @@
       "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"
       }
@@ -25745,6 +25701,7 @@
       "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",
@@ -25762,6 +25719,7 @@
       "version": "20.2.4",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
       "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -26154,9 +26112,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.16.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.5.tgz",
-      "integrity": "sha512-+Ce7T5iPNWzfu9C1aB5tN3Lyafs5xb3Ic7vBWyZL2KXT3QSdD1dD3CvgOzPmQKoNNRt6uauc0XwNJTQtXC2/Mw=="
+      "version": "7.16.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+      "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.16.2",
@@ -27896,7 +27854,7 @@
       }
     },
     "@oceanprotocol/contracts": {
-      "version": "git+ssh://git@github.com/oceanprotocol/contracts.git#9c6034f13f5c6951c22a360a1987f6067b8aa631",
+      "version": "git+ssh://git@github.com/oceanprotocol/contracts.git#25ca73bbe44bf6d1782e971b75a42e5ba65f197b",
       "from": "@oceanprotocol/contracts@github:oceanprotocol/contracts#v4main_postaudit",
       "requires": {
         "@openzeppelin/contracts": "^4.3.3",
@@ -28053,9 +28011,9 @@
       }
     },
     "@openzeppelin/contracts": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.4.0.tgz",
-      "integrity": "sha512-dlKiZmDvJnGRLHojrDoFZJmsQVeltVeoiRN7RK+cf2FmkhASDEblE0RiaYdxPNsUZa6mRG8393b9bfyp+V5IAw=="
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.4.1.tgz",
+      "integrity": "sha512-o+pHCf/yMLSlV5MkDQEzEQL402i6SoRnktru+0rdSxVEFZcTzzGhZCAtZjUFyKGazMSv1TilzMg+RbED1N8XHQ=="
     },
     "@openzeppelin/test-helpers": {
       "version": "0.5.15",
@@ -28316,9 +28274,9 @@
       }
     },
     "@truffle/abi-utils": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@truffle/abi-utils/-/abi-utils-0.2.4.tgz",
-      "integrity": "sha512-ICr5Sger6r5uj2G5GN9Zp9OQDCaCqe2ZyAEyvavDoFB+jX0zZFUCfDnv5jllGRhgzdYJ3mec2390mjUyz9jSZA==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@truffle/abi-utils/-/abi-utils-0.2.5.tgz",
+      "integrity": "sha512-eKDIn9LqUFP8MnHVohe8ncuza4p9bszz1NtJWc+sr5zUogtmWnnf8Ajyj7JJpNKhLNDVZVbLowVEVxWzSSpMHw==",
       "requires": {
         "change-case": "3.0.2",
         "faker": "^5.3.1",
@@ -28331,12 +28289,12 @@
       "integrity": "sha512-BFo/nyxwhoHqPrqBQA1EAmSxeNnspGLiOCMa9pAL7WYSjyNBlrHaqCMO/F2O87G+NUK/u06E70DiSP2BFP0ZZw=="
     },
     "@truffle/codec": {
-      "version": "0.11.20",
-      "resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.11.20.tgz",
-      "integrity": "sha512-OJtP/AEaYH0QNoq/Z0Pyo4muN0piJDTXQlWPSTb+SI+ypgzd0RT5QOcpmtc6Q24mfeWRB3QbJxQP0ZSeyo1MVA==",
+      "version": "0.11.21",
+      "resolved": "https://registry.npmjs.org/@truffle/codec/-/codec-0.11.21.tgz",
+      "integrity": "sha512-ZDzaEPCUFWmQuFsXA3KzXmU4w4lpxSWZTGUcEDHxn6IqAmL7FY8mmdbR6LQ1wTRAa9oPf84PcehMpTNY47HVcg==",
       "requires": {
-        "@truffle/abi-utils": "^0.2.4",
-        "@truffle/compile-common": "^0.7.22",
+        "@truffle/abi-utils": "^0.2.5",
+        "@truffle/compile-common": "^0.7.23",
         "big.js": "^5.2.2",
         "bn.js": "^5.1.3",
         "cbor": "^5.1.0",
@@ -28417,23 +28375,23 @@
       }
     },
     "@truffle/compile-common": {
-      "version": "0.7.22",
-      "resolved": "https://registry.npmjs.org/@truffle/compile-common/-/compile-common-0.7.22.tgz",
-      "integrity": "sha512-afFKh0Wphn8JrCSjOORKjO8/E1X0EtQv6GpFJpQCAWo3/i4VGcSVKR1rjkknnExtjEGe9PJH/Ym/opGH3pQyDw==",
+      "version": "0.7.23",
+      "resolved": "https://registry.npmjs.org/@truffle/compile-common/-/compile-common-0.7.23.tgz",
+      "integrity": "sha512-LWzeboJ9HmSZVgx5DMmKArOo96V4QZhS/+8beDOfeNT1W4QeKfkuVbAM0R77cXjiLnUsNjjFVXehnco6HiF8ww==",
       "requires": {
         "@truffle/error": "^0.0.14",
         "colors": "^1.4.0"
       }
     },
     "@truffle/contract": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.4.0.tgz",
-      "integrity": "sha512-k/YbwIOJsRAn3+VseG/lOlFiqjValHYwXdEyCT5D1HRQ0MQZ7JPabR05+dAlY88BK5o9ejUXCh+TDc0CRDn/eQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.4.1.tgz",
+      "integrity": "sha512-KVpG9alKxdNzWOcRN97crZXXmmnnShq1SkM9hQN2fOckszzrmy6ctOhnZKNAb8tzfHBgODDCmiGQbTqaYizcrA==",
       "requires": {
         "@ensdomains/ensjs": "^2.0.1",
         "@truffle/blockchain-utils": "^0.0.31",
-        "@truffle/contract-schema": "^3.4.3",
-        "@truffle/debug-utils": "^6.0.1",
+        "@truffle/contract-schema": "^3.4.4",
+        "@truffle/debug-utils": "^6.0.2",
         "@truffle/error": "^0.0.14",
         "@truffle/interface-adapter": "^0.5.8",
         "bignumber.js": "^7.2.1",
@@ -28468,9 +28426,9 @@
           }
         },
         "@types/node": {
-          "version": "12.20.37",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-          "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+          "version": "12.20.38",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+          "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
         },
         "cacheable-request": {
           "version": "6.1.0",
@@ -28825,20 +28783,20 @@
       }
     },
     "@truffle/contract-schema": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/@truffle/contract-schema/-/contract-schema-3.4.3.tgz",
-      "integrity": "sha512-pgaTgF4CKIpkqVYZVr2qGTxZZQOkNCWOXW9VQpKvLd4G0SNF2Y1gyhrFbBhoOUtYlbbSty+IEFFHsoAqpqlvpQ==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@truffle/contract-schema/-/contract-schema-3.4.4.tgz",
+      "integrity": "sha512-xWgrm6WRM2jmT04w7dP7aVbS2qyP9XPmH/mybQtFXMjJ/8BZlp0yltC8QOs8sGl6q8Ws7acp19YtRkLdK6SsmQ==",
       "requires": {
         "ajv": "^6.10.0",
         "debug": "^4.3.1"
       }
     },
     "@truffle/debug-utils": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-6.0.1.tgz",
-      "integrity": "sha512-ntuLPYwKNOIeWfeb2emO9Tu2v1aH6mCLGBrKRrDX4ofMUbPyN3ujxiCg/FCxbkL9cpkbH9zOHLmu2ubNlZ3gvA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@truffle/debug-utils/-/debug-utils-6.0.2.tgz",
+      "integrity": "sha512-gMZ2IHPS9cvWGinUwVMoZedOYJz4sSekUXGC5FQkBnR0XDVriPmuja4rdgXhkA9EFSqZdXu4JAL8IiEHp/1YIw==",
       "requires": {
-        "@truffle/codec": "^0.11.20",
+        "@truffle/codec": "^0.11.21",
         "@trufflesuite/chromafi": "^2.2.2",
         "bn.js": "^5.1.3",
         "chalk": "^2.4.2",
@@ -28929,9 +28887,9 @@
           }
         },
         "@types/node": {
-          "version": "12.20.37",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-          "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+          "version": "12.20.38",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+          "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
         },
         "bignumber.js": {
           "version": "9.0.2",
@@ -29640,9 +29598,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.11.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz",
-      "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="
+      "version": "16.11.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.15.tgz",
+      "integrity": "sha512-LMGR7iUjwZRxoYnfc9+YELxwqkaLmkJlo4/HUvOMyGvw9DaHO0gtAbH2FUdoFE6PXBTYZIT7x610r7kdo8o1fQ=="
     },
     "@types/node-fetch": {
       "version": "3.0.3",
@@ -30377,9 +30335,9 @@
       }
     },
     "babel-plugin-transform-async-to-promises": {
-      "version": "0.8.16",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-promises/-/babel-plugin-transform-async-to-promises-0.8.16.tgz",
-      "integrity": "sha512-mm0UMekJVOTuIlkGIEH1fpnExyTIIJ2/L5ixTTI1zAVdMpbG7Em3LiS92p0TCWKiMkHhYYinz/zn2D/BPPJaxA==",
+      "version": "0.8.17",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-promises/-/babel-plugin-transform-async-to-promises-0.8.17.tgz",
+      "integrity": "sha512-MAijrdLcXjZBkET+n4GA9g96Wt5AibTHRKHWU3Zuuenvkge3QgrYiYfXsNcHZbQzJ6XO73l4MRMDNP+ZE77u5A==",
       "dev": true
     },
     "babel-plugin-transform-replace-expressions": {
@@ -30815,9 +30773,9 @@
       }
     },
     "browserslist": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.0.tgz",
-      "integrity": "sha512-JGHzm73ei2OnAcobcQ61GXNnN6vDCg5Oz5MayudL+FyzjoLnCzUWnuLtDLMIYw8aXgQzzdCZMVky+fftD5jbtA==",
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+      "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
       "requires": {
         "caniuse-lite": "^1.0.30001286",
         "electron-to-chromium": "^1.4.17",
@@ -31000,9 +30958,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001286",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz",
-      "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ=="
+      "version": "1.0.30001291",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001291.tgz",
+      "integrity": "sha512-roMV5V0HNGgJ88s42eE70sstqGW/gwFndosYrikHthw98N5tLnOTxFqMLQjZVRxTWFlJ4rn+MsgXrR7MDPY4jA=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -31261,6 +31219,7 @@
       "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",
@@ -31270,12 +31229,14 @@
         "ansi-regex": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+          "dev": true
         },
         "strip-ansi": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
           "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
           "requires": {
             "ansi-regex": "^5.0.1"
           }
@@ -31324,9 +31285,9 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "colord": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz",
-      "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
+      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
       "dev": true
     },
     "colors": {
@@ -31422,18 +31383,11 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
     },
     "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
-        "safe-buffer": "5.1.2"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        }
+        "safe-buffer": "5.2.1"
       }
     },
     "content-hash": {
@@ -31469,8 +31423,7 @@
     "cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
-      "peer": true
+      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
     },
     "cookie-signature": {
       "version": "1.0.6",
@@ -31489,17 +31442,17 @@
       "optional": true
     },
     "core-js": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.3.tgz",
-      "integrity": "sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.0.tgz",
+      "integrity": "sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==",
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.3.tgz",
-      "integrity": "sha512-59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.0.tgz",
+      "integrity": "sha512-relrah5h+sslXssTTOkvqcC/6RURifB0W5yhYBdBkaPYa5/2KBMiog3XiD+s3TwEHWxInWVv4Jx2/Lw0vng+IQ==",
       "requires": {
-        "browserslist": "^4.18.1",
+        "browserslist": "^4.19.1",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -31511,9 +31464,9 @@
       }
     },
     "core-js-pure": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.3.tgz",
-      "integrity": "sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.0.tgz",
+      "integrity": "sha512-qsrbIwWSEEYOM7z616jAVgwhuDDtPLwZSpUsU3vyUkHYqKTf/uwOJBZg2V7lMurYWkpVlaVOxBrfX0Q3ppvjfg==",
       "peer": true
     },
     "core-util-is": {
@@ -31680,15 +31633,15 @@
       }
     },
     "css-select": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-      "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.0.tgz",
+      "integrity": "sha512-6YVG6hsH9yIb/si3Th/is8Pex7qnVHO6t7q7U6TIUnkQASGbS8tnUDBftnPynLNnuUl/r2+PTd0ekiiq7R0zJw==",
       "requires": {
         "boolbase": "^1.0.0",
-        "css-what": "^5.0.0",
-        "domhandler": "^4.2.0",
-        "domutils": "^2.6.0",
-        "nth-check": "^2.0.0"
+        "css-what": "^5.1.0",
+        "domhandler": "^4.3.0",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
       }
     },
     "css-tree": {
@@ -31721,27 +31674,26 @@
       "dev": true
     },
     "cssnano": {
-      "version": "5.0.12",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.12.tgz",
-      "integrity": "sha512-U38V4x2iJ3ijPdeWqUrEr4eKBB5PbEKsNP5T8xcik2Au3LeMtiMHX0i2Hu9k51FcKofNZumbrcdC6+a521IUHg==",
+      "version": "5.0.14",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.14.tgz",
+      "integrity": "sha512-qzhRkFvBhv08tbyKCIfWbxBXmkIpLl1uNblt8SpTHkgLfON5OCPX/CCnkdNmEosvo8bANQYmTTMEgcVBlisHaw==",
       "dev": true,
       "requires": {
-        "cssnano-preset-default": "^5.1.8",
-        "is-resolvable": "^1.1.0",
+        "cssnano-preset-default": "^5.1.9",
         "lilconfig": "^2.0.3",
         "yaml": "^1.10.2"
       }
     },
     "cssnano-preset-default": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.8.tgz",
-      "integrity": "sha512-zWMlP0+AMPBVE852SqTrP0DnhTcTA2C1wAF92TKZ3Va+aUVqLIhkqKlnJIXXdqXD7RN+S1ujuWmNpvrJBiM/vg==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.9.tgz",
+      "integrity": "sha512-RhkEucqlQ+OxEi14K1p8gdXcMQy1mSpo7P1oC44oRls7BYIj8p+cht4IFBFV3W4iOjTP8EUB33XV1fX9KhDzyA==",
       "dev": true,
       "requires": {
         "css-declaration-sorter": "^6.0.3",
         "cssnano-utils": "^2.0.1",
         "postcss-calc": "^8.0.0",
-        "postcss-colormin": "^5.2.1",
+        "postcss-colormin": "^5.2.2",
         "postcss-convert-values": "^5.0.2",
         "postcss-discard-comments": "^5.0.1",
         "postcss-discard-duplicates": "^5.0.1",
@@ -31760,7 +31712,7 @@
         "postcss-normalize-string": "^5.0.1",
         "postcss-normalize-timing-functions": "^5.0.1",
         "postcss-normalize-unicode": "^5.0.1",
-        "postcss-normalize-url": "^5.0.3",
+        "postcss-normalize-url": "^5.0.4",
         "postcss-normalize-whitespace": "^5.0.1",
         "postcss-ordered-values": "^5.0.2",
         "postcss-reduce-initial": "^5.0.2",
@@ -32132,9 +32084,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.17",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.17.tgz",
-      "integrity": "sha512-zhk1MravPtq/KBhmGB7TLBILmXTgRG9TFSI3qS3DbgyfHzIl72iiTE37r/BHIbPCJJlWIo5rySyxiH4vWhu2ZA=="
+      "version": "1.4.25",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.25.tgz",
+      "integrity": "sha512-bTwub9Y/76EiNmfaiJih+hAy6xn7Ns95S4KvI2NuKNOz8TEEKKQUu44xuy0PYMudjM9zdjKRS1bitsUvHTfuUg=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -34009,16 +33961,16 @@
       }
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.2.tgz",
+      "integrity": "sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==",
       "requires": {
         "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.19.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.4.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -34032,46 +33984,19 @@
         "on-finished": "~2.3.0",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.9.6",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.17.2",
+        "serve-static": "1.14.2",
+        "setprototypeof": "1.2.0",
         "statuses": "~1.5.0",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
-        "body-parser": {
-          "version": "1.19.0",
-          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-          "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-          "requires": {
-            "bytes": "3.1.0",
-            "content-type": "~1.0.4",
-            "debug": "2.6.9",
-            "depd": "~1.1.2",
-            "http-errors": "1.7.2",
-            "iconv-lite": "0.4.24",
-            "on-finished": "~2.3.0",
-            "qs": "6.7.0",
-            "raw-body": "2.4.0",
-            "type-is": "~1.6.17"
-          }
-        },
-        "bytes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-        },
-        "cookie": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -34080,58 +34005,15 @@
             "ms": "2.0.0"
           }
         },
-        "http-errors": {
-          "version": "1.7.2",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.1",
-            "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.0"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        },
-        "raw-body": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-          "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-          "requires": {
-            "bytes": "3.1.0",
-            "http-errors": "1.7.2",
-            "iconv-lite": "0.4.24",
-            "unpipe": "1.0.0"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        },
-        "setprototypeof": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-        },
-        "toidentifier": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-          "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+          "version": "6.9.6",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
+          "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="
         }
       }
     },
@@ -35544,9 +35426,9 @@
       }
     },
     "hardhat": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.7.1.tgz",
-      "integrity": "sha512-zmyQe9tOMI9UmFXNnDzdrKMezmKyAawVxU0oIipWPbl9D3zvQJEKaOaNgc9gG31dgkh4WqWCnUR/QxV1U6ctzA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.8.0.tgz",
+      "integrity": "sha512-A2L5F+B7HgdvfcuEWBXyokzP3biSlu4UeIvNR/lgSC0Og/2kbP9cjMMkIH42V1W8nQEZk70VuryhVKX2uHwSYw==",
       "peer": true,
       "requires": {
         "@ethereumjs/block": "^3.6.0",
@@ -36205,9 +36087,9 @@
       }
     },
     "hardhat-contract-sizer": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/hardhat-contract-sizer/-/hardhat-contract-sizer-2.1.1.tgz",
-      "integrity": "sha512-QgfuwdUkKT7Ugn6Zja26Eie7h6OLcBfWBewaaQtYMCzyglNafQPgUIznN2C42/iFmGrlqFPbqv4B98Iev89KSQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hardhat-contract-sizer/-/hardhat-contract-sizer-2.2.0.tgz",
+      "integrity": "sha512-H9YS935e9FE/gdiZN++/Eet34fkBHSLB4JpeOx7LMRZFneMM5WOrcIYE392hzG45FvA2Bfgw1jhoFi5/Ybr50w==",
       "requires": {
         "cli-table3": "^0.6.0",
         "colors": "^1.4.0"
@@ -36407,9 +36289,9 @@
       "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="
     },
     "highlightjs-solidity": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.2.tgz",
-      "integrity": "sha512-q0aYUKiZ9MPQg41qx/KpXKaCpqql50qTvmwGYyLFfcjt9AE/+C9CwjVIdJZc7EYj6NGgJuFJ4im1gfgrzUU1fQ=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/highlightjs-solidity/-/highlightjs-solidity-2.0.3.tgz",
+      "integrity": "sha512-tjFm5dtIE61VQBzjlZmkCtY5fLs3CaEABbVuUNyXeW+UuOCsxMg3MsPFy0kCelHP74hPpkoqDejLrbnV1axAIw=="
     },
     "hmac-drbg": {
       "version": "1.0.1",
@@ -36541,9 +36423,9 @@
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
     "ignore": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true
     },
     "immediate": {
@@ -36753,12 +36635,6 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
-    "is-absolute-url": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-      "dev": true
-    },
     "is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -37042,12 +36918,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
     "is-retry-allowed": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
@@ -39379,9 +39249,9 @@
       }
     },
     "object-inspect": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
     },
     "object-keys": {
       "version": "1.1.1",
@@ -40184,15 +40054,15 @@
       }
     },
     "postcss-colormin": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.1.tgz",
-      "integrity": "sha512-VVwMrEYLcHYePUYV99Ymuoi7WhKrMGy/V9/kTS0DkCoJYmmjdOMneyhzYUxcNgteKDVbrewOkSM7Wje/MFwxzA==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.2.tgz",
+      "integrity": "sha512-tSEe3NpqWARUTidDlF0LntPkdlhXqfDFuA1yslqpvvGAfpZ7oBaw+/QXd935NKm2U9p4PED0HDZlzmMk7fVC6g==",
       "dev": true,
       "requires": {
         "browserslist": "^4.16.6",
         "caniuse-api": "^3.0.0",
         "colord": "^2.9.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-convert-values": {
@@ -40425,14 +40295,13 @@
       }
     },
     "postcss-normalize-url": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.3.tgz",
-      "integrity": "sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.4.tgz",
+      "integrity": "sha512-cNj3RzK2pgQQyNp7dzq0dqpUpQ/wYtdDZM3DepPmFjCmYIfceuD9VIAcOdvrNetjIU65g1B4uwdP/Krf6AFdXg==",
       "dev": true,
       "requires": {
-        "is-absolute-url": "^3.0.3",
         "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.1.0"
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-whitespace": {
@@ -41722,9 +41591,9 @@
       }
     },
     "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.17.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
+      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
       "requires": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -41733,9 +41602,9 @@
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "1.8.1",
         "mime": "1.6.0",
-        "ms": "2.1.1",
+        "ms": "2.1.3",
         "on-finished": "~2.3.0",
         "range-parser": "~1.2.1",
         "statuses": "~1.5.0"
@@ -41756,32 +41625,10 @@
             }
           }
         },
-        "http-errors": {
-          "version": "1.7.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-          "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.1.1",
-            "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.0"
-          }
-        },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        },
-        "setprototypeof": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-        },
-        "toidentifier": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-          "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         }
       }
     },
@@ -41804,14 +41651,14 @@
       }
     },
     "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
+      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.17.2"
       }
     },
     "servify": {
@@ -43416,9 +43263,9 @@
       }
     },
     "underscore": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz",
+      "integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="
     },
     "unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
@@ -44152,9 +43999,9 @@
           }
         },
         "@types/node": {
-          "version": "12.20.37",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-          "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+          "version": "12.20.38",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+          "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
         },
         "cacheable-request": {
           "version": "6.1.0",
@@ -44289,9 +44136,9 @@
           }
         },
         "@types/node": {
-          "version": "12.20.37",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-          "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+          "version": "12.20.38",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+          "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
         },
         "bignumber.js": {
           "version": "9.0.2",
@@ -44850,9 +44697,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "12.20.37",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-          "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+          "version": "12.20.38",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.38.tgz",
+          "integrity": "sha512-NxmtBRGipjx1B225OeMdI+CQmLbYqvvmYbukDTJGDgzIDgPQ1EcjGmYxGhOk5hTBqeB558S6RgHSpq2iiqifAQ=="
         },
         "web3-core-helpers": {
           "version": "1.6.1",
@@ -45600,6 +45447,7 @@
       "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",
@@ -45609,12 +45457,14 @@
         "ansi-regex": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+          "dev": true
         },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -45623,6 +45473,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -45630,12 +45481,14 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         },
         "strip-ansi": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
           "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
           "requires": {
             "ansi-regex": "^5.0.1"
           }
@@ -45762,7 +45615,8 @@
     "y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true
     },
     "yaeti": {
       "version": "0.0.6",
@@ -45784,6 +45638,7 @@
       "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",
@@ -45797,7 +45652,8 @@
     "yargs-parser": {
       "version": "20.2.4",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true
     },
     "yargs-unparser": {
       "version": "2.0.0",
diff --git a/package.json b/package.json
index d4da0c87..e17bd525 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,8 @@
     "test:fixed": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/fixedRate/FixedRateExchange.test.ts'",
     "test:pool": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/balancer/Pool.test.ts'",
     "test:dispenser": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/dispenser/Dispenser.test.ts'",
-    "test:dt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Datatoken.test.ts'",
-    "test:nftDt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NFT.test.ts'",
+    "test:dt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/tokens/Datatoken.test.ts'",
+    "test:nftDt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Nft.test.ts'",
     "test:factory": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NftFactory.test.ts'",
     "test:router": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Router.test.ts'",
     "test:unit": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/**/*.test.ts'",
@@ -57,13 +57,14 @@
     "cross-fetch": "^3.1.4",
     "crypto-js": "^4.0.0",
     "decimal.js": "^10.2.1",
+    "ethereumjs-util": "^7.1.3",
     "fs": "0.0.1-security",
     "lzma": "^2.3.2",
     "node-abort-controller": "^2.0.0",
     "save-file": "^2.3.1",
     "underscore": "^1.13.1",
     "uuid": "^8.3.2",
-    "web3": "^1.6.1",
+    "web3": ">=1.3.5",
     "web3-core": "^1.6.1",
     "web3-eth-contract": "^1.6.1"
   },
diff --git a/src/factories/NFTFactory.ts b/src/factories/NFTFactory.ts
index d3e45a32..842dabae 100644
--- a/src/factories/NFTFactory.ts
+++ b/src/factories/NFTFactory.ts
@@ -26,11 +26,14 @@ interface Template {
 export interface TokenOrder {
   tokenAddress: string
   consumer: string
-  amount: string | number
   serviceIndex: number
   providerFeeAddress: string
   providerFeeToken: string
   providerFeeAmount: string
+  v: number // v of provider signed message
+  r: string // r of provider signed message
+  s: string // s of provider signed message
+  providerData: string // data encoded by provider
 }
 
 export interface NftCreateData {
@@ -40,6 +43,7 @@ export interface NftCreateData {
   tokenURI: string
 }
 
+const addressZERO = '0x0000000000000000000000000000000000000000'
 /**
  * Provides an interface for NFT Factory contract
  */
@@ -88,7 +92,7 @@ export class NftFactory {
           nftData.name,
           nftData.symbol,
           nftData.templateIndex,
-          '0x0000000000000000000000000000000000000000',
+          addressZERO,
           nftData.tokenURI
         )
         .estimateGas({ from: address }, (err, estGas) => (err ? gasLimitDefault : estGas))
@@ -112,7 +116,16 @@ export class NftFactory {
       nftData.name = name
       nftData.symbol = symbol
     }
+    if (nftData.templateIndex > (await this.getCurrentNFTTemplateCount())) {
+      throw new Error(`Template index doesnt exist`)
+    }
 
+    if (nftData.templateIndex === 0) {
+      throw new Error(`Template index cannot be ZERO`)
+    }
+    if ((await this.getNFTTemplate(nftData.templateIndex)).isActive === false) {
+      throw new Error(`Template is not active`)
+    }
     const estGas = await this.estGasCreateNFT(address, nftData)
 
     // Invoke createToken function of the contract
@@ -121,7 +134,7 @@ export class NftFactory {
         nftData.name,
         nftData.symbol,
         nftData.templateIndex,
-        '0x0000000000000000000000000000000000000000',
+        addressZERO,
         nftData.tokenURI
       )
       .send({
@@ -184,6 +197,13 @@ export class NftFactory {
    * @return {Promise<Template>} Number of Template added to this factory
    */
   public async getNFTTemplate(index: number): Promise<Template> {
+    if (index > (await this.getCurrentNFTTemplateCount())) {
+      throw new Error(`Template index doesnt exist`)
+    }
+
+    if (index === 0) {
+      throw new Error(`Template index cannot be ZERO`)
+    }
     const template = await this.factory721.methods.getNFTTemplate(index).call()
     return template
   }
@@ -250,6 +270,9 @@ export class NftFactory {
     if ((await this.getOwner()) !== address) {
       throw new Error(`Caller is not Factory Owner`)
     }
+    if (templateAddress === addressZERO) {
+      throw new Error(`Template cannot be ZERO address`)
+    }
 
     const estGas = await this.estGasAddNFTTemplate(address, templateAddress)
 
@@ -300,7 +323,13 @@ export class NftFactory {
     if ((await this.getOwner()) !== address) {
       throw new Error(`Caller is not Factory Owner`)
     }
+    if (templateIndex > (await this.getCurrentNFTTemplateCount())) {
+      throw new Error(`Template index doesnt exist`)
+    }
 
+    if (templateIndex === 0) {
+      throw new Error(`Template index cannot be ZERO`)
+    }
     const estGas = await this.estGasDisableNFTTemplate(address, templateIndex)
 
     // Invoke createToken function of the contract
@@ -350,6 +379,13 @@ export class NftFactory {
     if ((await this.getOwner()) !== address) {
       throw new Error(`Caller is not Factory Owner`)
     }
+    if (templateIndex > (await this.getCurrentNFTTemplateCount())) {
+      throw new Error(`Template index doesnt exist`)
+    }
+
+    if (templateIndex === 0) {
+      throw new Error(`Template index cannot be ZERO`)
+    }
 
     const estGas = await this.estGasReactivateNFTTemplate(address, templateIndex)
 
@@ -401,6 +437,9 @@ export class NftFactory {
     if ((await this.getOwner()) !== address) {
       throw new Error(`Caller is not Factory Owner`)
     }
+    if (templateAddress === addressZERO) {
+      throw new Error(`Template cannot be address ZERO`)
+    }
 
     const estGas = await this.estGasAddTokenTemplate(address, templateAddress)
 
@@ -451,7 +490,16 @@ export class NftFactory {
     if ((await this.getOwner()) !== address) {
       throw new Error(`Caller is not Factory Owner`)
     }
+    if (templateIndex > (await this.getCurrentNFTTemplateCount())) {
+      throw new Error(`Template index doesnt exist`)
+    }
 
+    if (templateIndex === 0) {
+      throw new Error(`Template index cannot be ZERO`)
+    }
+    if ((await this.getNFTTemplate(templateIndex)).isActive === false) {
+      throw new Error(`Template is already disabled`)
+    }
     const estGas = await this.estGasDisableTokenTemplate(address, templateIndex)
 
     // Invoke createToken function of the contract
@@ -501,6 +549,16 @@ export class NftFactory {
     if ((await this.getOwner()) !== address) {
       throw new Error(`Caller is not Factory Owner`)
     }
+    if (templateIndex > (await this.getCurrentNFTTemplateCount())) {
+      throw new Error(`Template index doesnt exist`)
+    }
+
+    if (templateIndex === 0) {
+      throw new Error(`Template index cannot be ZERO`)
+    }
+    if ((await this.getTokenTemplate(templateIndex)).isActive === true) {
+      throw new Error(`Template is already active`)
+    }
 
     const estGas = await this.estGasReactivateTokenTemplate(address, templateIndex)
 
@@ -553,6 +611,10 @@ export class NftFactory {
     address: string,
     orders: TokenOrder[]
   ): Promise<TransactionReceipt> {
+    if (orders.length > 50) {
+      throw new Error(`Too many orders`)
+    }
+
     const estGas = await this.estGasStartMultipleTokenOrder(address, orders)
 
     // Invoke createToken function of the contract
diff --git a/src/provider/Provider.ts b/src/provider/Provider.ts
index 0fef80b4..fee2a45b 100644
--- a/src/provider/Provider.ts
+++ b/src/provider/Provider.ts
@@ -203,7 +203,7 @@ export class Provider {
     serviceType: string,
     consumerAddress: string,
     providerUri: string,
-    fetchMethod: any,
+    getMethod: any,
     userCustomParameters?: UserCustomParameters
   ): Promise<string> {
     const providerEndpoints = await this.getEndpoints(providerUri)
@@ -224,8 +224,8 @@ export class Provider {
     if (userCustomParameters)
       initializeUrl += '&userdata=' + encodeURI(JSON.stringify(userCustomParameters))
     try {
-      const response = await fetchMethod(initializeUrl)
-      return await response.text()
+      const response = await getMethod(initializeUrl)
+      return await response
     } catch (e) {
       LoggerInstance.error(e)
       throw new Error('Asset URL not found or not available.')
diff --git a/src/tokens/Datatoken.ts b/src/tokens/Datatoken.ts
index 46e22988..1077f1c1 100644
--- a/src/tokens/Datatoken.ts
+++ b/src/tokens/Datatoken.ts
@@ -7,7 +7,7 @@ import defaultDatatokensAbi from '@oceanprotocol/contracts/artifacts/contracts/t
 import defaultDatatokensEnterpriseAbi from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json'
 import { LoggerInstance, getFairGasPrice } from '../utils'
 import { FreOrderParams, FreCreationParams } from '../interfaces'
-
+import { Nft } from './NFT'
 /**
  * ERC20 ROLES
  */
@@ -18,11 +18,14 @@ interface Roles {
 
 export interface OrderParams {
   consumer: string
-  amount: string
   serviceIndex: number
   providerFeeAddress: string
   providerFeeToken: string
   providerFeeAmount: string
+  v: number // v of provider signed message
+  r: string // r of provider signed message
+  s: string // s of provider signed message
+  providerData: string // data encoded by provider
 }
 
 export interface DispenserParams {
@@ -40,6 +43,7 @@ export class Datatoken {
   public datatokensEnterpriseAbi: AbiItem | AbiItem[]
   public web3: Web3
   public startBlock: number
+  public nft: Nft
 
   /**
    * Instantiate ERC20 DataTokens
@@ -57,6 +61,7 @@ export class Datatoken {
     this.datatokensEnterpriseAbi =
       datatokensEnterpriseAbi || (defaultDatatokensEnterpriseAbi.abi as AbiItem[])
     this.startBlock = startBlock || 0
+    this.nft = new Nft(this.web3)
   }
 
   /**
@@ -223,7 +228,9 @@ export class Datatoken {
     fixedRateParams: FreCreationParams
   ): Promise<TransactionReceipt> {
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
-
+    if (!(await this.isERC20Deployer(dtAddress, address))) {
+      throw new Error(`User is not ERC20 Deployer`)
+    }
     if (!fixedRateParams.allowedConsumer)
       fixedRateParams.allowedConsumer = '0x0000000000000000000000000000000000000000'
 
@@ -321,6 +328,10 @@ export class Datatoken {
     dispenserAddress: string,
     dispenserParams: DispenserParams
   ): Promise<TransactionReceipt> {
+    if (!(await this.isERC20Deployer(dtAddress, address))) {
+      throw new Error(`User is not ERC20 Deployer`)
+    }
+
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
 
     if (!dispenserParams.allowedSwapper)
@@ -444,8 +455,9 @@ export class Datatoken {
   ): Promise<TransactionReceipt> {
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
 
-    // should check ERC20Deployer role using erc721 level ..
-
+    if ((await this.isERC20Deployer(dtAddress, address)) !== true) {
+      throw new Error(`Caller is not ERC20Deployer`)
+    }
     // Estimate gas cost for addMinter method
     const estGas = await this.estGasAddMinter(dtAddress, address, minter, dtContract)
 
@@ -508,7 +520,9 @@ export class Datatoken {
   ): Promise<TransactionReceipt> {
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
 
-    // should check ERC20Deployer role using erc721 level ..
+    if ((await this.isERC20Deployer(dtAddress, address)) !== true) {
+      throw new Error(`Caller is not ERC20Deployer`)
+    }
 
     const estGas = await this.estGasRemoveMinter(dtAddress, address, minter, dtContract)
 
@@ -568,7 +582,9 @@ export class Datatoken {
   ): Promise<TransactionReceipt> {
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
 
-    // should check ERC20Deployer role using erc721 level ..
+    if ((await this.isERC20Deployer(dtAddress, address)) !== true) {
+      throw new Error(`Caller is not ERC20Deployer`)
+    }
 
     const estGas = await this.estGasAddPaymentManager(
       dtAddress,
@@ -631,7 +647,10 @@ export class Datatoken {
   ): Promise<TransactionReceipt> {
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
 
-    // should check ERC20Deployer role using erc721 level ..
+    if ((await this.isERC20Deployer(dtAddress, address)) !== true) {
+      throw new Error(`Caller is not ERC20Deployer`)
+    }
+
     const estGas = await this.estGasRemovePaymentManager(
       dtAddress,
       address,
@@ -817,11 +836,14 @@ export class Datatoken {
    * @param {String} dtAddress Datatoken address
    * @param {String} address User address which calls
    * @param {String} consumer Consumer Address
-   * @param {String} amount Amount of tokens that is going to be transfered
    * @param {Number} serviceIndex  Service index in the metadata
    * @param {String} providerFeeAddress Consume marketplace fee address
    * @param {String} providerFeeToken address of the token marketplace wants to add fee on top
    * @param {String} providerFeeAmount amount of feeToken to be transferred to mpFeeAddress on top, will be converted to WEI
+   * @param {String} v // v of provider signed message
+   * @param {String} r // r of provider signed message
+   * @param {String} s // s of provider signed message
+   * @param {String} providerData // data encoded by provider
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<any>}
    */
@@ -829,11 +851,14 @@ export class Datatoken {
     dtAddress: string,
     address: string,
     consumer: string,
-    amount: string,
     serviceIndex: number,
     providerFeeAddress: string,
     providerFeeToken: string,
     providerFeeAmount: string,
+    v: number,
+    r: string,
+    s: string,
+    providerDatas: string,
     contractInstance?: Contract
   ): Promise<any> {
     const dtContract =
@@ -846,11 +871,14 @@ export class Datatoken {
       estGas = await dtContract.methods
         .startOrder(
           consumer,
-          this.web3.utils.toWei(amount),
           serviceIndex,
           providerFeeAddress,
           providerFeeToken,
-          this.web3.utils.toWei(providerFeeAmount)
+          this.web3.utils.toWei(providerFeeAmount),
+          v,
+          r,
+          s,
+          providerDatas
         )
         .estimateGas({ from: address }, (err, estGas) => (err ? gasLimitDefault : estGas))
     } catch (e) {
@@ -863,23 +891,28 @@ export class Datatoken {
    * @param {String} dtAddress Datatoken address
    * @param {String} address User address which calls
    * @param {String} consumer Consumer Address
-   * @param {String} amount Amount of tokens that is going to be transfered
    * @param {Number} serviceIndex  Service index in the metadata
    * @param {String} providerFeeAddress Consume marketplace fee address
    * @param {String} providerFeeToken address of the token marketplace wants to add fee on top
    * @param {String} providerFeeAmount amount of feeToken to be transferred to mpFeeAddress on top, will be converted to WEI
-
+   * @param {String} v // v of provider signed message
+   * @param {String} r // r of provider signed message
+   * @param {String} s // s of provider signed message
+   * @param {String} providerData // data encoded by provider
    * @return {Promise<TransactionReceipt>} string
    */
   public async startOrder(
     dtAddress: string,
     address: string,
     consumer: string,
-    amount: string,
     serviceIndex: number,
     providerFeeAddress: string,
     providerFeeToken: string,
-    providerFeeAmount: string
+    providerFeeAmount: string,
+    v: number,
+    r: string,
+    s: string,
+    providerDatas: string
   ): Promise<TransactionReceipt> {
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
     if (!providerFeeAddress)
@@ -890,22 +923,28 @@ export class Datatoken {
         dtAddress,
         address,
         consumer,
-        amount,
         serviceIndex,
         providerFeeAddress,
         providerFeeToken,
         providerFeeAmount,
+        v,
+        r,
+        s,
+        providerDatas,
         dtContract
       )
 
       const trxReceipt = await dtContract.methods
         .startOrder(
           consumer,
-          this.web3.utils.toWei(amount),
           serviceIndex,
           providerFeeAddress,
           providerFeeToken,
-          this.web3.utils.toWei(providerFeeAmount)
+          this.web3.utils.toWei(providerFeeAmount),
+          v,
+          r,
+          s,
+          providerDatas
         )
         .send({
           from: address,
@@ -1098,6 +1137,10 @@ export class Datatoken {
     address: string,
     value: string
   ): Promise<TransactionReceipt> {
+    if (!(await this.isERC20Deployer(dtAddress, address))) {
+      throw new Error(`User is not ERC20 Deployer`)
+    }
+
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
 
     const estGas = await this.estGasSetData(dtAddress, address, value, dtContract)
@@ -1150,6 +1193,9 @@ export class Datatoken {
     dtAddress: string,
     address: string
   ): Promise<TransactionReceipt> {
+    if ((await this.nft.getNftOwner(await this.getNFTAddress(dtAddress))) !== address) {
+      throw new Error('Caller is NOT Nft Owner')
+    }
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
 
     const estGas = await this.estGasCleanPermissions(dtAddress, address, dtContract)
@@ -1208,11 +1254,11 @@ export class Datatoken {
   /**  Returns true if address has deployERC20 role
    * @param {String} dtAddress Datatoken adress
    * @param {String} dtAddress Datatoken adress
-   * @return {Promise<number>}
+   * @return {Promise<boolean>}
    */
-  public async isERC20Deployer(dtAddress: string, adddress: string): Promise<string> {
+  public async isERC20Deployer(dtAddress: string, address: string): Promise<boolean> {
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, dtAddress)
-    const isERC20Deployer = await dtContract.methods.isERC20Deployer(adddress).call()
+    const isERC20Deployer = await dtContract.methods.isERC20Deployer(address).call()
     return isERC20Deployer
   }
 
diff --git a/src/tokens/NFT.ts b/src/tokens/NFT.ts
index c4604163..6d7bdd3e 100644
--- a/src/tokens/NFT.ts
+++ b/src/tokens/NFT.ts
@@ -10,7 +10,7 @@ import { Contract } from 'web3-eth-contract'
  */
 interface Roles {
   manager: boolean
-  deployErc20: boolean
+  deployERC20: boolean
   updateMetadata: boolean
   store: boolean
 }
@@ -107,6 +107,9 @@ export class Nft {
     symbol?: string,
     templateIndex?: number
   ): Promise<string> {
+    if ((await this.getNftPermissions(nftAddress, address)).deployERC20 !== true) {
+      throw new Error(`Caller is not ERC20Deployer`)
+    }
     if (!templateIndex) templateIndex = 1
 
     // Generate name & symbol if not present
@@ -313,9 +316,9 @@ export class Nft {
   ): Promise<TransactionReceipt> {
     const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
 
-    // if ((await this.getNFTPermissions(nftAddress, address)).manager !== true) {
-    //   throw new Error(`Caller is not Manager`)
-    // }
+    if ((await this.getNftPermissions(nftAddress, address)).manager !== true) {
+      throw new Error(`Caller is not Manager`)
+    }
 
     // Estimate gas for addToCreateERC20List method
     const estGas = await this.estGasAddErc20Deployer(
@@ -381,10 +384,13 @@ export class Nft {
   ): Promise<TransactionReceipt> {
     const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
 
-    // if ((await this.getNFTPermissions(nftAddress, address)).manager !== true) {
-    //   throw new Error(`Caller is not Manager`)
-    // }
-
+    if (
+      (await this.getNftPermissions(nftAddress, address)).manager !== true ||
+      (address === erc20Deployer &&
+        (await this.getNftPermissions(nftAddress, address)).deployERC20 !== true)
+    ) {
+      throw new Error(`Caller is not Manager nor ERC20Deployer`)
+    }
     const estGas = await this.estGasRemoveErc20Deployer(
       nftAddress,
       address,
@@ -447,9 +453,9 @@ export class Nft {
   ): Promise<TransactionReceipt> {
     const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
 
-    // if ((await this.getNFTPermissions(nftAddress, address)).manager !== true) {
-    //   throw new Error(`Caller is not Manager`)
-    // }
+    if ((await this.getNftPermissions(nftAddress, address)).manager !== true) {
+      throw new Error(`Caller is not Manager`)
+    }
 
     const estGas = await this.estGasAddMetadataUpdater(
       nftAddress,
@@ -512,9 +518,13 @@ export class Nft {
   ): Promise<TransactionReceipt> {
     const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
 
-    // if ((await this.getNFTPermissions(nftAddress, address)).manager !== true) {
-    //   throw new Error(`Caller is not Manager`)
-    // }
+    if (
+      (await this.getNftPermissions(nftAddress, address)).manager !== true ||
+      (address !== metadataUpdater &&
+        (await this.getNftPermissions(nftAddress, address)).updateMetadata !== true)
+    ) {
+      throw new Error(`Caller is not Manager nor Metadata Updater`)
+    }
 
     const estGas = await this.esGasRemoveMetadataUpdater(
       nftAddress,
@@ -578,9 +588,9 @@ export class Nft {
   ): Promise<TransactionReceipt> {
     const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
 
-    // if ((await this.getNFTPermissions(nftAddress, address)).manager !== true) {
-    //   throw new Error(`Caller is not Manager`)
-    // }
+    if ((await this.getNftPermissions(nftAddress, address)).manager !== true) {
+      throw new Error(`Caller is not Manager`)
+    }
 
     const estGas = await this.estGasAddStoreUpdater(
       nftAddress,
@@ -642,9 +652,13 @@ export class Nft {
   ): Promise<TransactionReceipt> {
     const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
 
-    // if ((await this.getNFTPermissions(nftAddress, address)).manager !== true) {
-    //   throw new Error(`Caller is not Manager`)
-    // }
+    if (
+      (await this.getNftPermissions(nftAddress, address)).manager !== true ||
+      (address !== storeUpdater &&
+        (await this.getNftPermissions(nftAddress, address)).store !== true)
+    ) {
+      throw new Error(`Caller is not Manager nor storeUpdater`)
+    }
 
     const estGas = await this.estGasRemoveStoreUpdater(
       nftAddress,
@@ -882,7 +896,7 @@ export class Nft {
   /**
    * Estimate gas cost for setMetadata  method
    * @param {String} nftAddress erc721 contract adress
-   * @param {String} nftOwner Current NFT Owner adress
+   * @param {String} metadataUpdater metadataUpdater address
    * @param {Number} metadataState User which will receive the NFT, will also be set as Manager
    * @param {String} metaDataDecryptorUrl
    * @param {Number} tokenId The id of the token to be transfered
@@ -891,7 +905,7 @@ export class Nft {
    */
   public async estGasSetMetadata(
     nftAddress: string,
-    nftOwner: string,
+    metadataUpdater: string,
     metadataState: number,
     metaDataDecryptorUrl: string,
     metaDataDecryptorAddress: string,
@@ -915,7 +929,7 @@ export class Nft {
           data,
           metadataHash
         )
-        .estimateGas({ from: nftOwner }, (err, estGas) =>
+        .estimateGas({ from: metadataUpdater }, (err, estGas) =>
           err ? gasLimitDefault : estGas
         )
     } catch (e) {
@@ -930,8 +944,6 @@ export class Nft {
    * will clean all permissions both on erc721 and erc20 level.
    * @param {String} nftAddress erc721 contract adress
    * @param {String} address Caller address NFT Owner adress
-   * @param {String} nftReceiver User which will receive the NFT, will also be set as Manager
-   * @param {Number} tokenId The id of the token to be transfered
    * @return {Promise<TransactionReceipt>} trxReceipt
    */
   public async setMetadata(
@@ -946,9 +958,9 @@ export class Nft {
   ): Promise<TransactionReceipt> {
     const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
 
-    // if (!(await this.getNFTPermissions(nftAddress, address)).updateMetadata) {
-    //   throw new Error(`Caller is not NFT Owner`)
-    // }
+    if (!(await this.getNftPermissions(nftAddress, address)).updateMetadata) {
+      throw new Error(`Caller is not Metadata updater`)
+    }
 
     const estGas = await this.estGasSetMetadata(
       nftAddress,
@@ -981,49 +993,68 @@ export class Nft {
     return trxReceipt
   }
 
-  /** Get Owner
+  /**
+   * Estimate gas cost for setMetadataState  method
    * @param {String} nftAddress erc721 contract adress
-   * @return {Promise<string>} string
+   * @param {String} nftOwner Current NFT Owner adress
+   * @param {Number} metadataState new metadata state
+   * @param {Contract} nftContract optional contract instance
+   * @return {Promise<any>}
    */
-  public async getNftOwner(nftAddress: string): Promise<string> {
+  public async estGasSetMetadataState(
+    nftAddress: string,
+    metadataUpdater: string,
+    metadataState: number,
+    contractInstance?: Contract
+  ): Promise<any> {
+    const nftContract =
+      contractInstance || new this.web3.eth.Contract(this.nftAbi, nftAddress)
+
+    const gasLimitDefault = this.GASLIMIT_DEFAULT
+    let estGas
+    try {
+      estGas = await nftContract.methods
+        .setMetaDataState(metadataState)
+        .estimateGas({ from: metadataUpdater }, (err, estGas) =>
+          err ? gasLimitDefault : estGas
+        )
+    } catch (e) {
+      estGas = gasLimitDefault
+    }
+
+    return estGas
+  }
+
+  /**
+   * setMetadataState Used for updating the metadata State
+   * @param {String} nftAddress erc721 contract adress
+   * @param {String} address Caller address => metadata updater
+   * @param {Number} metadataState new metadata state
+   * @return {Promise<TransactionReceipt>} trxReceipt
+   */
+  public async setMetadataState(
+    nftAddress: string,
+    address: string,
+    metadataState: number
+  ): Promise<TransactionReceipt> {
     const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
-    const trxReceipt = await nftContract.methods.ownerOf(1).call()
+
+    if (!(await this.getNftPermissions(nftAddress, address)).updateMetadata) {
+      throw new Error(`Caller is not Metadata updater`)
+    }
+
+    const estGas = await this.estGasSetMetadataState(nftAddress, address, metadataState)
+
+    // Call transferFrom function of the contract
+    const trxReceipt = await nftContract.methods.setMetaDataState(metadataState).send({
+      from: address,
+      gas: estGas + 1,
+      gasPrice: await getFairGasPrice(this.web3)
+    })
+
     return trxReceipt
   }
 
-  /** Get users NFT Permissions
-   * @param {String} nftAddress erc721 contract adress
-   * @param {String} address user adress
-   * @return {Promise<Roles>}
-   */
-  public async getNftPermissions(nftAddress: string, address: string): Promise<Roles> {
-    const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
-    const roles = await nftContract.methods.getPermissions(address).call()
-    return roles
-  }
-
-  /** Get users ERC20Deployer role
-   * @param {String} nftAddress erc721 contract adress
-   * @param {String} address user adress
-   * @return {Promise<Roles>}
-   */
-  public async isErc20Deployer(nftAddress: string, address: string): Promise<boolean> {
-    const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
-    const isERC20Deployer = await nftContract.methods.isERC20Deployer(address).call()
-    return isERC20Deployer
-  }
-
-  /** Gets data at a given `key`
-   * @param {String} nftAddress erc721 contract adress
-   * @param {String} key the key which value to retrieve
-   * @return {Promise<string>} The data stored at the key
-   */
-  public async getData(nftAddress: string, key: string): Promise<string> {
-    const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
-    const data = await nftContract.methods.getData(key).call()
-    return data
-  }
-
   /** Estimate gas cost for setTokenURI method
    * @param nftAddress erc721 contract adress
    * @param address user adress
@@ -1071,4 +1102,67 @@ export class Nft {
     })
     return trxReceipt
   }
+
+  /** Get Owner
+   * @param {String} nftAddress erc721 contract adress
+   * @return {Promise<string>} string
+   */
+  public async getNftOwner(nftAddress: string): Promise<string> {
+    const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
+    const trxReceipt = await nftContract.methods.ownerOf(1).call()
+    return trxReceipt
+  }
+
+  /** Get users NFT Permissions
+   * @param {String} nftAddress erc721 contract adress
+   * @param {String} address user adress
+   * @return {Promise<Roles>}
+   */
+  public async getNftPermissions(nftAddress: string, address: string): Promise<Roles> {
+    const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
+    const roles = await nftContract.methods.getPermissions(address).call()
+    return roles
+  }
+
+  /** Get users Metadata, return Metadata details
+   * @param {String} nftAddress erc721 contract adress
+   * @return {Promise<Objecta>}
+   */
+  public async getMetadata(nftAddress: string): Promise<Object> {
+    const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
+    return await nftContract.methods.getMetaData().call()
+  }
+
+  /** Get users ERC20Deployer role
+   * @param {String} nftAddress erc721 contract adress
+   * @param {String} address user adress
+   * @return {Promise<Roles>}
+   */
+  public async isErc20Deployer(nftAddress: string, address: string): Promise<boolean> {
+    const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
+    const isERC20Deployer = await nftContract.methods.isERC20Deployer(address).call()
+    return isERC20Deployer
+  }
+
+  /** Gets data at a given `key`
+   * @param {String} nftAddress erc721 contract adress
+   * @param {String} key the key which value to retrieve
+   * @return {Promise<string>} The data stored at the key
+   */
+  public async getData(nftAddress: string, key: string): Promise<string> {
+    const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
+    const data = await nftContract.methods.getData(key).call()
+    return data
+  }
+
+  /** Gets data at a given `key`
+   * @param {String} nftAddress erc721 contract adress
+   * @param {String} id
+   * @return {Promise<string>} The data stored at the key
+   */
+  public async getTokenURI(nftAddress: string, id: number): Promise<string> {
+    const nftContract = new this.web3.eth.Contract(this.nftAbi, nftAddress)
+    const data = await nftContract.methods.tokenURI(id).call()
+    return data
+  }
 }
diff --git a/test/unit/NftFactory.test.ts b/test/unit/NftFactory.test.ts
index b2f3bc2d..362769d6 100644
--- a/test/unit/NftFactory.test.ts
+++ b/test/unit/NftFactory.test.ts
@@ -2,6 +2,7 @@ import { assert, expect } from 'chai'
 import { AbiItem } from 'web3-utils/types'
 import { TestContractHandler } from '../TestContractHandler'
 import Web3 from 'web3'
+import { ecsign } from 'ethereumjs-util'
 import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
 import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
 import SideStaking from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
@@ -20,6 +21,13 @@ import {
 import { ZERO_ADDRESS } from '../../src/utils'
 
 const web3 = new Web3('http://127.0.0.1:8545')
+function signMessage(message, privateKey) {
+  const { v, r, s } = ecsign(
+    Buffer.from(message.slice(2), 'hex'),
+    Buffer.from(privateKey, 'hex')
+  )
+  return { v, r, s }
+}
 
 describe('Nft Factory test', () => {
   let factoryOwner: string
@@ -375,27 +383,45 @@ describe('Nft Factory test', () => {
     expect(await dtContract.methods.balanceOf(user2).call()).to.equal(dtAmount)
     expect(await dtContract2.methods.balanceOf(user2).call()).to.equal(dtAmount)
 
+    const providerData = JSON.stringify({ timeout: 0 })
+    const message = web3.utils.soliditySha3(
+      { t: 'bytes', v: web3.utils.toHex(web3.utils.asciiToHex(providerData)) },
+      { t: 'address', v: user3 },
+      { t: 'address', v: '0x0000000000000000000000000000000000000000' },
+      { t: 'uint256', v: '1' }
+    )
+    const signedMessage = signMessage(
+      message,
+      '7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6'
+    )
+
     const orders: TokenOrder[] = [
       {
         tokenAddress: dtAddress,
         consumer: consumer,
-        amount: dtAmount,
         serviceIndex: serviceIndex,
         providerFeeAddress: consumeFeeAddress,
         providerFeeToken: consumeFeeToken,
-        providerFeeAmount: consumeFeeAmount
+        providerFeeAmount: consumeFeeAmount,
+        v: signedMessage.v,
+        r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+        s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
+        providerData: web3.utils.toHex(web3.utils.asciiToHex(providerData))
       },
       {
         tokenAddress: dtAddress2,
         consumer: consumer,
-        amount: dtAmount,
         serviceIndex: serviceIndex,
         providerFeeAddress: consumeFeeAddress,
         providerFeeToken: consumeFeeToken,
-        providerFeeAmount: consumeFeeAmount
+        providerFeeAmount: consumeFeeAmount,
+        v: signedMessage.v,
+        r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+        s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
+        providerData: web3.utils.toHex(web3.utils.asciiToHex(providerData))
       }
     ]
-
+    console.log('orders', orders)
     await nftFactory.startMultipleTokenOrder(user2, orders)
 
     // we check user2 has no more DTs
diff --git a/test/unit/tokens/Datatoken.test.ts b/test/unit/tokens/Datatoken.test.ts
index 70f5069d..c168b3b0 100644
--- a/test/unit/tokens/Datatoken.test.ts
+++ b/test/unit/tokens/Datatoken.test.ts
@@ -1,5 +1,6 @@
 import { assert } from 'chai'
 import Web3 from 'web3'
+import { ecsign } from 'ethereumjs-util'
 import ERC20TemplateEnterprise from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
 import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
@@ -19,6 +20,14 @@ import { FreCreationParams, FreOrderParams } from '../../../src/interfaces'
 
 const web3 = new Web3('http://127.0.0.1:8545')
 
+function signMessage(message, privateKey) {
+  const { v, r, s } = ecsign(
+    Buffer.from(message.slice(2), 'hex'),
+    Buffer.from(privateKey, 'hex')
+  )
+  return { v, r, s }
+}
+
 describe('Datatoken', () => {
   let nftOwner: string
   let user1: string
@@ -127,7 +136,7 @@ describe('Datatoken', () => {
     }
   })
 
-  it('#addMinter - should add user1 as minter, if nftDatatoken has ERC20Deployer permission', async () => {
+  it('#addMinter - should add user1 as minter, if user has ERC20Deployer permission', async () => {
     assert((await nftDatatoken.isErc20Deployer(nftAddress, nftOwner)) === true)
     assert((await datatoken.getDTPermissions(datatokenAddress, user1)).minter === false)
 
@@ -136,6 +145,19 @@ describe('Datatoken', () => {
     assert((await datatoken.getDTPermissions(datatokenAddress, user1)).minter === true)
   })
 
+  it('#addMinter - should FAIL TO add user1 as minter, if user has ERC20Deployer permission', async () => {
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user3)) === false)
+    assert((await datatoken.getDTPermissions(datatokenAddress, user2)).minter === false)
+
+    try {
+      await datatoken.addMinter(datatokenAddress, user3, user2)
+    } catch (e) {
+      assert(e.message === 'Caller is not ERC20Deployer')
+    }
+
+    assert((await datatoken.getDTPermissions(datatokenAddress, user2)).minter === false)
+  })
+
   it('#mint - should mint ERC20 datatoken to user1, if Minter', async () => {
     assert((await datatoken.getDTPermissions(datatokenAddress, nftOwner)).minter === true)
     await datatoken.mint(datatokenAddress, nftOwner, '10', user1)
@@ -160,6 +182,25 @@ describe('Datatoken', () => {
     exchangeId = fre.events.NewFixedRate.returnValues[0]
   })
 
+  it('#createFixedRate - should FAIL create FRE if NOT ERC20Deployer', async () => {
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user3)) === false)
+    const freParams: FreCreationParams = {
+      fixedRateAddress: contractHandler.fixedRateAddress,
+      baseTokenAddress: contractHandler.daiAddress,
+      owner: nftOwner,
+      marketFeeCollector: nftOwner,
+      baseTokenDecimals: 18,
+      dataTokenDecimals: 18,
+      fixedRate: web3.utils.toWei('1'),
+      marketFee: 1e15
+    }
+    try {
+      await datatoken.createFixedRate(datatokenAddress, user3, freParams)
+    } catch (e) {
+      assert(e.message === 'User is not ERC20 Deployer')
+    }
+  })
+
   it('#createDispenser - method creates a dispenser for the erc20DT', async () => {
     const dispenserParams: DispenserParams = {
       maxTokens: '10',
@@ -175,6 +216,36 @@ describe('Datatoken', () => {
     assert(dispenser !== null)
   })
 
+  it('#createDispenser - should FAIL to create a Dispenser if not ERC20 Deployer', async () => {
+    const dispenserParams: DispenserParams = {
+      maxTokens: '10',
+      maxBalance: '100'
+    }
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user3)) === false)
+    try {
+      await datatoken.createDispenser(
+        datatokenAddress,
+        user2,
+        contractHandler.dispenserAddress,
+        dispenserParams
+      )
+    } catch (e) {
+      assert(e.message === 'User is not ERC20 Deployer')
+    }
+  })
+
+  it('#removeMinter - should FAIL to remove user1 as minter, if caller is NOT ERC20Deployer', async () => {
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user2)) === false)
+    assert((await datatoken.getDTPermissions(datatokenAddress, user1)).minter === true)
+
+    try {
+      await datatoken.removeMinter(datatokenAddress, user2, user1)
+    } catch (e) {
+      assert(e.message === 'Caller is not ERC20Deployer')
+    }
+    assert((await datatoken.getDTPermissions(datatokenAddress, user1)).minter === true)
+  })
+
   it('#removeMinter - should remove user1 as minter, if nftDatatoken has ERC20Deployer permission', async () => {
     assert((await nftDatatoken.isErc20Deployer(nftAddress, nftOwner)) === true)
     assert((await datatoken.getDTPermissions(datatokenAddress, user1)).minter === true)
@@ -184,7 +255,23 @@ describe('Datatoken', () => {
     assert((await datatoken.getDTPermissions(datatokenAddress, user1)).minter === false)
   })
 
-  it('#addPaymentManager - should add user2 as paymentManager, if nftDatatoken has ERC20Deployer permission', async () => {
+  it('#addPaymentManager - should FAIL TO add user2 as paymentManager, if caller is NOT ERC20Deployer', async () => {
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user1)) === false)
+    assert(
+      (await datatoken.getDTPermissions(datatokenAddress, user2)).paymentManager === false
+    )
+
+    try {
+      await datatoken.addPaymentManager(datatokenAddress, user1, user2)
+    } catch (e) {
+      assert(e.message === 'Caller is not ERC20Deployer')
+    }
+    assert(
+      (await datatoken.getDTPermissions(datatokenAddress, user2)).paymentManager === false
+    )
+  })
+
+  it('#addPaymentManager - should add user2 as paymentManager, if caller has ERC20Deployer permission', async () => {
     assert((await nftDatatoken.isErc20Deployer(nftAddress, nftOwner)) === true)
     assert(
       (await datatoken.getDTPermissions(datatokenAddress, user2)).paymentManager === false
@@ -197,7 +284,23 @@ describe('Datatoken', () => {
     )
   })
 
-  it('#removePaymentManager - should remove user2 as paymentManager, if nftDatatoken has ERC20Deployer permission', async () => {
+  it('#removePaymentManager - should FAIL TO remove user2 as paymentManager, if nftDatatoken has ERC20Deployer permission', async () => {
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user1)) === false)
+    assert(
+      (await datatoken.getDTPermissions(datatokenAddress, user2)).paymentManager === true
+    )
+    try {
+      await datatoken.removePaymentManager(datatokenAddress, user1, user2)
+    } catch (e) {
+      assert(e.message === 'Caller is not ERC20Deployer')
+    }
+
+    assert(
+      (await datatoken.getDTPermissions(datatokenAddress, user2)).paymentManager === true
+    )
+  })
+
+  it('#removePaymentManager - should remove user2 as paymentManager, if Caller has ERC20Deployer permission', async () => {
     assert((await nftDatatoken.isErc20Deployer(nftAddress, nftOwner)) === true)
     assert(
       (await datatoken.getDTPermissions(datatokenAddress, user2)).paymentManager === true
@@ -246,15 +349,30 @@ describe('Datatoken', () => {
       'User2 does not hold 0 datatokens'
     )
 
+    const providerData = JSON.stringify({ timeout: 0 })
+    const message = web3.utils.soliditySha3(
+      { t: 'bytes', v: web3.utils.toHex(web3.utils.asciiToHex(providerData)) },
+      { t: 'address', v: user3 },
+      { t: 'address', v: '0x0000000000000000000000000000000000000000' },
+      { t: 'uint256', v: '1' }
+    )
+    const signedMessage = signMessage(
+      message,
+      '7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6'
+    )
+
     const order = await datatoken.startOrder(
       datatokenAddress,
       user1,
       user2,
-      '1',
       1,
       user3,
       '0x0000000000000000000000000000000000000000',
-      '0'
+      '0',
+      signedMessage.v,
+      web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+      web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
+      web3.utils.toHex(web3.utils.asciiToHex(providerData))
     )
     assert(order !== null)
 
@@ -272,15 +390,30 @@ describe('Datatoken', () => {
   })
 
   it('#buyFromDispenserAndOrder- Enterprise method', async () => {
+    const providerData = JSON.stringify({ timeout: 0 })
+    const message = web3.utils.soliditySha3(
+      { t: 'bytes', v: web3.utils.toHex(web3.utils.asciiToHex(providerData)) },
+      { t: 'address', v: user3 },
+      { t: 'address', v: '0x0000000000000000000000000000000000000000' },
+      { t: 'uint256', v: '1' }
+    )
+    const signedMessage = signMessage(
+      message,
+      '7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6'
+    )
+
     const order: OrderParams = {
       consumer: user1,
-      amount: '1',
       serviceIndex: 1,
-      providerFeeAddress: user1,
+      providerFeeAddress: user3,
       providerFeeToken: '0x0000000000000000000000000000000000000000',
-      providerFeeAmount: '0'
+      providerFeeAmount: '0',
+      v: signedMessage.v,
+      r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+      s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
+      providerData: web3.utils.toHex(web3.utils.asciiToHex(providerData))
     }
-
+    console.log('order', order)
     const buyFromDispenseTx = await datatoken.buyFromDispenserAndOrder(
       datatokenAddress,
       nftOwner,
@@ -291,13 +424,28 @@ describe('Datatoken', () => {
   })
 
   it('#buyFromFreAndOrder - Enterprise method ', async () => {
+    const providerData = JSON.stringify({ timeout: 0 })
+    const message = web3.utils.soliditySha3(
+      { t: 'bytes', v: web3.utils.toHex(web3.utils.asciiToHex(providerData)) },
+      { t: 'address', v: user3 },
+      { t: 'address', v: '0x0000000000000000000000000000000000000000' },
+      { t: 'uint256', v: '1' }
+    )
+    const signedMessage = signMessage(
+      message,
+      '7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6'
+    )
+
     const order: OrderParams = {
       consumer: user1,
-      amount: '1',
       serviceIndex: 1,
       providerFeeAddress: user1,
       providerFeeToken: '0x0000000000000000000000000000000000000000',
-      providerFeeAmount: '0'
+      providerFeeAmount: '0',
+      v: signedMessage.v,
+      r: web3.utils.asciiToHex(signedMessage.r.toString('ascii')),
+      s: web3.utils.asciiToHex(signedMessage.s.toString('ascii')),
+      providerData: web3.utils.toHex(web3.utils.asciiToHex(providerData))
     }
 
     const fre: FreOrderParams = {
@@ -312,6 +460,30 @@ describe('Datatoken', () => {
     assert(buyTx !== null)
   })
 
+  it('#cleanPermissions - should FAIL to clean permissions at ERC20 level, if NOT NFT Owner', async () => {
+    assert((await datatoken.getDTPermissions(datatokenAddress, nftOwner)).minter === true)
+
+    assert((await datatoken.getPaymentCollector(datatokenAddress)) === user3)
+
+    assert(
+      (await datatoken.getDTPermissions(datatokenAddress, user1)).paymentManager === true
+    )
+
+    try {
+      await datatoken.cleanPermissions(datatokenAddress, user2)
+    } catch (e) {
+      assert(e.message === 'Caller is NOT Nft Owner')
+    }
+
+    assert((await datatoken.getPaymentCollector(datatokenAddress)) === user3)
+
+    assert((await datatoken.getDTPermissions(datatokenAddress, nftOwner)).minter === true)
+
+    assert(
+      (await datatoken.getDTPermissions(datatokenAddress, user1)).paymentManager === true
+    )
+  })
+
   it('#cleanPermissions - should clean permissions at ERC20 level', async () => {
     assert((await datatoken.getDTPermissions(datatokenAddress, nftOwner)).minter === true)
 
@@ -339,7 +511,7 @@ describe('Datatoken', () => {
     assert(address, 'Not able to get the parent ERC721 address')
   })
 
-  it('#setData - should set a value into 725Y standard, if nftDatatoken has ERC20Deployer permission', async () => {
+  it('#setData - should set a value into 725Y standard, if Caller has ERC20Deployer permission', async () => {
     const data = web3.utils.asciiToHex('SomeData')
 
     assert((await nftDatatoken.isErc20Deployer(nftAddress, nftOwner)) === true)
@@ -349,4 +521,18 @@ describe('Datatoken', () => {
     const key = web3.utils.keccak256(datatokenAddress)
     assert((await nftDatatoken.getData(nftAddress, key)) === data)
   })
+
+  it('#setData - should FAIL to set a value into 725Y standard, if Caller has NOT ERC20Deployer permission', async () => {
+    const data = web3.utils.asciiToHex('NewData')
+    const OldData = web3.utils.asciiToHex('SomeData')
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user1)) === false)
+
+    try {
+      await datatoken.setData(datatokenAddress, user1, data)
+    } catch (e) {
+      assert(e.message === 'User is not ERC20 Deployer')
+    }
+    const key = web3.utils.keccak256(datatokenAddress)
+    assert((await nftDatatoken.getData(nftAddress, key)) === OldData)
+  })
 })
diff --git a/test/unit/tokens/Nft.test.ts b/test/unit/tokens/Nft.test.ts
index e8f9919a..6c3ea160 100644
--- a/test/unit/tokens/Nft.test.ts
+++ b/test/unit/tokens/Nft.test.ts
@@ -78,6 +78,11 @@ describe('NFT', () => {
     nftAddress = await nftFactory.createNFT(nftOwner, nftData)
     nftDatatoken = new Nft(web3, ERC721Template.abi as AbiItem[])
   })
+  it('#getTokenURI', async () => {
+    const tokenURI = await nftDatatoken.getTokenURI(nftAddress, 1)
+    assert(tokenURI === 'https://oceanprotocol.com/nft/')
+    console.log(tokenURI)
+  })
 
   it('#createERC20 - should create a new ERC20 DT from NFT contract', async () => {
     const erc20Address = await nftDatatoken.createErc20(
@@ -96,6 +101,26 @@ describe('NFT', () => {
     assert(erc20Address !== null)
   })
 
+  it('#createERC20 - should fail to create a new ERC20 DT if not ERC20Deployer', async () => {
+    try {
+      await nftDatatoken.createErc20(
+        nftAddress,
+        user1,
+        nftOwner,
+        user1,
+        user2,
+        '0x0000000000000000000000000000000000000000',
+        '0',
+        '10000',
+        nftName,
+        nftSymbol,
+        1
+      )
+    } catch (e) {
+      assert(e.message === 'Caller is not ERC20Deployer')
+    }
+  })
+
   // Manager
   it('#addManager - should add a new Manager', async () => {
     assert((await nftDatatoken.getNftPermissions(nftAddress, user1)).manager === false)
@@ -138,14 +163,19 @@ describe('NFT', () => {
     assert((await nftDatatoken.isErc20Deployer(nftAddress, user1)) === true)
   })
 
+  it('#addManager - should fail to add a new Manager, if NOT NFT Owner', async () => {
+    try {
+      await nftDatatoken.addManager(nftAddress, user1, user1)
+    } catch (e) {
+      assert(e.message === 'Caller is not NFT Owner')
+    }
+  })
+
   it('#addERC20Deployer - should fail to add ERC20deployer if NOT Manager', async () => {
     try {
       await nftDatatoken.addErc20Deployer(nftAddress, user1, user1)
     } catch (e) {
-      assert(
-        e.message ===
-          'Returned error: VM Exception while processing transaction: revert ERC721RolesAddress: NOT MANAGER'
-      )
+      assert(e.message === 'Caller is not Manager')
     }
   })
 
@@ -157,15 +187,25 @@ describe('NFT', () => {
     assert((await nftDatatoken.isErc20Deployer(nftAddress, user1)) === false)
   })
 
-  it('#removeERC20Deployer - should fail and remove ERC20deployer if NOT Manager', async () => {
+  it('#removeERC20Deployer - should fail and remove ERC20deployer if NOT Manager nor himself an ERC20Deployer', async () => {
+    await nftDatatoken.addErc20Deployer(nftAddress, nftOwner, user1)
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user1)) === true)
     try {
       await nftDatatoken.removeErc20Deployer(nftAddress, user1, user1)
     } catch (e) {
-      assert(
-        e.message ===
-          'Returned error: VM Exception while processing transaction: revert ERC721RolesAddress: Not enough permissions to remove from ERC20List'
-      )
+      assert(e.message === 'Caller is not Manager nor ERC20Deployer')
     }
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user1)) === true)
+  })
+
+  it('#removeERC20Deployer - should fail to remove himself an ERC20Deployer', async () => {
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user1)) === true)
+    try {
+      await nftDatatoken.removeErc20Deployer(nftAddress, user1, user1)
+    } catch (e) {
+      assert(e.message === 'Caller is not Manager nor ERC20Deployer')
+    }
+    assert((await nftDatatoken.isErc20Deployer(nftAddress, user1)) === true)
   })
 
   //  MetadataUpdate
@@ -185,10 +225,7 @@ describe('NFT', () => {
     try {
       await nftDatatoken.addMetadataUpdater(nftAddress, user1, user1)
     } catch (e) {
-      assert(
-        e.message ===
-          'Returned error: VM Exception while processing transaction: revert ERC721RolesAddress: NOT MANAGER'
-      )
+      assert(e.message === 'Caller is not Manager')
     }
   })
 
@@ -208,10 +245,7 @@ describe('NFT', () => {
     try {
       await nftDatatoken.removeMetadataUpdater(nftAddress, user1, user1)
     } catch (e) {
-      assert(
-        e.message ===
-          'Returned error: VM Exception while processing transaction: revert ERC721RolesAddress: Not enough permissions to remove from metadata list'
-      )
+      assert(e.message === 'Caller is not Manager nor Metadata Updater')
     }
   })
 
@@ -228,10 +262,7 @@ describe('NFT', () => {
     try {
       await nftDatatoken.addStoreUpdater(nftAddress, user1, user1)
     } catch (e) {
-      assert(
-        e.message ===
-          'Returned error: VM Exception while processing transaction: revert ERC721RolesAddress: NOT MANAGER'
-      )
+      assert(e.message === 'Caller is not Manager')
     }
   })
 
@@ -247,10 +278,7 @@ describe('NFT', () => {
     try {
       await nftDatatoken.removeStoreUpdater(nftAddress, user1, user1)
     } catch (e) {
-      assert(
-        e.message ===
-          'Returned error: VM Exception while processing transaction: revert ERC721RolesAddress: Not enough permissions to remove from 725StoreList'
-      )
+      assert(e.message === `Caller is not Manager nor storeUpdater`)
     }
   })
 
@@ -298,6 +326,93 @@ describe('NFT', () => {
     assert((await nftDatatoken.getNftPermissions(nftAddress, nftOwner)).manager === false)
   })
 
+  it('#setMetaData - should succeed to update metadata if metadataUpdater', async () => {
+    await nftDatatoken.addManager(nftAddress, user1, user1)
+    await nftDatatoken.addMetadataUpdater(nftAddress, user1, user1)
+    const metaDataDecryptorUrl = 'http://myprovider:8030'
+    const metaDataDecryptorAddress = '0x123'
+    const metaDataState = 1
+    const data = web3.utils.asciiToHex(user2)
+    const dataHash = web3.utils.asciiToHex(user2)
+    const flags = web3.utils.asciiToHex(user2)
+    assert(
+      (await nftDatatoken.getNftPermissions(nftAddress, user1)).updateMetadata === true
+    )
+    await nftDatatoken.setMetadata(
+      nftAddress,
+      user1,
+      metaDataState,
+      metaDataDecryptorUrl,
+      metaDataDecryptorAddress,
+      flags,
+      data,
+      dataHash
+    )
+
+    const metadata = await nftDatatoken.getMetadata(nftAddress)
+    assert(metadata[0] === metaDataDecryptorUrl)
+    assert(metadata[1] === metaDataDecryptorAddress)
+    //  assert((await nftDatatoken.getMetadata(nftAddress)).metaDataDecryptorAddress ===  metaDataDecryptorAddress)
+  })
+  it('#setMetaData - should fail to update metadata if NOT metadataUpdater', async () => {
+    const metaDataDecryptorUrl = 'http://myprovider:8030'
+    const metaDataDecryptorAddress = '0x123'
+    const metaDataState = 1
+    const data = web3.utils.asciiToHex(user2)
+    const dataHash = web3.utils.asciiToHex(user2)
+    const flags = web3.utils.asciiToHex(user2)
+    assert(
+      (await nftDatatoken.getNftPermissions(nftAddress, user3)).updateMetadata === false
+    )
+    try {
+      await nftDatatoken.setMetadata(
+        nftAddress,
+        user3,
+        metaDataState,
+        metaDataDecryptorUrl,
+        metaDataDecryptorAddress,
+        flags,
+        data,
+        dataHash
+      )
+    } catch (e) {
+      assert(e.message === 'Caller is not Metadata updater')
+    }
+    assert(
+      (await nftDatatoken.getNftPermissions(nftAddress, user3)).updateMetadata === false
+    )
+  })
+  it('#setMetaDataState - should succeed to update MetadataState if metadataUpdater', async () => {
+    await nftDatatoken.addManager(nftAddress, user1, user1)
+    await nftDatatoken.addMetadataUpdater(nftAddress, user1, user1)
+    let metadata = await nftDatatoken.getMetadata(nftAddress)
+
+    assert(metadata[2] === '1')
+    assert(
+      (await nftDatatoken.getNftPermissions(nftAddress, user1)).updateMetadata === true
+    )
+
+    await nftDatatoken.setMetadataState(nftAddress, user1, 2)
+
+    metadata = await nftDatatoken.getMetadata(nftAddress)
+    assert(metadata[2] === '2')
+  })
+
+  it('#setMetaDataState - should fail to update MetadataState if NOT metadataUpdater', async () => {
+    let metadata = await nftDatatoken.getMetadata(nftAddress)
+    assert(metadata[2] === '2')
+    assert(
+      (await nftDatatoken.getNftPermissions(nftAddress, user3)).updateMetadata === false
+    )
+    try {
+      await nftDatatoken.setMetadataState(nftAddress, user3, 1)
+    } catch (e) {
+      assert(e.message === 'Caller is not Metadata updater')
+    }
+    metadata = await nftDatatoken.getMetadata(nftAddress)
+    assert(metadata[2] === '2')
+  })
+
   it('#setTokenURI - should update TokenURI', async () => {
     const tx = await nftDatatoken.setTokenURI(nftAddress, user1, 'test')
     assert(tx.events.TokenURIUpdate)