Skip to content

O
openzeppelin-contracts-upgradeable
Commit 46881f71 by Francisco Giordano
Options

Merge branch 'upstream-patched' into upstream-v3.4-patched

parents 0b6bfde4 bc6886c2
Showing with 284 additions and 197 deletions
.github/workflows/test.yml
...@@ -6,6 +6,7 @@ on: ...@@ -6,6 +6,7 @@ on:
- master - master
- release-v* - release-v*
pull_request: {} pull_request: {}
workflow_dispatch: {}
jobs: jobs:
test: test:
......
contracts/mocks/AddressImpl.sol
...@@ -32,6 +32,11 @@ contract AddressImpl { ...@@ -32,6 +32,11 @@ contract AddressImpl {
emit CallReturnValue(abi.decode(returnData, (string))); emit CallReturnValue(abi.decode(returnData, (string)));
} }
function functionDelegateCall(address target, bytes calldata data) external {
bytes memory returnData = Address.functionDelegateCall(target, data);
emit CallReturnValue(abi.decode(returnData, (string)));
}
// sendValue's tests require the contract to hold Ether // sendValue's tests require the contract to hold Ether
receive () external payable { } receive () external payable { }
} }
contracts/utils/Address.sol
...@@ -144,6 +144,30 @@ library Address { ...@@ -144,6 +144,30 @@ library Address {
return _verifyCallResult(success, returndata, errorMessage); return _verifyCallResult(success, returndata, errorMessage);
} }
/**
* @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],
* but performing a delegate call.
*
* _Available since v3.3._
*/
function functionDelegateCall(address target, bytes memory data) internal returns (bytes memory) {
return functionDelegateCall(target, data, "Address: low-level delegate call failed");
}
/**
* @dev Same as {xref-Address-functionCall-address-bytes-string-}[`functionCall`],
* but performing a delegate call.
*
* _Available since v3.3._
*/
function functionDelegateCall(address target, bytes memory data, string memory errorMessage) internal returns (bytes memory) {
require(isContract(target), "Address: delegate call to non-contract");
// solhint-disable-next-line avoid-low-level-calls
(bool success, bytes memory returndata) = target.delegatecall(data);
return _verifyCallResult(success, returndata, errorMessage);
}
function _verifyCallResult(bool success, bytes memory returndata, string memory errorMessage) private pure returns(bytes memory) { function _verifyCallResult(bool success, bytes memory returndata, string memory errorMessage) private pure returns(bytes memory) {
if (success) { if (success) {
return returndata; return returndata;
......
package-lock.json
...@@ -63,9 +63,9 @@ ...@@ -63,9 +63,9 @@
} }
}, },
"@ethersproject/abstract-signer": { "@ethersproject/abstract-signer": {
"version": "5.0.10", "version": "5.0.11",
"resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.0.10.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.0.11.tgz",
"integrity": "sha512-irx7kH7FDAeW7QChDPW19WsxqeB1d3XLyOLSXm0bfPqL1SS07LXWltBJUBUxqC03ORpAOcM3JQj57DU8JnVY2g==", "integrity": "sha512-RKOgPSEYafknA62SrD3OCK42AllHE4YBfKYXyQeM+sBP7Nq3X5FpzeoY4uzC43P4wIhmNoTHCKQuwnX7fBqb6Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"@ethersproject/abstract-provider": "^5.0.8", "@ethersproject/abstract-provider": "^5.0.8",
...@@ -282,9 +282,9 @@ ...@@ -282,9 +282,9 @@
} }
}, },
"@ethersproject/providers": { "@ethersproject/providers": {
"version": "5.0.18", "version": "5.0.19",
"resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.18.tgz", "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.19.tgz",
"integrity": "sha512-VYKj11ZRnBX5mPDFJOcMQOS4GYP0rlqAgWHBntXSK4wqAJeuK451KfxqW92fQHb8yWSBKIERwwlj24K+P9g8Xw==", "integrity": "sha512-G+flo1jK1y/rvQy6b71+Nu7qOlkOKz+XqpgqFMZslkCzGuzQRmk9Qp7Ln4soK8RSyP1e5TCujaRf1H+EZahoaw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@ethersproject/abstract-provider": "^5.0.8", "@ethersproject/abstract-provider": "^5.0.8",
...@@ -2103,9 +2103,9 @@ ...@@ -2103,9 +2103,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "14.14.20", "version": "14.14.22",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz",
"integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==", "integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==",
"dev": true "dev": true
}, },
"@types/pbkdf2": { "@types/pbkdf2": {
...@@ -2139,9 +2139,9 @@ ...@@ -2139,9 +2139,9 @@
"dev": true "dev": true
}, },
"abi-decoder": { "abi-decoder": {
"version": "2.3.0", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/abi-decoder/-/abi-decoder-2.3.0.tgz", "resolved": "https://registry.npmjs.org/abi-decoder/-/abi-decoder-2.4.0.tgz",
"integrity": "sha512-RZXG5mo1JhJjTBg/4NXlS8hyTr2fxiuFaz3UveRpoX9IIc3LPHmWz89dFqTHNQVbWi3VZqxSJqfUwWpb/mCHxA==", "integrity": "sha512-TOLU2q1HgYOjs1GKGtVzaqrYkar6I2fT9a80rzx6/9EJ/5crb4nCGuro0grZayixem93T7omrajYmLiMkYDLDA==",
"dev": true, "dev": true,
"requires": { "requires": {
"web3-eth-abi": "^1.2.1", "web3-eth-abi": "^1.2.1",
...@@ -3291,9 +3291,9 @@ ...@@ -3291,9 +3291,9 @@
} }
}, },
"chokidar": { "chokidar": {
"version": "3.5.0", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.0.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
"integrity": "sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==", "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
"dev": true, "dev": true,
"requires": { "requires": {
"anymatch": "~3.1.1", "anymatch": "~3.1.1",
...@@ -3636,9 +3636,9 @@ ...@@ -3636,9 +3636,9 @@
"dev": true "dev": true
}, },
"core-js-pure": { "core-js-pure": {
"version": "3.8.2", "version": "3.8.3",
"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.8.2.tgz", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.8.3.tgz",
"integrity": "sha512-v6zfIQqL/pzTVAbZvYUozsxNfxcFb6Ks3ZfEbuneJl3FW9Jb8F6vLWB6f+qTmAu72msUdyb84V8d/yBFf7FNnw==", "integrity": "sha512-V5qQZVAr9K0xu7jXg1M7qTEwuxUgqr7dUOezGaNa7i+Xn9oXAU/d1fzqD9ObuwpVQOaorO5s70ckyi1woP9lVA==",
"dev": true "dev": true
}, },
"core-util-is": { "core-util-is": {
...@@ -4436,23 +4436,25 @@ ...@@ -4436,23 +4436,25 @@
} }
}, },
"es-abstract": { "es-abstract": {
"version": "1.18.0-next.1", "version": "1.18.0-next.2",
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz",
"integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "integrity": "sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==",
"dev": true, "dev": true,
"requires": { "requires": {
"call-bind": "^1.0.2",
"es-to-primitive": "^1.2.1", "es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1", "function-bind": "^1.1.1",
"get-intrinsic": "^1.0.2",
"has": "^1.0.3", "has": "^1.0.3",
"has-symbols": "^1.0.1", "has-symbols": "^1.0.1",
"is-callable": "^1.2.2", "is-callable": "^1.2.2",
"is-negative-zero": "^2.0.0", "is-negative-zero": "^2.0.1",
"is-regex": "^1.1.1", "is-regex": "^1.1.1",
"object-inspect": "^1.8.0", "object-inspect": "^1.9.0",
"object-keys": "^1.1.1", "object-keys": "^1.1.1",
"object.assign": "^4.1.1", "object.assign": "^4.1.2",
"string.prototype.trimend": "^1.0.1", "string.prototype.trimend": "^1.0.3",
"string.prototype.trimstart": "^1.0.1" "string.prototype.trimstart": "^1.0.3"
}, },
"dependencies": { "dependencies": {
"object-keys": { "object-keys": {
...@@ -5113,9 +5115,9 @@ ...@@ -5113,9 +5115,9 @@
} }
}, },
"ethereum-bloom-filters": { "ethereum-bloom-filters": {
"version": "1.0.7", "version": "1.0.9",
"resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.7.tgz", "resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.9.tgz",
"integrity": "sha512-cDcJJSJ9GMAcURiAWO3DxIEhTL/uWqlQnvgKpuYQzYPrt/izuGU+1ntQmHt0IRq6ADoSYHFnB+aCEFIldjhkMQ==", "integrity": "sha512-GiK/RQkAkcVaEdxKVkPcG07PQ5vD7v2MFSHgZmBJSfMzNRHimntdBithsHAT89tAXnIpzVDWt8iaCD1DvkaxGg==",
"dev": true, "dev": true,
"requires": { "requires": {
"js-sha3": "^0.8.0" "js-sha3": "^0.8.0"
...@@ -5874,9 +5876,9 @@ ...@@ -5874,9 +5876,9 @@
"dev": true "dev": true
}, },
"fast-glob": { "fast-glob": {
"version": "3.2.4", "version": "3.2.5",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
"integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.stat": "^2.0.2",
...@@ -7051,9 +7053,9 @@ ...@@ -7051,9 +7053,9 @@
"dev": true "dev": true
}, },
"get-intrinsic": { "get-intrinsic": {
"version": "1.0.2", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz",
"integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==", "integrity": "sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==",
"dev": true, "dev": true,
"requires": { "requires": {
"function-bind": "^1.1.1", "function-bind": "^1.1.1",
...@@ -10264,9 +10266,9 @@ ...@@ -10264,9 +10266,9 @@
} }
}, },
"pathval": { "pathval": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
"integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
"dev": true "dev": true
}, },
"pause-stream": { "pause-stream": {
...@@ -10447,9 +10449,9 @@ ...@@ -10447,9 +10449,9 @@
"dev": true "dev": true
}, },
"qs": { "qs": {
"version": "6.9.5", "version": "6.9.6",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.5.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
"integrity": "sha512-T0SnbxGiMcB09qd3bFcPt8rufxPs7T7TjePk33r1WsJNt12/rWsK/ofKqRHQ0rY/iMGE0mVdkc6Yg9CuL/ty0Q==", "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==",
"dev": true "dev": true
}, },
"query-string": { "query-string": {
...@@ -11581,12 +11583,12 @@ ...@@ -11581,12 +11583,12 @@
} }
}, },
"solidity-coverage": { "solidity-coverage": {
"version": "0.7.13", "version": "0.7.14",
"resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.13.tgz", "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.14.tgz",
"integrity": "sha512-06r0R+/j8lgl5/Z57VwxWNFZId0ZavcQU45W2gCfsBmEt/1Y6Xgm96oMSa6JBIvwrPR8H4T3icxTLiUVsMFNeg==", "integrity": "sha512-2X9oNtu4yBbtDXtVe2tc9vYHtwON6QRqNvVylKdkhcJgAdCzP/OkJy9fWcWH/g3fnNCIOFssHoe0LPGZ2ppMZg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@solidity-parser/parser": "^0.8.1", "@solidity-parser/parser": "^0.11.0",
"@truffle/provider": "^0.2.24", "@truffle/provider": "^0.2.24",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"death": "^1.1.0", "death": "^1.1.0",
...@@ -11608,9 +11610,9 @@ ...@@ -11608,9 +11610,9 @@
}, },
"dependencies": { "dependencies": {
"@solidity-parser/parser": { "@solidity-parser/parser": {
"version": "0.8.2", "version": "0.11.1",
"resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.8.2.tgz", "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.11.1.tgz",
"integrity": "sha512-8LySx3qrNXPgB5JiULfG10O3V7QTxI/TLzSw5hFQhXWSkVxZBAv4rZQ0sYgLEbc8g3L2lmnujj1hKul38Eu5NQ==", "integrity": "sha512-H8BSBoKE8EubJa0ONqecA2TviT3TnHeC4NpgnAHSUiuhZoQBfPB4L2P9bs8R6AoTW10Endvh3vc+fomVMIDIYQ==",
"dev": true "dev": true
}, },
"eth-lib": { "eth-lib": {
...@@ -11660,9 +11662,9 @@ ...@@ -11660,9 +11662,9 @@
} }
}, },
"web3-utils": { "web3-utils": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.3.tgz",
"integrity": "sha512-9gPwFm8SXtIJuzdrZ37PRlalu40fufXxo+H2PiCwaO6RpKGAvlUlWU0qQbyToFNXg7W2H8djEgoAVac8NLMCKQ==", "integrity": "sha512-ZwpdqEcBBzqRgXUbCj+kyu1jFnsDauURSQ79yVqgnTKSI4C3s0Qjpp4WLThV+LKhCKR5GZtBTkgGHeiq0FT88A==",
"dev": true, "dev": true,
"requires": { "requires": {
"bn.js": "^4.11.9", "bn.js": "^4.11.9",
...@@ -12480,9 +12482,9 @@ ...@@ -12480,9 +12482,9 @@
} }
}, },
"uglify-js": { "uglify-js": {
"version": "3.12.4", "version": "3.12.5",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.5.tgz",
"integrity": "sha512-L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==", "integrity": "sha512-SgpgScL4T7Hj/w/GexjnBHi3Ien9WS1Rpfg5y91WXMj9SY997ZCQU76mH4TpLwwfmMvoOU8wiaRkIf6NaH3mtg==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
...@@ -12732,18 +12734,18 @@ ...@@ -12732,18 +12734,18 @@
} }
}, },
"web3": { "web3": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3/-/web3-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3/-/web3-1.3.3.tgz",
"integrity": "sha512-lDJwOLSRWHYwhPy4h5TNgBRJ/lED7lWXyVOXHCHcEC8ai3coBNdgEXWBu/GGYbZMsS89EoUOJ14j3Ufi4dUkog==", "integrity": "sha512-fI/g0yC1FC0m4envv8FsPh7tbBoe/eXbEho+iY/hahs7YGgGt3nYNrAFTkR9pLhQaVMpOilhwgFxXEp+O7My/g==",
"dev": true, "dev": true,
"requires": { "requires": {
"web3-bzz": "1.3.1", "web3-bzz": "1.3.3",
"web3-core": "1.3.1", "web3-core": "1.3.3",
"web3-eth": "1.3.1", "web3-eth": "1.3.3",
"web3-eth-personal": "1.3.1", "web3-eth-personal": "1.3.3",
"web3-net": "1.3.1", "web3-net": "1.3.3",
"web3-shh": "1.3.1", "web3-shh": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
}, },
"dependencies": { "dependencies": {
"@ethersproject/abi": { "@ethersproject/abi": {
...@@ -12770,9 +12772,9 @@ ...@@ -12770,9 +12772,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "12.19.13", "version": "12.19.15",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.13.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz",
"integrity": "sha512-qdixo2f0U7z6m0UJUugTJqVF94GNDkdgQhfBtMs8t5898JE7G/D2kJYw4rc1nzjIPLVAsDkY2MdABnLAP5lM1w==", "integrity": "sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==",
"dev": true "dev": true
}, },
"bignumber.js": { "bignumber.js": {
...@@ -12892,9 +12894,9 @@ ...@@ -12892,9 +12894,9 @@
"dev": true "dev": true
}, },
"web3-bzz": { "web3-bzz": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.3.3.tgz",
"integrity": "sha512-MN726zFpFpwhs3NMC35diJGkwTVUj+8LM/VWqooGX/MOjgYzNrJ7Wr8EzxoaTCy87edYNBprtxBkd0HzzLmung==", "integrity": "sha512-lFERlqnr/upJhADT6US7BGUkM5cy6idw86/GvWKo9h/uyrbV14gk+bUqcQdBBSopa1Mvvy5ZaO6rKtRe8PTsQw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "^12.12.6", "@types/node": "^12.12.6",
...@@ -12904,115 +12906,115 @@ ...@@ -12904,115 +12906,115 @@
} }
}, },
"web3-core": { "web3-core": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.3.3.tgz",
"integrity": "sha512-QlBwSyjl2pqYUBE7lH9PfLxa8j6AzzAtvLUqkgoaaFJYLP/+XavW1n6dhVCTq+U3L3eNc+bMp9GLjGDJNXMnGg==", "integrity": "sha512-hCDWj/3PBHhSJSSBi+nV7MiW9Djf/pRuUXcVO2jWroAXqAbTSXLHpju0AWTzXnlsqs1QHK0Yk8nF9jojGUQVYg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/bn.js": "^4.11.5", "@types/bn.js": "^4.11.5",
"@types/node": "^12.12.6", "@types/node": "^12.12.6",
"bignumber.js": "^9.0.0", "bignumber.js": "^9.0.0",
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"web3-core-method": "1.3.1", "web3-core-method": "1.3.3",
"web3-core-requestmanager": "1.3.1", "web3-core-requestmanager": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-core-helpers": { "web3-core-helpers": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.3.3.tgz",
"integrity": "sha512-tMVU0ScyQUJd/HFWfZrvGf+QmPCodPyKQw1gQ+n9We/H3vPPbUxDjNeYnd4BbYy5O9ox+0XG6i3+JlwiSkgDkA==", "integrity": "sha512-rUTC9sgn1Wvw2KGBtc9/bsQKUd+yjzIm14mlaqqiO0vpFueTmmagwiGRE2CWzEfYg+r2jnYIIgh9qnsCykgVkQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-eth-iban": "1.3.1", "web3-eth-iban": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-core-method": { "web3-core-method": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.3.3.tgz",
"integrity": "sha512-dA38tNVZWTxBFMlLFunLD5Az1AWRi5HqM+AtQrTIhxWCzg7rJSHuaYOZ6A5MHKGPWpdykLhzlna0SsNv5AVs8w==", "integrity": "sha512-d3AA1lyw0dvLs53X17pHpD5QpxJdkfolbN31UQymRF5Y+swFweqRiCuJoNTplE95ZX2uUtsLhEIbaszj7dQgFg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@ethersproject/transactions": "^5.0.0-beta.135", "@ethersproject/transactions": "^5.0.0-beta.135",
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"web3-core-promievent": "1.3.1", "web3-core-promievent": "1.3.3",
"web3-core-subscriptions": "1.3.1", "web3-core-subscriptions": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-core-promievent": { "web3-core-promievent": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.3.3.tgz",
"integrity": "sha512-jGu7TkwUqIHlvWd72AlIRpsJqdHBQnHMeMktrows2148gg5PBPgpJ10cPFmCCzKT6lDOVh9B7pZMf9eckMDmiA==", "integrity": "sha512-ARgO+BWUCxK8U/977SdJ8oyJo51mDYUzlZFoa2NFjUH+QYrFoKA7l9Hhw/vxhy13jE2LaVUM31JBLzVb+GM9dQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"eventemitter3": "4.0.4" "eventemitter3": "4.0.4"
} }
}, },
"web3-core-requestmanager": { "web3-core-requestmanager": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.3.3.tgz",
"integrity": "sha512-9WTaN2SoyJX1amRyTzX2FtbVXsyWBI2Wef2Q3gPiWaEo/VRVm3e4Bq8MwxNTUMIJMO8RLGHjtdgsoDKPwfL73Q==", "integrity": "sha512-4/J23wK5IXRw/1kqda7FXtvySKjX7Phcevqjx0EkcBtrxAfLedcqf8k2PlDh5LtCXfPW66u4V3fDgHdLZMrVgQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"underscore": "1.9.1", "underscore": "1.9.1",
"util": "^0.12.0", "util": "^0.12.0",
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"web3-providers-http": "1.3.1", "web3-providers-http": "1.3.3",
"web3-providers-ipc": "1.3.1", "web3-providers-ipc": "1.3.3",
"web3-providers-ws": "1.3.1" "web3-providers-ws": "1.3.3"
} }
}, },
"web3-core-subscriptions": { "web3-core-subscriptions": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.3.3.tgz",
"integrity": "sha512-eX3N5diKmrxshc6ZBZ8EJxxAhCxdYPbYXuF2EfgdIyHmxwmYqIVvKepzO8388Bx8JD3D0Id/pKE0dC/FnDIHTQ==", "integrity": "sha512-VvcPuNYcGLb6HfgMrNN6Q/1CwSk2uIqUjhrVTQ67JIxIddsEdV1f6SsQH9MX1cmwi39ffGsYtssOT1pht4Zc8g==",
"dev": true, "dev": true,
"requires": { "requires": {
"eventemitter3": "4.0.4", "eventemitter3": "4.0.4",
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-core-helpers": "1.3.1" "web3-core-helpers": "1.3.3"
} }
}, },
"web3-eth": { "web3-eth": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.3.3.tgz",
"integrity": "sha512-e4iL8ovj0zNxzbv4LTHEv9VS03FxKlAZD+95MolwAqtVoUnKC2H9X6dli0w6eyXP0aKw+mwY0g0CWQHzqZvtXw==", "integrity": "sha512-NvbkCaN26o7f9EogsRsA/lbwF+8dXimJWsaGpZK3ANa+AZrYkWj3NuaxfPO/S/RLsC9ptJdt7id72qxT40r5QQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-core": "1.3.1", "web3-core": "1.3.3",
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"web3-core-method": "1.3.1", "web3-core-method": "1.3.3",
"web3-core-subscriptions": "1.3.1", "web3-core-subscriptions": "1.3.3",
"web3-eth-abi": "1.3.1", "web3-eth-abi": "1.3.3",
"web3-eth-accounts": "1.3.1", "web3-eth-accounts": "1.3.3",
"web3-eth-contract": "1.3.1", "web3-eth-contract": "1.3.3",
"web3-eth-ens": "1.3.1", "web3-eth-ens": "1.3.3",
"web3-eth-iban": "1.3.1", "web3-eth-iban": "1.3.3",
"web3-eth-personal": "1.3.1", "web3-eth-personal": "1.3.3",
"web3-net": "1.3.1", "web3-net": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-eth-abi": { "web3-eth-abi": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.3.3.tgz",
"integrity": "sha512-ds4aTeKDUEqTXgncAtxvcfMpPiei9ey7+s2ZZ+OazK2CK5jWhFiJuuj9Q68kOT+hID7E1oSDVsNmJWFD/7lbMw==", "integrity": "sha512-9GQ7YTALt1uxGwdMBpBHlagCj4yn0fPUT2wDDAGoyJFVJMsUt3arF855zsVpJL3zfhHmUgRNoVrAkobRR2YYLw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@ethersproject/abi": "5.0.7", "@ethersproject/abi": "5.0.7",
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-eth-accounts": { "web3-eth-accounts": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.3.3.tgz",
"integrity": "sha512-wsV3/0Pbn5+pI8PiCD1CYw7I1dkQujcP//aJ+ZH8PoaHQoG6HnJ7nTp7foqa0r/X5lizImz/g5S8D76t3Z9tHA==", "integrity": "sha512-Jn9nguNsCLnY7Po6lv7Mg5JDaYuKdvL0Ezv1V2LTLy+EhcVt5i19h+/3M92Xynpe5Tx+WY/ELfeA2jLTeP5jRg==",
"dev": true, "dev": true,
"requires": { "requires": {
"crypto-browserify": "3.12.0", "crypto-browserify": "3.12.0",
...@@ -13022,130 +13024,130 @@ ...@@ -13022,130 +13024,130 @@
"scrypt-js": "^3.0.1", "scrypt-js": "^3.0.1",
"underscore": "1.9.1", "underscore": "1.9.1",
"uuid": "3.3.2", "uuid": "3.3.2",
"web3-core": "1.3.1", "web3-core": "1.3.3",
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"web3-core-method": "1.3.1", "web3-core-method": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-eth-contract": { "web3-eth-contract": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.3.3.tgz",
"integrity": "sha512-cHu9X1iGrK+Zbrj4wYKwHI1BtVGn/9O0JRsZqd9qcFGLwwAmaCJYy0sDn7PKCKDSL3qB+MDILoyI7FaDTWWTHg==", "integrity": "sha512-TKGs1qvc/v7TriyGKtnTqVrB3J/mWSeqLkWtLY60lGqY8KopZ9k7dZ/g5Cvfiox57VHWkpOk0xDwUQjlIe4Ikg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/bn.js": "^4.11.5", "@types/bn.js": "^4.11.5",
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-core": "1.3.1", "web3-core": "1.3.3",
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"web3-core-method": "1.3.1", "web3-core-method": "1.3.3",
"web3-core-promievent": "1.3.1", "web3-core-promievent": "1.3.3",
"web3-core-subscriptions": "1.3.1", "web3-core-subscriptions": "1.3.3",
"web3-eth-abi": "1.3.1", "web3-eth-abi": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-eth-ens": { "web3-eth-ens": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.3.3.tgz",
"integrity": "sha512-MUQvYgUYQ5gAwbZyHwI7y+NTT6j98qG3MVhGCUf58inF5Gxmn9OlLJRw8Tofgf0K87Tk9Kqw1/2QxUE4PEZMMA==", "integrity": "sha512-tresrI1CM6RbxsUCM6kfG1W10LDMqWJnU+lNhfaD5mt5IzJ4GcfDAHO9WzoYl8Esh+Epj/jD+vI30clI4j90Vg==",
"dev": true, "dev": true,
"requires": { "requires": {
"content-hash": "^2.5.2", "content-hash": "^2.5.2",
"eth-ens-namehash": "2.0.8", "eth-ens-namehash": "2.0.8",
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-core": "1.3.1", "web3-core": "1.3.3",
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"web3-core-promievent": "1.3.1", "web3-core-promievent": "1.3.3",
"web3-eth-abi": "1.3.1", "web3-eth-abi": "1.3.3",
"web3-eth-contract": "1.3.1", "web3-eth-contract": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-eth-iban": { "web3-eth-iban": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.3.3.tgz",
"integrity": "sha512-RCQLfR9Z+DNfpw7oUauYHg1HcVoEljzhwxKn3vi15gK0ssWnTwRGqUiIyVTeSb836G6oakOd5zh7XYqy7pn+nw==", "integrity": "sha512-+9a+bZHAKQ4oBcRxiGbC1MC8S2cOgDlXo8qcw0XpMhLJZ3c/brZM7ZbPdiuU8Z7AMYf3PknaGFQyVmedZhrauA==",
"dev": true, "dev": true,
"requires": { "requires": {
"bn.js": "^4.11.9", "bn.js": "^4.11.9",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-eth-personal": { "web3-eth-personal": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.3.3.tgz",
"integrity": "sha512-/vZEQpXJfBfYoy9KT911ItfoscEfF0Q2j8tsXzC2xmmasSZ6YvAUuPhflVmAo0IHQSX9rmxq0q1p3sbnE3x2pQ==", "integrity": "sha512-S/TSGTm7x9oHRXUHXi8f+y187RKpn5aqYJRlSoyTmB3B4EMrv9NcZZQmHaiXwM48wkFdRhTMECW1Ar8E5zZLFw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "^12.12.6", "@types/node": "^12.12.6",
"web3-core": "1.3.1", "web3-core": "1.3.3",
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"web3-core-method": "1.3.1", "web3-core-method": "1.3.3",
"web3-net": "1.3.1", "web3-net": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-net": { "web3-net": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.3.3.tgz",
"integrity": "sha512-vuMMWMk+NWHlrNfszGp3qRjH/64eFLiNIwUi0kO8JXQ896SP3Ma0su5sBfSPxNCig047E9GQimrL9wvYAJSO5A==", "integrity": "sha512-GcPj2lyAC5CP6FOCwoURCRMFsh0khWBi6sGqiKtUPMa7dKnLw8CLCAFcwX//d3ucnn1E7I78Va6k8liKjj87sA==",
"dev": true, "dev": true,
"requires": { "requires": {
"web3-core": "1.3.1", "web3-core": "1.3.3",
"web3-core-method": "1.3.1", "web3-core-method": "1.3.3",
"web3-utils": "1.3.1" "web3-utils": "1.3.3"
} }
}, },
"web3-providers-http": { "web3-providers-http": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.3.3.tgz",
"integrity": "sha512-DOujG6Ts7/hAMj0PW5p9/1vwxAIr+1CJ6ZWHshtfOq1v1KnMphVTGOrjcTTUvPT33/DA/so2pgGoPMrgaEIIvQ==", "integrity": "sha512-V2x27IFXQqsaZrAbA4GJurKuyrNXapmmpSJ7jxPDOxewOy9dEURlKIg5W1bb4QXGh2YSCksuH9fKquvTfPfc/A==",
"dev": true, "dev": true,
"requires": { "requires": {
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"xhr2-cookies": "1.1.0" "xhr2-cookies": "1.1.0"
} }
}, },
"web3-providers-ipc": { "web3-providers-ipc": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.3.3.tgz",
"integrity": "sha512-BNPscLbvwo+u/tYJrLvPnl/g/SQVSnqP/TjEsB033n4IXqTC4iZ9Of8EDmI0U6ds/9nwNqOBx3KsxbinL46UZA==", "integrity": "sha512-XMQo/YsH/2lBaRlkYa5d/Q+2EJ2RTzVjio1i2G9TESESfHCj0l2AWLb3zet+f/QRVxfvXGmGlZuf99diof2a1g==",
"dev": true, "dev": true,
"requires": { "requires": {
"oboe": "2.1.5", "oboe": "2.1.5",
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-core-helpers": "1.3.1" "web3-core-helpers": "1.3.3"
} }
}, },
"web3-providers-ws": { "web3-providers-ws": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.3.3.tgz",
"integrity": "sha512-DAbVbiizv0Hr/bLKjyyKMHc/66ccVkudan3eRsf+R/PXWCqfXb7q6Lwodj4llvC047pEuLKR521ZKr5wbfk1KQ==", "integrity": "sha512-yuzqB3jST9JS19oOR1FRaARM7JBeP6cbKffM8HoWp4Y98/OowjW1mbDQVS47YTSHBP2QiLzSrwBxjIEPm8f48Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"eventemitter3": "4.0.4", "eventemitter3": "4.0.4",
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-core-helpers": "1.3.1", "web3-core-helpers": "1.3.3",
"websocket": "^1.0.32" "websocket": "^1.0.32"
} }
}, },
"web3-shh": { "web3-shh": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.3.3.tgz",
"integrity": "sha512-57FTQvOW1Zm3wqfZpIEqL4apEQIR5JAxjqA4RM4eL0jbdr+Zj5Y4J93xisaEVl6/jMtZNlsqYKTVswx8mHu1xw==", "integrity": "sha512-byp2+sHnc8UAj6sNcVFacF3pmRzIaMATsI4ARfU+0S8EpaQ3trojww2QBYPnZ4r0QOMH+I6+bVl8qTu0Zz4eoA==",
"dev": true, "dev": true,
"requires": { "requires": {
"web3-core": "1.3.1", "web3-core": "1.3.3",
"web3-core-method": "1.3.1", "web3-core-method": "1.3.3",
"web3-core-subscriptions": "1.3.1", "web3-core-subscriptions": "1.3.3",
"web3-net": "1.3.1" "web3-net": "1.3.3"
} }
}, },
"web3-utils": { "web3-utils": {
"version": "1.3.1", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.1.tgz", "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.3.tgz",
"integrity": "sha512-9gPwFm8SXtIJuzdrZ37PRlalu40fufXxo+H2PiCwaO6RpKGAvlUlWU0qQbyToFNXg7W2H8djEgoAVac8NLMCKQ==", "integrity": "sha512-ZwpdqEcBBzqRgXUbCj+kyu1jFnsDauURSQ79yVqgnTKSI4C3s0Qjpp4WLThV+LKhCKR5GZtBTkgGHeiq0FT88A==",
"dev": true, "dev": true,
"requires": { "requires": {
"bn.js": "^4.11.9", "bn.js": "^4.11.9",
...@@ -13179,9 +13181,9 @@ ...@@ -13179,9 +13181,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "10.17.50", "version": "10.17.51",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.50.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.51.tgz",
"integrity": "sha512-vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA==", "integrity": "sha512-KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg==",
"dev": true "dev": true
}, },
"cacheable-request": { "cacheable-request": {
...@@ -13280,9 +13282,9 @@ ...@@ -13280,9 +13282,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "12.19.13", "version": "12.19.15",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.13.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz",
"integrity": "sha512-qdixo2f0U7z6m0UJUugTJqVF94GNDkdgQhfBtMs8t5898JE7G/D2kJYw4rc1nzjIPLVAsDkY2MdABnLAP5lM1w==", "integrity": "sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==",
"dev": true "dev": true
}, },
"bignumber.js": { "bignumber.js": {
...@@ -13488,9 +13490,9 @@ ...@@ -13488,9 +13490,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "12.19.13", "version": "12.19.15",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.13.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz",
"integrity": "sha512-qdixo2f0U7z6m0UJUugTJqVF94GNDkdgQhfBtMs8t5898JE7G/D2kJYw4rc1nzjIPLVAsDkY2MdABnLAP5lM1w==", "integrity": "sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==",
"dev": true "dev": true
} }
} }
......
scripts/upgradeable/patch/01-remove-address-functiondelegatecall.patch 0 → 100644
diff --git a/contracts/mocks/AddressImplUpgradeable.sol b/contracts/mocks/AddressImplUpgradeable.sol
index e9a0f96f..2b87e58e 100644
--- a/contracts/mocks/AddressImplUpgradeable.sol
+++ b/contracts/mocks/AddressImplUpgradeable.sol
@@ -39,11 +39,6 @@ contract AddressImplUpgradeable is Initializable {
emit CallReturnValue(abi.decode(returnData, (string)));
}
- function functionDelegateCall(address target, bytes calldata data) external {
- bytes memory returnData = AddressUpgradeable.functionDelegateCall(target, data);
- emit CallReturnValue(abi.decode(returnData, (string)));
- }
-
// sendValue's tests require the contract to hold Ether
receive () external payable { }
uint256[49] private __gap;
diff --git a/contracts/utils/AddressUpgradeable.sol b/contracts/utils/AddressUpgradeable.sol
index 75acb96f..08a59041 100644
--- a/contracts/utils/AddressUpgradeable.sol
+++ b/contracts/utils/AddressUpgradeable.sol
@@ -144,30 +144,6 @@ library AddressUpgradeable {
return _verifyCallResult(success, returndata, errorMessage);
}
- /**
- * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`],
- * but performing a delegate call.
- *
- * _Available since v3.3._
- */
- function functionDelegateCall(address target, bytes memory data) internal returns (bytes memory) {
- return functionDelegateCall(target, data, "Address: low-level delegate call failed");
- }
-
- /**
- * @dev Same as {xref-Address-functionCall-address-bytes-string-}[`functionCall`],
- * but performing a delegate call.
- *
- * _Available since v3.3._
- */
- function functionDelegateCall(address target, bytes memory data, string memory errorMessage) internal returns (bytes memory) {
- require(isContract(target), "Address: delegate call to non-contract");
-
- // solhint-disable-next-line avoid-low-level-calls
- (bool success, bytes memory returndata) = target.delegatecall(data);
- return _verifyCallResult(success, returndata, errorMessage);
- }
-
function _verifyCallResult(bool success, bytes memory returndata, string memory errorMessage) private pure returns(bytes memory) {
if (success) {
return returndata;
scripts/upgradeable/transpile.sh
...@@ -13,3 +13,7 @@ npx @openzeppelin/upgrade-safe-transpiler -D \ ...@@ -13,3 +13,7 @@ npx @openzeppelin/upgrade-safe-transpiler -D \
-x 'contracts/proxy/**/*' \ -x 'contracts/proxy/**/*' \
-x '!contracts/proxy/Clones.sol' \ -x '!contracts/proxy/Clones.sol' \
-p 'contracts/presets/**/*' -p 'contracts/presets/**/*'
for p in scripts/upgradeable/patch/*.patch; do
git apply "$p"
done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment