Skip to content

Revive Katana, Add SushiV3 - #564

Closed
jparklev wants to merge 18 commits into
masterfrom
codex/revive-katana-add-sushi-minloc
Closed

Revive Katana, Add SushiV3#564
jparklev wants to merge 18 commits into
masterfrom
codex/revive-katana-add-sushi-minloc

Conversation

@jparklev

@jparklev jparklev commented May 14, 2026

Copy link
Copy Markdown
Contributor

Restores Katana support after #557 and adds Sushi v3.

@jparklev jparklev changed the title Revive Katana SushiV3 Revive Katana, Add SushiV3 May 14, 2026
@jparklev
jparklev force-pushed the codex/revive-katana-add-sushi-minloc branch from a95ebc0 to 70c8f60 Compare May 14, 2026 16:15
@jparklev
jparklev requested review from duncancmt and e1Ru1o May 14, 2026 16:39
@jparklev
jparklev marked this pull request as ready for review May 14, 2026 16:39
@jparklev
jparklev requested a review from dekz as a code owner May 14, 2026 16:39
@immunefi-magnus

Copy link
Copy Markdown

🛡️ Immunefi PR Reviews

We noticed that your project isn't set up for automatic code reviews. If you'd like this PR reviewed by the Immunefi team, you can request it manually using the link below:

🔗 Send this PR in for review

Once submitted, we'll take care of assigning a reviewer and follow up here.

@duncancmt duncancmt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Can you please add a new script to the script/ directory that mirrors DeploySafes.s.sol, but that assumes that the chain is already mostly set up and we just need to deploy a new suite of Settlers and then reclaim ownership of the relevant Safe(s). You can assume that the current setup on-chain on Katana is typical of what this script should expect, with the exception of the specific addresses of the Safe(s) -- that should be pulled from the config.

Comment thread src/core/univ3forks/SushiswapV3.sol
Comment thread .github/workflows/integration.yml
@jparklev
jparklev marked this pull request as draft May 20, 2026 06:48
@jparklev
jparklev force-pushed the codex/revive-katana-add-sushi-minloc branch from 7fbfcc1 to 9c81b49 Compare May 20, 2026 07:04

@duncancmt duncancmt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looking good

Comment thread script/RedeploySettlers.s.sol Outdated
Comment thread script/RedeploySettlers.s.sol
Comment thread script/RedeploySettlers.s.sol Outdated
Comment thread sh/revive_chain.sh Outdated
Comment thread test/integration/katana/SushiV3.t.sol Outdated
Comment thread chain_config.json
@jparklev jparklev closed this May 21, 2026
@jparklev
jparklev deleted the codex/revive-katana-add-sushi-minloc branch May 21, 2026 22:48
@jparklev jparklev reopened this May 21, 2026
@jparklev
jparklev force-pushed the codex/revive-katana-add-sushi-minloc branch from 3e54a72 to ccaa774 Compare May 22, 2026 02:15
@jparklev

Copy link
Copy Markdown
Contributor Author

Ok, ready for review again. Katana is Cancun, so maybe this gets pulled into dcmt/cancun for execution?

(and noticed that codex replaced my free-range branch name with it's GMO codex/ when i asked it to look for loc cuts. apologies for the noise 😢)

@jparklev
jparklev marked this pull request as ready for review May 22, 2026 02:16

@duncancmt duncancmt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Nice! I have some more nits here. Mostly around how to be adequately defensive in the face of gas limits and future gas-changing EIPs

Comment thread script/DeploySafes.s.sol Outdated
Comment thread script/RedeploySettlers.s.sol Outdated
Comment thread script/RedeploySettlers.s.sol Outdated
Comment thread sh/revive_chain.sh Outdated

@duncancmt duncancmt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Nice

Comment thread script/DeploySafes.s.sol Outdated
return subCalls;
}

modifier eraVmCompat(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Do you think this modifier should move into the base contract?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Pulled it into SafeMultisend here ab978ad. RedeploySettlers doesn't use it anywhere yet, since Katana isn't EraVm. Want me to also wire it here so future revives that do will be ready?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Yes, please! The more homogeneity there is, the lower the cognitive burden, and the lower the chance of mistakes.

Comment thread sh/revive_chain.sh
Comment on lines +222 to +225
if ! jq_out="$(jq -r '.transactions[] | [.transaction.from // error, .transaction.gas // error] | @tsv' "$dry_run_json")" ; then
echo "Failed to parse dry-run JSON at $dry_run_json" >&2
exit 1
fi

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You don't need an explicit error handler here. set -e does this for you.

@jparklev

jparklev commented May 28, 2026

Copy link
Copy Markdown
Contributor Author

Thanks for the reviews @duncancmt. Feeling better about RedeploySettlers.s.sol. One update for the thread here: internally we've decided not to move forward with the Katana redeploy, since the ROI doesn't seem to be there.

Question for you @duncancmt — do you have a preference between 1) me closing this pr, or 2) reworking it to just be focused on generic RedeploySettlers.s.sol with anything Katana pulled out?

@duncancmt

Copy link
Copy Markdown
Collaborator

The work on RedeploySettlers.s.sol is still valuable. Please strip out the Katana-specific stuff and we can merge just the generic "revive a chain" functionality.

@jparklev

Copy link
Copy Markdown
Contributor Author

Superseded by #573. See the last few comments here for context

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.

2 participants