Skip to content

Smart wallets FEDEV-3469#2270

Draft
midas-myth wants to merge 23 commits into
qwinndev/update-v22c-contractsfrom
smart-account-multichain
Draft

Smart wallets FEDEV-3469#2270
midas-myth wants to merge 23 commits into
qwinndev/update-v22c-contractsfrom
smart-account-multichain

Conversation

@midas-myth

Copy link
Copy Markdown
Contributor

No description provided.

@midas-myth midas-myth self-assigned this Feb 24, 2026
@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Feb 24, 2026

Copy link
Copy Markdown

Deploying gmx-interface with  Cloudflare Pages  Cloudflare Pages

Latest commit: 6f3f00d
Status: ✅  Deploy successful!
Preview URL: https://dcf95e83.gmx-interface.pages.dev
Branch Preview URL: https://smart-account-multichain.gmx-interface.pages.dev

View logs

@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Feb 24, 2026

Copy link
Copy Markdown

Deploying gmx-interface-home with  Cloudflare Pages  Cloudflare Pages

Latest commit: 6f3f00d
Status: ✅  Deploy successful!
Preview URL: https://bd94cc90.gmx-interface-home.pages.dev
Branch Preview URL: https://smart-account-multichain.gmx-interface-home.pages.dev

View logs

@midas-myth midas-myth changed the title Smart wallets Smart wallets FEDEV-3469 Mar 5, 2026
… related components for handling saltNonce in wallet creation and signature wrapping.
…d smart wallet support and enhance chain handling logic.
…hain

Resolve conflicts: take v22c for CustomErrors, SimulationRouter, expressOrderUtils,
locks, simulateExecuteTxn, simulation; merge ARBITRUM_SEPOLIA contracts, GELATO keys
(MEGAETH + sepolia from v22c), Intercom + signing early-exit, useIsNonEoaAccountOnAnyChain
alias. JIT sim encode uses SimulationRouter ABI for typed encodeFunctionData.
API URLs, oracle fallbacks, tokens (MEGA on MegaETH), tokens spec ignores,
static markets/rpc/indexers/icons, block explorers, indexer clients, BuyGMX and
dashboard constants; merge api.ts with primary DO URLs + v22c fallbacks.
@midas-myth midas-myth changed the base branch from release to qwinndev/update-v22c-contracts May 4, 2026 13:03
@midas-myth midas-myth changed the base branch from qwinndev/update-v22c-contracts to release May 4, 2026 13:04
midas-myth added 5 commits May 4, 2026 15:21
…gating

- Static markets/sortedMarkets: MEGAETH entries match SDK; restore deposit/shift helpers where needed
- rpc: MegaETH Alchemy HTTP/WS like release; WS_RPC_CONFIGS MEGAETH; megaeth-mainnet host in getAlchemyProvider
- Settings + PositionEditor: drop Gemini/express-unsupported wallet checks; rely on multichain express defaults
- indexers/icons/multichain/useAvailableTokenOptions/clients: merge fixes and typings
- sdk: dedupe MEGAETH in chains/contracts/abis (merge artifact duplicate keys)
- Refresh yarn.lock + sdk/yarn.lock
…ichain

Resolved conflicts:
- Contract addresses/config (contracts.ts, api.ts, indexers.ts, markets, sortedMarkets):
  took qwinndev's v22c addresses; kept smart-account's additive
  StaticOracleProvider/FeeHandler/ConfigSyncer keys.
- Wallet stack: kept qwinndev's Privy migration (rainbowKitConfig -> walletConfig,
  getRainbowKitConfig -> getWagmiConfig) while keeping smart-account's RainbowKit/
  Reown/Safe deps that are still imported; package.json/yarn.lock reconciled
  (Privy pinned at 3.27.1).
- useAccountType/useNonSingingAccount usages aligned across DepositView, TradeBox,
  MarginField, TradingSettings.
- Kept smart-account's simplified express gating.
- Regenerated locale catalogs via lingui extract.

Verified: tsc (0 errors) and eslint clean on touched files.
…ichain

Pulls latest qwinndev/update-v22c-contracts (93 commits incl. release merges,
Privy 3.32.0, hide-botanix-in-ui).

Resolved conflicts:
- package.json/yarn.lock: took qwinndev's Privy 3.32.0/4.0.8 (with its ox/viem
  patch resolutions) while keeping smart-account's RainbowKit/Reown/Safe deps.
- TradeBox/MarginField: kept smart-account's useNonSingingAccount; dropped the
  removed lib/wallets/useConnectModal import (useConnectModal now comes from
  context/ConnectModalContext).
- Dashboard/StatsCard: took qwinndev's explicit chains list [ARBITRUM, AVALANCHE,
  MEGAETH] (Botanix hidden).
- Regenerated locale catalogs via lingui extract.

Verified: tsc (0 errors) and eslint clean on touched files.
The main app was migrated off RainbowKit to Privy (useConnectModal now lives in
context/ConnectModalContext). DevSmartWallet was the last importer of
@rainbow-me/rainbowkit; switch it to the context hook (same { openConnectModal }
interface) and remove the @rainbow-me/rainbowkit dependency from package.json/yarn.lock.

Reown WalletKit and Safe protocol-kit are kept — they are genuine smart-wallet deps.

Verified: tsc (0 errors) and eslint clean.
…ight configs

These optimizeDeps/inline entries were leftover from RainbowKit (vanilla-extract
was a RainbowKit transitive dep). Both packages are no longer in the dependency
tree, so the references only produced "failed to resolve" noise. Kept the
unrelated esbuildOptions target.
@github-actions

Copy link
Copy Markdown

Playwright Component Test Report

All tests passed.

View Report

Commit 799a0a0

@midas-myth midas-myth changed the base branch from release to qwinndev/update-v22c-contracts June 30, 2026 13:37
DevSmartWallet was a dev-only testing surface. Remove its pages and the
/dev-smart-wallet route, and drop @reown/walletkit + @safe-global/protocol-kit
(only DevSmartWallet used them). Code preserved on branch devsmartwallet-archive.
Revert SDK divergence so the branch carries only feature changes, not config
drift: ExchangeRouter ABI drops the extra native-TWAP overload (qwinn reverted
native TWAP); DataStore/EventEmitter/ReferralStorage were prettier-only churn.
Configs (chains/contracts/tokens/oracleKeeper) restored to qwinn, dropping local
Midas-fork config (MEGA token, OpenOcean/MEGAETH external, unused contract keys).
Restore app config that was local Midas-fork customization (commit 56c0403)
or cosmetic drift, so the delta to qwinn is only feature work: icons, indexer
URLs, rpc, static markets/sortedMarkets, block-explorer labels, indexer clients,
OpenOcean buy links. qwinn already carries MegaETH support.
Re-extract message catalogs to match current source after the cleanup.
…onState

@walletconnect/core and @walletconnect/utils were added with the (now removed)
DevSmartWallet testing surface and are imported nowhere; drop them so deps match
qwinn. Also revert a stray TODO + commented-out console.log in useTradeButtonState.
Unify the typo'd useNonSingingAccount and the useIsNonEoaAccountOnAnyChain alias
into a single correctly-spelled useNonSigningAccount across all callers.
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.

1 participant