Remove deprecated variables (storyprotocol#19)

kingster-will · Jan 31, 2025 · 6298953 · 6298953
1 parent ce3cbc9
commit 6298953
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/contracts/modules/royalty/policies/IpRoyaltyVault.sol b/contracts/modules/royalty/policies/IpRoyaltyVault.sol
@@ -26,23 +26,13 @@ contract IpRoyaltyVault is IIpRoyaltyVault, ERC20Upgradeable, ReentrancyGuardUpg
 
     /// @dev Storage structure for the IpRoyaltyVault
     /// @param ipId The ip id to whom this royalty vault belongs to
-    /// @param lastSnapshotTimestamp [DEPRECATED] The last snapshotted timestamp
-    /// @param pendingVaultAmount [DEPRECATED] Amount of revenue token pending to be snapshotted
-    /// @param claimVaultAmount [DEPRECATED] Amount of revenue token in the claim vault
-    /// @param claimableAtSnapshot [DEPRECATED] Amount of revenue token claimable at a given snapshot
-    /// @param isClaimedAtSnapshot [DEPRECATED] Indicates whether the claimer has claimed the token at a given snapshot
     /// @param tokens The list of revenue tokens in the vault
     /// @param vaultAccBalances The accumulated balance of revenue tokens in the vault
     /// @param claimerRevenueDebt The revenue debt of the claimer, used to calculate the claimable revenue,
     /// positive value means claimed need to deducted, negative value means claimable from vault
     /// @custom:storage-location erc7201:story-protocol.IpRoyaltyVault
     struct IpRoyaltyVaultStorage {
         address ipId;
-        uint40 lastSnapshotTimestamp;
-        mapping(address token => uint256 amount) pendingVaultAmount;
-        mapping(address token => uint256 amount) claimVaultAmount;
-        mapping(uint256 snapshotId => mapping(address token => uint256 amount)) claimableAtSnapshot;
-        mapping(uint256 snapshotId => mapping(address claimer => mapping(address token => bool))) isClaimedAtSnapshot;
         EnumerableSet.AddressSet tokens;
         mapping(address token => uint256 accBalance) vaultAccBalances;
         mapping(address token => mapping(address claimer => int256 revenueDebt)) claimerRevenueDebt;

diff --git a/contracts/modules/royalty/policies/VaultController.sol b/contracts/modules/royalty/policies/VaultController.sol
@@ -12,11 +12,9 @@ import { Errors } from "../../../lib/Errors.sol";
 abstract contract VaultController is IVaultController, ProtocolPausableUpgradeable {
     /// @dev Storage structure for the VaultController
     /// @param ipRoyaltyVaultBeacon The ip royalty vault beacon address
-    /// @param snapshotInterval [DEPRECATED] The minimum timestamp interval between snapshots
     /// @custom:storage-location erc7201:story-protocol.VaultController
     struct VaultControllerStorage {
         address ipRoyaltyVaultBeacon;
-        uint256 snapshotInterval;
     }
 
     // keccak256(abi.encode(uint256(keccak256("story-protocol.VaultController")) - 1)) & ~bytes32(uint256(0xff));