Upgrade MOVE to OFT by Primata · Pull Request #1298 · movement-network/movement

Primata · 2025-08-20T20:10:59Z

Summary

RFCs: $\emptyset$.
Categories: protocol-units,scripts.

Upgrades MOVE token to inherit OFTUpgradeable and become a native OFT.
It also:

grants DEFAULT_ADMIN_ROLE to Movement Labs Operations multisig
revokes DEFAULT_ADMIN_ROLE from old Movement Foundation multisig
burns the current bridge balance

Changelog

MOVETokenV2.sol
MOVETokenV2.t.sol

Testing

cd protocol-units/settlement/mcr/contracts
forge test ./test/token/MOVETokenV2.t.sol --rpc-url $ETHEREUM_MAINNET_RPC -vvv

Outstanding issues

Full upgrade procedure

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…ntlabsxyz/movement into primata/contract-pipeline

Copilot

Pull Request Overview

This PR upgrades the MOVE token to inherit from OFTUpgradeable and adds native OFT (Omnichain Fungible Token) capabilities for cross-chain functionality. The upgrade also includes significant access control changes by transferring admin roles from the old Movement Foundation multisig to Movement Labs Operations multisig and burning bridge balances.

Key changes:

Implements MOVETokenV2 with LayerZero OFT capabilities for cross-chain transfers
Updates access control by granting DEFAULT_ADMIN_ROLE to Movement Labs and revoking it from old Foundation
Burns deprecated bridge balances during upgrade initialization
Adds comprehensive test coverage for the upgrade process and OFT functionality

Reviewed Changes

Copilot reviewed 35 out of 36 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
MOVETokenV2.sol	New implementation inheriting from MOVEToken and OFTUpgradeable with upgrade initialization
MOVEToken.sol	Makes decimals() function virtual to support inheritance
MOVETokenV2.t.sol	Comprehensive test suite covering upgrade process, OFT features, and LayerZero integration
Various test files	New test files for token components (base, custodian, locked tokens, staking)
Configuration files	Updated deployment addresses and build settings
Git submodules	Added LayerZero and devtools dependencies

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-08-20T20:11:56Z

