Add OETHb migration contracts by shahthepro · Pull Request #2909 · OriginProtocol/origin-dollar

shahthepro · 2026-06-01T10:06:32Z

Summary

OETHb Phase 1 cross-chain strategy pair (Master on Base / Remote on Ethereum) with a bridge-agnostic adapter family (CCIP, Superbridge). Migrates the Base vault's wOETH position off the oracle-priced BridgedWOETHStrategy so it earns real, reported yield.

Changes

Master + Remote strategies on a single nonce-gated yield channel — one operation in flight at a time (deposit / withdraw / claim), plus a balance report Remote pushes on an operator cadence.
Adapters (CCIPAdapter, SuperbridgeAdapter) on a shared AbstractAdapter base — multi-tenant whitelist, per-lane config, governor-settable min/maxTransferAmount caps.
CreateX/CREATE2 proxies (BridgeAdapterProxy, CrossChainStrategyProxy) so paired chains share addresses (required for the transportSender == address(this) peer-parity check).
BridgedWOETHMigrationStrategy — upgrade impl for the existing Base proxy, adds bridgeToRemote() to CCIP-ship the custodied wOETH in rate-limited batches.
Only the backing asset (WETH) crosses a bridge; the OToken and wOToken never do. Both tokens must be 18-decimal, asserted at construction.
Production OETHb deploys (deploy/base/100-104_*, deploy/mainnet/210-211_*). Base→Ethereum destGasLimit sized to 2M against measured worst-case inbound gas, with a Foundry fork-test regression.
README.md, DESIGN.md, FLOWS.md (sequence diagrams) + sol2uml diagrams.

codecov · 2026-06-08T10:43:22Z

Codecov Report

❌ Patch coverage is 83.38945% with 148 lines in your changes missing coverage. Please review.
✅ Project coverage is 50.57%. Comparing base (c52692d) to head (dd40635).

Files with missing lines	Patch %	Lines
...racts/strategies/BridgedWOETHMigrationStrategy.sol	0.00%	45 Missing ⚠️
...egies/crosschainV3/adapters/SuperbridgeAdapter.sol	56.52%	30 Missing ⚠️
...s/strategies/crosschainV3/adapters/CCIPAdapter.sol	54.54%	15 Missing ⚠️
...rategies/crosschainV3/adapters/AbstractAdapter.sol	86.00%	14 Missing ⚠️
...s/strategies/crosschainV3/adapters/CCTPAdapter.sol	88.29%	11 Missing ⚠️
.../strategies/crosschainV3/MasterWOTokenStrategy.sol	95.42%	8 Missing ⚠️
contracts/contracts/utils/BytesHelper.sol	0.00%	8 Missing ⚠️
...gies/crosschainV3/AbstractCrossChainV3Strategy.sol	87.93%	7 Missing ⚠️
...trategies/crosschainV3/AbstractWOTokenStrategy.sol	94.31%	5 Missing ⚠️
.../strategies/crosschainV3/RemoteWOTokenStrategy.sol	97.10%	5 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2909      +/-   ##
==========================================
+ Coverage   44.63%   50.57%   +5.94%     
==========================================
  Files         110      123      +13     
  Lines        4920     5811     +891     
  Branches     1362     1641     +279     
==========================================
+ Hits         2196     2939     +743     
- Misses       2721     2869     +148     
  Partials        3        3

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

clement-ux

Left some comments

sparrowDom

Minor comments otherwise LGTM

sparrowDom · 2026-07-07T08:49:13Z

+    ///      must equal the vault (enforced by the require below); Master always forwards the
+    ///      received bridgeAsset to `vaultAddress` on the leg-2 ack.
+    ///
+    ///      Only the `remoteStrategyBalance` slice is drawable here: `_amount` must be


Proposed change of this section:

/// Drawable bound is `_drawableRemoteBalance()` = `remoteStrategyBalance + /// min(0, bridgeAdjustment)`, NOT `remoteStrategyBalance` alone: /// - a NEGATIVE `bridgeAdjustment` (net BRIDGE_OUT) is folded in, lowering the cap so we /// never request more shares than Remote can actually unwrap (else it NACKs on Remote); /// - a POSITIVE `bridgeAdjustment` is excluded here even though `checkBalance` counts it /// (that + local bridgeAsset can report more). To realise it, `requestSettlement()` /// first (folds bridgeAdjustment into remoteStrategyBalance) and/or use the local /// bridgeAsset, then withdraw.

sparrowDom · 2026-07-07T08:54:30Z

+    ///      on a WITHDRAW_CLAIM_ACK (the bridgeAsset is still held when this is computed).
+    ///      `oTokenAmount` is in OToken (18dp) units, matching `_viewCheckBalance`;
+    ///      `_yieldOnlyBaseline()` is the `oTokenAmount == 0` case.
+    /// @dev Clamps to 0 rather than reverting on a negative. `_viewCheckBalance - bridgeAdjustment`


suggested fix:

