OFT v1.1.0 upgrade #101

pegahcarter · 2025-08-04T20:19:24Z

This PR merges:

into one single audit-able branch. The goal here is to separate the concerns across PRs and then combine when each is deemed sufficient. In addition, this PR provides the mainnet upgrade scripts used, which also require an audit.

* feat: FraxOFTMintableAdapterUpgradeable with script * fix: recover() * feat: build comptroller addMinter txs * wip: test * test: passing send, receive for (s)frxUSD, fpi * refactor: label fraxtal script, rm wfrax * feat: init 1b * chore: rm 1b for later * feat: track supply * feedback * feat: initialTotalSupply * fix: reset totalTransferX when setting initialSupply * refactor: upgrade to v110 dir

* feat: frxUsd compliance * fix: _disableInitializers() * refactor: optimize for verkle * chore: init v1.1.0 scripts * refactor: mv modules to dir * refactor: frozen array, error * test: FrxUSDOFTUpgradeable coverage * refactor: always passing freeze/thaw

* feat: EIP3009Module, PermitModule * build: update * build: pnpm up * feat: support eip 712 in OFT * test: permit works * refactor: public cancelAuthorization() * test: add hashing for authorization * fix: compile * test: authorization coverage * feat: view of nonce use * test: coverage * feat: eip2619, 3009 to all OFTs * refactor: SignatureChecker in 712, 2612 supports 1271 * refactor: SignatureModule * chore: build * feat: format file

tom2o17

LGTM

Couple of nit comments.

I also ran into a VM issue with snapshotState() when

rm -rf node_modules
pnpm i 
forge build

but that might be a me issue

tom2o17 · 2025-08-15T18:29:15Z

contracts/FraxOFTAdapterUpgradeable.sol

