diff --git a/contracts/UnderwriterToken.sol b/contracts/UnderwriterToken.sol index 2b54b5bd..e3565f8d 100644 --- a/contracts/UnderwriterToken.sol +++ b/contracts/UnderwriterToken.sol @@ -14,6 +14,7 @@ pragma solidity 0.8.9; +import "@openzeppelin/contracts/utils/math/SafeCast.sol"; import "@thesis/solidity-contracts/contracts/token/ERC20WithPermit.sol"; import "@threshold-network/solidity-contracts/contracts/governance/Checkpoints.sol"; diff --git a/package.json b/package.json index e67ef1fc..92bd5072 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@keep-network/keep-core": ">1.8.0-dev <1.8.0-pre", "@keep-network/tbtc": ">1.1.2-dev <1.1.2-ropsten", "@thesis/solidity-contracts": "github:thesis/solidity-contracts#4985bcf", - "@threshold-network/solidity-contracts": "1.0.0", + "@threshold-network/solidity-contracts": "github:threshold-network/solidity-contracts#0f07c2f", "@openzeppelin/contracts": "^4.3", "@tenderly/hardhat-tenderly": "^1.0.12" }, diff --git a/yarn.lock b/yarn.lock index db0d4283..27618209 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1143,14 +1143,6 @@ deepmerge "^4.2.2" untildify "^4.0.0" -"@keep-network/keep-core@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.7.0.tgz#0923d539fc431810bd9b239f91e09a92a2b255a0" - integrity sha512-jU0ol4L5a7vFUXCTlYGsjZYhl87cUpiAYz9LgDgvM3sGmwNIVZ9dY3gziINXIbSSFZjoqh3eGDxDPcQmA+Rjrg== - dependencies: - "@openzeppelin/upgrades" "^2.7.2" - openzeppelin-solidity "2.4.0" - "@keep-network/keep-core@1.8.0-rc.6": version "1.8.0-rc.6" resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.0-rc.6.tgz#a9f6bec312aa8b1bc40f95c8a27c2ba8d09886f7" @@ -1294,6 +1286,11 @@ "@types/sinon-chai" "^3.2.3" "@types/web3" "1.0.19" +"@openzeppelin/contracts-upgradeable@^4.4": + version "4.4.2" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.4.2.tgz#748a5986a02548ef541cabc2ce8c67a890044c40" + integrity sha512-bavxs18L47EmcdnL9I6DzsVSUJO+0/zD6zH7/6qG7QRBugvR3VNVZR+nMvuZlCNwuTTnCa3apR00PYzYr/efAw== + "@openzeppelin/contracts@^2.4.0": version "2.5.1" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-2.5.1.tgz#c76e3fc57aa224da3718ec351812a4251289db31" @@ -1592,13 +1589,13 @@ dependencies: "@openzeppelin/contracts" "^4.1.0" -"@threshold-network/solidity-contracts@1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@threshold-network/solidity-contracts/-/solidity-contracts-1.0.0.tgz#030f388de2b6ed730fafc2575189797ac5690133" - integrity sha512-Y/2FeMAKPZREDvxZC/doIezNW3ScgBb4blAyCrlswhTCmpxofRCuBuEkoaZRMRmvS8aaT0ln47DTzkn6bRq6DQ== +"@threshold-network/solidity-contracts@github:threshold-network/solidity-contracts#0f07c2f": + version "1.1.0-dev" + resolved "https://codeload.github.com/threshold-network/solidity-contracts/tar.gz/0f07c2fc06788d5f9d7080e00b42efa63e406690" dependencies: - "@keep-network/keep-core" "1.7.0" + "@keep-network/keep-core" ">1.8.0-dev <1.8.0-pre" "@openzeppelin/contracts" "^4.4" + "@openzeppelin/contracts-upgradeable" "^4.4" "@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf" "@truffle/error@^0.0.14":