/// @dev Clamps to 0 rather than reverting on a negative. `_viewCheckBalance - bridgeAdjustment` /// is principal + yield + retained fees and is never *economically* negative **while /// (w)OTokens are up-only** — the only thing that pushes it a few wei negative is the /// wOToken 4626 rounding against the strategy (~1 wei per BRIDGE_IN floor / BRIDGE_OUT /// ceil) once a `withdrawAll` drains it near 0. Reverting on that dust would freeze the /// serialized yield channel, so we clamp (matches checkBalance-never-reverts). /// CAVEAT: a real negative rebase (loss/slashing) would make this genuinely negative; the /// clamp then masks it, and because Master re-adds its OWN `bridgeAdjustment`, /// `checkBalance` OVER-reports by ~`bridgeAdjustment` (not 0). Out of scope while /// (w)OTokens never negative-rebase; revisit (signed baseline) if that changes. See DESIGN §3.10.

sparrowDom · 2026-07-07T09:01:39Z

+leg-2 claim ack lands.
+
+For `withdrawAll` (vault or governor sweep), `_withdrawRequest` is called with
+`min(remoteStrategyBalance, inboundAdapter.maxTransferAmount())` so a sweep


this should be

`min(_drawableRemoteBalance(), inboundAdapter.maxTransferAmount())` so a sweep

sparrowDom · 2026-07-07T09:04:23Z

+        Master->>Master: _processWithdrawClaimAck success:<br/>_markYieldNonceProcessed(N+2)<br/>pendingWithdrawalAmount = 0<br/>remoteStrategyBalance = yieldBaseline
+        Master->>Vault: «WETH» transfer (forwards its full bridgeAsset balance)
+        Note over Master: safeTransfer(vaultAddress, balanceOf(this))<br/>emit Withdrawal(WETH, WETH, claimed)
+    else queue not yet matured (NACK)


proposed change:

Leg-2 NACKs on four conditions, not just an immature queue: else NACK — outstandingRequestId != EMPTY / amount == 0 / bridgeAssetHeld < amount / ship out of [min,max]

sparrowDom · 2026-07-07T09:07:15Z

+        ) {
+            return;
+        }
+        // Best-effort: a mid-migration cleared inbound adapter must no-op the sweep, not


Proposed change:

// Best-effort no-op if the inbound adapter isn't wired yet (pre-configuration only — // setInboundAdapter now rejects zero, so it can't be cleared mid-migration).

Both files existed as real files. CLAUDE.md held all 298 lines of real guidance; AGENTS.md held 40 lines written on another machine. Merge decisions: - Workflow guidance (prettier, smallest-verification, do-not-reformat): present in both, word for word. Kept CLAUDE.md's copy. - 'Run repo commands from /Users/nicholasaddison/.../contracts' loses to 'Run repo commands from contracts/'. The absolute path is another engineer's home directory and is wrong everywhere but that machine. - Dropped the hand-maintained 'Skills' registry. It listed four skills by absolute path under /Users/clement/.codex/skills and /Users/clement/Documents, none of which resolve here, plus 25 lines instructing the agent how to discover and load skills. Skill discovery is the harness's job and differs per harness; a checked-in registry of one engineer's local paths is exactly the rot-prone state STD-001 forbids. If those skills are worth sharing they belong in the repo under .agents/skills/ (STD-003), not as pointers into a home directory. Verified with automation/scripts/check-agents-md.sh. AGENTS.md is 298 lines, over the 200-line content rule. Not addressed here: splitting it (storage-layout checks and the Foundry/Talos mandatory check are the candidates for .claude/rules/) changes what every agent in this repo reads and should be its own reviewed change.

sparrowDom

Just 1 comment inline about the deploy files not written in foundry

sparrowDom · 2026-08-27T12:21:27Z

@@ -0,0 +1,37 @@
+const { deployOnBase } = require("../../utils/deploy-l2");


Shouldn't these deploys be written in foundry?

naddison36

Can you change the deploy scripts to use Foundry

