diff --git a/README.md b/README.md index 70f0ee1..f52b41e 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,6 @@ HSTK Token is an ERC20-compliant token implementation built on the Ethereum bloc ## Security Considerations 1. **Access Control** - - All administrative functions are restricted to the multisig wallet - Blacklisting provides additional control over token movement 2. **Supply Management** diff --git a/solidity/foundry.toml b/solidity/foundry.toml index 2466663..7722963 100644 --- a/solidity/foundry.toml +++ b/solidity/foundry.toml @@ -2,6 +2,7 @@ src = "src" out = "out" libs = ["lib"] +solc = ["0.8.28"] gas_reports = ["*"] no_test = true diff --git a/solidity/script/HSTK.s.sol b/solidity/script/HSTK.s.sol index e31cd4a..c73939f 100644 --- a/solidity/script/HSTK.s.sol +++ b/solidity/script/HSTK.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.13; +pragma solidity 0.8.4; import {Script, console} from "forge-std/Script.sol"; import {MultiSigWallet} from "../src/MultiSigWallet.sol"; diff --git a/solidity/script/claimable.s.sol b/solidity/script/claimable.s.sol index 50e9d62..2a46ba6 100644 --- a/solidity/script/claimable.s.sol +++ b/solidity/script/claimable.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.13; +pragma solidity ^0.8.4; import {Script, console} from "forge-std/Script.sol"; import {Claimable} from "../src/Claimable2.sol"; diff --git a/solidity/src/AccessRegistry/AccessRegistry.sol b/solidity/src/AccessRegistry/AccessRegistry.sol index 0b6754f..71b9b49 100644 --- a/solidity/src/AccessRegistry/AccessRegistry.sol +++ b/solidity/src/AccessRegistry/AccessRegistry.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.20; +pragma solidity 0.8.4; import {Context} from "@openzeppelin/contracts/utils/Context.sol"; import {SuperAdmin2Step} from "./helpers/superAdmin2Step.sol"; diff --git a/solidity/src/AccessRegistry/helpers/fallbackAdmin2Step.sol b/solidity/src/AccessRegistry/helpers/fallbackAdmin2Step.sol index 91d87b2..853754f 100644 --- a/solidity/src/AccessRegistry/helpers/fallbackAdmin2Step.sol +++ b/solidity/src/AccessRegistry/helpers/fallbackAdmin2Step.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.4; +pragma solidity 0.8.4; /// @notice Simple single fallbackAdmin authorization mixin. /// @author Hashstack diff --git a/solidity/src/AccessRegistry/helpers/superAdmin2Step.sol b/solidity/src/AccessRegistry/helpers/superAdmin2Step.sol index 93837be..d51f5de 100644 --- a/solidity/src/AccessRegistry/helpers/superAdmin2Step.sol +++ b/solidity/src/AccessRegistry/helpers/superAdmin2Step.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.4; +pragma solidity 0.8.4; /// @notice Simple single superAdmin authorization mixin. /// @author Hashstack diff --git a/solidity/src/Claimable2.sol b/solidity/src/Claimable2.sol index d57184f..8feb329 100644 --- a/solidity/src/Claimable2.sol +++ b/solidity/src/Claimable2.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.8.4; +pragma solidity 0.8.4; import {SafeMath} from "./utils/SafeMath.sol"; import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol"; diff --git a/solidity/src/HSTK.sol b/solidity/src/HSTK.sol index 32f6b90..175a8c9 100644 --- a/solidity/src/HSTK.sol +++ b/solidity/src/HSTK.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.4; +pragma solidity 0.8.4; import {Pausable} from "./utils/Pausable.sol"; import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; diff --git a/solidity/src/MultiSigWallet.sol b/solidity/src/MultiSigWallet.sol index d4fc669..cb5fe7e 100644 --- a/solidity/src/MultiSigWallet.sol +++ b/solidity/src/MultiSigWallet.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.4; +pragma solidity 0.8.4; import {AccessRegistry} from "./AccessRegistry/AccessRegistry.sol"; import {UUPSUpgradeable} from "./utils/UUPSUpgradeable.sol"; diff --git a/solidity/src/utils/BlackListed.sol b/solidity/src/utils/BlackListed.sol index 4456f72..1c0f945 100644 --- a/solidity/src/utils/BlackListed.sol +++ b/solidity/src/utils/BlackListed.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.4; +pragma solidity 0.8.4; import {Context} from "@openzeppelin/contracts/utils/Context.sol"; diff --git a/solidity/src/utils/Initializable.sol b/solidity/src/utils/Initializable.sol index ad46956..40f8b9a 100644 --- a/solidity/src/utils/Initializable.sol +++ b/solidity/src/utils/Initializable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.4; +pragma solidity 0.8.4; /// @notice Initializable mixin for the upgradeable contracts. abstract contract Initializable { diff --git a/solidity/src/utils/Pausable.sol b/solidity/src/utils/Pausable.sol index 1861442..6806125 100644 --- a/solidity/src/utils/Pausable.sol +++ b/solidity/src/utils/Pausable.sol @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MIT - -pragma solidity ^0.8.20; +pragma solidity 0.8.4; import {Context} from "@openzeppelin/contracts/utils/Context.sol"; diff --git a/solidity/src/utils/SafeMath.sol b/solidity/src/utils/SafeMath.sol index faf8fe0..934528c 100644 --- a/solidity/src/utils/SafeMath.sol +++ b/solidity/src/utils/SafeMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.4; +pragma solidity 0.8.4; library SafeMath { function add(uint256 a, uint256 b) internal pure returns (uint256) { diff --git a/solidity/src/utils/UUPSUpgradeable.sol b/solidity/src/utils/UUPSUpgradeable.sol index db271d8..8825396 100644 --- a/solidity/src/utils/UUPSUpgradeable.sol +++ b/solidity/src/utils/UUPSUpgradeable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.4; +pragma solidity 0.8.4; /// @dev Note: /// - This implementation is intended to be used with ERC1967 proxies. diff --git a/solidity/test/Claimable.t.sol b/solidity/test/Claimable.t.sol index 4165c93..b7024c0 100644 --- a/solidity/test/Claimable.t.sol +++ b/solidity/test/Claimable.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.13; +pragma solidity 0.8.4; import {Test, console} from "forge-std/Test.sol"; import {Claimable} from "../src/Claimable2.sol";