@@ -1,5 +1,5 @@
 {
-    "minDelay": "172800",
+    "minDelay": 172800,


The minDelay value changed from a string "172800" to a number 172800. While this works functionally, ensure all consuming code properly handles both string and numeric formats to avoid parsing errors.

Suggested change

"minDelay": 172800,

"minDelay": "172800",

is this with respect to the recent string vs value "update"?

apenzk · 2025-08-21T07:28:07Z

This PR combines large changes that have nothing to do with the current MOVE token upgrade to V2. Hence the description of this PR is incomplete.

In particular the description does not describe, why there are many changes and indeed creations of files related to the current MoveToken. ( I take it that you forked of another branch, or copied in files from another branch ).

I suggest to split this into two PRs.

PR to get the current code to the correct state with respect to the move token deployment. (which we then can approve first). I assume this has to be correct, even if we would not have applied PR2
PR for upgrading to V2 (rebase)

Primata · 2025-08-21T09:05:45Z

This PR combines large changes that have nothing to do with the current MOVE token upgrade to V2. Hence the description of this PR is incomplete.

In particular the description does not describe, why there are many changes and indeed creations of files related to the current MoveToken. ( I take it that you forked of another branch, or copied in files from another branch ).

I suggest to split this into two PRs.

PR to get the current code to the correct state with respect to the move token deployment. (which we then can approve first). I assume this has to be correct, even if we would not have applied PR2

PR for upgrading to V2 (rebase)

#1285 it's already here

0xmovses

Unable to run the tests, perhaps a step is missing?

⋊> ~/m/movement on upgrade-move-oft ◦ cd protocol-units/settlement/mcr/contracts                                                                                                   15:16:36
⋊> ~/m/m/p/s/m/contracts on upgrade-move-oft ◦ forge test ./test/token/MOVETokenV2.t.sol --rpc-url $ETHEREUM_MAINNET_RPC -vvv                                                      15:16:42
error: unexpected argument './test/token/MOVETokenV2.t.sol' found

Usage: forge test [OPTIONS]

For more information, try '--help'

Primata · 2025-08-21T14:22:30Z

Unable to run the tests, perhaps a step is missing?

⋊> ~/m/movement on upgrade-move-oft ◦ cd protocol-units/settlement/mcr/contracts                                                                                                   15:16:36
⋊> ~/m/m/p/s/m/contracts on upgrade-move-oft ◦ forge test ./test/token/MOVETokenV2.t.sol --rpc-url $ETHEREUM_MAINNET_RPC -vvv                                                      15:16:42
error: unexpected argument './test/token/MOVETokenV2.t.sol' found

Usage: forge test [OPTIONS]

For more information, try '--help'

No, that's correct, can you try running the MOVETokenV2 test by yourself? You can do it a few ways

0xmovses · 2025-08-21T14:26:11Z

CMD in the PR description should result in a successful test. You can either update the cmds or fix whatever is wrong. Thanks!

0xmovses · 2025-08-21T19:54:33Z

Not sure what's happening here, I just pulled latest and ran forge test ./test/token/MOVETokenV2.t.sol --rpc-url $ETHEREUM_MAINNET_RPC -vvv

⋊> ~/m/m/p/s/m/contracts on upgrade-move-oft ◦ forge test ./test/token/MOVETokenV2.t.sol --rpc-url $ETHEREUM_MAINNET_RPC -vvv                                                      20:53:41


error: unexpected argument './test/token/MOVETokenV2.t.sol' found

Usage: forge test [OPTIONS]

For more information, try '--help'.

Can you fix the cmd so I'm able to run the tests?

0xmovses · 2025-08-28T08:44:04Z

This now has many merge conflicts @Primata

apenzk

The MOVETokenV2.t.sol looks great with the comments and seems easy accessible. All tests work.

0xmovses

Primata · 2025-09-09T18:44:32Z

+     * @param _revoke The address of the address to revoke role.
+     * @param _burned Burns circulation supply on Ethereum.
+     */
+    function initialize(address _delegate, address _revoke, address[] calldata _burned) external reinitializer(2) {


_delegate is movement labs operations multisig
_revoke is movement foundation multisig

Primata · 2025-09-09T18:44:59Z

+    function initialize(address _delegate, address _revoke, address[] calldata _burned) external reinitializer(2) {
+        __OFTCore_init(_delegate);
+        __Ownable_init_unchained(_delegate);
+        _grantRole(DEFAULT_ADMIN_ROLE, _delegate);


movement labs ops receives DEFAULT_ADMIN_ROLE

Primata · 2025-09-09T18:46:07Z

+        __OFTCore_init(_delegate);
+        __Ownable_init_unchained(_delegate);
+        _grantRole(DEFAULT_ADMIN_ROLE, _delegate);
+        _revokeRole(DEFAULT_ADMIN_ROLE, _revoke);


Previous movement foundation multisig had the DEFAULT_ADMIN_ROLE, here we intend to revoke it.

Primata · 2025-09-09T18:47:13Z

+        _grantRole(DEFAULT_ADMIN_ROLE, _delegate);
+        _revokeRole(DEFAULT_ADMIN_ROLE, _revoke);
+        for (uint256 i = 0; i < _burned.length; i++) {
+            _burn(_burned[i], balanceOf(_burned[i]));


Specific addresses like the old bridge contract and liquidity meant to be released on the Movement side to initial validator rewards get their supply burned.

Primata · 2025-09-09T18:48:07Z

+    /**
+     * @dev Disables potential implementation exploit
+     */
+    constructor(address _endpoint) OFTUpgradeable(_endpoint) {_disableInitializers();}


endpoint is defined in the implementation. Any new upgrade would need the new implementation to once again specify the endpoint.

Primata · 2025-09-09T18:48:35Z

+import {MOVEToken} from "./MOVEToken.sol";
+import {OFTUpgradeable, ERC20Upgradeable} from "@layerzerolabs/oft-evm-upgradeable/contracts/oft/OFTUpgradeable.sol";
+
+contract MOVETokenV2 is MOVEToken, OFTUpgradeable {


here we inherit from MOVEToken to avoid collision.

Primata and others added 11 commits July 29, 2025 00:11

fix: config and new timelock setup

3a3ba71

remove foundry.lock

7e90e3a

Update protocol-units/settlement/mcr/contracts/script/helpers/Helper.sol

ba58a46

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

merge main, bring back contracts

5b2aab9

Merge branch 'primata/contract-pipeline' of https://github.com/moveme…

45f2cbc

…ntlabsxyz/movement into primata/contract-pipeline

bring back latest changes

1307515

fix: reinclude latest MCR

b992010

remove foundry.lock

24dd3d0

init

1d01e5b

check permissions

6e4fd85

ready for audit

dff6ebf

Copilot AI review requested due to automatic review settings August 20, 2025 20:11

Primata requested review from 0xmovses, ganymedio and musitdev as code owners August 20, 2025 20:11

Primata changed the title ~~Upgrade move oft~~ Upgrade MOVE to OFT Aug 20, 2025

Copilot AI reviewed Aug 20, 2025

View reviewed changes

Primata added 3 commits August 20, 2025 23:26

fix: gitmodules

0539834

fix: upgrade script

95aac13

fix: missing

13bcf88

0xmovses suggested changes Aug 21, 2025

View reviewed changes

fix: rename

33c15a4

0xmovses self-requested a review August 26, 2025 15:43

0xmovses approved these changes Aug 26, 2025

View reviewed changes

0xmovses self-requested a review August 26, 2025 15:59

0xmovses approved these changes Aug 26, 2025

View reviewed changes

Primata removed the request for review from ganymedio August 27, 2025 16:37

Primata added 3 commits August 28, 2025 15:15

merge conflicts

9866556

remove move token dev

5f601d2

fix pendign merge conflict

7270a12

apenzk requested review from 0xmovses and apenzk September 2, 2025 17:48

apenzk approved these changes Sep 3, 2025

View reviewed changes

Comment thread protocol-units/settlement/mcr/contracts/src/token/MOVETokenV2.sol

0xmovses approved these changes Sep 3, 2025

View reviewed changes

0xmovses merged commit 5eb6154 into main Sep 3, 2025
39 of 47 checks passed

Primata commented Sep 9, 2025

View reviewed changes

Uh oh!

Conversation

Primata commented Aug 20, 2025 • edited by apenzk Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changelog

Testing

Outstanding issues

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

apenzk Aug 21, 2025

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

Primata commented Aug 21, 2025

Uh oh!

0xmovses left a comment

Choose a reason for hiding this comment

Uh oh!

Primata commented Aug 21, 2025

Uh oh!

0xmovses commented Aug 21, 2025

Uh oh!

0xmovses commented Aug 21, 2025

Uh oh!

0xmovses commented Aug 28, 2025

Uh oh!

apenzk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

0xmovses left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Primata Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Primata Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

Primata Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

Primata Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

Primata Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

Primata Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Primata commented Aug 20, 2025 •

edited by apenzk

Loading

apenzk commented Aug 21, 2025 •

edited

Loading

Primata Sep 9, 2025 •

edited

Loading