The deploy-time gate keys on the contract name, so BridgedWOETHMigrationStrategy had no descriptor on Base and passed as a brand-new contract — the one upgrade in this stack that touches a live proxy ran without a layout comparison. Seed deployments/base/BridgedWOETHMigrationStrategy.json with the live BridgedWOETHStrategy storage layout so check-storage-upgrade.js compares the new implementation against what the proxy runs today. Verified both ways: the gate passes on the real layout (totalBridged/maxPerBridge appended after V1's slot-157 tail) and exits 1 with a layoutchange finding if a V1 slot moves. The post-deploy descriptor refresh replaces the seed wholesale.

Master gained 005_DeployOETHVaultLens.s.sol (#2953) after this branch diverged, so the OETHb V3 mainnet scripts would collide with it on merge. Bump file names, contract names and constructor deployment IDs, and update the cross-references in base/002, base/003, the RemoteWOTokenStrategy fork test comment, DESIGN.md and README.md. Neither script has been broadcast, so no deployment state is affected.

sparrowDom

One minor thing to resolve below. I've also pushed 2 commits:

renamed (bumped number) deploy files to reflect the situation on master
the Bridged strategy is a migration one and replaces the existing one. If we just copy the previous strategy storage slot but name it as the new strategy json the storage slot check will still run.

sparrowDom · 2026-08-28T12:48:19Z

So this Claude file just simlinks to Agents. Master has a newer Claude.md file can you merge those things please?

sparrowDom · 2026-08-28T13:12:44Z

Also CI is still not green.

shahthepro added 8 commits June 1, 2026 15:35

Add OUSD V3 contracts

a6fadbc

Fixes

35657e5

Simplify code

d8e9240

Remove root pnpm files

610e7ed

Refactor superbridge

1f4fa8e

checkpoint

bde0f2b

Add testnet files and bug fixes

700853b

Fix tests

b7cb68a

shahthepro changed the title ~~[WIP] Add OUSD V3 contracts~~ Add OUSD V3 and OETHb migration contracts Jun 8, 2026

Add flows file

d778f8f

shahthepro marked this pull request as ready for review June 8, 2026 10:06

shahthepro requested review from clement-ux, naddison36 and sparrowDom as code owners June 8, 2026 10:06

shahthepro added 2 commits June 8, 2026 14:18

Fix pnpm lock file

0e901b1

Fix slither

10ecbde

shahthepro added 13 commits June 8, 2026 15:03

Fix Base fork test

2993eaa

Commit readme files

3cf586e

Merge branch 'master' into shah/ousd-v3

ca967cb

bug fixes

fb920df

Fix hh config

443290e

Fix hh config

2df0162

Move testnet harness to shah/ousd-v3-testnet

c061d37

Fix unit test

ef27955

Fix AbstractAdapter

0cb3982

Update comment

2ffc8ef

Code simplification

550a014

bug fixes

2c2da82

Few more code cleanup

f984421

shahthepro added 3 commits July 2, 2026 14:23

Merge branch 'master' into shah/ousd-v3

f20d464

Address CR comments

82f0179

Rename var

d8331cf

clement-ux reviewed Jul 6, 2026

View reviewed changes

Comment thread contracts/contracts/strategies/crosschainV3/adapters/CCTPAdapter.sol Outdated

Comment thread contracts/contracts/strategies/crosschainV3/adapters/SuperbridgeAdapter.sol

Bug fixes

97f6f1a

sparrowDom previously approved these changes Jul 7, 2026

View reviewed changes

clement-ux reviewed Jul 7, 2026

View reviewed changes

Comment thread contracts/contracts/strategies/crosschainV3/adapters/SuperbridgeAdapter.sol

Update docs and comments

4a60403

shahthepro dismissed sparrowDom’s stale review via 4a60403 July 7, 2026 10:31

shahthepro added 12 commits July 7, 2026 14:43

Add missing check

dd40635

Merge branch 'master' into shah/ousd-v3

8a5ee2d

Merge branch 'master' into shah/ousd-v3

5dee167

Simplify CrossChainStrategyV3

e3dc759

Merge branch 'master' into shah/ousd-v3

eaac1db

Fix linting issues

434eeda

Fix lint issues

34f5a32

Fix docs and stuff

9a76c77

Make balance check push-only

3f58128

Fix gas bug

7ea0dda

Merge branch 'master' into shah/ousd-v3

dd3a9d6

shahthepro changed the title ~~Add OUSD V3 and OETHb migration contracts~~ Add OETHb migration contracts Aug 25, 2026

sparrowDom reviewed Aug 27, 2026

View reviewed changes

naddison36 reviewed Aug 28, 2026

View reviewed changes

shahthepro and others added 3 commits August 28, 2026 14:46

Migrate deploy scripts to foundry

0a1f3c2

sparrowDom force-pushed the shah/ousd-v3 branch from b9d72a7 to 6c47c1b Compare August 28, 2026 13:07

sparrowDom approved these changes Aug 28, 2026

View reviewed changes

		@@ -0,0 +1,37 @@
		const { deployOnBase } = require("../../utils/deploy-l2");

Uh oh!

Conversation

shahthepro commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

Uh oh!

codecov Bot commented Jun 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

clement-ux left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

sparrowDom left a comment

Choose a reason for hiding this comment

Uh oh!

sparrowDom Jul 7, 2026

Choose a reason for hiding this comment

Uh oh!

sparrowDom Jul 7, 2026

Choose a reason for hiding this comment

Uh oh!

sparrowDom Jul 7, 2026

Choose a reason for hiding this comment

Uh oh!

sparrowDom Jul 7, 2026

Choose a reason for hiding this comment

Uh oh!

sparrowDom Jul 7, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sparrowDom left a comment

Choose a reason for hiding this comment

Uh oh!

sparrowDom Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

naddison36 left a comment

Choose a reason for hiding this comment

Uh oh!

sparrowDom left a comment

Choose a reason for hiding this comment

Uh oh!

sparrowDom Aug 28, 2026

Choose a reason for hiding this comment

Uh oh!

sparrowDom commented Aug 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

shahthepro commented Jun 1, 2026 •

edited

Loading

codecov Bot commented Jun 8, 2026 •

edited

Loading