Skip to content

chore: sync lockfile after optional deps#11

Merged
Wieedze merged 2 commits into
mainfrom
feat/safe-integration-followups
Apr 28, 2026
Merged

chore: sync lockfile after optional deps#11
Wieedze merged 2 commits into
mainfrom
feat/safe-integration-followups

Conversation

@Wieedze
Copy link
Copy Markdown
Owner

@Wieedze Wieedze commented Apr 28, 2026

Fixes CI build failure on main after Safe followups merge — bun install --frozen-lockfile was failing because @ledgerhq/* + @trezor/connect added locally without committing bun.lock.

Wieedze and others added 2 commits April 28, 2026 17:00
CI ran `bun install --frozen-lockfile` and failed because the
lockfile drifted from package.json after `bun add @ledgerhq/* +
@trezor/connect` was run locally without committing the lockfile.

Restores parity. The deps end up in two places:
- safe-tx/package.json: optionalDependencies (the canonical
  declaration — only consumed when the matching signer is selected)
- root package.json: dependencies (a side effect of `bun add` from
  the repo root; harmless, just hoists the install)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Aligns 7 panels (FundPool, Reclaim, Withdraw, SetFees, ClaimLimits,
History, Versions) on the same eyebrow + title pattern already used by
AdminsPanel / UpgradeAuthorityPanel / PendingSafeTxsPanel:

  <span text-[10px] font-mono uppercase tracking-widest>{eyebrow}</span>
  <h2 font-semibold>{title}</h2>

Eyebrows carry scope information (Admin only / Public / Activity / ERC-
7936) so the section's permission boundary is legible at a glance,
without burning a sentence on it. VersionsPanel promotes the ERC-7936
link from inside the title to the eyebrow itself.

H3 headings inside cards are also promoted to H2 so the document
outline matches the visual hierarchy.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@Wieedze Wieedze merged commit 25dda69 into main Apr 28, 2026
1 check failed
Wieedze added a commit that referenced this pull request May 18, 2026
Resolves 5 conflicts triggered by main's Safe-aware refactors landing
in parallel (PRs #10 + #11):

- packages/safe-tx/src/ops/index.ts — keep both `versionedProxy` (ours)
  and `sponsored` (main) namespace exports.

- packages/safe-tx/src/ops/versioned-proxy.ts — main shipped a
  versioned-proxy ops module with the OLD 2-step API
  (transferProxyAdmin + acceptProxyAdmin + registerVersion +
  setDefaultVersion). The 2-step API no longer exists on the contract
  post-a2c82e5. Resolution: keep our `setProxyAdmin` builder, keep
  main's `registerVersion` + `setDefaultVersion` builders (still
  valid — they're separate Role 1 surfaces), drop the 2-step ones.

- packages/safe-tx/test/unit/ops/versioned-proxy.test.ts — same
  reduction: keep setProxyAdmin + registerVersion + setDefaultVersion
  tests, drop 2-step tests.

- packages/webapp/src/components/SafeProposeFeedback.tsx — both
  branches independently extracted this component. Keep main's
  version (already reviewed in #10, slightly cleaner with fragment +
  parent-controlled spacing).

- packages/webapp/src/components/UpgradeAuthorityPanel.tsx — main
  rewrote it as Safe-aware against the old 2-step API. All of that
  is dead. Take our multi-admin whitelist version entirely; the
  Safe-aware integration (useSafePropose + ops.versionedProxy) is
  already preserved in our version.

Plus two test-infra fixes the merge surfaced:

- safe-tx: ANVIL_PORT default 8545 → 8546. Anvil silently fails to
  bind a busy port and the fixture's RPC-ready probe was happily
  talking to a Hardhat node squatting 8545 from another package,
  producing opaque `anvil_impersonateAccount not supported` errors
  in the integration suite. direct-sign.test.ts bumped 8546 → 8547
  to keep parallel runs collision-free.

- safe-tx: broaden the trezor "no device" error regex in
  factory.test.ts to include "trezor getAddress failed — Transport
  is missing", which is what happens when the optional deps are
  installed but no Bridge / device is reachable at getAddress() time.
  Equally actionable to the other three branches the regex already
  accepts.

Verified: 82/82 safe-tx tests pass, webapp typecheck clean, sdk build
clean.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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