merge in dev

CheyenneAtapour · CheyenneAtapour · commit 754a4a548ffb · 2026-02-06T15:42:28.000-08:00
diff --git a/snapshots/NativeTokenGateway.Operations.json b/snapshots/NativeTokenGateway.Operations.json
@@ -1,8 +1,8 @@
 {
-  "borrowNative": "225854",
-  "repayNative": "164373",
-  "supplyAsCollateralNative": "159402",
-  "supplyNative": "135195",
-  "withdrawNative: full": "124808",
-  "withdrawNative: partial": "135810"
+  "borrowNative": "225898",
+  "repayNative": "164439",
+  "supplyAsCollateralNative": "159468",
+  "supplyNative": "135230",
+  "withdrawNative: full": "124826",
+  "withdrawNative: partial": "135832"
 }
diff --git a/snapshots/SignatureGateway.Operations.json b/snapshots/SignatureGateway.Operations.json
@@ -1,10 +1,10 @@
 {
-  "borrowWithSig": "213087",
-  "repayWithSig": "184645",
+  "borrowWithSig": "213131",
+  "repayWithSig": "184711",
   "setSelfAsUserPositionManagerWithSig": "75385",
-  "setUsingAsCollateralWithSig": "85365",
-  "supplyWithSig": "151427",
-  "updateUserDynamicConfigWithSig": "63098",
-  "updateUserRiskPremiumWithSig": "62068",
-  "withdrawWithSig": "130063"
+  "setUsingAsCollateralWithSig": "85387",
+  "supplyWithSig": "151462",
+  "updateUserDynamicConfigWithSig": "63120",
+  "updateUserRiskPremiumWithSig": "62090",
+  "withdrawWithSig": "130080"
 }
diff --git a/snapshots/Spoke.Getters.json b/snapshots/Spoke.Getters.json
@@ -1,7 +1,7 @@
 {
-  "getUserAccountData: supplies: 0, borrows: 0": "12992",
-  "getUserAccountData: supplies: 1, borrows: 0": "49194",
-  "getUserAccountData: supplies: 2, borrows: 0": "80660",
-  "getUserAccountData: supplies: 2, borrows: 1": "101176",
-  "getUserAccountData: supplies: 2, borrows: 2": "120523"
+  "getUserAccountData: supplies: 0, borrows: 0": "13014",
+  "getUserAccountData: supplies: 1, borrows: 0": "49216",
+  "getUserAccountData: supplies: 2, borrows: 0": "80682",
+  "getUserAccountData: supplies: 2, borrows: 1": "101198",
+  "getUserAccountData: supplies: 2, borrows: 2": "120545"
 }
