@xyo-network/chain-services 1.15.3 → 1.15.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-services",
-  "version": "1.15.3",
+  "version": "1.15.4",
   "description": "XYO Layer One SDK Services",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -54,17 +54,17 @@
     "@xyo-network/boundwitness-model": "~5.1.6",
     "@xyo-network/boundwitness-validator": "~5.1.6",
     "@xyo-network/boundwitness-wrapper": "~5.1.6",
-    "@xyo-network/chain-analyze": "~1.15.3",
-    "@xyo-network/chain-modules": "~1.15.3",
-    "@xyo-network/chain-protocol": "~1.15.3",
-    "@xyo-network/chain-utils": "~1.15.3",
+    "@xyo-network/chain-analyze": "~1.15.4",
+    "@xyo-network/chain-modules": "~1.15.4",
+    "@xyo-network/chain-protocol": "~1.15.4",
+    "@xyo-network/chain-utils": "~1.15.4",
     "@xyo-network/payload-builder": "~5.1.6",
     "@xyo-network/payload-model": "~5.1.6",
     "@xyo-network/typechain": "~4.0.10",
-    "@xyo-network/xl1-protocol": "~1.12.66",
-    "@xyo-network/xl1-protocol-sdk": "~1.15.3",
-    "@xyo-network/xl1-validation": "~1.15.3",
-    "@xyo-network/xl1-wrappers": "~1.15.3",
+    "@xyo-network/xl1-protocol": "~1.12.69",
+    "@xyo-network/xl1-protocol-sdk": "~1.15.4",
+    "@xyo-network/xl1-validation": "~1.15.4",
+    "@xyo-network/xl1-wrappers": "~1.15.4",
     "async-mutex": "~0.5.0",
     "ethers": "6.15.0",
     "lru-cache": "~11.2.2"
@@ -77,7 +77,7 @@
     "@xylabs/vitest-extended": "~5.0.12",
     "@xyo-network/account": "~5.1.6",
     "@xyo-network/account-model": "~5.1.6",
-    "@xyo-network/chain-validation": "~1.15.3",
+    "@xyo-network/chain-validation": "~1.15.4",
     "@xyo-network/wallet": "~5.1.6",
     "eslint": "^9.37.0",
     "tslib": "~2.8.1",

package/src/AccountBalance/accountBalanceServiceFromArchivist.ts

@@ -2,8 +2,11 @@ import { ZERO_HASH } from '@xylabs/hex'
 import type { ReadArchivist } from '@xyo-network/archivist-model'
 import { LruCacheMap } from '@xyo-network/chain-protocol'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import type { AccountBalanceServiceV2, ChainId } from '@xyo-network/xl1-protocol'
+import {
+  type AccountBalanceServiceV2, type ChainId, StepSizes,
+} from '@xyo-network/xl1-protocol'
 import { type BalancesStepSummary, readPayloadMapFromStore } from '@xyo-network/xl1-protocol-sdk'
+import { Semaphore } from 'async-mutex'
 
 import { BaseAccountBalanceService } from './BaseAccountBalanceService.ts'
 
