c1988b9674
Reported as "the Aegis DigiByte import error". The vendored @dgb-wallet/core modules under lib/dgb/ imported "bitcoinjs-lib", "bip32", "ecpair", "bip39" and "@bitcoinerlab/secp256k1" as bare specifiers. Node's ESM resolver walks up from the importing file, so that resolves in a dev checkout — where Theseus's node_modules sits above the add-on — and resolves nowhere once Aegis is running from <userData>/extensions/aegis/, which is every OTA install. The import threw, index.js caught it and set dgbCore = null, and any DigiByte import then died in digibyteNetwork() with "DGB adapter not available". So DigiByte worked on a fresh install and disappeared after the first update. Confirmed on this machine: the only node_modules reachable from the installed extension carries bip39 and none of the other four. lib/dgb/deps.js now holds the dependencies, injected by index.js from api.require (which resolves against the app tree) before anything under lib/dgb/ is imported — the same pattern every other lib/*.js in Aegis already uses, and the reason that pattern exists. Consumers read them through accessors rather than capturing them at module scope, so import order is no longer load-bearing: hd.js builds its bip32 on first use and the two initEccLib callers go through a once-only ensureEcc(). Using a DGB module without injection now throws a named error instead of a resolver failure swallowed into a null. Verified by loading the modules from a directory with no reachable node_modules and deriving real addresses: BIP44 D…, BIP49 S… with its legacy 3… pair, BIP84 dgb1q…, BIP86 dgb1p… taproot, plus a WIF round-trip and the non-DGB WIF rejection.
69 lines
No EOL
3.2 KiB
JavaScript
69 lines
No EOL
3.2 KiB
JavaScript
import { payments, ECPair, ensureEcc } from '../deps.js';
|
|
import { digibyte, digibyteLegacyP2SH, digibyteLegacyWIF } from './network.js';
|
|
// Import a DigiByte private key in WIF (Wallet Import Format).
|
|
// Tries the modern 0x80 prefix first, falls back to the legacy 0x9e
|
|
// prefix that older DGB tools produced. Rejects anything else with a
|
|
// clear message that identifies the network mismatch.
|
|
export function importWif(wif) {
|
|
const trimmed = wif.trim();
|
|
try {
|
|
return { keyPair: ECPair().fromWIF(trimmed, digibyte), variant: 'modern' };
|
|
}
|
|
catch {
|
|
// fall through to legacy attempt
|
|
}
|
|
try {
|
|
return { keyPair: ECPair().fromWIF(trimmed, digibyteLegacyWIF), variant: 'legacy' };
|
|
}
|
|
catch (e) {
|
|
throw new Error(`Not a valid DigiByte WIF (tried both current 0x80 and legacy 0x9e prefixes). ` +
|
|
`Underlying error: ${e.message}. Check the key is for DGB mainnet, not testnet or another chain.`);
|
|
}
|
|
}
|
|
// Import against a specific network only (advanced / testing).
|
|
export function importWifStrict(wif, network = digibyte) {
|
|
return ECPair().fromWIF(wif.trim(), network);
|
|
}
|
|
export function exportWif(keyPair) {
|
|
return keyPair.toWIF();
|
|
}
|
|
export function addressesForPubkey(pubkey, network = digibyte) {
|
|
ensureEcc(); // p2tr below needs initEccLib.
|
|
const p2pkh = payments().p2pkh({ pubkey, network });
|
|
const wpkhRedeem = payments().p2wpkh({ pubkey, network });
|
|
// bitcoinjs-lib enforces `redeem.network === outerNetwork` (identity
|
|
// comparison, not shape). To render the legacy 3-prefix P2SH address
|
|
// we need a fresh redeem whose .network property is the legacy variant
|
|
// — same bytes on the wire, different object identity.
|
|
const wpkhRedeemLegacy = payments().p2wpkh({ pubkey, network: digibyteLegacyP2SH });
|
|
const p2shModern = payments().p2sh({ redeem: wpkhRedeem, network });
|
|
const p2shLegacy = payments().p2sh({ redeem: wpkhRedeemLegacy, network: digibyteLegacyP2SH });
|
|
const p2wpkh = payments().p2wpkh({ pubkey, network });
|
|
const p2tr = payments().p2tr({ internalPubkey: pubkey.subarray(1, 33), network });
|
|
if (!p2pkh.address || !p2shModern.address || !p2shLegacy.address || !p2wpkh.address || !p2tr.address) {
|
|
throw new Error('bitcoinjs-lib returned an empty address for one of the payment types');
|
|
}
|
|
if (!p2pkh.output || !p2shModern.output || !p2wpkh.output || !p2tr.output) {
|
|
throw new Error('bitcoinjs-lib returned an empty scriptPubKey for one of the payment types');
|
|
}
|
|
return {
|
|
p2pkh: p2pkh.address,
|
|
p2shP2wpkhModern: p2shModern.address,
|
|
p2shP2wpkhLegacy: p2shLegacy.address,
|
|
p2wpkh: p2wpkh.address,
|
|
p2tr: p2tr.address,
|
|
scripts: {
|
|
p2pkh: Buffer.from(p2pkh.output).toString('hex'),
|
|
p2shP2wpkh: Buffer.from(p2shModern.output).toString('hex'),
|
|
p2wpkh: Buffer.from(p2wpkh.output).toString('hex'),
|
|
p2tr: Buffer.from(p2tr.output).toString('hex'),
|
|
},
|
|
};
|
|
}
|
|
export function importWifWithAddresses(wif) {
|
|
const imported = importWif(wif);
|
|
const pubkey = Buffer.from(imported.keyPair.publicKey);
|
|
const addrs = addressesForPubkey(pubkey);
|
|
return { ...imported, ...addrs };
|
|
}
|
|
//# sourceMappingURL=wif.js.map
|