@shipload/sdk 1.0.0-next.7 → 1.0.0-next.71

package/src/capabilities/storage.ts

@@ -1,4 +1,4 @@
-import {UInt16, UInt32, UInt64, type UInt64Type} from '@wharfkit/antelope'
+import {UInt16, UInt32, UInt64, type UInt32Type, type UInt64Type} from '@wharfkit/antelope'
 import {ServerContract} from '../contracts'
 import type {StorageCapability} from '../types/capabilities'
 import {getItem} from '../data/catalog'
@@ -9,11 +9,11 @@ export interface HasCargo {
 }
 
 export interface HasCapacity {
-    capacity: UInt32
+    capacity: UInt32Type
 }
 
 export interface HasCargomass {
-    cargomass: UInt32
+    cargomass: UInt32Type
 }
 
 interface MassInput {
@@ -75,15 +75,15 @@ export function hasSpaceForMass(
     currentMass: UInt64Type,
     additionalMass: UInt64Type
 ): boolean {
-    return UInt64.from(currentMass).adding(additionalMass).lte(capacity)
+    return UInt64.from(currentMass).adding(additionalMass).lte(UInt64.from(capacity))
 }
 
 export function isFull(entity: HasCapacity & HasCargomass): boolean {
-    return UInt64.from(entity.cargomass).gte(entity.capacity)
+    return UInt64.from(entity.cargomass).gte(UInt64.from(entity.capacity))
 }
 
 export function isFullFromMass(capacity: UInt64Type, cargoMass: UInt64Type): boolean {
-    return UInt64.from(cargoMass).gte(capacity)
+    return UInt64.from(cargoMass).gte(UInt64.from(capacity))
 }
 
 export interface CargoStack {
@@ -97,7 +97,7 @@ export function cargoItemToStack(item: ServerContract.Types.cargo_item): CargoSt
     return {
         item_id: UInt16.from(item.item_id),
         quantity: UInt32.from(item.quantity),
-        stats: item.stats,
+        stats: UInt64.from(item.stats),
         modules: item.modules ?? [],
     }
 }
@@ -157,3 +157,18 @@ export function removeFromStacks(stacks: CargoStack[], remove: CargoStack): Carg
     result[idx] = {...target, quantity: remaining}
     return result
 }
+
+// Tolerant subtraction mirroring the contract's subtract_cargo (projection replay): missing or oversized removal clamps to zero, never throws.
+export function subtractFromStacks(stacks: CargoStack[], remove: CargoStack): CargoStack[] {
+    const idx = stacks.findIndex((s) => stackIdentityEqual(s, remove))
+    if (idx === -1) {
+        return stacks
+    }
+    const target = stacks[idx]
+    if (target.quantity.lte(remove.quantity)) {
+        return [...stacks.slice(0, idx), ...stacks.slice(idx + 1)]
+    }
+    const result = stacks.slice()
+    result[idx] = {...target, quantity: UInt32.from(target.quantity.subtracting(remove.quantity))}
+    return result
+}

package/src/contracts/fund.ts

