@shipload/sdk 1.0.0-next.24 → 1.0.0-next.26

package/src/nft/atomicassets.ts

@@ -11,6 +11,7 @@ import {
 import {deserializeAtomicData, type SchemaField} from './atomicdata'
 import {deserializeAsset, type NFTCargoItem, type NFTModuleSlot} from './deserializers'
 import type {ImmutableEntry} from './buildImmutableData'
+import atomicAssetsAbi from './atomicassets.abi.json'
 
 const PLACEHOLDER_AUTH = PermissionLevel.from({
     actor: '............1',
@@ -20,6 +21,8 @@ const PLACEHOLDER_AUTH = PermissionLevel.from({
 export const ATOMICASSETS_ACCOUNT = 'atomicassets'
 export const SHIPLOAD_COLLECTION = 'shipload'
 
+export const ATOMICASSETS_ABI = ABI.from(atomicAssetsAbi as ABIDef)
+
 const ATOMIC_ATTRIBUTE_VARIANT_NAME =
     'variant_int8_int16_int32_int64_uint8_uint16_uint32_uint64_float32_float64_string_INT8_VEC_INT16_VEC_INT32_VEC_INT64_VEC_UINT8_VEC_UINT16_VEC_UINT32_VEC_UINT64_VEC_FLOAT_VEC_DOUBLE_VEC_STRING_VEC'
 
@@ -147,6 +150,7 @@ export interface AtomicSchemaRow {
 export interface FetchAssetsOptions {
     collection?: NameType
     pageSize?: number
+    account?: NameType
 }
 
 export async function fetchAtomicAssetsForOwner(
@@ -156,11 +160,12 @@ export async function fetchAtomicAssetsForOwner(
 ): Promise<AtomicAssetRow[]> {
     const collection = opts.collection ? String(Name.from(opts.collection)) : undefined
     const pageSize = opts.pageSize ?? 1000
+    const account = Name.from(opts.account ?? ATOMICASSETS_ACCOUNT)
     const out: AtomicAssetRow[] = []
     let lower: UInt64 | undefined
     while (true) {
         const res = await client.v1.chain.get_table_rows({
-            code: Name.from(ATOMICASSETS_ACCOUNT),
+            code: account,
             scope: String(Name.from(owner)),
             table: Name.from('assets'),
             limit: pageSize,
@@ -178,13 +183,14 @@ export async function fetchAtomicAssetsForOwner(
 
 export async function fetchAtomicSchemas(
     client: APIClient,
-    collection: NameType
+    collection: NameType,
+    account: NameType = ATOMICASSETS_ACCOUNT
 ): Promise<AtomicSchemaRow[]> {
     const out: AtomicSchemaRow[] = []
     let lower: Name | undefined
     while (true) {
         const res = await client.v1.chain.get_table_rows({
-            code: Name.from(ATOMICASSETS_ACCOUNT),
+            code: Name.from(account),
             scope: String(Name.from(collection)),
             table: Name.from('schemas'),
             limit: 100,

package/src/scheduling/schedule.ts

@@ -60,7 +60,10 @@ export function scheduleRemaining(entity: ScheduleData, now: Date): number {
 }
 
 export function scheduleComplete(entity: ScheduleData, now: Date): boolean {
-    return hasSchedule(entity) && scheduleRemaining(entity, now) === 0
+    if (!hasSchedule(entity)) return false
+    if ((entity.schedule?.tasks ?? []).some((t) => t.type.toNumber() === TaskType.RESERVED))
+        return false
+    return scheduleRemaining(entity, now) === 0
 }
 
 export function currentTaskIndex(entity: ScheduleData, now: Date): number {
@@ -124,6 +127,8 @@ export function getTaskRemaining(entity: ScheduleData, index: number, now: Date)
 export function isTaskComplete(entity: ScheduleData, index: number, now: Date): boolean {
     if (!entity.schedule || index < 0 || index >= entity.schedule.tasks.length) return false
 
+    if (entity.schedule.tasks[index].type.toNumber() === TaskType.RESERVED) return false
+
     const taskDuration = entity.schedule.tasks[index].duration.toNumber()
     const taskElapsed = getTaskElapsed(entity, index, now)
     return taskElapsed >= taskDuration

package/src/shipload.ts

@@ -18,6 +18,7 @@ interface ShiploadOptions {
     serverContractName?: string
     client?: APIClient
     subscriptionsUrl?: string
+    atomicAssetsAccount?: string
 }
 
 interface ShiploadConstructorOptions extends ShiploadOptions {
@@ -40,7 +41,12 @@ export class Shipload {
             ? serverContract
             : new ServerContract.Contract({client: apiClient})
 
-        this._context = new GameContext(apiClient, server, platform)
+        this._context = new GameContext(
+            apiClient,
+            server,
+            platform,
+            constructorOptions?.atomicAssetsAccount ?? 'atomicassets'
+        )
 
         if (constructorOptions?.subscriptionsUrl) {
             this._context.setSubscriptionsUrl(constructorOptions.subscriptionsUrl)
@@ -80,6 +86,10 @@ export class Shipload {
         return this._context.client
     }
 
+    get atomicAssetsAccount(): string {
+        return this._context.atomicAssetsAccount
+    }
+
     get server(): Contract {
         return this._context.server
     }

package/src/types.ts

@@ -55,6 +55,7 @@ export enum TaskType {
     DEMOLISH = 13,
     CLAIMPLOT = 14,
     BUILDPLOT = 15,
+    RESERVED = 16,
 }
 
 export enum LocationType {

package/src/capabilities/loading.ts

@@ -1,8 +0,0 @@
-import {UInt32, type UInt64} from '@wharfkit/antelope'
-import type {LoaderCapability} from '../types/capabilities'
-
-export function calcLoadDuration(entity: LoaderCapability, cargoMass: UInt64): UInt32 {
-    const totalThrust = entity.loaders.thrust.toNumber() * entity.loaders.quantity.toNumber()
-    if (totalThrust === 0) return UInt32.from(0)
-    return UInt32.from(Math.ceil(Number(cargoMass) / totalThrust))
-}