diff --git a/snapshots/Spoke.Operations.ZeroRiskPremium.json b/snapshots/Spoke.Operations.ZeroRiskPremium.json
@@ -1,31 +1,31 @@
 {
-  "borrow: first": "202616",
-  "borrow: second action, same reserve": "182482",
-  "liquidationCall (receiveShares): full": "313835",
-  "liquidationCall (receiveShares): partial": "313253",
-  "liquidationCall (reportDeficit): full": "376047",
-  "liquidationCall: full": "330557",
-  "liquidationCall: partial": "329975",
-  "permitReserve + repay (multicall)": "162413",
-  "permitReserve + supply (multicall)": "146047",
-  "permitReserve + supply + enable collateral (multicall)": "160476",
-  "repay: full": "121773",
-  "repay: partial": "126731",
+  "borrow: first": "202638",
+  "borrow: second action, same reserve": "182504",
+  "liquidationCall (receiveShares): full": "313857",
+  "liquidationCall (receiveShares): partial": "313275",
+  "liquidationCall (reportDeficit): full": "376069",
+  "liquidationCall: full": "330579",
+  "liquidationCall: partial": "329997",
+  "permitReserve + repay (multicall)": "162457",
+  "permitReserve + supply (multicall)": "146091",
+  "permitReserve + supply + enable collateral (multicall)": "160542",
+  "repay: full": "121795",
+  "repay: partial": "126753",
   "setUserPositionManagersWithSig: disable": "47039",
   "setUserPositionManagersWithSig: enable": "68951",
-  "supply + enable collateral (multicall)": "140678",
-  "supply: 0 borrows, collateral disabled": "122159",
-  "supply: 0 borrows, collateral enabled": "105130",
-  "supply: second action, same reserve": "105059",
-  "updateUserDynamicConfig: 1 collateral": "74523",
-  "updateUserDynamicConfig: 2 collaterals": "89391",
-  "updateUserRiskPremium: 1 borrow": "95589",
-  "updateUserRiskPremium: 2 borrows": "106052",
-  "usingAsCollateral: 0 borrows, enable": "59594",
-  "usingAsCollateral: 1 borrow, disable": "105633",
-  "usingAsCollateral: 1 borrow, enable": "42482",
-  "usingAsCollateral: 2 borrows, disable": "127269",
-  "usingAsCollateral: 2 borrows, enable": "42494",
+  "supply + enable collateral (multicall)": "140744",
+  "supply: 0 borrows, collateral disabled": "122181",
+  "supply: 0 borrows, collateral enabled": "105152",
+  "supply: second action, same reserve": "105081",
+  "updateUserDynamicConfig: 1 collateral": "74545",
+  "updateUserDynamicConfig: 2 collaterals": "89413",
+  "updateUserRiskPremium: 1 borrow": "95611",
+  "updateUserRiskPremium: 2 borrows": "106074",
+  "usingAsCollateral: 0 borrows, enable": "59616",
+  "usingAsCollateral: 1 borrow, disable": "105655",
+  "usingAsCollateral: 1 borrow, enable": "42504",
+  "usingAsCollateral: 2 borrows, disable": "127291",
+  "usingAsCollateral: 2 borrows, enable": "42516",
   "withdraw: 0 borrows, full": "126526",
   "withdraw: 0 borrows, partial": "131727",
   "withdraw: 1 borrow, partial": "158430",
diff --git a/snapshots/Spoke.Operations.json b/snapshots/Spoke.Operations.json
@@ -1,31 +1,31 @@
 {
-  "borrow: first": "271122",
-  "borrow: second action, same reserve": "213988",
-  "liquidationCall (receiveShares): full": "345450",
-  "liquidationCall (receiveShares): partial": "344868",
-  "liquidationCall (reportDeficit): full": "370664",
-  "liquidationCall: full": "362172",
-  "liquidationCall: partial": "361590",
-  "permitReserve + repay (multicall)": "160314",
-  "permitReserve + supply (multicall)": "146047",
-  "permitReserve + supply + enable collateral (multicall)": "160476",
-  "repay: full": "115852",
-  "repay: partial": "135210",
+  "borrow: first": "271144",
+  "borrow: second action, same reserve": "214010",
+  "liquidationCall (receiveShares): full": "345472",
+  "liquidationCall (receiveShares): partial": "344890",
+  "liquidationCall (reportDeficit): full": "370686",
+  "liquidationCall: full": "362194",
+  "liquidationCall: partial": "361612",
+  "permitReserve + repay (multicall)": "160349",
+  "permitReserve + supply (multicall)": "146091",
+  "permitReserve + supply + enable collateral (multicall)": "160542",
+  "repay: full": "115874",
+  "repay: partial": "135232",
   "setUserPositionManagersWithSig: disable": "47039",
   "setUserPositionManagersWithSig: enable": "68951",
-  "supply + enable collateral (multicall)": "140678",
-  "supply: 0 borrows, collateral disabled": "122159",
-  "supply: 0 borrows, collateral enabled": "105130",
-  "supply: second action, same reserve": "105059",
-  "updateUserDynamicConfig: 1 collateral": "74523",
-  "updateUserDynamicConfig: 2 collaterals": "89391",
-  "updateUserRiskPremium: 1 borrow": "158302",
-  "updateUserRiskPremium: 2 borrows": "218701",
-  "usingAsCollateral: 0 borrows, enable": "59594",
-  "usingAsCollateral: 1 borrow, disable": "168343",
-  "usingAsCollateral: 1 borrow, enable": "42482",
-  "usingAsCollateral: 2 borrows, disable": "247914",
-  "usingAsCollateral: 2 borrows, enable": "42494",
+  "supply + enable collateral (multicall)": "140744",
+  "supply: 0 borrows, collateral disabled": "122181",
+  "supply: 0 borrows, collateral enabled": "105152",
+  "supply: second action, same reserve": "105081",
+  "updateUserDynamicConfig: 1 collateral": "74545",
+  "updateUserDynamicConfig: 2 collaterals": "89413",
+  "updateUserRiskPremium: 1 borrow": "158324",
+  "updateUserRiskPremium: 2 borrows": "218723",
+  "usingAsCollateral: 0 borrows, enable": "59616",
+  "usingAsCollateral: 1 borrow, disable": "168365",
+  "usingAsCollateral: 1 borrow, enable": "42504",
+  "usingAsCollateral: 2 borrows, disable": "247936",
+  "usingAsCollateral: 2 borrows, enable": "42516",
   "withdraw: 0 borrows, full": "126526",
   "withdraw: 0 borrows, partial": "131727",
   "withdraw: 1 borrow, partial": "218638",
diff --git a/src/spoke/Spoke.sol b/src/spoke/Spoke.sol
@@ -128,20 +128,20 @@ abstract contract Spoke is
   ) external restricted returns (uint256) {
     require(hub != address(0), InvalidAddress());
     require(assetId <= MAX_ALLOWED_ASSET_ID, InvalidAssetId());
-    require(!_reserveExists[hub][assetId], ReserveExists());
-    _reserveExists[hub][assetId] = true;
+    require(!_isAssetIdListed(hub, assetId, _hubAssetIdToReserveId[hub][assetId]), ReserveExists());
 
     _validateReserveConfig(config);
     _validateDynamicReserveConfig(dynamicConfig);
     uint256 reserveId = _reserveCount++;
-    uint32 dynamicConfigKey; // 0 as first key to use
+    _hubAssetIdToReserveId[hub][assetId] = reserveId;
 
     (address underlying, uint8 decimals) = IHubBase(hub).getAssetUnderlyingAndDecimals(assetId);
     require(underlying != address(0), AssetNotListed());
     require(decimals <= WadRayMath.WAD_DECIMALS, InvalidAssetDecimals());
 
     _updateReservePriceSource(reserveId, priceSource);
 
+    uint32 dynamicConfigKey; // 0 as first key to use
     _reserves[reserveId] = Reserve({
       underlying: underlying,
       hub: IHubBase(hub),
@@ -527,6 +527,13 @@ abstract contract Spoke is
     return reserve.hub.getSpokeTotalOwed(reserve.assetId, address(this));
   }
 
+  /// @inheritdoc ISpoke
+  function getReserveId(address hub, uint256 assetId) external view returns (uint256) {
+    uint256 reserveId = _hubAssetIdToReserveId[hub][assetId];
+    require(_isAssetIdListed(hub, assetId, reserveId), ReserveNotListed());
+    return reserveId;
+  }
+
   /// @inheritdoc ISpoke
   function getReserve(uint256 reserveId) external view returns (Reserve memory) {
     return _reserves.get(reserveId);
@@ -891,6 +898,14 @@ abstract contract Spoke is
     }
   }
 
+  function _isAssetIdListed(
+    address hub,
+    uint256 assetId,
+    uint256 reserveId
+  ) internal view returns (bool) {
+    return _reserves[reserveId].assetId == assetId && address(_reserves[reserveId].hub) == hub;
+  }
+
   /// @notice Returns whether `manager` is active & approved positionManager for `user`.
   function _isPositionManager(address user, address manager) internal view returns (bool) {
     if (user == manager) return true;
diff --git a/src/spoke/SpokeStorage.sol b/src/spoke/SpokeStorage.sol
@@ -18,8 +18,9 @@ abstract contract SpokeStorage {
   /// @dev Map of reserve identifiers to their Reserve data.
   mapping(uint256 reserveId => ISpoke.Reserve) internal _reserves;
 
-  /// @dev Map of hub addresses and asset identifiers to whether the reserve exists.
-  mapping(address hub => mapping(uint256 assetId => bool)) internal _reserveExists;
+  /// @dev Map of hub addresses and asset identifiers to the reserve identifier.
+  mapping(address hub => mapping(uint256 assetId => uint256 reserveId))
+    internal _hubAssetIdToReserveId;
 
   /// @dev Map of reserve identifiers and dynamic configuration keys to the dynamic configuration data.
   mapping(uint256 reserveId => mapping(uint32 dynamicConfigKey => ISpoke.DynamicReserveConfig))
diff --git a/src/spoke/interfaces/ISpoke.sol b/src/spoke/interfaces/ISpoke.sol
@@ -462,6 +462,13 @@ interface ISpoke is ISpokeBase, IAccessManaged, IIntentConsumer, IExtSload, IMul
   /// @dev Count includes reserves that are not currently active.
   function getReserveCount() external view returns (uint256);
 
+  /// @notice Returns the reserve identifier for a given assetId in a Hub.
+  /// @dev It reverts if no reserve is associated with the given assetId.
+  /// @param hub The address of the Hub.
+  /// @param assetId The identifier of the asset on the Hub.
+  /// @return The identifier of the reserve.
+  function getReserveId(address hub, uint256 assetId) external view returns (uint256);
+
   /// @notice Returns the reserve struct data in storage.
   /// @dev It reverts if the reserve associated with the given reserve identifier is not listed.
   /// @param reserveId The identifier of the reserve.
diff --git a/tests/unit/Spoke/Spoke.Config.t.sol b/tests/unit/Spoke/Spoke.Config.t.sol
@@ -173,6 +173,7 @@ contract SpokeConfigTest is SpokeBase {
 
     assertEq(spoke1.getReserveConfig(reserveId), newReserveConfig);
     assertEq(_getLatestDynamicReserveConfig(spoke1, reserveId), newDynReserveConfig);
+    assertEq(spoke1.getReserveId(address(hub1), usdzAssetId), reserveId);
   }
 
   function test_addReserve_fuzz_revertsWith_AssetNotListed() public {
@@ -300,6 +301,110 @@ contract SpokeConfigTest is SpokeBase {
     );
   }
 
+  function test_getReserveId_fuzz(uint256 reserveId) public view {
+    reserveId = bound(reserveId, 0, spoke1.getReserveCount() - 1);
+    uint256 assetId = spoke1.getReserve(reserveId).assetId;
+
+    uint256 returnedId = spoke1.getReserveId(address(hub1), assetId);
+    assertEq(returnedId, getReserveIdByAssetId(spoke1, hub1, assetId));
+  }
+
+  function test_getReserveId_fuzz_multipleHubs(uint256 reserveId) public {
+    (IHub hub2, ) = hub2Fixture();
+    (IHub hub3, ) = hub3Fixture();
+
+    vm.startPrank(ADMIN);
+    spoke1.addReserve(
+      address(hub2),
+      0,
+      _deployMockPriceFeed(spoke1, 2000e8),
+      spokeInfo[spoke1].weth.reserveConfig,
+      spokeInfo[spoke1].weth.dynReserveConfig
+    );
+    spoke1.addReserve(
+      address(hub2),
+      1,
+      _deployMockPriceFeed(spoke1, 2000e8),
+      spokeInfo[spoke1].usdx.reserveConfig,
+      spokeInfo[spoke1].usdx.dynReserveConfig
+    );
+    spoke1.addReserve(
+      address(hub2),
+      2,
+      _deployMockPriceFeed(spoke1, 2000e8),
+      spokeInfo[spoke1].dai.reserveConfig,
+      spokeInfo[spoke1].dai.dynReserveConfig
+    );
+    spoke1.addReserve(
+      address(hub2),
+      3,
+      _deployMockPriceFeed(spoke1, 2000e8),
+      spokeInfo[spoke1].wbtc.reserveConfig,
+      spokeInfo[spoke1].wbtc.dynReserveConfig
+    );
+
+    spoke1.addReserve(
+      address(hub3),
+      0,
+      _deployMockPriceFeed(spoke1, 2000e8),
+      spokeInfo[spoke1].dai.reserveConfig,
+      spokeInfo[spoke1].dai.dynReserveConfig
+    );
+    spoke1.addReserve(
+      address(hub3),
+      1,
+      _deployMockPriceFeed(spoke1, 2000e8),
+      spokeInfo[spoke1].usdx.reserveConfig,
+      spokeInfo[spoke1].usdx.dynReserveConfig
+    );
+    spoke1.addReserve(
+      address(hub3),
+      2,
+      _deployMockPriceFeed(spoke1, 2000e8),
+      spokeInfo[spoke1].wbtc.reserveConfig,
+      spokeInfo[spoke1].wbtc.dynReserveConfig
+    );
+    spoke1.addReserve(
+      address(hub3),
+      3,
+      _deployMockPriceFeed(spoke1, 2000e8),
+      spokeInfo[spoke1].weth.reserveConfig,
+      spokeInfo[spoke1].weth.dynReserveConfig
+    );
+
+    IHub.SpokeConfig memory spokeConfig = IHub.SpokeConfig({
+      active: true,
+      halted: false,
+      addCap: Constants.MAX_ALLOWED_SPOKE_CAP,
+      drawCap: Constants.MAX_ALLOWED_SPOKE_CAP,
+      riskPremiumThreshold: Constants.MAX_ALLOWED_COLLATERAL_RISK
+    });
+
+    hub2.addSpoke(0, address(spoke1), spokeConfig);
+    hub2.addSpoke(1, address(spoke1), spokeConfig);
+    hub2.addSpoke(2, address(spoke1), spokeConfig);
+    hub2.addSpoke(3, address(spoke1), spokeConfig);
+
+    hub3.addSpoke(0, address(spoke1), spokeConfig);
+    hub3.addSpoke(1, address(spoke1), spokeConfig);
+    hub3.addSpoke(2, address(spoke1), spokeConfig);
+    hub3.addSpoke(3, address(spoke1), spokeConfig);
+    vm.stopPrank();
+
+    reserveId = bound(reserveId, 0, spoke1.getReserveCount() - 1);
+    uint256 assetId = spoke1.getReserve(reserveId).assetId;
+    address hub = address(spoke1.getReserve(reserveId).hub);
+
+    uint256 returnedId = spoke1.getReserveId(hub, assetId);
+    assertEq(returnedId, getReserveIdByAssetId(spoke1, IHub(hub), assetId));
+  }
+
+  function test_getReserveId_fuzz_revertsWith_ReserveNotListed(uint256 assetId) public {
+    assetId = bound(assetId, hub1.getAssetCount(), UINT256_MAX);
+    vm.expectRevert(ISpoke.ReserveNotListed.selector, address(spoke1));
+    spoke1.getReserveId(address(hub1), assetId);
+  }
+
   function test_updateLiquidationConfig_targetHealthFactor() public {
     uint128 newTargetHealthFactor = HEALTH_FACTOR_LIQUIDATION_THRESHOLD + 1;
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`		`- "getUserAccountData: supplies: 0, borrows: 0": "12992",`
`3`		`- "getUserAccountData: supplies: 1, borrows: 0": "49194",`
`4`		`- "getUserAccountData: supplies: 2, borrows: 0": "80660",`
`5`		`- "getUserAccountData: supplies: 2, borrows: 1": "101176",`
`6`		`- "getUserAccountData: supplies: 2, borrows: 2": "120523"`
	`2`	`+ "getUserAccountData: supplies: 0, borrows: 0": "13014",`
	`3`	`+ "getUserAccountData: supplies: 1, borrows: 0": "49216",`
	`4`	`+ "getUserAccountData: supplies: 2, borrows: 0": "80682",`
	`5`	`+ "getUserAccountData: supplies: 2, borrows: 1": "101198",`
	`6`	`+ "getUserAccountData: supplies: 2, borrows: 2": "120545"`
`7`	`7`	`}`