@shipload/sdk 1.0.0-next.62 → 1.0.0-next.64

package/src/shipload.ts

@@ -12,7 +12,9 @@ import type {EpochsManager} from './managers/epochs'
 import type {ActionsManager} from './managers/actions'
 import type {ClusterManager} from './managers/cluster'
 import type {NftManager} from './managers/nft'
+import type {BalancesManager} from './managers/balances'
 import type {JobsManager} from './managers/jobs'
+import type {InfluenceManager} from './managers/influence'
 import type {SubscriptionsManager} from './subscriptions/manager'
 import type {GameState} from './entities/gamestate'
 
@@ -133,10 +135,18 @@ export class Shipload {
         return this._context.nft
     }
 
+    get balances(): BalancesManager {
+        return this._context.balances
+    }
+
     get jobs(): JobsManager {
         return this._context.jobs
     }
 
+    get influence(): InfluenceManager {
+        return this._context.influence
+    }
+
     get subscriptions(): SubscriptionsManager {
         return this._context.subscriptions
     }

package/src/types.ts

@@ -8,6 +8,7 @@ import {
     type UInt64Type,
 } from '@wharfkit/antelope'
 import {ServerContract} from './contracts'
+import {COORD_MAX, COORD_MIN} from './coordinates/constants'
 
 export const PRECISION = 10000
 export const CRAFT_ENERGY_DIVISOR = 150000
@@ -70,6 +71,7 @@ export enum TaskType {
     UPGRADE = 17,
     SHUTTLE = 18,
     REFIT = 19,
+    CONTRIBUTE = 20,
 }
 
 export enum RefitOp {
@@ -124,13 +126,30 @@ export class Coordinates extends ServerContract.Types.coordinates {
 
 export function coordsToLocationId(coords: CoordinatesType): UInt64 {
     const c = Coordinates.from(coords)
-    const mask = BigInt(0xffffffff)
-    const x = BigInt(c.x.toNumber()) & mask
-    const y = BigInt(c.y.toNumber()) & mask
-    const id = (x << BigInt(32)) | y
+    const x = BigInt(c.x.toString())
+    const y = BigInt(c.y.toString())
+    if (
+        x < BigInt(COORD_MIN) ||
+        x > BigInt(COORD_MAX) ||
+        y < BigInt(COORD_MIN) ||
+        y > BigInt(COORD_MAX)
+    ) {
+        throw new Error('coordinate out of int32 bounds')
+    }
+    const offset = BigInt(2147483648)
+    const id = ((x + offset) << BigInt(32)) | (y + offset)
     return UInt64.from(id)
 }
 
+export function locationIdToCoords(id: UInt64Type): {x: number; y: number} {
+    const value = BigInt(UInt64.from(id).toString())
+    const offset = BigInt(2147483648)
+    return {
+        x: Number((value >> BigInt(32)) - offset),
+        y: Number((value & BigInt('0xffffffff')) - offset),
+    }
+}
+
 export interface Distance {
     origin: ServerContract.ActionParams.Type.coordinates
     destination: ServerContract.ActionParams.Type.coordinates

package/src/utils/hash.ts

@@ -9,3 +9,7 @@ export function hash512(seed: Checksum256Type, string: string): Checksum512 {
     const bytes = Bytes.from(`${seed}${string}`, 'utf8')
     return Checksum512.hash(bytes)
 }
+
+export function uint16(hash: Checksum512, offset: number): number {
+    return (hash.array[offset] << 8) | hash.array[offset + 1]
+}

package/src/utils/system.ts

@@ -1,5 +1,5 @@
 import {Checksum256, type Checksum256Type, type Checksum512, UInt8} from '@wharfkit/antelope'
-import {hash512} from './hash'
+import {hash512, uint16} from './hash'
 import {Coordinates, type CoordinatesType, LocationType} from '../types'
 import {ServerContract} from '../contracts'
 import {deriveLocationSize} from '../derivation/location-size'
@@ -47,10 +47,6 @@ export function getLocationTypeName(type: LocationType): string {
     }
 }
 
-function uint16(hash: Checksum512, offset: number): number {
-    return (hash.array[offset] << 8) | hash.array[offset + 1]
-}
-
 function generatePlanetName(hashResult: Checksum512): string {
     const syllableCount = 2 + (hashResult.array[0] % 2)
     const name: string[] = []