@@ -22,6 +25,7 @@ export const accountBalancesServiceFromArchivist = async (
     context: {
       chainId,
       store: { chainMap },
+      stepSemaphores: StepSizes.map(() => new Semaphore(20)),
       summaryMap,
       head: () => ZERO_HASH,
     },

package/src/AccountTransfers/accountTransfersServiceFromArchivist.ts

@@ -2,9 +2,12 @@ import { ZERO_HASH } from '@xylabs/hex'
 import type { ReadArchivist } from '@xyo-network/archivist-model'
 import { LruCacheMap } from '@xyo-network/chain-protocol'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import type { AccountTransfersService, ChainId } from '@xyo-network/xl1-protocol'
+import {
+  type AccountTransfersService, type ChainId, StepSizes,
+} from '@xyo-network/xl1-protocol'
 import type { TransfersStepSummary } from '@xyo-network/xl1-protocol-sdk'
 import { readPayloadMapFromStore } from '@xyo-network/xl1-protocol-sdk'
+import { Semaphore } from 'async-mutex'
 
 import { BaseAccountTransfersService } from './BaseAccountTransfersService.ts'
 
@@ -23,6 +26,7 @@ export const accountTransfersServiceFromArchivist = async (
     context: {
       chainId,
       store: { chainMap },
+      stepSemaphores: StepSizes.map(() => new Semaphore(20)),
       summaryMap,
       head: () => ZERO_HASH,
     },

package/src/ChainService/Evm/Evm.ts

@@ -42,16 +42,16 @@ export class EvmChainService extends BaseService<EvmChainServiceParams> implemen
     return await this.contract.active()
   }
 
-  async activeByAddressStaked(address: string): Promise<bigint> {
-    return await this.contract.activeByAddressStaked(getAddress(address))
+  async activeByStaked(staked: Address): Promise<bigint> {
+    return await this.contract.activeByAddressStaked(getAddress(toEthAddress(staked)))
   }
 
-  async activeByStaker(address: string): Promise<bigint> {
-    return await this.contract.activeByStaker(getAddress(address))
+  async activeByStaker(address: Address): Promise<bigint> {
+    return await this.contract.activeByStaker(getAddress(toEthAddress(address)))
   }
 
-  async addStake(staked: string, amount: bigint): Promise<boolean> {
-    const result = await this.contract.addStake(getAddress(staked), amount)
+  async addStake(staked: Address, amount: bigint): Promise<boolean> {
+    const result = await this.contract.addStake(getAddress(toEthAddress(staked)), amount)
     await result.wait()
     return true
   }
@@ -76,8 +76,8 @@ export class EvmChainService extends BaseService<EvmChainServiceParams> implemen
     return await this.contract.pending()
   }
 
-  async pendingByStaker(staker: string): Promise<bigint> {
-    return await this.contract.pendingByStaker(getAddress(staker))
+  async pendingByStaker(staker: Address): Promise<bigint> {
+    return await this.contract.pendingByStaker(getAddress(toEthAddress(staker)))
   }
 
   async removeStake(slot: bigint): Promise<boolean> {

package/src/ChainService/Memory/Memory.ts

@@ -21,7 +21,7 @@ export class MemoryChainService extends BaseService<MemoryChainServiceParams> im
     return await Promise.resolve(this._simulatedStake)
   }
 
-  async activeByAddressStaked(_address: string): Promise<bigint> {
+  async activeByStaked(_staked: Address): Promise<bigint> {
     return await Promise.resolve(this._simulatedStake)
   }
 

package/src/NetworkStakeStepReward/BaseNetworkStakeStepRewardService.ts

@@ -3,7 +3,7 @@ import { Address } from '@xylabs/hex'
 import { Promisable } from '@xylabs/promise'
 import { ReadArchivist } from '@xyo-network/archivist-model'
 import {
-  EventingChainBlockNumberIteratorService, NetworkStakeStepRewardService, StepContext,
+  EventingChainBlockNumberIteratorService, NetworkStakeStepRewardService, StepIdentity,
 } from '@xyo-network/xl1-protocol'
 import { Provider } from 'ethers'
 
@@ -22,11 +22,11 @@ export class BaseNetworkStakeStepRewardService extends BaseService<BaseNetworkSt
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardAddressReward(_context: StepContext, _address: Address): Promisable<Record<Address, bigint>> {
+  networkStakeStepRewardAddressReward(_context: StepIdentity, _address: Address): Promisable<Record<Address, bigint>> {
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardAddressShare(_context: StepContext, _address: Address): Promisable<[bigint, bigint]> {
+  networkStakeStepRewardAddressShare(_context: StepIdentity, _address: Address): Promisable<[bigint, bigint]> {
     throw new Error('Method not implemented.')
   }
 
@@ -34,35 +34,39 @@ export class BaseNetworkStakeStepRewardService extends BaseService<BaseNetworkSt
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardForStep(_context: StepContext): Promisable<bigint> {
+  networkStakeStepRewardForPosition(_position: number, _range: [number, number]): Promisable<[bigint, bigint]> {
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardForStepForPosition(_context: StepContext, _position: number): Promisable<[bigint, bigint]> {
+  networkStakeStepRewardForStep(_context: StepIdentity): Promisable<bigint> {
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardPoolRewards(_context: StepContext): Promisable<Record<Address, bigint>> {
+  networkStakeStepRewardForStepForPosition(_context: StepIdentity, _position: number): Promisable<[bigint, bigint]> {
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardPoolShares(_context: StepContext): Promisable<Record<Address, bigint>> {
+  networkStakeStepRewardPoolRewards(_context: StepIdentity): Promisable<Record<Address, bigint>> {
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardPositionWeight(_context: StepContext, _position: number): Promisable<bigint> {
+  networkStakeStepRewardPoolShares(_context: StepIdentity): Promisable<Record<Address, bigint>> {
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardPotentialPositionLoss(_context: StepContext, _position: number): Promisable<bigint> {
+  networkStakeStepRewardPositionWeight(_context: StepIdentity, _position: number): Promisable<bigint> {
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardRandomizer(_context: StepContext): Promisable<bigint> {
+  networkStakeStepRewardPotentialPositionLoss(_context: StepIdentity, _position: number): Promisable<bigint> {
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardStakerCount(_context: StepContext): Promisable<number> {
+  networkStakeStepRewardRandomizer(_context: StepIdentity): Promisable<bigint> {
+    throw new Error('Method not implemented.')
+  }
+
+  networkStakeStepRewardStakerCount(_context: StepIdentity): Promisable<number> {
     throw new Error('Method not implemented.')
   }
 
@@ -70,7 +74,7 @@ export class BaseNetworkStakeStepRewardService extends BaseService<BaseNetworkSt
     throw new Error('Method not implemented.')
   }
 
-  networkStakeStepRewardWeightForAddress(_context: StepContext, _address: Address): Promisable<bigint> {
+  networkStakeStepRewardWeightForAddress(_context: StepIdentity, _address: Address): Promisable<bigint> {
     throw new Error('Method not implemented.')
   }
 }

package/src/StakeIntent/XyoStakeIntentService.ts

@@ -139,7 +139,7 @@ export class XyoStakeIntentService extends BaseService<XyoStakeIntentServicePara
         const stake = this._stakeCache.get(candidate)
         if (stake === undefined) {
           // Fetch from chainStakeViewer if not cached
-          const activeStake = await chainStakeViewer.activeByAddressStaked(`${candidate}`)
+          const activeStake = await chainStakeViewer.activeByStaked(candidate)
           if (activeStake > 0n) {
             // Store result in cache
             this._stakeCache.set(candidate, activeStake, { ttl: ACTIVE_STAKE_TTL })

package/src/StepStake/BaseStepStakeService.ts

@@ -3,7 +3,7 @@ import { Address } from '@xylabs/hex'
 import { Promisable } from '@xylabs/promise'
 import { ReadArchivist } from '@xyo-network/archivist-model'
 import {
-  CompletedStep,
+  StepIdentity,
   StepStakeService,
 } from '@xyo-network/xl1-protocol'
 
@@ -16,11 +16,11 @@ export interface BaseStepStakeServiceParams extends BaseServiceParams {
 
 @creatable()
 export class BaseStepStakeService extends BaseService<BaseStepStakeServiceParams> implements StepStakeService {
-  stepStake(_step: CompletedStep): Promisable<Record<Address, bigint>> {
+  stepStake(_step: StepIdentity): Promisable<Record<Address, bigint>> {
     throw new Error('Method not implemented.')
   }
 
-  stepStakeForAddress(_address: Address, _step: CompletedStep): Promisable<bigint> {
+  stepStakeForAddress(_address: Address, _step: StepIdentity): Promisable<bigint> {
     throw new Error('Method not implemented.')
   }
 }