mirror of
https://github.com/luxfi/bridge.git
synced 2026-09-24 00:26:46 +00:00
zeekay
84d4d56cf4
The bridge previously fast-failed DOT keygen with ErrSubstrateNotImplemented. The MPC cluster already returns a 33-byte compressed secp256k1 pubkey (ecdsa_pub_key) — the only missing piece was the SS58 derivation, which internal/substrate now provides. Changes: - Wallet.ECDSAPubKey: new field carrying the compressed pubkey hex. Required by the DOT signing path so the assembler can derive the AccountId and resolve the ECDSA recovery byte at Finalize. - pickAddress: AddressTypeDOT now derives SS58 from ECDSAPubKey via blake2_256(pub) -> AccountId32 -> base58check with the per-network prefix (mainnet=0, Westend=42, Kusama=2). Returns ErrMissingPubKey if the cluster forgot to populate ecdsa_pub_key. - networkAddressType: add POLKADOT_TESTNET, KUSAMA_MAINNET as DOT family (alongside the existing POLKADOT_MAINNET entry). - ErrSubstrateNotImplemented: kept exported (callers may errors.Is) but documented as deprecated. KeygenForDeposit no longer returns it. Tests updated: - TestKeygen_DOT_DerivesSS58FromPubKey: pin a deterministic pubkey, verify the SS58 address starts with '1' (Polkadot prefix 0). - TestKeygen_DOT_TestnetPrefix: Westend (prefix 42) addresses start with '5'. - TestKeygen_DOT_MissingPubKeyErrors: empty ecdsa_pub_key -> ErrMissingPubKey. - cmd/bridge swap handler test: TestSwapsCreate_DOTRequest_Succeeds replaces the old "returns 501" expectation.
58 lines
2.2 KiB
Go
58 lines
2.2 KiB
Go
// dot.go: substrate-flavoured derivation helpers for the keygen path.
|
|
//
|
|
// The MPC cluster returns a hex-encoded compressed secp256k1 pubkey
|
|
// (ecdsa_pub_key) for every ECDSA keygen. For substrate (DOT/Kusama),
|
|
// the bridge derives an SS58 address client-side rather than waiting
|
|
// for the cluster to learn the SS58 algorithm. This keeps the cluster
|
|
// generic and lets the bridge support new substrate chains by just
|
|
// adding a prefix entry to substrateNetworkPrefix.
|
|
|
|
package mchain
|
|
|
|
import (
|
|
"encoding/hex"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/luxfi/bridge/internal/substrate"
|
|
)
|
|
|
|
// substrateNetworkPrefix maps a bridge internal_name → SS58 prefix.
|
|
// Add new substrate-flavoured chains here as the bridge supports them.
|
|
// Defaults to SS58Generic (42) for unknown DOT-family chains.
|
|
var substrateNetworkPrefix = map[string]substrate.SS58Prefix{
|
|
"POLKADOT_MAINNET": substrate.SS58PolkadotMainnet, // 0
|
|
"POLKADOT_TESTNET": substrate.SS58Generic, // 42 (Westend)
|
|
"KUSAMA_MAINNET": substrate.SS58Kusama, // 2
|
|
}
|
|
|
|
// SubstratePrefixFor returns the SS58 prefix for a substrate-flavoured
|
|
// network. Falls back to SS58Generic (42) for any unknown name —
|
|
// matches the substrate-generic encoding most testnets use, and is
|
|
// safe (the on-chain runtime accepts the raw AccountId regardless).
|
|
func SubstratePrefixFor(networkInternalName string) substrate.SS58Prefix {
|
|
if p, ok := substrateNetworkPrefix[networkInternalName]; ok {
|
|
return p
|
|
}
|
|
return substrate.SS58Generic
|
|
}
|
|
|
|
// deriveSubstrateSS58 takes the hex-encoded 33-byte compressed pubkey
|
|
// the MPC cluster returns and derives the substrate ECDSA address (an
|
|
// SS58 string) for the given network.
|
|
//
|
|
// The bridge stores BOTH the SS58 address and the raw pubkey on the
|
|
// Wallet record so the signing path can use either.
|
|
func deriveSubstrateSS58(pubkeyHex, networkInternalName string) (string, error) {
|
|
pubkeyHex = strings.TrimPrefix(strings.TrimPrefix(pubkeyHex, "0x"), "0X")
|
|
pub, err := hex.DecodeString(pubkeyHex)
|
|
if err != nil {
|
|
return "", fmt.Errorf("decode hex pubkey: %w", err)
|
|
}
|
|
acc, err := substrate.AccountIDFromECDSAPub(pub)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return substrate.SS58Encode(acc, SubstratePrefixFor(networkInternalName))
|
|
}
|