diff options
Diffstat (limited to 'src/ark')
| -rw-r--r-- | src/ark/manager.js | 12 | ||||
| -rw-r--r-- | src/ark/offboard.js | 14 |
2 files changed, 20 insertions, 6 deletions
diff --git a/src/ark/manager.js b/src/ark/manager.js index a190480..59f9f09 100644 --- a/src/ark/manager.js +++ b/src/ark/manager.js @@ -45,7 +45,7 @@ import { encodeVtxoFromDecoded, } from './refresh.js'; import { - getOffboardFeeRate, feeRateKwu, offboardFee, offboardAttestation, + getOffboardFeeRate, feeRateKwu, offboardFeeParts, offboardAttestation, prepareOffboard, validateOffboardTx, signOffboardForfeits, finishOffboard, P2TR_DUST, } from './offboard.js'; @@ -564,16 +564,18 @@ export class ArkManager { const tip = await this.chain.tipHeight(); const satVkb = await getOffboardFeeRate(this.arkUrl); const grossSat = inputs.reduce((n, v) => n + v.amountSat, 0); - const feeSat = offboardFee({ + const feeParts = offboardFeeParts({ spkLen: spk.length, satVkb, fees: this.info.offboardFees, tip, inputs: inputs.map((v) => ({ amountSat: v.amountSat, expiryHeight: v.expiryHeight })), }); + const feeSat = feeParts.totalSat; const netSat = grossSat - feeSat; if (netSat < P2TR_DUST) throw new Error('ark balance too small to offboard after fees'); const action = { id: `offboard-${Date.now()}`, type: 'offboard', step: 'created', inputIds: inputs.map((v) => v.id), address, spkHex: hex.encode(spk), - grossSat, feeSat, netSat, rateKwu: feeRateKwu(satVkb), + grossSat, feeSat, chainFeeSat: feeParts.chainSat, serviceFeeSat: feeParts.serviceSat, + netSat, rateKwu: feeRateKwu(satVkb), }; for (const v of inputs) v.state = 'pending'; this.state.actions.push(action); @@ -626,6 +628,8 @@ export class ArkManager { this._movement({ type: 'offboard', amountSat: action.netSat, status: 'complete', txid: action.txid, detail: `fee ${action.feeSat} sat`, to: action.address, + feeSat: action.feeSat, chainFeeSat: action.chainFeeSat, serviceFeeSat: action.serviceFeeSat, + inputIds: action.inputIds, }); this._save(); } else { @@ -640,6 +644,8 @@ export class ArkManager { this._movement({ type: 'offboard', amountSat: action.netSat, status: 'complete', txid: action.txid, detail: `fee ${action.feeSat} sat`, to: action.address, + feeSat: action.feeSat, chainFeeSat: action.chainFeeSat, serviceFeeSat: action.serviceFeeSat, + inputIds: action.inputIds, }); this._save(); } diff --git a/src/ark/offboard.js b/src/ark/offboard.js index ae6530d..28fd190 100644 --- a/src/ark/offboard.js +++ b/src/ark/offboard.js @@ -60,9 +60,13 @@ export const feeRateKwu = (satVkb) => Math.floor(satVkb / 4); // OffboardFees::calculate — base + ceil(rate * weight) + per-vtxo ppm-by-expiry. // inputs: [{ amountSat, expiryHeight }]; fees: info.offboardFees. -export function offboardFee({ spkLen, satVkb, fees, tip, inputs }) { +// The fee splits into what the MINERS take (this offboard's weight in the +// shared tx, at the current rate) and what the ASP charges for the service +// (base fee + the per-coin lifetime ppm, same bracket table as renewals) — +// kept separate so the wallet can show them apart. +export function offboardFeeParts({ spkLen, satVkb, fees, tip, inputs }) { const wu = (fees.fixedAdditionalVb + spkLen) * 4; - const weightFee = Math.floor((feeRateKwu(satVkb) * wu + 999) / 1000); + const chainSat = Math.floor((feeRateKwu(satVkb) * wu + 999) / 1000); // pver >= 4: sub-satoshi ppm accumulates across vtxos, one round-up at the end let ppmUnits = 0; for (const v of inputs) { @@ -70,7 +74,11 @@ export function offboardFee({ spkLen, satVkb, fees, tip, inputs }) { const entry = [...fees.ppmExpiryTable].reverse().find((e) => blocks >= e.thresholdBlocks); if (entry) ppmUnits += v.amountSat * entry.ppm; } - return fees.baseFeeSat + weightFee + Math.ceil(ppmUnits / 1_000_000); + const serviceSat = fees.baseFeeSat + Math.ceil(ppmUnits / 1_000_000); + return { chainSat, serviceSat, totalSat: chainSat + serviceSat }; +} +export function offboardFee(args) { + return offboardFeeParts(args).totalSat; } // OffboardRequestAttestation: BIP340 signature over |