Remove storage migration

Snowfork · Aug 29, 2024 · 64b9ef4 · 64b9ef4
1 parent 84bb52c
commit 64b9ef4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 86 deletions.
diff --git a/contracts/src/storage/AssetsStorage.sol b/contracts/src/storage/AssetsStorage.sol
@@ -6,6 +6,8 @@ import {TokenInfo, ParaID} from "../Types.sol";
 
 library AssetsStorage {
     struct Layout {
+        // Native token registry by token address
+        mapping(address token => TokenInfo) tokenRegistry;
         address assetHubAgent;
         ParaID assetHubParaID;
         // XCM fee charged by AssetHub for registering a token (DOT)
@@ -14,12 +16,11 @@ library AssetsStorage {
         uint128 assetHubReserveTransferFee;
         // Extra fee for registering a token, to discourage spamming (Ether)
         uint256 registerTokenFee;
-        // Token registry by token address
-        mapping(address token => TokenInfo) tokenRegistry;
+        // Foreign token registry by token ID
         mapping(bytes32 foreignID => address) tokenAddressOf;
     }
 
-    bytes32 internal constant SLOT = keccak256("org.snowbridge.storage.assets.v2");
+    bytes32 internal constant SLOT = keccak256("org.snowbridge.storage.assets");
 
     function layout() internal pure returns (Layout storage $) {
         bytes32 slot = SLOT;

diff --git a/contracts/src/storage/LegacyAssetsStorage.sol b/contracts/src/storage/LegacyAssetsStorage.sol
diff --git a/contracts/src/upgrades/rococo/GatewayWithAssetStorageV2.sol b/contracts/src/upgrades/rococo/GatewayWithAssetStorageV2.sol