Thunder Loan

AI First Flight #7
Beginner FriendlyFoundryDeFiOracle
EXP
View results
Submission Details
Severity: high
Valid

Storage layout collision on upgrade to ThunderLoanUpgraded corrupts s_flashLoanFee and s_currentlyFlashLoaning, breaking fee accounting

Root + Impact

Description

ThunderLoan is a UUPS-upgradeable proxy, so an upgrade MUST preserve the storage slot layout of the declared state variables in order. The documented upgrade target ThunderLoanUpgraded changes that layout.

Original ThunderLoan (protocol-declared slots, in order):

mapping(IERC20 => AssetToken) public s_tokenToAssetToken; // slot N
uint256 private s_feePrecision; // slot N+1
uint256 private s_flashLoanFee; // slot N+2
mapping(IERC20 => bool) private s_currentlyFlashLoaning; // slot N+3

Upgraded ThunderLoanUpgraded:

mapping(IERC20 => AssetToken) public s_tokenToAssetToken; // slot N
@> uint256 private s_flashLoanFee; // slot N+1 (was s_feePrecision!)
uint256 public constant FEE_PRECISION = 1e18; // constant: NO storage slot
mapping(IERC20 => bool) private s_currentlyFlashLoaning; // slot N+2 (shifted up)

By removing s_feePrecision and turning the precision into a constant, every later variable shifts up one slot. After the upgrade:

  • s_flashLoanFee now reads slot N+1, which still holds the OLD s_feePrecision value (1e18). The fee jumps from 3e15 (0.3%) to 1e18.

  • s_currentlyFlashLoaning now maps over slot N+2 (the old s_flashLoanFee), corrupting the flash-loan-in-progress accounting.

Risk

Likelihood: High - occurs deterministically the moment the documented ThunderLoan -> ThunderLoanUpgraded upgrade is performed.

Impact: High - fee accounting is corrupted (getFee() returns 1e18 instead of 3e15), flash-loan fees become nonsensical, and the currentlyFlashLoaning guard reads the wrong slot. Core economic invariants break.

Proof of Concept

