diff --git a/.gas-snapshot b/.gas-snapshot index 3c44d86..61eb31a 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -1,16 +1,16 @@ ContentPoolTest:test_addReward_InvalidReward_ko() (gas: 28972) ContentPoolTest:test_addReward_InvalidRole_ko() (gas: 17640) ContentPoolTest:test_addReward_ok() (gas: 66202) -ContentPoolTest:test_canBeDeployedAndInit_ok() (gas: 2820972) -ContentPoolTest:test_getRewardStates_ok() (gas: 223662) +ContentPoolTest:test_canBeDeployedAndInit_ok() (gas: 2821772) +ContentPoolTest:test_getRewardStates_ok() (gas: 223663) ContentPoolTest:test_initialize_InitTwice_ko() (gas: 17982) -ContentPoolTest:test_participantStates_ok() (gas: 220752) -ContentPoolTest:test_updateUserAndPool_WithRewardBeforeState_ok() (gas: 428709) -ContentPoolTest:test_updateUserAndPool_ok() (gas: 325512) -ContentPoolTest:test_updateUser_MultiTokenTransfer_ok() (gas: 539500) -ContentPoolTest:test_updateUser_WithRewardBeforeStateChange_ok() (gas: 713307) -ContentPoolTest:test_updateUser_ok() (gas: 400284) -FrakTeasuryWalletTest:test_canBeDeployedAndInit_ok() (gas: 1773426) +ContentPoolTest:test_participantStates_ok() (gas: 220753) +ContentPoolTest:test_updateUserAndPool_WithRewardBeforeState_ok() (gas: 428712) +ContentPoolTest:test_updateUserAndPool_ok() (gas: 325513) +ContentPoolTest:test_updateUser_MultiTokenTransfer_ok() (gas: 539394) +ContentPoolTest:test_updateUser_WithRewardBeforeStateChange_ok() (gas: 713311) +ContentPoolTest:test_updateUser_ok() (gas: 400285) +FrakTeasuryWalletTest:test_canBeDeployedAndInit_ok() (gas: 1773826) FrakTeasuryWalletTest:test_initialize_InitTwice_ko() (gas: 17937) FrakTeasuryWalletTest:test_transferBatch_InvalidArray_ko() (gas: 28753) FrakTeasuryWalletTest:test_transferBatch_NoReward_ko() (gas: 34416) @@ -24,9 +24,9 @@ FrakTeasuryWalletTest:test_transfer_NotEnoughTreasury_ko() (gas: 11321404) FrakTeasuryWalletTest:test_transfer_NotMinter_ko() (gas: 17684) FrakTeasuryWalletTest:test_transfer_RewardTooLarge_ko() (gas: 20534) FrakTeasuryWalletTest:test_transfer_ok() (gas: 136126) -FrakTokenTest:invariant_cap_lt_supply() (runs: 256, calls: 3840, reverts: 3497) +FrakTokenTest:invariant_cap_lt_supply() (runs: 256, calls: 3840, reverts: 3443) FrakTokenTest:test_burn_ok() (gas: 53321) -FrakTokenTest:test_canBeDeployedAndInit_ok() (gas: 4949212) +FrakTokenTest:test_canBeDeployedAndInit_ok() (gas: 4950012) FrakTokenTest:test_cap_ok() (gas: 10366) FrakTokenTest:test_decimals_ok() (gas: 10426) FrakTokenTest:test_initialize_InitTwice_ko() (gas: 15759) @@ -49,23 +49,23 @@ FraktionTokensTest:test_addContent_SupplyUpdateNotAllowed_ko() (gas: 75241) FraktionTokensTest:test_addContent_ok() (gas: 330174) FraktionTokensTest:test_batchBalance_ok() (gas: 59879) FraktionTokensTest:test_burn_ok() (gas: 49614) -FraktionTokensTest:test_canBeDeployedAndInit_ok() (gas: 7339660) +FraktionTokensTest:test_canBeDeployedAndInit_ok() (gas: 7337660) FraktionTokensTest:test_initialize_InitTwice_ko() (gas: 16030) FraktionTokensTest:test_ownerOf_ok() (gas: 16910) FraktionTokensTest:test_permitTransferAll_DelayExpired_ko() (gas: 27984) FraktionTokensTest:test_permitTransferAll_InvalidNonce_ko() (gas: 50430) FraktionTokensTest:test_permitTransferAll_InvalidSigner_ko() (gas: 53829) FraktionTokensTest:test_permitTransferAll_ok() (gas: 77652) -FraktionTokensTest:test_setUpTransferCallback_ok() (gas: 367202) +FraktionTokensTest:test_setUpTransferCallback_ok() (gas: 368003) FraktionTokensTest:test_supply_InvalidRole_ko() (gas: 53455) FraktionTokensTest:test_supply_SupplyUpdateNotAllowed_ko() (gas: 45998) FraktionTokensTest:test_supply_ok() (gas: 87798) -FraktionTokensTest:test_transferAllFrom_ok() (gas: 189678) +FraktionTokensTest:test_transferAllFrom_ok() (gas: 189442) MinterTest:test_addContent_InvalidRole_ko() (gas: 17786) MinterTest:test_addContent_InvalidSupply_ko() (gas: 62349) MinterTest:test_addContent_ok() (gas: 194511) MinterTest:test_benchmarkAddContent_ok() (gas: 695493) -MinterTest:test_canBeDeployedAndInit_ok() (gas: 2460978) +MinterTest:test_canBeDeployedAndInit_ok() (gas: 2461778) MinterTest:test_increaseSupply_InvalidRole_ko() (gas: 62426) MinterTest:test_increaseSupply_ok() (gas: 75960) MinterTest:test_initialize_InitTwice_ko() (gas: 22408) @@ -107,7 +107,7 @@ MultiVestingWalletsTest:test_transfer_InvalidUser_ko() (gas: 209500) MultiVestingWalletsTest:test_transfer_ok() (gas: 226492) ReferralPoolTest:test_canBeDeployedAndInit_ok() (gas: 1690025) ReferralPoolTest:test_initialize_InitTwice_ko() (gas: 17881) -RewarderConfigTest:test_canBeDeployedAndInit_ok() (gas: 2533292) +RewarderConfigTest:test_canBeDeployedAndInit_ok() (gas: 2534102) RewarderConfigTest:test_initialize_InitTwice_ko() (gas: 26774) RewarderConfigTest:test_updateContentBadge_BadgeTooLarge_ko() (gas: 20191) RewarderConfigTest:test_updateContentBadge_InvalidRole_ko() (gas: 17630) @@ -123,18 +123,18 @@ RewarderTest:test_pay_InvalidAddress_ko() (gas: 21620) RewarderTest:test_pay_InvalidArray_ko() (gas: 38041) RewarderTest:test_pay_InvalidContent_ko() (gas: 56871) RewarderTest:test_pay_InvalidRoles_ko() (gas: 21259) -RewarderTest:test_pay_PayedFraktions_LargeListenCounts_ok() (gas: 367557) -RewarderTest:test_pay_PayedFraktions_TooMuchListenCounts_ko() (gas: 167427) -RewarderTest:test_pay_PayedFraktions_ok() (gas: 405426) -RewarderTest:test_pay_TooLargeReward_ko() (gas: 231010) +RewarderTest:test_pay_PayedFraktions_LargeListenCounts_ok() (gas: 367049) +RewarderTest:test_pay_PayedFraktions_TooMuchListenCounts_ko() (gas: 166919) +RewarderTest:test_pay_PayedFraktions_ok() (gas: 404918) +RewarderTest:test_pay_TooLargeReward_ko() (gas: 230502) VestingWalletFactoryTest:test_canBeDeployedAndInit_ok() (gas: 2093328) VestingWalletFactoryTest:test_initialize_InitTwice_ko() (gas: 17926) WalletMigratorTest:test_claimAllFoundsForUser_ok() (gas: 359120) WalletMigratorTest:test_claimAllFounds_ok() (gas: 359246) -WalletMigratorTest:test_fullMigrationForUserDirect_ok() (gas: 568197) -WalletMigratorTest:test_fullMigrationForUser_ok() (gas: 634824) -WalletMigratorTest:test_fullMigration_ok() (gas: 634148) -WalletMigratorTest:test_migrateFrationsForUser_ok() (gas: 269287) -WalletMigratorTest:test_migrateFrations_ok() (gas: 269401) +WalletMigratorTest:test_fullMigrationForUserDirect_ok() (gas: 567961) +WalletMigratorTest:test_fullMigrationForUser_ok() (gas: 634588) +WalletMigratorTest:test_fullMigration_ok() (gas: 633912) +WalletMigratorTest:test_migrateFrationsForUser_ok() (gas: 269098) +WalletMigratorTest:test_migrateFrations_ok() (gas: 269212) WalletMigratorTest:test_migrateFrkForUser_ok() (gas: 144729) WalletMigratorTest:test_migrateFrk_ok() (gas: 144949) \ No newline at end of file diff --git a/contracts/fraktions/FraktionTokens.sol b/contracts/fraktions/FraktionTokens.sol index aa37a16..60c3fba 100644 --- a/contracts/fraktions/FraktionTokens.sol +++ b/contracts/fraktions/FraktionTokens.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { ERC1155Upgradeable } from "@oz-upgradeable/token/ERC1155/ERC1155Upgradeable.sol"; import { FraktionTransferCallback } from "./FraktionTransferCallback.sol"; diff --git a/contracts/fraktions/FraktionTransferCallback.sol b/contracts/fraktions/FraktionTransferCallback.sol index b7b3a6a..8a8e8ae 100644 --- a/contracts/fraktions/FraktionTransferCallback.sol +++ b/contracts/fraktions/FraktionTransferCallback.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { FraktionId } from "../libs/FraktionId.sol"; diff --git a/contracts/libs/ArrayLib.sol b/contracts/libs/ArrayLib.sol index 2ea3ea0..8715364 100644 --- a/contracts/libs/ArrayLib.sol +++ b/contracts/libs/ArrayLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { FraktionId } from "./FraktionId.sol"; diff --git a/contracts/libs/ContentId.sol b/contracts/libs/ContentId.sol index 928b702..f6a9bdf 100644 --- a/contracts/libs/ContentId.sol +++ b/contracts/libs/ContentId.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { FraktionId } from "./FraktionId.sol"; diff --git a/contracts/libs/FraktionId.sol b/contracts/libs/FraktionId.sol index ff6e4de..fcdee43 100644 --- a/contracts/libs/FraktionId.sol +++ b/contracts/libs/FraktionId.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; /// @dev Define the FraktionId type type FraktionId is uint256; diff --git a/contracts/minter/IMinter.sol b/contracts/minter/IMinter.sol index 456a81a..2f0c8e7 100644 --- a/contracts/minter/IMinter.sol +++ b/contracts/minter/IMinter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { ContentId } from "../libs/ContentId.sol"; import { FraktionId } from "../libs/FraktionId.sol"; diff --git a/contracts/minter/Minter.sol b/contracts/minter/Minter.sol index 458ccec..6a79d9d 100644 --- a/contracts/minter/Minter.sol +++ b/contracts/minter/Minter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { IMinter } from "./IMinter.sol"; import { FraktionCostBadges } from "./badges/FraktionCostBadges.sol"; diff --git a/contracts/minter/badges/FraktionCostBadges.sol b/contracts/minter/badges/FraktionCostBadges.sol index c88b0bb..a87b501 100644 --- a/contracts/minter/badges/FraktionCostBadges.sol +++ b/contracts/minter/badges/FraktionCostBadges.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { FraktionId } from "../../libs/FraktionId.sol"; import { ContentIdLib } from "../../libs/ContentId.sol"; diff --git a/contracts/reward/IRewarder.sol b/contracts/reward/IRewarder.sol index 2020a7f..97cd0ea 100644 --- a/contracts/reward/IRewarder.sol +++ b/contracts/reward/IRewarder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { ContentId } from "../libs/ContentId.sol"; diff --git a/contracts/reward/RewardAccounter.sol b/contracts/reward/RewardAccounter.sol index a189902..511cdc9 100644 --- a/contracts/reward/RewardAccounter.sol +++ b/contracts/reward/RewardAccounter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; /// @dev Struct representing the accounter for the reward struct RewardAccounter { diff --git a/contracts/reward/Rewarder.sol b/contracts/reward/Rewarder.sol index bf77f18..2b05afa 100644 --- a/contracts/reward/Rewarder.sol +++ b/contracts/reward/Rewarder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { IRewarder } from "./IRewarder.sol"; import { ContentBadges } from "./badges/ContentBadges.sol"; diff --git a/contracts/reward/badges/ContentBadges.sol b/contracts/reward/badges/ContentBadges.sol index 5750edf..f2d75c9 100644 --- a/contracts/reward/badges/ContentBadges.sol +++ b/contracts/reward/badges/ContentBadges.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { ContentId } from "../../libs/ContentId.sol"; import { BadgeTooLarge } from "../../utils/FrakErrors.sol"; diff --git a/contracts/reward/badges/ListenerBadges.sol b/contracts/reward/badges/ListenerBadges.sol index b53bbf0..666d56b 100644 --- a/contracts/reward/badges/ListenerBadges.sol +++ b/contracts/reward/badges/ListenerBadges.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { BadgeTooLarge } from "../../utils/FrakErrors.sol"; diff --git a/contracts/reward/contentPool/ContentPool.sol b/contracts/reward/contentPool/ContentPool.sol index fd540c6..7a82cb8 100644 --- a/contracts/reward/contentPool/ContentPool.sol +++ b/contracts/reward/contentPool/ContentPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { FraktionId } from "../../libs/FraktionId.sol"; import { ContentId, ContentIdLib } from "../../libs/ContentId.sol"; diff --git a/contracts/reward/contentPool/IContentPool.sol b/contracts/reward/contentPool/IContentPool.sol index 67c204f..c2eddb3 100644 --- a/contracts/reward/contentPool/IContentPool.sol +++ b/contracts/reward/contentPool/IContentPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { FraktionTransferCallback } from "../../fraktions/FraktionTransferCallback.sol"; import { ContentId } from "../../libs/ContentId.sol"; diff --git a/contracts/reward/referralPool/IReferralPool.sol b/contracts/reward/referralPool/IReferralPool.sol index a20673e..c5d968d 100644 --- a/contracts/reward/referralPool/IReferralPool.sol +++ b/contracts/reward/referralPool/IReferralPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; /// @author @KONFeature /// @title IReferralPool diff --git a/contracts/reward/referralPool/ReferralPool.sol b/contracts/reward/referralPool/ReferralPool.sol index 858c95f..a8e8da2 100644 --- a/contracts/reward/referralPool/ReferralPool.sol +++ b/contracts/reward/referralPool/ReferralPool.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { FrakRoles } from "../../roles/FrakRoles.sol"; import { PushPullReward } from "../../utils/PushPullReward.sol"; diff --git a/contracts/roles/FrakAccessControlUpgradeable.sol b/contracts/roles/FrakAccessControlUpgradeable.sol index 6b0f9c1..62300eb 100644 --- a/contracts/roles/FrakAccessControlUpgradeable.sol +++ b/contracts/roles/FrakAccessControlUpgradeable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { Initializable } from "@oz-upgradeable/proxy/utils/Initializable.sol"; import { UUPSUpgradeable } from "@oz-upgradeable/proxy/utils/UUPSUpgradeable.sol"; diff --git a/contracts/roles/FrakRoles.sol b/contracts/roles/FrakRoles.sol index 2eb603f..a8d238e 100644 --- a/contracts/roles/FrakRoles.sol +++ b/contracts/roles/FrakRoles.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; /// @author @KONFeature /// @title FrakRoles diff --git a/contracts/tokens/FrakToken.sol b/contracts/tokens/FrakToken.sol index 23a0d6d..9792cfb 100644 --- a/contracts/tokens/FrakToken.sol +++ b/contracts/tokens/FrakToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { ERC20Upgradeable } from "@oz-upgradeable/token/ERC20/ERC20Upgradeable.sol"; import { FrakRoles } from "../roles/FrakRoles.sol"; diff --git a/contracts/tokens/IFrakToken.sol b/contracts/tokens/IFrakToken.sol index ece1efd..ff2d563 100644 --- a/contracts/tokens/IFrakToken.sol +++ b/contracts/tokens/IFrakToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { IERC20Upgradeable } from "@oz-upgradeable/token/ERC20/IERC20Upgradeable.sol"; diff --git a/contracts/utils/EIP712Diamond.sol b/contracts/utils/EIP712Diamond.sol index 5d9e9c3..5bead6c 100644 --- a/contracts/utils/EIP712Diamond.sol +++ b/contracts/utils/EIP712Diamond.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { Initializable } from "@oz-upgradeable/proxy/utils/Initializable.sol"; diff --git a/contracts/utils/FrakErrors.sol b/contracts/utils/FrakErrors.sol index 7fcfae0..3fdec61 100644 --- a/contracts/utils/FrakErrors.sol +++ b/contracts/utils/FrakErrors.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; // Access control error (when accessing unauthorized method, or renouncing role that he havn't go) error RenounceForCallerOnly(); diff --git a/contracts/utils/IPushPullReward.sol b/contracts/utils/IPushPullReward.sol index 5694e29..77a1835 100644 --- a/contracts/utils/IPushPullReward.sol +++ b/contracts/utils/IPushPullReward.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; /// @author @KONFeature /// @title IPushPullReward diff --git a/contracts/utils/PushPullReward.sol b/contracts/utils/PushPullReward.sol index 4073e73..1b37234 100644 --- a/contracts/utils/PushPullReward.sol +++ b/contracts/utils/PushPullReward.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { Initializable } from "@oz-upgradeable/proxy/utils/Initializable.sol"; import { NoReward, InvalidAddress, RewardTooLarge } from "./FrakErrors.sol"; diff --git a/contracts/wallets/FrakTreasuryWallet.sol b/contracts/wallets/FrakTreasuryWallet.sol index 737423d..7ce7621 100644 --- a/contracts/wallets/FrakTreasuryWallet.sol +++ b/contracts/wallets/FrakTreasuryWallet.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { IFrakToken } from "../tokens/IFrakToken.sol"; import { FrakAccessControlUpgradeable } from "../roles/FrakAccessControlUpgradeable.sol"; diff --git a/contracts/wallets/MultiVestingWallets.sol b/contracts/wallets/MultiVestingWallets.sol index 93af0d3..ac55bfd 100644 --- a/contracts/wallets/MultiVestingWallets.sol +++ b/contracts/wallets/MultiVestingWallets.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { EnumerableSet } from "openzeppelin/utils/structs/EnumerableSet.sol"; import { FrakAccessControlUpgradeable } from "../roles/FrakAccessControlUpgradeable.sol"; diff --git a/contracts/wallets/VestingWalletFactory.sol b/contracts/wallets/VestingWalletFactory.sol index 2adbc48..aee5af9 100644 --- a/contracts/wallets/VestingWalletFactory.sol +++ b/contracts/wallets/VestingWalletFactory.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { MultiVestingWallets } from "./MultiVestingWallets.sol"; import { FrakAccessControlUpgradeable } from "../roles/FrakAccessControlUpgradeable.sol"; diff --git a/contracts/wallets/WalletMigrator.sol b/contracts/wallets/WalletMigrator.sol index 9a4d319..6594ab5 100644 --- a/contracts/wallets/WalletMigrator.sol +++ b/contracts/wallets/WalletMigrator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { IFrakToken } from "../tokens/IFrakToken.sol"; import { FraktionTokens } from "../fraktions/FraktionTokens.sol"; diff --git a/script/AddMaticToLiquidityPool.s.sol b/script/AddMaticToLiquidityPool.s.sol index 53a44dd..8ef1960 100644 --- a/script/AddMaticToLiquidityPool.s.sol +++ b/script/AddMaticToLiquidityPool.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/Script.sol"; import "forge-std/console.sol"; diff --git a/script/DeploySwapPool.s.sol b/script/DeploySwapPool.s.sol index cf192b7..37a0c72 100644 --- a/script/DeploySwapPool.s.sol +++ b/script/DeploySwapPool.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/Script.sol"; import "forge-std/console.sol"; diff --git a/script/DeployWalletMigrator.s.sol b/script/DeployWalletMigrator.s.sol index 7ac7e10..cc03de7 100644 --- a/script/DeployWalletMigrator.s.sol +++ b/script/DeployWalletMigrator.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/Script.sol"; import "forge-std/console.sol"; @@ -28,10 +28,10 @@ contract DeployWalletMigrator is UpgradeScript { { // Build the wallet migrator we will test return new WalletMigrator( - addresses.frakToken, - addresses.fraktionTokens, - addresses.rewarder, - addresses.contentPool, + addresses.frakToken, + addresses.fraktionTokens, + addresses.rewarder, + addresses.contentPool, addresses.referralPool ); } diff --git a/script/PerformMaticFrkSwap.s.sol b/script/PerformMaticFrkSwap.s.sol index 4bf0b48..ef7cfa4 100644 --- a/script/PerformMaticFrkSwap.s.sol +++ b/script/PerformMaticFrkSwap.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/Script.sol"; import "forge-std/console.sol"; diff --git a/script/RemoveLiquidityPoolPosition.s.sol b/script/RemoveLiquidityPoolPosition.s.sol index edb8b77..3d23708 100644 --- a/script/RemoveLiquidityPoolPosition.s.sol +++ b/script/RemoveLiquidityPoolPosition.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/Script.sol"; import "forge-std/console.sol"; diff --git a/script/UpdateAll.s.sol b/script/UpdateAll.s.sol index dd5afd9..f622478 100644 --- a/script/UpdateAll.s.sol +++ b/script/UpdateAll.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/Script.sol"; import { UpgradeScript } from "./utils/UpgradeScript.s.sol"; diff --git a/script/UpdateFeeReceiver.s.sol b/script/UpdateFeeReceiver.s.sol index 29502b5..344c9bc 100644 --- a/script/UpdateFeeReceiver.s.sol +++ b/script/UpdateFeeReceiver.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/Script.sol"; import { UpgradeScript } from "./utils/UpgradeScript.s.sol"; @@ -22,7 +22,7 @@ contract UpdateAllScript is UpgradeScript { // Get the frk labs & foundation address address labsWallet; address foundationWallet; - if(block.chainid == 137) { + if (block.chainid == 137) { labsWallet = 0x9d92de42aB5BbB59d6c39fdabB55B998c83Da97c; foundationWallet = 0x11D2fF1540F2c275EE199500320Af58a97E9Da33; } else { @@ -41,7 +41,14 @@ contract UpdateAllScript is UpgradeScript { } /// @dev Update every contracts - function _updateRewarderAndMinter(UpgradeScript.ContractProxyAddresses memory addresses, bytes memory rewarderUpdateData, bytes memory minterUpdateData) internal deployerBroadcast { + function _updateRewarderAndMinter( + UpgradeScript.ContractProxyAddresses memory addresses, + bytes memory rewarderUpdateData, + bytes memory minterUpdateData + ) + internal + deployerBroadcast + { // Deploy the new rewarder & minter Rewarder rewarder = new Rewarder(); Minter minter = new Minter(); diff --git a/script/UpdateToEip712Diamond.s.sol b/script/UpdateToEip712Diamond.s.sol index dc8cddd..b009d65 100644 --- a/script/UpdateToEip712Diamond.s.sol +++ b/script/UpdateToEip712Diamond.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/console.sol"; import "forge-std/Script.sol"; @@ -68,10 +68,10 @@ contract UpdateToEip712Diamond is UpgradeScript { { // Build the wallet migrator we will test return new WalletMigrator( - addresses.frakToken, - addresses.fraktionTokens, - addresses.rewarder, - addresses.contentPool, + addresses.frakToken, + addresses.fraktionTokens, + addresses.rewarder, + addresses.contentPool, addresses.referralPool ); } diff --git a/script/test/FakeReward.s.sol b/script/test/FakeReward.s.sol index ff1c7cc..1cc4939 100644 --- a/script/test/FakeReward.s.sol +++ b/script/test/FakeReward.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/Script.sol"; import { UpgradeScript } from "../utils/UpgradeScript.s.sol"; diff --git a/script/utils/DeployAllScript.s.sol b/script/utils/DeployAllScript.s.sol index a18c323..7d5e8d7 100644 --- a/script/utils/DeployAllScript.s.sol +++ b/script/utils/DeployAllScript.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { UpgradeScript } from "./UpgradeScript.s.sol"; import { FrakToken } from "contracts/tokens/FrakToken.sol"; diff --git a/script/utils/UpgradeScript.s.sol b/script/utils/UpgradeScript.s.sol index a036b02..4480464 100644 --- a/script/utils/UpgradeScript.s.sol +++ b/script/utils/UpgradeScript.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/console.sol"; import "forge-std/Script.sol"; diff --git a/test/FrakTest.sol b/test/FrakTest.sol index 05658e7..eeaf49a 100644 --- a/test/FrakTest.sol +++ b/test/FrakTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { ContentId } from "contracts/libs/ContentId.sol"; import { FraktionId } from "contracts/libs/FraktionId.sol"; diff --git a/test/fraktions/FraktionTokens.t.sol b/test/fraktions/FraktionTokens.t.sol index e266cfa..57157de 100644 --- a/test/fraktions/FraktionTokens.t.sol +++ b/test/fraktions/FraktionTokens.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../FrakTest.sol"; import { NotAuthorized, InvalidArray, InvalidSigner, PermitDelayExpired } from "contracts/utils/FrakErrors.sol"; diff --git a/test/minter/FraktionCostBadges.t.sol b/test/minter/FraktionCostBadges.t.sol index 3f37edc..ee5e7a5 100644 --- a/test/minter/FraktionCostBadges.t.sol +++ b/test/minter/FraktionCostBadges.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../FrakTest.sol"; import { InvalidFraktionType, NotAuthorized } from "contracts/utils/FrakErrors.sol"; diff --git a/test/minter/Minter.t.sol b/test/minter/Minter.t.sol index fdbb0f3..18e66af 100644 --- a/test/minter/Minter.t.sol +++ b/test/minter/Minter.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/console.sol"; import { FrakTest } from "../FrakTest.sol"; diff --git a/test/reward/RewarderConfig.t.sol b/test/reward/RewarderConfig.t.sol index 467c8fe..bd3b8d7 100644 --- a/test/reward/RewarderConfig.t.sol +++ b/test/reward/RewarderConfig.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../FrakTest.sol"; import { diff --git a/test/reward/RewarderPayment.t.sol b/test/reward/RewarderPayment.t.sol index ab12b36..5d77d67 100644 --- a/test/reward/RewarderPayment.t.sol +++ b/test/reward/RewarderPayment.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../FrakTest.sol"; import { NotAuthorized, InvalidAddress, NoReward, RewardTooLarge, InvalidArray } from "contracts/utils/FrakErrors.sol"; diff --git a/test/reward/pools/ContentPool.t.sol b/test/reward/pools/ContentPool.t.sol index 2e0049b..efdc38f 100644 --- a/test/reward/pools/ContentPool.t.sol +++ b/test/reward/pools/ContentPool.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../../FrakTest.sol"; import { NotAuthorized, InvalidAddress, NoReward, RewardTooLarge, InvalidArray } from "contracts/utils/FrakErrors.sol"; diff --git a/test/reward/pools/ReferralPool.t.sol b/test/reward/pools/ReferralPool.t.sol index f4c6f48..dfa9038 100644 --- a/test/reward/pools/ReferralPool.t.sol +++ b/test/reward/pools/ReferralPool.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../../FrakTest.sol"; import { NotAuthorized, InvalidAddress, NoReward, RewardTooLarge, InvalidArray } from "contracts/utils/FrakErrors.sol"; diff --git a/test/tokens/FrakToken.t.sol b/test/tokens/FrakToken.t.sol index 030a4bd..ce56b09 100644 --- a/test/tokens/FrakToken.t.sol +++ b/test/tokens/FrakToken.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../FrakTest.sol"; import { NotAuthorized, PermitDelayExpired, InvalidSigner } from "contracts/utils/FrakErrors.sol"; diff --git a/test/wallets/FrakTeasuryWallet.t.sol b/test/wallets/FrakTeasuryWallet.t.sol index 2cad62a..8a625c3 100644 --- a/test/wallets/FrakTeasuryWallet.t.sol +++ b/test/wallets/FrakTeasuryWallet.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../FrakTest.sol"; import { NotAuthorized, InvalidAddress, NoReward, RewardTooLarge, InvalidArray } from "contracts/utils/FrakErrors.sol"; diff --git a/test/wallets/MultiVestingWallets.t.sol b/test/wallets/MultiVestingWallets.t.sol index d3354b7..1bbda67 100644 --- a/test/wallets/MultiVestingWallets.t.sol +++ b/test/wallets/MultiVestingWallets.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../FrakTest.sol"; import { NotAuthorized, InvalidArray, InvalidAddress, NoReward, RewardTooLarge } from "contracts/utils/FrakErrors.sol"; diff --git a/test/wallets/VestingWalletFactory.t.sol b/test/wallets/VestingWalletFactory.t.sol index e3ed207..fd74dd6 100644 --- a/test/wallets/VestingWalletFactory.t.sol +++ b/test/wallets/VestingWalletFactory.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import { FrakTest } from "../FrakTest.sol"; import { NotAuthorized, InvalidAddress, NoReward, RewardTooLarge, InvalidArray } from "contracts/utils/FrakErrors.sol"; diff --git a/test/wallets/WalletMigrator.t.sol b/test/wallets/WalletMigrator.t.sol index 10f42bf..2708074 100644 --- a/test/wallets/WalletMigrator.t.sol +++ b/test/wallets/WalletMigrator.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity ^0.8.0; import "forge-std/console.sol"; import { FrakTest } from "../FrakTest.sol"; @@ -22,11 +22,7 @@ contract WalletMigratorTest is FrakTest { // Build the wallet migrator we will test walletMigrator = new WalletMigrator( - address(frakToken), - address(fraktionTokens), - address(rewarder), - address(contentPool), - address(referralPool) + address(frakToken), address(fraktionTokens), address(rewarder), address(contentPool), address(referralPool) ); }