Merge pull request #9 from Cerebellum-Network/feature/devnet-runtime-…

…v54114

Runtime v54114 support

db/migrations/1723441441325-Data.js

@@ -0,0 +1,17 @@
+module.exports = class Data1723441441325 {
+    name = 'Data1723441441325'
+
+    async up(db) {
+        await db.query(`ALTER TABLE "ddc_node" ADD "transferred_bytes" numeric NOT NULL DEFAULT 0`)
+        await db.query(`ALTER TABLE "ddc_node" ADD "stored_bytes" numeric NOT NULL DEFAULT 0`)
+        await db.query(`ALTER TABLE "ddc_node" ADD "number_of_puts" numeric NOT NULL DEFAULT 0`)
+        await db.query(`ALTER TABLE "ddc_node" ADD "number_of_gets" numeric NOT NULL DEFAULT 0`)
+    }
+
+    async down(db) {
+        await db.query(`ALTER TABLE "ddc_node" DROP COLUMN "transferred_bytes"`)
+        await db.query(`ALTER TABLE "ddc_node" DROP COLUMN "stored_bytes"`)
+        await db.query(`ALTER TABLE "ddc_node" DROP COLUMN "number_of_puts"`)
+        await db.query(`ALTER TABLE "ddc_node" DROP COLUMN "number_of_gets"`)
+    }
+}

schema.graphql

@@ -51,6 +51,11 @@ type DdcNode @entity {
   grpcPort: Int!
   p2pPort: Int!
   mode: DdcNodeMode!
+
+  transferredBytes: BigInt!
+  storedBytes: BigInt!
+  numberOfPuts: BigInt!
+  numberOfGets: BigInt!
 }
 
 enum DdcNodeMode {

src/main.ts

@@ -181,6 +181,10 @@ processor.run(new TypeormDatabase({ supportHotBlocks: true }), async (ctx) => {
         nodeEntity.grpcPort = node.grpcPort
         nodeEntity.p2pPort = node.p2pPort
         nodeEntity.mode = node.mode
+        nodeEntity.transferredBytes = node.transferredBytes
+        nodeEntity.storedBytes = node.storedBytes
+        nodeEntity.numberOfPuts = node.numberOfPuts
+        nodeEntity.numberOfGets = node.numberOfGets
         ddcNodesMap.set(node.id, nodeEntity)
     })
     // add to cluster

src/model/generated/ddcNode.model.ts

@@ -1,4 +1,4 @@
-import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, ManyToOne as ManyToOne_, Index as Index_, StringColumn as StringColumn_, BooleanColumn as BooleanColumn_, IntColumn as IntColumn_} from "@subsquid/typeorm-store"
+import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, ManyToOne as ManyToOne_, Index as Index_, StringColumn as StringColumn_, BooleanColumn as BooleanColumn_, IntColumn as IntColumn_, BigIntColumn as BigIntColumn_} from "@subsquid/typeorm-store"
 import {Account} from "./account.model"
 import {DdcCluster} from "./ddcCluster.model"
 import {DdcNodeMode} from "./_ddcNodeMode"
@@ -40,4 +40,16 @@ export class DdcNode {
 
     @Column_("varchar", {length: 7, nullable: false})
     mode!: DdcNodeMode
+
+    @BigIntColumn_({nullable: false})
+    transferredBytes!: bigint
+
+    @BigIntColumn_({nullable: false})
+    storedBytes!: bigint
+
+    @BigIntColumn_({nullable: false})
+    numberOfPuts!: bigint
+
+    @BigIntColumn_({nullable: false})
+    numberOfGets!: bigint
 }

src/processors/ddcClustersProcessor.ts

@@ -132,8 +132,7 @@ export class DdcClustersProcessor extends BaseProcessor<State> {
                 clusterInfo.replicationTotal = cluster.props.replicationTotal
                 clusterInfo.status = DdcClusterStatus[cluster.status.__kind]
             }