Record the fee, perform the upgrade, read the fee again - it changes from 3e15 to 1e18. Runnable Foundry test (extend the repo's BaseTest):

import { ThunderLoanUpgraded } from "../../src/upgradedProtocol/ThunderLoanUpgraded.sol";
function test_PoC_storageCollisionOnUpgrade() public {
uint256 feeBefore = thunderLoan.getFee();
// perform the documented upgrade
ThunderLoanUpgraded upgraded = new ThunderLoanUpgraded();
thunderLoan.upgradeToAndCall(address(upgraded), "");
uint256 feeAfter = ThunderLoanUpgraded(address(thunderLoan)).getFee();
// fee is corrupted: it now reads the old s_feePrecision slot
assertEq(feeBefore, 3e15);
assertEq(feeAfter, 1e18);
assert(feeBefore != feeAfter);
}

Run forge test --mt test_PoC_storageCollisionOnUpgrade -vv; it passes, showing the fee jumps from 3e15 to 1e18 purely from the upgrade.

Recommended Mitigation

Preserve the exact storage layout across the upgrade. Keep s_feePrecision as a storage variable in its original slot rather than converting it to a constant; only append new variables at the end:

contract ThunderLoanUpgraded is ... {
mapping(IERC20 => AssetToken) public s_tokenToAssetToken;
- uint256 private s_flashLoanFee;
- uint256 public constant FEE_PRECISION = 1e18;
+ uint256 private s_feePrecision; // keep original slot N+1
+ uint256 private s_flashLoanFee; // keep original slot N+2
mapping(IERC20 token => bool currentlyFlashLoaning) private s_currentlyFlashLoaning;
}

If the precision must become a constant, reserve the slot with a storage gap so downstream variables do not shift.

Updates

Lead Judging Commences

ai-first-flight-judge Lead Judge about 4 hours ago
Submission Judgement Published
Validated
Assigned finding tags:

[H-01] Storage Collision during upgrade

## Description The thunderloanupgrade.sol storage layout is not compatible with the storage layout of thunderloan.sol which will cause storage collision and mismatch of variable to different data. ## Vulnerability Details Thunderloan.sol at slot 1,2 and 3 holds s_feePrecision, s_flashLoanFee and s_currentlyFlashLoaning, respectively, but the ThunderLoanUpgraded at slot 1 and 2 holds s_flashLoanFee, s_currentlyFlashLoaning respectively. the s_feePrecision from the thunderloan.sol was changed to a constant variable which will no longer be assessed from the state variable. This will cause the location at which the upgraded version will be pointing to for some significant state variables like s_flashLoanFee to be wrong because s_flashLoanFee is now pointing to the slot of the s_feePrecision in the thunderloan.sol and when this fee is used to compute the fee for flashloan it will return a fee amount greater than the intention of the developer. s_currentlyFlashLoaning might not really be affected as it is back to default when a flashloan is completed but still to be noted that the value at that slot can be cleared to be on a safer side. ## Impact 1. Fee is miscalculated for flashloan 1. users pay same amount of what they borrowed as fee ## POC 2 ``` function testFlashLoanAfterUpgrade() public setAllowedToken hasDeposits { //upgrade thunderloan upgradeThunderloan(); uint256 amountToBorrow = AMOUNT * 10; console.log("amount flashloaned", amountToBorrow); uint256 calculatedFee = thunderLoan.getCalculatedFee( tokenA, amountToBorrow ); AssetToken assetToken = thunderLoan.getAssetFromToken(tokenA); vm.startPrank(user); tokenA.mint(address(mockFlashLoanReceiver), amountToBorrow); thunderLoan.flashloan( address(mockFlashLoanReceiver), tokenA, amountToBorrow, "" ); vm.stopPrank(); console.log("feepaid", calculatedFee); assertEq(amountToBorrow, calculatedFee); } ``` Add the code above to thunderloantest.t.sol and run `forge test --mt testFlashLoanAfterUpgrade -vv` to test for the second poc ## Recommendations The team should should make sure the the fee is pointing to the correct location as intended by the developer: a suggestion recommendation is for the team to get the feeValue from the previous implementation, clear the values that will not be needed again and after upgrade reset the fee back to its previous value from the implementation. ##POC for recommendation ``` // function upgradeThunderloanFixed() internal { thunderLoanUpgraded = new ThunderLoanUpgraded(); //getting the current fee; uint fee = thunderLoan.getFee(); // clear the fee as thunderLoan.updateFlashLoanFee(0); // upgrade to the new implementation thunderLoan.upgradeTo(address(thunderLoanUpgraded)); //wrapped the abi thunderLoanUpgraded = ThunderLoanUpgraded(address(proxy)); // set the fee back to the correct value thunderLoanUpgraded.updateFlashLoanFee(fee); } function testSlotValuesFixedfterUpgrade() public setAllowedToken { AssetToken asset = thunderLoan.getAssetFromToken(tokenA); uint precision = thunderLoan.getFeePrecision(); uint fee = thunderLoan.getFee(); bool isflanshloaning = thunderLoan.isCurrentlyFlashLoaning(tokenA); /// 4 slots before upgrade console.log("????SLOTS VALUE BEFORE UPGRADE????"); console.log("slot 0 for s_tokenToAssetToken =>", address(asset)); console.log("slot 1 for s_feePrecision =>", precision); console.log("slot 2 for s_flashLoanFee =>", fee); console.log("slot 3 for s_currentlyFlashLoaning =>", isflanshloaning); //upgrade function upgradeThunderloanFixed(); //// after upgrade they are only 3 valid slot left because precision is now set to constant AssetToken assetUpgrade = thunderLoan.getAssetFromToken(tokenA); uint feeUpgrade = thunderLoan.getFee(); bool isflanshloaningUpgrade = thunderLoan.isCurrentlyFlashLoaning( tokenA ); console.log("????SLOTS VALUE After UPGRADE????"); console.log("slot 0 for s_tokenToAssetToken =>", address(assetUpgrade)); console.log("slot 1 for s_flashLoanFee =>", feeUpgrade); console.log( "slot 2 for s_currentlyFlashLoaning =>", isflanshloaningUpgrade ); assertEq(address(asset), address(assetUpgrade)); //asserting precision value before upgrade to be what fee takes after upgrades assertEq(fee, feeUpgrade); // #POC assertEq(isflanshloaning, isflanshloaningUpgrade); } ``` Add the code above to thunderloantest.t.sol and run with `forge test --mt testSlotValuesFixedfterUpgrade -vv`. it can also be tested with `testFlashLoanAfterUpgrade function` and see the fee properly calculated for flashloan

Support

FAQs

Can't find an answer? Chat with us on Discord, Twitter or Linkedin.

Give us feedback!