@shipload/sdk 1.0.0-next.74 → 1.0.0-next.76

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@shipload/sdk",
     "description": "SDKs for Shipload",
-    "version": "1.0.0-next.74",
+    "version": "1.0.0-next.76",
     "homepage": "https://github.com/shipload/toolkit/tree/master/packages/sdk",
     "repository": {
         "type": "git",
@@ -42,9 +42,9 @@
         "test": "make test"
     },
     "dependencies": {
-        "@wharfkit/antelope": "1.2.0",
-        "@wharfkit/common": "1.5.0",
-        "@wharfkit/contract": "1.3.0",
+        "@wharfkit/antelope": "4.0.2",
+        "@wharfkit/common": "4.0.2",
+        "@wharfkit/contract": "4.0.2",
         "tslib": "^2.1.0"
     },
     "devDependencies": {
@@ -60,8 +60,8 @@
         "@types/bun": "latest",
         "@types/chai": "^4.3.1",
         "@types/node": "^18.7.18",
-        "@wharfkit/mock-data": "^1.3.0",
-        "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
+        "@wharfkit/mock-data": "^4.0.2",
+        "@wharfkit/wallet-plugin-privatekey": "^4.0.2",
         "chai": "^4.3.4",
         "gh-pages": "^4.0.0",
         "node-fetch": "^2.6.1",

package/src/capabilities/storage.ts

@@ -23,17 +23,15 @@ interface MassInput {
 }
 
 export function calcCargoItemMass(item: MassInput): UInt64 {
-    const itemDef = getItem(item.item_id)
-    let mass = UInt64.from(itemDef.mass).multiplying(item.quantity)
+    let unitMass = UInt64.from(getItem(item.item_id).mass)
 
     for (const mod of item.modules) {
         if (mod.installed) {
-            const modDef = getItem(mod.installed.item_id)
-            mass = mass.adding(UInt64.from(modDef.mass))
+            unitMass = unitMass.adding(UInt64.from(getItem(mod.installed.item_id).mass))
         }
     }
 
-    return mass
+    return unitMass.multiplying(item.quantity)
 }
 
 export function calcCargoMass(entity: HasCargo): UInt64 {
@@ -91,14 +89,17 @@ export interface CargoStack {
     quantity: UInt32
     stats: UInt64
     modules: ServerContract.Types.module_entry[]
+    entity_id?: UInt64
 }
 
 export function cargoItemToStack(item: ServerContract.Types.cargo_item): CargoStack {
+    const identity = cargoIdentity(item.entity_id)
     return {
         item_id: UInt16.from(item.item_id),
         quantity: UInt32.from(item.quantity),
         stats: UInt64.from(item.stats),
         modules: item.modules ?? [],
+        ...(identity ? {entity_id: identity} : {}),
     }
 }
 
@@ -108,19 +109,50 @@ export function stackToCargoItem(stack: CargoStack): ServerContract.Types.cargo_
         quantity: stack.quantity,
         stats: stack.stats,
         modules: stack.modules,
+        entity_id: stack.entity_id,
     })
 }
 
-function statsEquals(a: UInt64, b: UInt64): boolean {
-    return a.equals(b)
+function cargoIdentity(id: UInt64Type | undefined): UInt64 | undefined {
+    if (id === undefined || id === null) return undefined
+    const value = UInt64.from(id)
+    return value.equals(UInt64.from(0)) ? undefined : value
+}
+
+export function cargoModulesEquiv(
+    a: readonly ServerContract.Types.module_entry[],
+    b: readonly ServerContract.Types.module_entry[]
+): boolean {
+    const n = Math.max(a.length, b.length)
+    for (let i = 0; i < n; i++) {
+        const ia = a[i]?.installed
+        const ib = b[i]?.installed
+        if (!ia !== !ib) return false
+        if (ia && ib && !(ia.item_id.equals(ib.item_id) && ia.stats.equals(ib.stats))) return false
+    }
+    return true
 }
 
-function stackIdentityEqual(a: CargoStack, b: CargoStack): boolean {
-    return a.item_id.equals(b.item_id) && statsEquals(a.stats, b.stats)
+function identityEquals(a: UInt64 | undefined, b: UInt64 | undefined): boolean {
+    return (a ?? UInt64.from(0)).equals(b ?? UInt64.from(0))
+}
+
+export function stackIdentityEqual(a: CargoStack, b: CargoStack): boolean {
+    return (
+        a.item_id.equals(b.item_id) &&
+        a.stats.equals(b.stats) &&
+        cargoModulesEquiv(a.modules, b.modules) &&
+        identityEquals(a.entity_id, b.entity_id)
+    )
 }
 
 export function stackKey(s: CargoStack): string {
-    return `${s.item_id.toNumber()}:${s.stats.toString()}`
+    const installed = s.modules
+        .map((m, i) => (m.installed ? `${i}=${m.installed.item_id}.${m.installed.stats}` : ''))
+        .filter((part) => part !== '')
+    const modulesPart = installed.length > 0 ? `:${installed.join(',')}` : ''
+    const identityPart = s.entity_id ? `#${s.entity_id.toString()}` : ''
+    return `${s.item_id.toNumber()}:${s.stats.toString()}${modulesPart}${identityPart}`
 }
 
 export function stacksEqual(a: CargoStack, b: CargoStack): boolean {
@@ -128,6 +160,9 @@ export function stacksEqual(a: CargoStack, b: CargoStack): boolean {
 }
 
 export function mergeStacks(stacks: CargoStack[], add: CargoStack): CargoStack[] {
+    if (add.entity_id) {
+        return [...stacks, {...add}]
+    }
     const idx = stacks.findIndex((s) => stackIdentityEqual(s, add))
     if (idx === -1) {
         return [...stacks, {...add}]