-        }
-        else {
+        } else {
             throwUnsupportedStorageSpec(block)
         }
         if (clusterInfo) {

src/processors/ddcNodesProcessor.ts

@@ -22,6 +22,11 @@ interface DdcNodeInfo {
     grpcPort: number
     p2pPort: number
     mode: DdcNodeMode
+
+    transferredBytes: bigint
+    storedBytes: bigint
+    numberOfPuts: bigint
+    numberOfGets: bigint
 }
 
 type State = {
@@ -60,6 +65,10 @@ export class DdcNodesProcessor extends BaseProcessor<State> {
                     grpcPort: 9090,
                     p2pPort: 9070,
                     mode: DdcNodeMode.Storage,
+                    transferredBytes: 0n,
+                    storedBytes: 0n,
+                    numberOfPuts: 0n,
+                    numberOfGets: 0n,
                 }
             }
         } else if (storage.ddcNodes.storageNodes.v48013.is(block)) {
@@ -79,6 +88,10 @@ export class DdcNodesProcessor extends BaseProcessor<State> {
                     grpcPort: node.props.grpcPort,
                     p2pPort: node.props.p2PPort,
                     mode: DdcNodeMode.Storage,
+                    transferredBytes: 0n,
+                    storedBytes: 0n,
+                    numberOfPuts: 0n,
+                    numberOfGets: 0n,
                 }
             }
         } else if (storage.ddcNodes.storageNodes.v48017.is(block)) {
@@ -98,6 +111,10 @@ export class DdcNodesProcessor extends BaseProcessor<State> {
                     grpcPort: node.props.grpcPort,
                     p2pPort: node.props.p2PPort,
                     mode: DdcNodeMode[node.props.mode.__kind],
+                    transferredBytes: 0n,
+                    storedBytes: 0n,
+                    numberOfPuts: 0n,
+                    numberOfGets: 0n,
                 }
             }
         } else if (storage.ddcNodes.storageNodes.v48400.is(block)) {
@@ -117,6 +134,10 @@ export class DdcNodesProcessor extends BaseProcessor<State> {
                     grpcPort: node.props.grpcPort,
                     p2pPort: node.props.p2PPort,
                     mode: DdcNodeMode[node.props.mode.__kind],
+                    transferredBytes: 0n,
+                    storedBytes: 0n,
+                    numberOfPuts: 0n,
+                    numberOfGets: 0n,
                 }
             }
         } else if (storage.ddcNodes.storageNodes.v54100.is(block)) {
@@ -136,6 +157,33 @@ export class DdcNodesProcessor extends BaseProcessor<State> {
                     grpcPort: node.props.grpcPort,
                     p2pPort: node.props.p2PPort,
                     mode: DdcNodeMode[node.props.mode.__kind],
+                    transferredBytes: 0n,
+                    storedBytes: 0n,
+                    numberOfPuts: 0n,
+                    numberOfGets: 0n,
+                }
+            }
+        } else if (storage.ddcNodes.storageNodes.v54113.is(block)) {
+            const node = await storage.ddcNodes.storageNodes.v54113.get(
+                block,
+                nodeId,
+            )
+            if (node) {
+                nodeInfo = {
+                    id: nodeId,
+                    providerId: node.providerId,
+                    clusterId: node.clusterId,
+                    host: node.props.host,
+                    domain: node.props.domain,
+                    ssl: node.props.ssl,
+                    httpPort: node.props.httpPort,
+                    grpcPort: node.props.grpcPort,
+                    p2pPort: node.props.p2PPort,
+                    mode: DdcNodeMode[node.props.mode.__kind],
+                    transferredBytes: node.totalUsage?.transferredBytes ?? 0n,
+                    storedBytes: node.totalUsage?.storedBytes ?? 0n,
+                    numberOfPuts: node.totalUsage?.numberOfPuts ?? 0n,
+                    numberOfGets: node.totalUsage?.numberOfGets ?? 0n,
                 }
             }
         } else {

src/types/ddc-nodes/storage.ts

@@ -4,13 +4,15 @@ import * as v48013 from '../v48013'
 import * as v48017 from '../v48017'
 import * as v48400 from '../v48400'
 import * as v54100 from '../v54100'
+import * as v54113 from '../v54113'
 
 export const storageNodes =  {
     v48008: new StorageType('DdcNodes.StorageNodes', 'Optional', [v48008.AccountId32], v48008.StorageNode) as StorageNodesV48008,
     v48013: new StorageType('DdcNodes.StorageNodes', 'Optional', [v48013.AccountId32], v48013.StorageNode) as StorageNodesV48013,
     v48017: new StorageType('DdcNodes.StorageNodes', 'Optional', [v48017.AccountId32], v48017.StorageNode) as StorageNodesV48017,
     v48400: new StorageType('DdcNodes.StorageNodes', 'Optional', [v48400.AccountId32], v48400.StorageNode) as StorageNodesV48400,
     v54100: new StorageType('DdcNodes.StorageNodes', 'Optional', [v54100.AccountId32], v54100.StorageNode) as StorageNodesV54100,
+    v54113: new StorageType('DdcNodes.StorageNodes', 'Optional', [v54113.AccountId32], v54113.StorageNode) as StorageNodesV54113,
 }
 
 export interface StorageNodesV48008  {
@@ -83,6 +85,20 @@ export interface StorageNodesV54100  {
     getPairsPaged(pageSize: number, block: Block, key: v54100.AccountId32): AsyncIterable<[k: v54100.AccountId32, v: (v54100.StorageNode | undefined)][]>
 }
 
+export interface StorageNodesV54113  {
+    is(block: RuntimeCtx): boolean
+    get(block: Block, key: v54113.AccountId32): Promise<(v54113.StorageNode | undefined)>
+    getMany(block: Block, keys: v54113.AccountId32[]): Promise<(v54113.StorageNode | undefined)[]>
+    getKeys(block: Block): Promise<v54113.AccountId32[]>
+    getKeys(block: Block, key: v54113.AccountId32): Promise<v54113.AccountId32[]>
+    getKeysPaged(pageSize: number, block: Block): AsyncIterable<v54113.AccountId32[]>
+    getKeysPaged(pageSize: number, block: Block, key: v54113.AccountId32): AsyncIterable<v54113.AccountId32[]>
+    getPairs(block: Block): Promise<[k: v54113.AccountId32, v: (v54113.StorageNode | undefined)][]>
+    getPairs(block: Block, key: v54113.AccountId32): Promise<[k: v54113.AccountId32, v: (v54113.StorageNode | undefined)][]>
+    getPairsPaged(pageSize: number, block: Block): AsyncIterable<[k: v54113.AccountId32, v: (v54113.StorageNode | undefined)][]>
+    getPairsPaged(pageSize: number, block: Block, key: v54113.AccountId32): AsyncIterable<[k: v54113.AccountId32, v: (v54113.StorageNode | undefined)][]>
+}
+
 export const cdnNodes =  {
     v48008: new StorageType('DdcNodes.CDNNodes', 'Optional', [v48008.AccountId32], v48008.CDNNode) as CdnNodesV48008,
     v48013: new StorageType('DdcNodes.CDNNodes', 'Optional', [v48013.AccountId32], v48013.CDNNode) as CdnNodesV48013,

src/types/index.ts

@@ -46,6 +46,7 @@ export * as v53001 from './v53001'
 export * as v54002 from './v54002'
 export * as v54106 from './v54106'
 export * as v54112 from './v54112'
+export * as v54113 from './v54113'
 export * as v53003 from './v53003'
 export * as events from './events'
 export * as constants from './constants'

src/types/system/storage.ts

@@ -47,6 +47,7 @@ import * as v54100 from '../v54100'
 import * as v54105 from '../v54105'
 import * as v54106 from '../v54106'
 import * as v54112 from '../v54112'
+import * as v54113 from '../v54113'
 
 export const account =  {
     /**
@@ -766,6 +767,16 @@ export const events =  {
      *  just in case someone still reads them from within the runtime.
      */
     v54112: new StorageType('System.Events', 'Default', [], sts.array(() => v54112.EventRecord)) as EventsV54112,
+    /**
+     *  Events deposited for the current block.
+     * 
+     *  NOTE: The item is unbound and should therefore never be read on chain.
+     *  It could otherwise inflate the PoV size of a block.
+     * 
+     *  Events have a large in-memory size. Box the events to not go out-of-memory
+     *  just in case someone still reads them from within the runtime.
+     */
+    v54113: new StorageType('System.Events', 'Default', [], sts.array(() => v54113.EventRecord)) as EventsV54113,
 }
 
 /**
@@ -1431,6 +1442,21 @@ export interface EventsV54112  {
     get(block: Block): Promise<(v54112.EventRecord[] | undefined)>
 }
 
+/**
+ *  Events deposited for the current block.
+ * 
+ *  NOTE: The item is unbound and should therefore never be read on chain.
+ *  It could otherwise inflate the PoV size of a block.
+ * 
+ *  Events have a large in-memory size. Box the events to not go out-of-memory
+ *  just in case someone still reads them from within the runtime.
+ */
+export interface EventsV54113  {
+    is(block: RuntimeCtx): boolean
+    getDefault(block: Block): v54113.EventRecord[]
+    get(block: Block): Promise<(v54113.EventRecord[] | undefined)>
+}
+
 export const eventCount =  {
     /**
      *  The number of events in the `Events<T>` list.