Files
bridge/cmd
zeekay 21ff378695 merge: pull jackson's a3215f9+c8e77bd (swap amount + coingecko)
Integrate whispers/bridgev2 into z/bridgev2-mpc-pool-gas:
- a3215f9 'fixed swap amount correctly' (introduces ReceiveAmount + releaseAmount helper, resolveReleaseSigning, FileReleaseStore)
- c8e77bd 'lux rice from live coingecko' (CoinGecko price feed)

Conflict resolution (preserving both sides):
- cmd/bridge/main.go: union of imports (math/big + net/http); both envOrInt+envOrInt64 (ours) and envBool (jackson)
- cmd/bridge/signing_driver.go: keep our BTC dispatch + multi-family pool acquire path; use jackson's resolveReleaseSigning as a fallback before the deposit-as-release legacy path; keep our SOL/DOT/TON switch cases AND jackson's releaseAmount helper used in the EVM PreSign call
- cmd/bridge/swap_store.go: collapse duplicate ReleaseWalletID/ReleaseAddress field declarations (both sides added the same fields with identical JSON tags); keep the more thorough doc block from jackson's side
- internal/mchain/client.go: keep our extra Wallet.ECDSAPubKey+EDDSAPubKeyHex fields AND add json tags from jackson's side so FileReleaseStore.persistLocked can serialize them
2026-05-28 00:59:41 -07:00
..