@shipload/sdk 1.0.0-next.32 → 1.0.0-next.34

package/src/data/recipes.json

@@ -30,15 +30,15 @@
   },
   {
     "outputItemId": 10002,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 401,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 501,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -92,15 +92,15 @@
   },
   {
     "outputItemId": 10004,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 201,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 101,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -125,15 +125,15 @@
   },
   {
     "outputItemId": 10005,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 101,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 301,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -245,15 +245,15 @@
   },
   {
     "outputItemId": 10009,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 301,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 401,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -278,15 +278,15 @@
   },
   {
     "outputItemId": 10010,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 501,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 201,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -311,7 +311,7 @@
   },
   {
     "outputItemId": 10100,
-    "outputMass": 900000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10003,
@@ -340,7 +340,7 @@
   },
   {
     "outputItemId": 10101,
-    "outputMass": 1400000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10004,
@@ -369,7 +369,7 @@
   },
   {
     "outputItemId": 10102,
-    "outputMass": 1200000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10005,
@@ -418,7 +418,7 @@
   },
   {
     "outputItemId": 10103,
-    "outputMass": 1000000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10007,
@@ -447,7 +447,7 @@
   },
   {
     "outputItemId": 10104,
-    "outputMass": 1200000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10008,
@@ -480,7 +480,7 @@
   },
   {
     "outputItemId": 10105,
-    "outputMass": 1200000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10001,
@@ -529,7 +529,7 @@
   },
   {
     "outputItemId": 10106,
-    "outputMass": 1400000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10004,
@@ -570,7 +570,7 @@
   },
   {
     "outputItemId": 10107,
-    "outputMass": 1400000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10004,
@@ -602,7 +602,7 @@
   },
   {
     "outputItemId": 10108,
-    "outputMass": 1000000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10003,
@@ -651,7 +651,7 @@
   },
   {
     "outputItemId": 10200,
-    "outputMass": 1500000,
+    "outputMass": 1300000,
     "inputs": [
       {
         "itemId": 10001,
@@ -700,7 +700,7 @@
   },
   {
     "outputItemId": 10201,
-    "outputMass": 2300000,
+    "outputMass": 1900000,
     "inputs": [
       {
         "itemId": 10001,
@@ -749,7 +749,7 @@
   },
   {
     "outputItemId": 10202,
-    "outputMass": 5800000,
+    "outputMass": 4800000,
     "inputs": [
       {
         "itemId": 10001,
@@ -798,7 +798,7 @@
   },
   {
     "outputItemId": 10203,
-    "outputMass": 4400000,
+    "outputMass": 3700000,
     "inputs": [
       {
         "itemId": 10001,
@@ -847,7 +847,7 @@
   },
   {
     "outputItemId": 10204,
-    "outputMass": 5500000,
+    "outputMass": 4600000,
     "inputs": [
       {
         "itemId": 10001,

package/src/derivation/capabilities.ts

@@ -97,7 +97,7 @@ export function computeLoaderCapabilities(stats: Record<string, number>): {
 
     return {
         mass: Math.max(200, 2000 - Math.floor(insulation * 2)),
-        thrust: 1 + Math.floor(plasticity / 500),
+        thrust: 1 + Math.floor((plasticity * plasticity) / 10000),
         quantity: 1,
     }
 }

package/src/index-module.ts

@@ -65,6 +65,8 @@ export type {
     Reservation,
 } from './managers'
 export type {EntityRefInput} from './managers/actions'
+export type {WrapDeposit} from './managers/nft'
+export {resolveLockedAmount} from './managers/nft'
 
 export {
     getItem,

package/src/managers/actions.ts

@@ -65,6 +65,12 @@ export class ActionsManager extends BaseManager {
         return this.server.action('resolve', params)
     }
 
+    resolveall(owner: NameType): Action {
+        return this.server.action('resolveall', {
+            owner: Name.from(owner),
+        })
+    }
+
     cancel(entityId: UInt64Type, laneKey: number, count: UInt64Type): Action {
         return this.server.action('cancel', {
             id: UInt64.from(entityId),

package/src/managers/construction-types.ts

@@ -46,6 +46,7 @@ export interface SourceCargoStack {
 
 export interface FinalizerEntityRef {
     entityId: UInt64
+    entityType: Name
     name: string
     capability: FinalizerCapability
     crafterSpeed: number

package/src/managers/construction.ts

@@ -71,7 +71,8 @@ export class ConstructionManager extends BaseManager {
             if (speed === undefined) continue
             out.push({
                 entityId: entity.id,
-                name: entity.id.toString(),
+                entityType: entity.type,
+                name: entity.entity_name,
                 capability: 'crafter',
                 crafterSpeed: speed,
                 estimatedDuration: this.estimateFinalizeDuration(target, speed),

package/src/managers/nft.test.ts

@@ -0,0 +1,14 @@
+import {describe, expect, test} from 'bun:test'
+import {resolveLockedAmount} from './nft'
+
+describe('resolveLockedAmount', () => {
+    test('no fee refunds the full cost', () => {
+        expect(resolveLockedAmount(5_0000n, 0)).toBe(5_0000n)
+    })
+    test('2% fee floors the fee and refunds the remainder', () => {
+        expect(resolveLockedAmount(5_0000n, 200)).toBe(4_9000n)
+    })
+    test('rounding floors the fee (contract uses integer division)', () => {
+        expect(resolveLockedAmount(101n, 250)).toBe(99n) // fee = floor(101*250/10000)=2
+    })
+})

package/src/managers/nft.ts

@@ -1,12 +1,26 @@
 import {UInt64, type UInt64Type} from '@wharfkit/antelope'
 import {BaseManager} from './base'
-import type {ServerContract} from '../contracts'
+import type {PlatformContract, ServerContract} from '../contracts'
 
 export interface NftConfigForItem {
     templateId: number
     schemaName: string
 }
 
+export interface WrapDeposit {
+    cost: bigint
+    refund: bigint
+    feePct: number
+    symbol: string
+    precision: number
+    tokenContract: string
+}
+
+export function resolveLockedAmount(cost: bigint, feePctBasisPoints: number): bigint {
+    const fee = (cost * BigInt(feePctBasisPoints)) / 10_000n
+    return cost - fee
+}
+
 export class NftManager extends BaseManager {
     private cache = new Map<string, NftConfigForItem | null>()
 
@@ -25,4 +39,32 @@ export class NftManager extends BaseManager {
         this.cache.set(key, result)
         return result ?? undefined
     }
+
+    async getWrapDeposit(itemType: number, tier: number): Promise<WrapDeposit | null> {
+        const key = UInt64.from((BigInt(itemType) << 8n) | BigInt(tier))
+        const costRow = (await this.server.table('wrapcost').get(key)) as
+            | ServerContract.Types.wrapcost_row
+            | undefined
+        const cost = costRow ? BigInt(costRow.amount.toString()) : 0n
+        if (cost === 0n) return null
+
+        const cfg = (await this.server.table('wrapconfig').get()) as
+            | ServerContract.Types.wrapconfig_row
+            | undefined
+        const feePctBasisPoints = cfg ? Number(cfg.fee_pct) : 0
+
+        const depositCfg = (await this.platform.table('depositcfg').get()) as
+            | PlatformContract.Types.depositcfg_row
+            | undefined
+        if (!depositCfg) return null
+
+        return {
+            cost,
+            refund: resolveLockedAmount(cost, feePctBasisPoints),
+            feePct: feePctBasisPoints / 100,
+            symbol: depositCfg.token_symbol.code.toString(),
+            precision: depositCfg.token_symbol.precision,
+            tokenContract: depositCfg.token_contract.toString(),
+        }
+    }
 }

package/src/managers/plot.ts

@@ -79,13 +79,10 @@ export class PlotManager extends BaseManager {
         }
 
         let state: BuildableTarget['state']
-        const taskType = activeTask?.type.toNumber()
         if (scheduledBuild?.hasStarted) {
             state = 'finalizing'
         } else if (scheduledBuild) {
             state = 'scheduled'
-        } else if (taskType === TaskType.CLAIMPLOT) {
-            state = 'initializing'
         } else if (progress.isComplete) {
             state = 'ready'
         } else {

package/src/nft/description.ts

@@ -57,7 +57,7 @@ export const computeGathererDrain = (con: number): number =>
 export const computeGathererDepth = (tol: number, tier: number): number =>
     gathererDepthForTier(tol, tier)
 export const computeLoaderMass = (ins: number): number => Math.max(200, 2000 - ins * 2)
-export const computeLoaderThrust = (pla: number): number => 1 + idiv(pla, 500)
+export const computeLoaderThrust = (pla: number): number => 1 + idiv(pla * pla, 10000)
 export const computeCrafterSpeed = (rea: number): number => 100 + idiv(rea * 4, 5)
 export const computeCrafterDrain = (fin: number): number => Math.max(5, 30 - idiv(fin, 33))
 export const computeHaulerCapacity = (fin: number): number => Math.max(1, 1 + idiv(fin, 400))

package/src/scheduling/idle-resolve.ts

@@ -31,13 +31,14 @@ export function composeIdleResolve(
         add(blocker.id)
     }
 
-    for (const hold of blocker.holds ?? []) {
-        const counterpartId = hold.counterpart.entity_id
-        if (lookupCounterpart) {
+    // Without a lookup we cannot confirm the counterpart has a completed task, so skip it.
+    if (lookupCounterpart) {
+        for (const hold of blocker.holds ?? []) {
+            const counterpartId = hold.counterpart.entity_id
             const counterpart = lookupCounterpart(counterpartId)
             if (!counterpart || !hasResolvable(counterpart, now)) continue
+            add(counterpartId)
         }
-        add(counterpartId)
     }
 
     return [...ids.map((id) => actions.resolve(id)), action]