-        major = 1;
-        minor = 0;
-        patch = 1;
+    function version() public pure returns (string memory) {


Nit: Personally prefer the old convention but defer to you

I converted this to a string so that signatures can utilize the version of the contract:

frax-oft-upgradeable/contracts/FraxOFTUpgradeable.sol

Line 27 in dea4360

__EIP712_init(_name, version());

One thing to note is that future versions will cause prior signatures to be invalid.

tom2o17 · 2025-08-15T18:40:41Z

contracts/WFRAXTokenOFTUpgradeable.sol

+    }
+
+    /// @dev This method is called specifically when upgrading an existing OFT
+    function initializeV110() external reinitializer(3) {


Won't only either initialize() or initializeV110 be callable ?

Would it not make more sense to just remove the one that is not intended to be used.

That's correct, either only initialize() or initializeV110() is able to be called. Having both within the contract allows one contract where:

It can solely upgrade existing OFTs to EIP-712 compatible (as it is in this upgrade)

It can be deployed on a fresh chain while maintaining the deploy script

Ultimately, we have one implementation that is used for both cases.

@tom2o17 just reviewed this and realized only the dual initialize() functions are needed for frxUSD as WFRAX and sfrxUSD deployments are using FraxOFTUpgradeable.sol. Good catch here, I removed the extra methods in eee52da.

tom2o17 · 2025-08-15T18:41:11Z

contracts/WFRAXTokenOFTUpgradeable.sol

-contract WFRAXTokenOFTUpgradeable is OFTUpgradeable {
+import {EIP3009Module} from "contracts/modules/EIP3009Module.sol";
+import {PermitModule} from "contracts/modules/PermitModule.sol";
+


NIT: - Q: do we want the freeze thaw module here too ?

Good question! I'll raise on tg.

Team confirmed, only freeze/thaw for frxUSD.

tom2o17 · 2025-08-15T18:43:37Z

contracts/frxUsd/FrxUSDOFTUpgradeable.sol

+    /// @param accounts Array of accounts to be frozen
+    /// @dev Added in v1.1.0
+    function freezeMany(address[] memory accounts) external {
+        if (!isFreezer(msg.sender)) revert NotFreezer();


Nit: do we want to allow owner to bypass. Could go either way, would not be difficult to batch if role is not granted

tom2o17 · 2025-08-15T18:44:26Z

contracts/frxUsd/SFrxUSDOFTUpgradeable.sol


-    function initialize(string memory _name, string memory _symbol, address _delegate) external initializer {
+    /// @dev This method is called specifically when deploying a new OFT
+    function initialize(string memory _name, string memory _symbol, address _delegate) external reinitializer(3) {


tom2o17 · 2025-08-15T18:56:29Z

contracts/modules/EIP3009Module.sol

+/// @title Eip3009
+/// @notice Eip3009 provides internal implementations for gas-abstracted transfers under Eip3009 guidelines
+/// @author Frax Finance, inspired by Agora (thanks Drake)
+abstract contract EIP3009Module is SignatureModule {


Nit: Potentially add

/** * @notice Returns the state of an authorization * @dev Nonces are randomly generated 32-byte data unique to the authorizer's * address * @param authorizer Authorizer's address * @param nonce Nonce of the authorization * @return True if the nonce is used */ function authorizationState( address authorizer, bytes32 nonce ) external view returns (bool) { return _getEIP3009ModuleStorage().isAuthorizationUsed[authorizer][nonce]; }

Just to check all of the boxes for EIP-3009 as defined in
https://eips.ethereum.org/EIPS/eip-3009

Nice catch, will add.

tom2o17 · 2025-08-15T19:11:30Z

contracts/modules/SupplyTrackingModule.sol

+ * @title SupplyTrackingModule
+ * @notice Contract module to track circulating supply of an OFT across all destination chains
+*/
+abstract contract SupplyTrackingModule {


Nit: potoentially make an event

pegahcarter · 2025-08-18T18:51:41Z

I also ran into a VM issue with snapshotState() when
...
but that might be a me issue

I reproduced your issue after following the same commands. Even after syncing packages to their latest version I still had the same issue. Will debug after addressing the other comments.

dhruvinparikh · 2025-08-19T15:56:31Z

forge build fails with following error:

Error: Compiler run failed:
Error (7364): Different number of components on the left hand side (3) than on the right hand side (1).
  --> scripts/ops/testnet/UpgradeEthSepoliaOFT/2_UpgradeOFT.s.sol:61:9:
   |
61 |         (uint256 major, uint256 minor, uint256 patch) = FraxOFTAdapterUpgradeable(oft).version();
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Error (9574): Type string memory is not implicitly convertible to expected type uint256.
  --> scripts/ops/testnet/UpgradeEthSepoliaOFT/2_UpgradeOFT.s.sol:61:9:
   |
61 |         (uint256 major, uint256 minor, uint256 patch) = FraxOFTAdapterUpgradeable(oft).version();

pegahcarter · 2025-08-19T17:16:53Z

@dhruvinparikh it'll compile now. I was working with a modified foundry.toml to speed up testing by only compiling contracts/.

* fix: 3.5 * fix: 3.6

* (chore): deploy v110 on linea * (chore): update v110 implementation in msig json

…gradeable into feat/oft-upgrade

* (chore): deploy v110 on zksync * (chore): v110 on abstract

pegahcarter added 5 commits August 4, 2025 13:12

feat: init v110 upgrade script

a3a1d71

refactor: destinations dir

a03aeaa

pegahcarter marked this pull request as ready for review August 12, 2025 20:58

pegahcarter changed the title ~~[WIP] OFT v1.1.0 upgrade~~ OFT v1.1.0 upgrade Aug 12, 2025

pegahcarter added 3 commits August 13, 2025 09:50

chore: improve docs/views

d2e476e

feat: upgrade adapter ethereum

0f6ba36

feat: create evm v1.1.0 jsons

dea4360

tom2o17 approved these changes Aug 15, 2025

View reviewed changes

pegahcarter added 2 commits August 18, 2025 13:24

thomas feedback

0a84f77

fix: broken build

745c4a8

build: dangling compile

9d34ad7

pegahcarter and others added 13 commits August 28, 2025 16:18

chore: rm extra initialize()

eee52da

docs: v1.1.0 audit scope

19b4b9d

Update v1.1.0.README.md

05aff12

fix: extra signature check

8c864b4

fix: compile

b8d76da

Zellic Frax0 Mesh audit 9/25 fixes (#106)

e6fd92f

* fix: 3.5 * fix: 3.6

ops(v1.1.0): deploy mintable lockboxes

db1372f

ops: broadcast several v1.1.0 deploys

cdf162e

Deploy OFT v1.1.0 for linea (#112)

372a85b

* (chore): deploy v110 on linea * (chore): update v110 implementation in msig json

ops: deploy remaining v110 imps

9615525

Merge branch 'feat/oft-upgrade' of github.com:FraxFinance/frax-oft-up…

d24d992

…gradeable into feat/oft-upgrade

Merge branch 'master' into feat/oft-upgrade

2d54e82

ops: deploy v110 on new chains

27baed0

pegahcarter and others added 8 commits October 14, 2025 10:21

fix: eth msig tx

2ecb163

fix: msig txs to proxyAdmin

c0458df

refactor: separate fpi scripts

9472a62

ops: upgrade fpi lockbox eth

84dd0a7

Abstract, zkSync V110 deployment (#113)

5171394

* (chore): deploy v110 on zksync * (chore): v110 on abstract

fix: eth fpi lockbox upgrade direct from msig

dc65888

ops: upgrade fraxtal (s)frxETH lockboxes

c5a78ce

chore(docs): README with mintable lockbox

65ffb7b

Uh oh!

OFT v1.1.0 upgrade #101

Are you sure you want to change the base?

OFT v1.1.0 upgrade #101

Uh oh!

Conversation

pegahcarter commented Aug 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tom2o17 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pegahcarter commented Aug 18, 2025

Uh oh!

dhruvinparikh commented Aug 19, 2025

Uh oh!

pegahcarter commented Aug 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pegahcarter commented Aug 4, 2025 •

edited

Loading