@@ -0,0 +1,306 @@
+import type {
+    Action,
+    AssetType,
+    NameType,
+    UInt16Type,
+    UInt32Type,
+    UInt64Type,
+} from '@wharfkit/antelope'
+import {ABI, Asset, Blob, Name, Struct, UInt16, UInt32, UInt64} from '@wharfkit/antelope'
+import type {ActionOptions, ContractArgs, PartialBy, Table} from '@wharfkit/contract'
+import {Contract as BaseContract} from '@wharfkit/contract'
+export const abiBlob = Blob.from(
+    'DmVvc2lvOjphYmkvMS4yABkLYWNjcnVlZF9yb3cAAg50b2tlbl9jb250cmFjdARuYW1lB2JhbGFuY2UFYXNzZXQIYWRkdG9rZW4AAg50b2tlbl9jb250cmFjdARuYW1lDHRva2VuX3N5bWJvbAZzeW1ib2wJYmVuZWZfcm93AAIHYWNjb3VudARuYW1lA2JwcwZ1aW50MTYLYmVuZWZpY2lhcnkAAgdhY2NvdW50BG5hbWUDYnBzBnVpbnQxNgVjbGFpbQABE2JlbmVmaWNpYXJ5X2FjY291bnQEbmFtZQdjb2xsZWN0AAALY29sbGVjdGZlZXMAAApjdXJzb3Jfcm93AAENbmV4dF9hc3NldF9pZAZ1aW50NjQIZGVsdG9rZW4AAQ50b2tlbl9jb250cmFjdARuYW1lB2dldGxvdHMAAgtsb3dlcl9ib3VuZAZ1aW50NjQIbWF4X2xvdHMGdWludDMyC2dldHRlbmRhYmxlAAEIbWF4X2xvdHMGdWludDMyCGxvdF9pbmZvAAYIYXNzZXRfaWQGdWludDY0BWdyYWRlBG5hbWUKYXVjdGlvbl9pZAZ1aW50NjQHaXRlbV9pZAZ1aW50MTYIcXVhbnRpdHkGdWludDMyBXN0YXRzBnVpbnQ2NAtsb3RzX3Jlc3VsdAACBGxvdHMKbG90X2luZm9bXQRuZXh0BnVpbnQ2NAhsb3RzX3JvdwADCGFzc2V0X2lkBnVpbnQ2NAVncmFkZQRuYW1lCmF1Y3Rpb25faWQGdWludDY0CXJlc2N1ZW5mdAADCWFzc2V0X2lkcwh1aW50NjRbXQJ0bwRuYW1lBG1lbW8Gc3RyaW5nCHNldGJlbmVmAAEIcmVnaXN0cnkNYmVuZWZpY2lhcnlbXQlzZXRtYXJrZXQAAgZtYXJrZXQEbmFtZRFtYWtlcl9tYXJrZXRwbGFjZQRuYW1lCHNldHRlcm1zAAMFZ3JhZGUEbmFtZQxzdGFydGluZ19iaWQFYXNzZXQIZHVyYXRpb24GdWludDMyDHNldHRpbmdzX3JvdwAEBm1hcmtldARuYW1lDnRva2VuX2NvbnRyYWN0BG5hbWUMdG9rZW5fc3ltYm9sBnN5bWJvbBFtYWtlcl9tYXJrZXRwbGFjZQRuYW1lCHNldHRva2VuAAIOdG9rZW5fY29udHJhY3QEbmFtZQx0b2tlbl9zeW1ib2wGc3ltYm9sBXN3ZWVwAAEIbWF4X2xvdHMGdWludDMyBHRlbmQAAQlhc3NldF9pZHMIdWludDY0W10JdGVybXNfcm93AAMFZ3JhZGUEbmFtZQxzdGFydGluZ19iaWQFYXNzZXQIZHVyYXRpb24GdWludDMyCXRva2VuX3JvdwACDnRva2VuX2NvbnRyYWN0BG5hbWUMdG9rZW5fc3ltYm9sBnN5bWJvbAR3aXBlAAAPAAAAU0GaUzIIYWRkdG9rZW4AAAAAAADpTEQFY2xhaW0AAAAAICMVI0UHY29sbGVjdAAAsFIrIxUjRQtjb2xsZWN0ZmVlcwAAAABTQZqjSghkZWx0b2tlbgAAAAAAZxqzYgdnZXRsb3RzAABUPCZNlbNiC2dldHRlbmRhYmxlAAAAyGsqjbC6CXJlc2N1ZW5mdAAAAABLTXWywghzZXRiZW5lZgAAAMgKXiOzwglzZXRtYXJrZXQAAAAAWF6Vs8IIc2V0dGVybXMAAAAAU0Gas8IIc2V0dG9rZW4AAAAAAICqFMcFc3dlZXAAAAAAAACQpsoEdGVuZAAAAAAAAKCq4wR3aXBlAAcAAAAgKX0RMgNpNjQAAAthY2NydWVkX3JvdwAAAADgpaY6A2k2NAAACWJlbmVmX3JvdwAAAABciq9GA2k2NAAACmN1cnNvcl9yb3cAAAAAAIAzjQNpNjQAAAhsb3RzX3JvdwAAAJhNl7PCA2k2NAAADHNldHRpbmdzX3JvdwAAAAAALK/KA2k2NAAACXRlcm1zX3JvdwAAAADgqSDNA2k2NAAACXRva2VuX3JvdwAAAAACAAAAAGcas2ILbG90c19yZXN1bHQAVDwmTZWzYgh1aW50NjRbXQ=='
+)
+export const abi = ABI.from(abiBlob)
+export namespace Types {
+    @Struct.type('accrued_row')
+    export class accrued_row extends Struct {
+        @Struct.field(Name)
+        declare token_contract: Name
+        @Struct.field(Asset)
+        declare balance: Asset
+    }
+    @Struct.type('addtoken')
+    export class addtoken extends Struct {
+        @Struct.field(Name)
+        declare token_contract: Name
+        @Struct.field(Asset.Symbol)
+        declare token_symbol: Asset.Symbol
+    }
+    @Struct.type('benef_row')
+    export class benef_row extends Struct {
+        @Struct.field(Name)
+        declare account: Name
+        @Struct.field(UInt16)
+        declare bps: UInt16
+    }
+    @Struct.type('beneficiary')
+    export class beneficiary extends Struct {
+        @Struct.field(Name)
+        declare account: Name
+        @Struct.field(UInt16)
+        declare bps: UInt16
+    }
+    @Struct.type('claim')
+    export class claim extends Struct {
+        @Struct.field(Name)
+        declare beneficiary_account: Name
+    }
+    @Struct.type('collect')
+    export class collect extends Struct {}
+    @Struct.type('collectfees')
+    export class collectfees extends Struct {}
+    @Struct.type('cursor_row')
+    export class cursor_row extends Struct {
+        @Struct.field(UInt64)
+        declare next_asset_id: UInt64
+    }
+    @Struct.type('deltoken')
+    export class deltoken extends Struct {
+        @Struct.field(Name)
+        declare token_contract: Name
+    }
+    @Struct.type('getlots')
+    export class getlots extends Struct {
+        @Struct.field(UInt64)
+        declare lower_bound: UInt64
+        @Struct.field(UInt32)
+        declare max_lots: UInt32
+    }
+    @Struct.type('gettendable')
+    export class gettendable extends Struct {
+        @Struct.field(UInt32)
+        declare max_lots: UInt32
+    }
+    @Struct.type('lot_info')
+    export class lot_info extends Struct {
+        @Struct.field(UInt64)
+        declare asset_id: UInt64
+        @Struct.field(Name)
+        declare grade: Name
+        @Struct.field(UInt64)
+        declare auction_id: UInt64
+        @Struct.field(UInt16)
+        declare item_id: UInt16
+        @Struct.field(UInt32)
+        declare quantity: UInt32
+        @Struct.field(UInt64)
+        declare stats: UInt64
+    }
+    @Struct.type('lots_result')
+    export class lots_result extends Struct {
+        @Struct.field(lot_info, {array: true})
+        declare lots: lot_info[]
+        @Struct.field(UInt64)
+        declare next: UInt64
+    }
+    @Struct.type('lots_row')
+    export class lots_row extends Struct {
+        @Struct.field(UInt64)
+        declare asset_id: UInt64
+        @Struct.field(Name)
+        declare grade: Name
+        @Struct.field(UInt64)
+        declare auction_id: UInt64
+    }
+    @Struct.type('rescuenft')
+    export class rescuenft extends Struct {
+        @Struct.field(UInt64, {array: true})
+        declare asset_ids: UInt64[]
+        @Struct.field(Name)
+        declare to: Name
+        @Struct.field('string')
+        declare memo: string
+    }
+    @Struct.type('setbenef')
+    export class setbenef extends Struct {
+        @Struct.field(beneficiary, {array: true})
+        declare registry: beneficiary[]
+    }
+    @Struct.type('setmarket')
+    export class setmarket extends Struct {
+        @Struct.field(Name)
+        declare market: Name
+        @Struct.field(Name)
+        declare maker_marketplace: Name
+    }
+    @Struct.type('setterms')
+    export class setterms extends Struct {
+        @Struct.field(Name)
+        declare grade: Name
+        @Struct.field(Asset)
+        declare starting_bid: Asset
+        @Struct.field(UInt32)
+        declare duration: UInt32
+    }
+    @Struct.type('settings_row')
+    export class settings_row extends Struct {
+        @Struct.field(Name)
+        declare market: Name
+        @Struct.field(Name)
+        declare token_contract: Name
+        @Struct.field(Asset.Symbol)
+        declare token_symbol: Asset.Symbol
+        @Struct.field(Name)
+        declare maker_marketplace: Name
+    }
+    @Struct.type('settoken')
+    export class settoken extends Struct {
+        @Struct.field(Name)
+        declare token_contract: Name
+        @Struct.field(Asset.Symbol)
+        declare token_symbol: Asset.Symbol
+    }
+    @Struct.type('sweep')
+    export class sweep extends Struct {
+        @Struct.field(UInt32)
+        declare max_lots: UInt32
+    }
+    @Struct.type('tend')
+    export class tend extends Struct {
+        @Struct.field(UInt64, {array: true})
+        declare asset_ids: UInt64[]
+    }
+    @Struct.type('terms_row')
+    export class terms_row extends Struct {
+        @Struct.field(Name)
+        declare grade: Name
+        @Struct.field(Asset)
+        declare starting_bid: Asset
+        @Struct.field(UInt32)
+        declare duration: UInt32
+    }
+    @Struct.type('token_row')
+    export class token_row extends Struct {
+        @Struct.field(Name)
+        declare token_contract: Name
+        @Struct.field(Asset.Symbol)
+        declare token_symbol: Asset.Symbol
+    }
+    @Struct.type('wipe')
+    export class wipe extends Struct {}
+}
+export const TableMap = {
+    accrued: Types.accrued_row,
+    benefs: Types.benef_row,
+    cursor: Types.cursor_row,
+    lots: Types.lots_row,
+    settings: Types.settings_row,
+    terms: Types.terms_row,
+    tokens: Types.token_row,
+}
+export interface TableTypes {
+    accrued: Types.accrued_row
+    benefs: Types.benef_row
+    cursor: Types.cursor_row
+    lots: Types.lots_row
+    settings: Types.settings_row
+    terms: Types.terms_row
+    tokens: Types.token_row
+}
+export type RowType<T> = T extends keyof TableTypes ? TableTypes[T] : any
+export type TableNames = keyof TableTypes
+export namespace ActionParams {
+    export namespace Type {
+        export interface beneficiary {
+            account: NameType
+            bps: UInt16Type
+        }
+    }
+    export interface addtoken {
+        token_contract: NameType
+        token_symbol: Asset.SymbolType
+    }
+    export interface claim {
+        beneficiary_account: NameType
+    }
+    export interface collect {}
+    export interface collectfees {}
+    export interface deltoken {
+        token_contract: NameType
+    }
+    export interface getlots {
+        lower_bound: UInt64Type
+        max_lots: UInt32Type
+    }
+    export interface gettendable {
+        max_lots: UInt32Type
+    }
+    export interface rescuenft {
+        asset_ids: UInt64Type[]
+        to: NameType
+        memo: string
+    }
+    export interface setbenef {
+        registry: Type.beneficiary[]
+    }
+    export interface setmarket {
+        market: NameType
+        maker_marketplace: NameType
+    }
+    export interface setterms {
+        grade: NameType
+        starting_bid: AssetType
+        duration: UInt32Type
+    }
+    export interface settoken {
+        token_contract: NameType
+        token_symbol: Asset.SymbolType
+    }
+    export interface sweep {
+        max_lots: UInt32Type
+    }
+    export interface tend {
+        asset_ids: UInt64Type[]
+    }
+    export interface wipe {}
+}
+export interface ActionNameParams {
+    addtoken: ActionParams.addtoken
+    claim: ActionParams.claim
+    collect: ActionParams.collect
+    collectfees: ActionParams.collectfees
+    deltoken: ActionParams.deltoken
+    getlots: ActionParams.getlots
+    gettendable: ActionParams.gettendable
+    rescuenft: ActionParams.rescuenft
+    setbenef: ActionParams.setbenef
+    setmarket: ActionParams.setmarket
+    setterms: ActionParams.setterms
+    settoken: ActionParams.settoken
+    sweep: ActionParams.sweep
+    tend: ActionParams.tend
+    wipe: ActionParams.wipe
+}
+export type ActionNames = keyof ActionNameParams
+export interface ActionReturnValues {
+    getlots: Types.lots_result
+    gettendable: UInt64[]
+}
+export type ActionReturnNames = keyof ActionReturnValues
+export class Contract extends BaseContract {
+    constructor(args: PartialBy<ContractArgs, 'abi' | 'account'>) {
+        super({
+            client: args.client,
+            abi: abi,
+            account: args.account || Name.from('fnd.shipload'),
+        })
+    }
+    action<T extends ActionNames>(
+        name: T,
+        data: ActionNameParams[T],
+        options?: ActionOptions
+    ): Action {
+        return super.action(name, data, options)
+    }
+    readonly<T extends ActionReturnNames>(
+        name: T,
+        data?: ActionNameParams[T]
+    ): ActionReturnValues[T] {
+        return super.readonly(name, data) as unknown as ActionReturnValues[T]
+    }
+    table<T extends TableNames>(name: T, scope?: NameType): Table<RowType<T>> {
+        return super.table(name, scope, TableMap[name])
+    }
+}