Skip to content

Conversation

@grasphoper
Copy link
Contributor

Updated both Polygon Spoke and Adapter contracts, updated deploy scripts and added happy-path tests

* update adapter part for USDT0

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* update spokepool

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* fix polygon test compilation

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* add polygon adapter test

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* add spoke test + fix spokepool test

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* cleanup

Signed-off-by: Ihor Farion <ihor@umaproject.org>

---------

Signed-off-by: Ihor Farion <ihor@umaproject.org>
@mrice32 mrice32 closed this Aug 21, 2025
@mrice32 mrice32 deleted the audit-aug20 branch August 21, 2025 03:48
@grasphoper grasphoper changed the title chore: prepare Polygon contracts for USDT0 rollout (#1074) chore: (#1074) Aug 21, 2025
@mrice32 mrice32 restored the audit-aug20 branch August 21, 2025 04:10
@grasphoper grasphoper reopened this Aug 21, 2025
grasphoper and others added 5 commits August 25, 2025 18:16
Signed-off-by: Ihor Farion <ihor@umaproject.org>
* enforce payment of Oft fee by caller

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* revert version bump

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* fix forge tests

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* fix hardhat tests

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* remove unused imports

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* only wrap native token if the l2 token is not OFT

Signed-off-by: Ihor Farion <ihor@umaproject.org>

---------

Signed-off-by: Ihor Farion <ihor@umaproject.org>
* deploy Polygon_Adapter

Signed-off-by: Ihor Farion <ihor@umaproject.org>

* add spokepool deployment

Signed-off-by: Ihor Farion <ihor@umaproject.org>

---------

Signed-off-by: Ihor Farion <ihor@umaproject.org>
Signed-off-by: Ihor Farion <ihor@umaproject.org>
@grasphoper grasphoper changed the title chore: (#1074) chore: new Polygon deployments (#1074) Aug 28, 2025
Comment on lines -24 to +25
function processMessageFromRoot(
uint256 stateId,
address rootMessageSender,
bytes calldata data
) external;
function processMessageFromRoot(uint256 stateId, address rootMessageSender, bytes calldata data) external;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grasphoper ooc, are these manual adjustments or is it automatic reflowing by your editor?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automatic

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They were not abundant so I didn't spend time to figure out why the reformatting was happening

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly I'm not even sure what formatting is canonical for our contracts repo: is it prettier ? Or some different solidity formatter?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah; idk either. I think we should generally avoid unintentional formatting changes because we'll just end up with ping-pong changes based on who touched the cost most recently and what their editor is configured to do. git reset -p origin/master is a good way of backing out anything unintended, fwiw.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree; I think we should enforce formatting as a pre-commit hook ideally too

bmzig
bmzig previously approved these changes Aug 29, 2025
fusmanii
fusmanii previously approved these changes Aug 29, 2025
"Optimism_Adapter": { "address": "0xE1e74B3D6A8E2A479B62958D4E4E6eEaea5B612b", "blockNumber": 19915034 },
"PolygonTokenBridger": { "address": "0x0330E9b4D0325cCfF515E81DFbc7754F2a02ac57", "blockNumber": 14819539 },
"Polygon_Adapter": { "address": "0xb4AeF0178f5725392A26eE18684C2aB62adc912e", "blockNumber": 19915066 },
"Polygon_Adapter": { "address": "0xF71F1e20F75820b484F8A0959C2D9E5cdd89c9F0", "blockNumber": 23227800 },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you run yarn extract-addresses to update the deployed-addresses.json

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, will do! Do we want to add that as a commit hook?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fusmanii 15a2089 seems to have added an extra # to a lot of things. Is this expected?

Copy link
Contributor

@fusmanii fusmanii Aug 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually commit hook sounds great!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fusmanii Ok I'll push the changes as is and we fix the extra # later just so that I can proceed with deploying Universal_Spoke. Sounds good?

Copy link
Contributor

@fusmanii fusmanii Aug 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all good, I will fix in my pr :)

Signed-off-by: Ihor Farion <ihor@umaproject.org>
@grasphoper grasphoper dismissed stale reviews from fusmanii and bmzig via 15a2089 August 29, 2025 20:36
@grasphoper grasphoper merged commit 95e7bfe into master Aug 29, 2025
10 checks passed
@grasphoper grasphoper deleted the audit-aug20 branch August 29, 2025 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants