diff --git a/cache_forge/solidity-files-cache.json b/cache_forge/solidity-files-cache.json index 5af4d94..75a0fe1 100644 --- a/cache_forge/solidity-files-cache.json +++ b/cache_forge/solidity-files-cache.json @@ -13,7 +13,7 @@ }, "files": { "contracts/InstadappAdapter.sol": { - "lastModificationDate": 1683847810570, + "lastModificationDate": 1684761252546, "contentHash": "405466b92e213e012519571fe719e3e9", "sourceName": "contracts/InstadappAdapter.sol", "solcConfig": { @@ -60,8 +60,8 @@ } }, "contracts/InstadappTarget.sol": { - "lastModificationDate": 1683848109539, - "contentHash": "92d6709ae5db0060d3d0e70d68b7a2ec", + "lastModificationDate": 1684764127932, + "contentHash": "542bc6fb49efd60f1d96ecca5f82d47b", "sourceName": "contracts/InstadappTarget.sol", "solcConfig": { "settings": { @@ -116,7 +116,7 @@ } }, "contracts/interfaces/IDSA.sol": { - "lastModificationDate": 1682654700386, + "lastModificationDate": 1683575085773, "contentHash": "88eb0711db492555b613a27414ca8474", "sourceName": "contracts/interfaces/IDSA.sol", "solcConfig": { @@ -157,7 +157,7 @@ } }, "forge-test/InstadappAdapter.t.sol": { - "lastModificationDate": 1683849395973, + "lastModificationDate": 1684761252547, "contentHash": "af2e30ca53e944444016d11c12fb28d1", "sourceName": "forge-test/InstadappAdapter.t.sol", "solcConfig": { @@ -226,7 +226,7 @@ } }, "forge-test/InstadappTarget.t.sol": { - "lastModificationDate": 1683849732441, + "lastModificationDate": 1684765292789, "contentHash": "573b9f3cca4252f41d9afc817136d975", "sourceName": "forge-test/InstadappTarget.t.sol", "solcConfig": { @@ -309,7 +309,7 @@ } }, "forge-test/interfaces/IBridgeToken.sol": { - "lastModificationDate": 1682917925534, + "lastModificationDate": 1683575085774, "contentHash": "b73ebcd16b5e651107b76b2a33aec834", "sourceName": "forge-test/interfaces/IBridgeToken.sol", "solcConfig": { @@ -353,7 +353,7 @@ } }, "forge-test/utils/OZERC20.sol": { - "lastModificationDate": 1682917939019, + "lastModificationDate": 1683575085774, "contentHash": "777bd02af720dc89e67d122896e76119", "sourceName": "forge-test/utils/OZERC20.sol", "solcConfig": { @@ -403,7 +403,7 @@ } }, "forge-test/utils/TestERC20.sol": { - "lastModificationDate": 1682917963145, + "lastModificationDate": 1683575085774, "contentHash": "d998499415e7e7203bf61ca940fc7805", "sourceName": "forge-test/utils/TestERC20.sol", "solcConfig": { @@ -455,7 +455,7 @@ } }, "forge-test/utils/TestHelper.sol": { - "lastModificationDate": 1682917535119, + "lastModificationDate": 1683575085775, "contentHash": "34142ed104fb8cb435b4ebfaf055feca", "sourceName": "forge-test/utils/TestHelper.sol", "solcConfig": { @@ -514,7 +514,7 @@ } }, "lib/forge-std/lib/ds-test/src/test.sol": { - "lastModificationDate": 1682918914187, + "lastModificationDate": 1682681547754, "contentHash": "9febff9d09f18af5306669dc276c4c43", "sourceName": "lib/forge-std/lib/ds-test/src/test.sol", "solcConfig": { @@ -555,7 +555,7 @@ } }, "lib/forge-std/src/Base.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1682681546553, "contentHash": "8f04bbbb2c16f79e14fdc321695a8ec2", "sourceName": "lib/forge-std/src/Base.sol", "solcConfig": { @@ -605,7 +605,7 @@ } }, "lib/forge-std/src/StdAssertions.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1682681546553, "contentHash": "6cc2858240bcd443debbbf075490e325", "sourceName": "lib/forge-std/src/StdAssertions.sol", "solcConfig": { @@ -649,7 +649,7 @@ } }, "lib/forge-std/src/StdChains.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1684761249450, "contentHash": "9c76820952c8f5e2fc02f872dc3afeb4", "sourceName": "lib/forge-std/src/StdChains.sol", "solcConfig": { @@ -692,7 +692,7 @@ } }, "lib/forge-std/src/StdCheats.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1682681546554, "contentHash": "1f7c1fe2f20a051b847336e1630e4bb5", "sourceName": "lib/forge-std/src/StdCheats.sol", "solcConfig": { @@ -739,7 +739,7 @@ } }, "lib/forge-std/src/StdError.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1682681546554, "contentHash": "64c896e1276a291776e5ea5aecb3870a", "sourceName": "lib/forge-std/src/StdError.sol", "solcConfig": { @@ -780,7 +780,7 @@ } }, "lib/forge-std/src/StdInvariant.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1682681546554, "contentHash": "12c06010ec43ce935ed209d5aca30828", "sourceName": "lib/forge-std/src/StdInvariant.sol", "solcConfig": { @@ -821,7 +821,7 @@ } }, "lib/forge-std/src/StdJson.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1682681546554, "contentHash": "2e1d13674e152408867795362d833c24", "sourceName": "lib/forge-std/src/StdJson.sol", "solcConfig": { @@ -864,7 +864,7 @@ } }, "lib/forge-std/src/StdMath.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1682681546554, "contentHash": "9da8f453eba6bb98f3d75bc6822bfb29", "sourceName": "lib/forge-std/src/StdMath.sol", "solcConfig": { @@ -905,7 +905,7 @@ } }, "lib/forge-std/src/StdStorage.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1682681546554, "contentHash": "3cb9868082df39a53927db09dbc21f23", "sourceName": "lib/forge-std/src/StdStorage.sol", "solcConfig": { @@ -951,7 +951,7 @@ } }, "lib/forge-std/src/StdStyle.sol": { - "lastModificationDate": 1682918913301, + "lastModificationDate": 1682681546554, "contentHash": "820e6f6b7704f0c980fae604b1e34b18", "sourceName": "lib/forge-std/src/StdStyle.sol", "solcConfig": { @@ -994,7 +994,7 @@ } }, "lib/forge-std/src/StdUtils.sol": { - "lastModificationDate": 1682918913302, + "lastModificationDate": 1682681546555, "contentHash": "3c8a13d3abf093886cea4e028158b601", "sourceName": "lib/forge-std/src/StdUtils.sol", "solcConfig": { @@ -1038,7 +1038,7 @@ } }, "lib/forge-std/src/Test.sol": { - "lastModificationDate": 1682918913302, + "lastModificationDate": 1682681546555, "contentHash": "bc9d74a0c612e1c2b66cca2973bcc803", "sourceName": "lib/forge-std/src/Test.sol", "solcConfig": { @@ -1096,7 +1096,7 @@ } }, "lib/forge-std/src/Vm.sol": { - "lastModificationDate": 1682918913302, + "lastModificationDate": 1684761249451, "contentHash": "2873383b1217375a8baccae57b02f0b0", "sourceName": "lib/forge-std/src/Vm.sol", "solcConfig": { @@ -1140,7 +1140,7 @@ } }, "lib/forge-std/src/console.sol": { - "lastModificationDate": 1682918913302, + "lastModificationDate": 1682681546555, "contentHash": "100b8a33b917da1147740d7ab8b0ded3", "sourceName": "lib/forge-std/src/console.sol", "solcConfig": { @@ -1181,7 +1181,7 @@ } }, "lib/forge-std/src/console2.sol": { - "lastModificationDate": 1682918913302, + "lastModificationDate": 1682681546555, "contentHash": "2096b4e5f252c5df9909cccbe3d2da2e", "sourceName": "lib/forge-std/src/console2.sol", "solcConfig": { @@ -1222,7 +1222,7 @@ } }, "lib/forge-std/src/interfaces/IMulticall3.sol": { - "lastModificationDate": 1682918913303, + "lastModificationDate": 1682681546556, "contentHash": "7b131ca1ca32ef6378b7b9ad5488b901", "sourceName": "lib/forge-std/src/interfaces/IMulticall3.sol", "solcConfig": { @@ -1263,7 +1263,7 @@ } }, "node_modules/@connext/interfaces/core/IConnext.sol": { - "lastModificationDate": 1682654815890, + "lastModificationDate": 1684763857533, "contentHash": "779ead8b9a51b366d4a722e3e46ad751", "sourceName": "node_modules/@connext/interfaces/core/IConnext.sol", "solcConfig": { @@ -1307,7 +1307,7 @@ } }, "node_modules/@connext/interfaces/core/IXReceiver.sol": { - "lastModificationDate": 1682654815890, + "lastModificationDate": 1684763857533, "contentHash": "bdb597c337215e04702edd5fc5069e3a", "sourceName": "node_modules/@connext/interfaces/core/IXReceiver.sol", "solcConfig": { @@ -1348,7 +1348,7 @@ } }, "node_modules/@connext/interfaces/libraries/LibConnextStorage.sol": { - "lastModificationDate": 1682654815890, + "lastModificationDate": 1684763857533, "contentHash": "26c4843058bf695f58e62a24af9d694f", "sourceName": "node_modules/@connext/interfaces/libraries/LibConnextStorage.sol", "solcConfig": { @@ -1389,7 +1389,7 @@ } }, "node_modules/@connext/interfaces/libraries/TokenId.sol": { - "lastModificationDate": 1682654815890, + "lastModificationDate": 1684763857533, "contentHash": "4259a1c7d7f0cd1604bcc35f448d0aa9", "sourceName": "node_modules/@connext/interfaces/libraries/TokenId.sol", "solcConfig": { @@ -1430,7 +1430,7 @@ } }, "node_modules/@openzeppelin/contracts/token/ERC20/IERC20.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "ad7c2d0af148c8f9f097d65deeb4da6b", "sourceName": "node_modules/@openzeppelin/contracts/token/ERC20/IERC20.sol", "solcConfig": { @@ -1471,7 +1471,7 @@ } }, "node_modules/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "909ab67fc5c25033fe6cd364f8c056f9", "sourceName": "node_modules/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol", "solcConfig": { @@ -1514,7 +1514,7 @@ } }, "node_modules/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "fb77f144244b9ab12533aa6ce85ef8c5", "sourceName": "node_modules/@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol", "solcConfig": { @@ -1555,7 +1555,7 @@ } }, "node_modules/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "0320a90f714843ca19373ed143fc4466", "sourceName": "node_modules/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol", "solcConfig": { @@ -1600,7 +1600,7 @@ } }, "node_modules/@openzeppelin/contracts/utils/Address.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "f31ad6fc4bbf9c06203987220156a6ba", "sourceName": "node_modules/@openzeppelin/contracts/utils/Address.sol", "solcConfig": { @@ -1641,7 +1641,7 @@ } }, "node_modules/@openzeppelin/contracts/utils/Counters.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "74654e3ae5d7f39555055dfe244dab7a", "sourceName": "node_modules/@openzeppelin/contracts/utils/Counters.sol", "solcConfig": { @@ -1682,7 +1682,7 @@ } }, "node_modules/@openzeppelin/contracts/utils/Strings.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "396031251978f8febfd90cb62cb240ec", "sourceName": "node_modules/@openzeppelin/contracts/utils/Strings.sol", "solcConfig": { @@ -1725,7 +1725,7 @@ } }, "node_modules/@openzeppelin/contracts/utils/cryptography/ECDSA.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "fe1190dbb6431c2464246925713f0f7f", "sourceName": "node_modules/@openzeppelin/contracts/utils/cryptography/ECDSA.sol", "solcConfig": { @@ -1769,7 +1769,7 @@ } }, "node_modules/@openzeppelin/contracts/utils/cryptography/EIP712.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "7c33eaa0f6dc029429ed8b986694c3a4", "sourceName": "node_modules/@openzeppelin/contracts/utils/cryptography/EIP712.sol", "solcConfig": { @@ -1814,7 +1814,7 @@ } }, "node_modules/@openzeppelin/contracts/utils/math/Math.sol": { - "lastModificationDate": 1682654853367, + "lastModificationDate": 1684763857530, "contentHash": "b9c58920ce74d6dc819161786112e7ee", "sourceName": "node_modules/@openzeppelin/contracts/utils/math/Math.sol", "solcConfig": { diff --git a/package.json b/package.json index 40bf672..4662afb 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,23 @@ "dotenv": "^16.0.3" }, "devDependencies": { + "@nomicfoundation/hardhat-chai-matchers": "^1.0.6", "@nomicfoundation/hardhat-foundry": "^1.0.1", + "@nomicfoundation/hardhat-network-helpers": "^1.0.8", "@nomicfoundation/hardhat-toolbox": "^2.0.2", + "@nomiclabs/hardhat-ethers": "^2.2.3", + "@nomiclabs/hardhat-etherscan": "^3.1.7", + "@typechain/ethers-v5": "^10.2.1", + "@typechain/hardhat": "^6.1.6", + "@types/chai": "^4.3.5", + "@types/mocha": "^10.0.1", + "chai": "^4.3.7", "hardhat": "^2.14.0", + "hardhat-dependency-compiler": "^1.1.3", + "hardhat-gas-reporter": "^1.0.9", + "solidity-coverage": "^0.8.2", "ts-node": "^10.9.1", + "typechain": "^8.1.1", "typescript": "^5.0.4" } } diff --git a/yarn.lock b/yarn.lock index 33c34ba..eac85c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -124,7 +124,7 @@ "@ethersproject/logger" "^5.7.0" "bn.js" "^5.2.1" -"@ethersproject/bytes@^5.0.0", "@ethersproject/bytes@^5.7.0", "@ethersproject/bytes@5.7.0": +"@ethersproject/bytes@^5.7.0", "@ethersproject/bytes@5.7.0": "integrity" "sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==" "resolved" "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.7.0.tgz" "version" "5.7.0" @@ -594,7 +594,7 @@ "mcl-wasm" "^0.7.1" "rustbn.js" "~0.2.0" -"@nomicfoundation/hardhat-chai-matchers@^1.0.0": +"@nomicfoundation/hardhat-chai-matchers@^1.0.0", "@nomicfoundation/hardhat-chai-matchers@^1.0.6": "integrity" "sha512-f5ZMNmabZeZegEfuxn/0kW+mm7+yV7VNDxLpMOMGXWFJ2l/Ct3QShujzDRF9cOkK9Ui/hbDeOWGZqyQALDXVCQ==" "resolved" "https://registry.npmjs.org/@nomicfoundation/hardhat-chai-matchers/-/hardhat-chai-matchers-1.0.6.tgz" "version" "1.0.6" @@ -612,7 +612,7 @@ dependencies: "chalk" "^2.4.2" -"@nomicfoundation/hardhat-network-helpers@^1.0.0": +"@nomicfoundation/hardhat-network-helpers@^1.0.0", "@nomicfoundation/hardhat-network-helpers@^1.0.8": "integrity" "sha512-MNqQbzUJZnCMIYvlniC3U+kcavz/PhhQSsY90tbEtUyMj/IQqsLwIRZa4ctjABh3Bz0KCh9OXUZ7Yk/d9hr45Q==" "resolved" "https://registry.npmjs.org/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-1.0.8.tgz" "version" "1.0.8" @@ -645,12 +645,12 @@ "@nomicfoundation/solidity-analyzer-win32-ia32-msvc" "0.1.1" "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.1" -"@nomiclabs/hardhat-ethers@^2.0.0": +"@nomiclabs/hardhat-ethers@^2.0.0", "@nomiclabs/hardhat-ethers@^2.2.3": "integrity" "sha512-YhzPdzb612X591FOe68q+qXVXGG2ANZRvDo0RRUtimev85rCrAlv/TLMEZw5c+kq9AbzocLTVX/h2jVIFPL9Xg==" "resolved" "https://registry.npmjs.org/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.2.3.tgz" "version" "2.2.3" -"@nomiclabs/hardhat-etherscan@^3.0.0": +"@nomiclabs/hardhat-etherscan@^3.0.0", "@nomiclabs/hardhat-etherscan@^3.1.7": "integrity" "sha512-tZ3TvSgpvsQ6B6OGmo1/Au6u8BrAkvs1mIC/eURA3xgIfznUZBhmpne8hv7BXUzw9xNL3fXdpOYgOQlVMTcoHQ==" "resolved" "https://registry.npmjs.org/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-3.1.7.tgz" "version" "3.1.7" @@ -788,18 +788,18 @@ "resolved" "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz" "version" "1.0.3" -"@typechain/ethers-v5@^10.1.0", "@typechain/ethers-v5@^10.2.0": - "integrity" "sha512-ikaq0N/w9fABM+G01OFmU3U3dNnyRwEahkdvi9mqy1a3XwKiPZaF/lu54OcNaEWnpvEYyhhS0N7buCtLQqC92w==" - "resolved" "https://registry.npmjs.org/@typechain/ethers-v5/-/ethers-v5-10.2.0.tgz" - "version" "10.2.0" +"@typechain/ethers-v5@^10.1.0", "@typechain/ethers-v5@^10.2.1": + "integrity" "sha512-n3tQmCZjRE6IU4h6lqUGiQ1j866n5MTCBJreNEHHVWXa2u9GJTaeYyU1/k+1qLutkyw+sS6VAN+AbeiTqsxd/A==" + "resolved" "https://registry.npmjs.org/@typechain/ethers-v5/-/ethers-v5-10.2.1.tgz" + "version" "10.2.1" dependencies: "lodash" "^4.17.15" "ts-essentials" "^7.0.1" -"@typechain/hardhat@^6.1.2": - "integrity" "sha512-lg7LW4qDZpxFMknp3Xool61Fg6Lays8F8TXdFGBG+MxyYcYU5795P1U2XdStuzGq9S2Dzdgh+1jGww9wvZ6r4Q==" - "resolved" "https://registry.npmjs.org/@typechain/hardhat/-/hardhat-6.1.5.tgz" - "version" "6.1.5" +"@typechain/hardhat@^6.1.2", "@typechain/hardhat@^6.1.6": + "integrity" "sha512-BiVnegSs+ZHVymyidtK472syodx1sXYlYJJixZfRstHVGYTi8V1O7QG4nsjyb0PC/LORcq7sfBUcHto1y6UgJA==" + "resolved" "https://registry.npmjs.org/@typechain/hardhat/-/hardhat-6.1.6.tgz" + "version" "6.1.6" dependencies: "fs-extra" "^9.1.0" @@ -824,7 +824,7 @@ dependencies: "@types/chai" "*" -"@types/chai@*", "@types/chai@^4.2.0": +"@types/chai@*", "@types/chai@^4.2.0", "@types/chai@^4.3.5": "integrity" "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==" "resolved" "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz" "version" "4.3.5" @@ -861,7 +861,7 @@ "resolved" "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz" "version" "5.1.2" -"@types/mocha@>=9.1.0": +"@types/mocha@^10.0.1", "@types/mocha@>=9.1.0": "integrity" "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==" "resolved" "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz" "version" "10.0.1" @@ -1403,7 +1403,7 @@ dependencies: "check-error" "^1.0.2" -"chai@^4.2.0", "chai@>= 2.1.2 < 5": +"chai@^4.2.0", "chai@^4.3.7", "chai@>= 2.1.2 < 5": "integrity" "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==" "resolved" "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz" "version" "4.3.7" @@ -2495,7 +2495,12 @@ "ajv" "^6.12.3" "har-schema" "^2.0.0" -"hardhat-gas-reporter@^1.0.8": +"hardhat-dependency-compiler@^1.1.3": + "integrity" "sha512-bCDqsOxGST6WkbMvj4lPchYWidNSSBm5CFnkyAex1T11cGmr9otZTGl81W6f9pmrtBXbKCvr3OSuNJ6Q394sAw==" + "resolved" "https://registry.npmjs.org/hardhat-dependency-compiler/-/hardhat-dependency-compiler-1.1.3.tgz" + "version" "1.1.3" + +"hardhat-gas-reporter@^1.0.8", "hardhat-gas-reporter@^1.0.9": "integrity" "sha512-INN26G3EW43adGKBNzYWOlI3+rlLnasXTwW79YNnUhXPDa+yHESgt639dJEs37gCjhkbNKcRRJnomXEuMFBXJg==" "resolved" "https://registry.npmjs.org/hardhat-gas-reporter/-/hardhat-gas-reporter-1.0.9.tgz" "version" "1.0.9" @@ -4121,7 +4126,7 @@ "semver" "^5.5.0" "tmp" "0.0.33" -"solidity-coverage@^0.8.1": +"solidity-coverage@^0.8.1", "solidity-coverage@^0.8.2": "integrity" "sha512-cv2bWb7lOXPE9/SSleDO6czkFiMHgP4NXPj+iW9W7iEKLBk7Cj0AGBiNmGX3V1totl9wjPrT0gHmABZKZt65rQ==" "resolved" "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.8.2.tgz" "version" "0.8.2"