- 
                Notifications
    
You must be signed in to change notification settings  - Fork 75
 
chore: new Polygon deployments (#1074) #1075
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
* 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>
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>
| function processMessageFromRoot( | ||
| uint256 stateId, | ||
| address rootMessageSender, | ||
| bytes calldata data | ||
| ) external; | ||
| function processMessageFromRoot(uint256 stateId, address rootMessageSender, bytes calldata data) external; | 
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Automatic
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
| "Optimism_Adapter": { "address": "0xE1e74B3D6A8E2A479B62958D4E4E6eEaea5B612b", "blockNumber": 19915034 }, | ||
| "PolygonTokenBridger": { "address": "0x0330E9b4D0325cCfF515E81DFbc7754F2a02ac57", "blockNumber": 14819539 }, | ||
| "Polygon_Adapter": { "address": "0xb4AeF0178f5725392A26eE18684C2aB62adc912e", "blockNumber": 19915066 }, | ||
| "Polygon_Adapter": { "address": "0xF71F1e20F75820b484F8A0959C2D9E5cdd89c9F0", "blockNumber": 23227800 }, | 
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh shoot, I noticed that as well and removed it here https://github.com/across-protocol/contracts/pull/1081/files#diff-175744961939b2f9d0f6f4d483df761c3f3ed16129129e21842eb59dfb4dd1c0L363
it shouldn't be there
There was a problem hiding this comment.
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!
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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>
Updated both Polygon Spoke and Adapter contracts, updated deploy scripts and added happy-path tests