Support scheduled travel agreements
Verify and publish checkpoint container / container (push) Successful in 11m8s
Verify and publish checkpoint container / container (push) Successful in 11m8s
This commit is contained in:
1 parent
e1e02fc1a1
commit
1e81ce8ad8
13 files changed
+767
-56
No files matched your search
+16
-2
@@ -24,6 +24,8 @@ export type PublicDealTravel = {
|
||||
answer: boolean;
|
||||
/** Present only in a multi-party term; the selected recipient accepts last. */
|
||||
actor?: string;
|
||||
/** Absent on existing terms: their original offer turn is the due turn. */
|
||||
dueTurn?: number;
|
||||
};
|
||||
export type PublicDeal = {
|
||||
id: string;
|
||||
@@ -93,6 +95,10 @@ export function publicDealAcceptVotes(deal: PublicDeal): string[] {
|
||||
export function publicDealTravelActor(deal: PublicDeal): string {
|
||||
return deal.travel?.actor ?? deal.to;
|
||||
}
|
||||
/** Call after ledger validation; older travel records are due on their offer turn. */
|
||||
export function publicDealTravelDueTurn(deal: PublicDeal): number {
|
||||
return deal.travel?.dueTurn ?? deal.turn;
|
||||
}
|
||||
function orderedSubset(votes: readonly string[], parties: readonly string[]): boolean {
|
||||
return new Set(votes).size === votes.length &&
|
||||
votes.every(vote => parties.includes(vote)) &&
|
||||
@@ -123,12 +129,18 @@ export function parsePublicDealPayment(value: unknown, parties: readonly string[
|
||||
export function parsePublicDealTravel(value: unknown): PublicDealTravel {
|
||||
const keys = object(value) ? Object.keys(value).sort().join(',') : '';
|
||||
requireDeal(object(value) && (keys === 'answer,kind,minimum,territory' ||
|
||||
keys === 'actor,answer,kind,minimum,territory' && id(value.actor)) &&
|
||||
keys === 'answer,dueTurn,kind,minimum,territory' ||
|
||||
keys === 'actor,answer,kind,minimum,territory' ||
|
||||
keys === 'actor,answer,dueTurn,kind,minimum,territory') &&
|
||||
(!Object.hasOwn(value, 'actor') || id(value.actor)) &&
|
||||
(!Object.hasOwn(value, 'dueTurn') || typeof value.dueTurn === 'number' &&
|
||||
Number.isSafeInteger(value.dueTurn) && value.dueTurn > 0) &&
|
||||
typeof value.answer === 'boolean', 'Choose an exact shipment or movement term and require or avoid it.');
|
||||
try {
|
||||
const claim = parseTravelActionClaim({ kind: value.kind, territory: value.territory, minimum: value.minimum });
|
||||
return { kind: claim.kind, territory: claim.territory, minimum: claim.minimum, answer: value.answer,
|
||||
...(keys.startsWith('actor,') ? {actor: value.actor as string} : {}) };
|
||||
...(Object.hasOwn(value, 'actor') ? {actor: value.actor as string} : {}),
|
||||
...(Object.hasOwn(value, 'dueTurn') ? {dueTurn: value.dueTurn as number} : {}) };
|
||||
} catch (error) {
|
||||
if (error instanceof TravelPromiseError) throw new PublicDealError(error.message);
|
||||
throw error;
|
||||
@@ -175,6 +187,8 @@ export function validatePublicDeals(value: unknown, players: readonly PublicDeal
|
||||
? parsePublicDealPayment(deal.payment, parties, deal.turn as number) : undefined;
|
||||
if (Object.hasOwn(deal, 'travel')) {
|
||||
const travel = parsePublicDealTravel(deal.travel);
|
||||
requireDeal(travel.dueTurn === undefined || travel.dueTurn >= (deal.turn as number),
|
||||
'Choose a travel turn no earlier than the offer turn.');
|
||||
requireDeal(!Object.hasOwn(deal, 'paymentStatus') && (multi
|
||||
? !!travel.actor && travel.actor !== deal.from && parties.includes(travel.actor) && !payment
|
||||
: !Object.hasOwn(travel, 'actor') && (!payment || payment.kind === 'immediateBribe' &&
|
||||
|
||||
Reference in new issue
Block a user