Fixed issues with the state getter

Author: rpanic

packages/protocol/src/state/protocol/ProtocolState.ts

@@ -34,29 +34,30 @@ export function createStateGetter<TargetModule extends StatefulModule>(
   prefix: string,
   debugInfo: { parentName: string; baseModuleNames: string }
 ) {
-  return () => {
+  return function getter(this: TargetModule) {
+    // const self = this;
     const { value } = valueReference;
     // Short-circuit this to return the state in case its already initialized
     if (value !== undefined && value.path !== undefined) {
       return value;
     }
 
-    if (target.name === undefined) {
-      throw errors.missingName(target.constructor.name);
+    if (this.name === undefined) {
+      throw errors.missingName(this.constructor.name);
     }
 
-    if (!target.parent) {
+    if (!this.parent) {
       throw errors.missingParent(
-        target.constructor.name,
+        this.constructor.name,
         debugInfo.parentName,
         debugInfo.baseModuleNames
       );
     }
 
-    const path = Path.fromProperty(target.name, propertyKey, prefix);
+    const path = Path.fromProperty(this.name, propertyKey, prefix);
     if (value) {
       value.path = path;
-      value.stateServiceProvider = target.parent.stateServiceProvider;
+      value.stateServiceProvider = this.parent.stateServiceProvider;
     }
     return value;
   };

packages/sdk/test/networkstate/Balance.ts

@@ -5,11 +5,11 @@ import {
   TokenId,
   UInt64,
 } from "@proto-kit/library";
-import { runtimeMethod, runtimeModule, state } from "@proto-kit/module";
+import { runtimeMethod, runtimeModule } from "@proto-kit/module";
 import { log, Presets, range, mapSequential } from "@proto-kit/common";
 import { Bool, Field, PublicKey } from "o1js";
 import { Admin } from "@proto-kit/module/test/modules/Admin";
-import { State, assert } from "@proto-kit/protocol";
+import { State, assert, state } from "@proto-kit/protocol";
 
 @runtimeModule()
 export class BalanceChild extends Balances {

packages/sequencer/test/integration/BlockProduction.test.ts

@@ -18,6 +18,7 @@ import {
   MandatoryProtocolModulesRecord,
   Path,
   Protocol,
+  PROTOKIT_PREFIXES,
 } from "@proto-kit/protocol";
 import { AppChain } from "@proto-kit/sdk";
 import { Bool, Field, PrivateKey, PublicKey, Struct, UInt64 } from "o1js";
@@ -595,7 +596,11 @@ describe("block production", () => {
     expect(batch!.blockHashes).toHaveLength(1);
     expect(batch!.proof.proof).toBe(MOCK_PROOF);
 
-    const supplyPath = Path.fromProperty("Balance", "totalSupply");
+    const supplyPath = Path.fromProperty(
+      "Balance",
+      "totalSupply",
+      PROTOKIT_PREFIXES.STATE_RUNTIME
+    );
     const newState = await test.getState(supplyPath, "block");
 
     expect(newState).toBeDefined();

packages/sequencer/test/integration/mocks/Balance.ts

@@ -3,12 +3,18 @@ import {
   runtimeMethod,
   runtimeModule,
   RuntimeModule,
-  state,
 } from "@proto-kit/module";
 import { log, Presets, range, mapSequential } from "@proto-kit/common";
 import { Bool, Field, PublicKey, UInt64 } from "o1js";
 import { Admin } from "@proto-kit/module/test/modules/Admin";
-import { Option, State, StateMap, assert, Deposit } from "@proto-kit/protocol";
+import {
+  Option,
+  State,
+  StateMap,
+  assert,
+  Deposit,
+  state,
+} from "@proto-kit/protocol";
 
 @runtimeModule()
 export class Balance extends RuntimeModule<object> {

packages/sequencer/test/integration/mocks/ProtocolStateTestHook.ts

@@ -1,9 +1,9 @@
 import {
   AfterTransactionHookArguments,
   BeforeTransactionHookArguments,
-  protocolState,
   ProvableTransactionHook,
   StateMap,
+  state,
 } from "@proto-kit/protocol";
 import { Field } from "o1js";
 import { noop } from "@proto-kit/common";
@@ -12,7 +12,7 @@ import { noop } from "@proto-kit/common";
  * A hook used to test protocolstate inside the blockproduction tests
  */
 export class ProtocolStateTestHook extends ProvableTransactionHook {
-  @protocolState() methodIdInvocations = StateMap.from(Field, Field);
+  @state() methodIdInvocations = StateMap.from(Field, Field);
 
   public async beforeTransaction(
     executionData: BeforeTransactionHookArguments

packages/sequencer/test/merkle/MerkleTree.test.ts

@@ -1,3 +1,4 @@
+import "reflect-metadata";
 import { Field } from "o1js";
 import { RollupMerkleTree, log } from "@proto-kit/common";
 

packages/sequencer/test/settlement/mocks/Balances.ts

@@ -2,11 +2,10 @@ import { NoConfig } from "@proto-kit/common";
 import {
   RuntimeModule,
   runtimeMethod,
-  state,
   runtimeModule,
   runtimeMessage,
 } from "@proto-kit/module";
-import { StateMap, assert, Deposit } from "@proto-kit/protocol";
+import { StateMap, assert, Deposit, state } from "@proto-kit/protocol";
 import { Field, PublicKey, Struct, Provable, UInt64 } from "o1js";
 
 export const errors = {