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

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@shipload/sdk",
     "description": "SDKs for Shipload",
-    "version": "1.0.0-next.34",
+    "version": "1.0.0-next.36",
     "homepage": "https://github.com/shipload/toolkit/tree/master/packages/sdk",
     "repository": {
         "type": "git",

package/src/capabilities/crafting.ts

@@ -1,10 +1,9 @@
 import {UInt32} from '@wharfkit/antelope'
 import {CRAFT_ENERGY_DIVISOR} from '../types'
-import type {EntityCapabilities} from '../types/capabilities'
-import type {ServerContract} from '../contracts'
+import type {CrafterStats, EntityCapabilities} from '../types/capabilities'
 
 export interface CrafterCapability {
-    crafter: ServerContract.Types.crafter_stats
+    crafter: CrafterStats
 }
 
 export function capsHasCrafter(caps: EntityCapabilities): boolean {

package/src/capabilities/gathering.test.ts

@@ -0,0 +1,16 @@
+import {expect, test} from 'bun:test'
+import type {GathererStats} from '../types/capabilities'
+import {calc_gather_energy} from './gathering'
+
+function gatherer(drain: number): GathererStats {
+    return {
+        yield: {toNumber: () => 1},
+        drain: {toNumber: () => drain},
+        depth: {toNumber: () => 0, toString: () => '0'},
+    }
+}
+
+test('calc_gather_energy does not clamp above the old uint16 ceiling', () => {
+    const energy = calc_gather_energy(gatherer(30), 400_000_000)
+    expect(Number(energy)).toBeGreaterThan(65535)
+})

package/src/capabilities/gathering.ts

@@ -1,13 +1,13 @@
-import {UInt16, UInt32} from '@wharfkit/antelope'
-import type {ServerContract} from '../contracts'
+import {UInt32} from '@wharfkit/antelope'
+import type {GathererStats} from '../types/capabilities'
 import {PRECISION} from '../types'
 
 const GATHER_TIME_SCALE = 100
-const GATHER_MASS_DIVISOR = 228
+export const GATHER_MASS_DIVISOR = 228
 const DEPTH_PENALTY_DIVISOR = 5000
 
 function gather_duration_raw(
-    gatherer: ServerContract.Types.gatherer_stats,
+    gatherer: GathererStats,
     itemMass: number,
     quantity: number,
     stratum: number,
@@ -24,7 +24,7 @@ function gather_duration_raw(
 }
 
 export function calc_gather_duration(
-    gatherer: ServerContract.Types.gatherer_stats,
+    gatherer: GathererStats,
     itemMass: number,
     quantity: number,
     stratum: number,
@@ -36,7 +36,7 @@ export function calc_gather_duration(
 }
 
 export function calc_gather_rate(
-    gatherer: ServerContract.Types.gatherer_stats,
+    gatherer: GathererStats,
     itemMass: number,
     stratum: number,
     richness: number
@@ -47,10 +47,7 @@ export function calc_gather_rate(
     return {unitsPerSec, unitsPerMin: unitsPerSec * 60, secPerUnit}
 }
 
-export function calc_gather_energy(
-    gatherer: ServerContract.Types.gatherer_stats,
-    duration: number
-): UInt16 {
+export function calc_gather_energy(gatherer: GathererStats, duration: number): UInt32 {
     const energy = Math.floor((duration * gatherer.drain.toNumber()) / PRECISION)
-    return UInt16.from(energy)
+    return UInt32.from(energy)
 }