@ocap/statedb-memory 1.29.3 → 1.29.5

package/esm/db.d.mts

@@ -26,6 +26,14 @@ declare class MemoryStateDB extends StateDB {
   evidence: IStateTable<IEvidenceState>;
   tokenFactory: IStateTable<ITokenFactoryState>;
   constructor();
+  /**
+   * Execute function - Memory adapter has no real transaction support
+   * This is a no-op wrapper that simply executes the callback
+   *
+   * @param fn - Function to execute (txn parameter will be null)
+   * @returns Result of the function
+   */
+  runAsLambda<T>(fn: (txn: null) => T | Promise<T>): Promise<T>;
 }
 //#endregion
 export { MemoryStateDB as default };

package/esm/db.mjs

@@ -94,6 +94,16 @@ var MemoryStateDB = class extends StateDB {
 		});
 		this.attachReadyListeners();
 	}
+	/**
+	* Execute function - Memory adapter has no real transaction support
+	* This is a no-op wrapper that simply executes the callback
+	*
+	* @param fn - Function to execute (txn parameter will be null)
+	* @returns Result of the function
+	*/
+	async runAsLambda(fn) {
+		return fn(null);
+	}
 };
 var db_default = MemoryStateDB;
 

package/esm/package.mjs

@@ -11,7 +11,10 @@ var package_default = {
 	},
 	publishConfig: { "access": "public" },
 	contributors: ["wangshijun <shijun@arcblock.io> (https://www.arcblock.io)"],
-	devDependencies: { "@types/lokijs": "^1.5.14" },
+	devDependencies: {
+		"@ocap/statedb-test": "workspace:*",
+		"@types/lokijs": "^1.5.14"
+	},
 	homepage: "https://github.com/ArcBlock/blockchain/tree/master/statedb/memory",
 	keywords: [
 		"ocap",

package/esm/table/account.d.mts

@@ -12,6 +12,7 @@ interface AccountOperationContext extends IOperationContext {
 declare class AccountStateDB extends MemoryTable<IAccountState> {
   _get(address: string, context?: AccountOperationContext): Promise<IAccountState | null>;
   _create(key: string, attrs?: Partial<IAccountState>, context?: IOperationContext): Promise<IAccountState>;
+  _update(key: string, updates: Partial<IAccountState>, context?: IOperationContext): Promise<IAccountState>;
 }
 //#endregion
 export { AccountStateDB as default };

package/esm/table/account.mjs

@@ -1,4 +1,5 @@
 import base_default from "./base.mjs";
+import { followMigrationChain, wouldCreateMigrationCycle } from "@ocap/statedb";
 import { ensureChecksumAddress } from "@ocap/state/lib/states/account";
 
 //#region src/table/account.ts
@@ -8,18 +9,30 @@ import { ensureChecksumAddress } from "@ocap/state/lib/states/account";
 */
 var AccountStateDB = class extends base_default {
 	async _get(address, context = {}) {
-		const { traceMigration = true, ...restContext } = context;
-		const current = await super._get(ensureChecksumAddress(address), restContext);
-		if (current && traceMigration && Array.isArray(current.migratedTo) && current.migratedTo.length) return this._get(current.migratedTo[0], context);
-		return current;
+		const { traceMigration = true } = context;
+		const normalizedAddress = ensureChecksumAddress(address);
+		if (!traceMigration) return super._get(normalizedAddress, context);
+		return followMigrationChain(normalizedAddress, (addr) => super._get(addr, context), ensureChecksumAddress);
 	}
-	_create(key, attrs = {}, context) {
+	async _create(key, attrs = {}, context) {
 		const address = ensureChecksumAddress(key);
+		const { migratedTo } = attrs;
+		if (migratedTo?.length) {
+			if (await wouldCreateMigrationCycle(address, migratedTo, (addr) => super._get(addr, context), ensureChecksumAddress)) throw new Error(`Circular migration detected: ${address} -> ${migratedTo.join(", ")}`);
+		}
 		return super._create(address, {
 			...attrs,
 			[this.uniqIndex]: address
 		}, context);
 	}
+	async _update(key, updates, context) {
+		const address = ensureChecksumAddress(key);
+		const { migratedTo } = updates;
+		if (migratedTo?.length) {
+			if (await wouldCreateMigrationCycle(address, migratedTo, (addr) => super._get(addr, context), ensureChecksumAddress)) throw new Error(`Circular migration detected: ${address} -> ${migratedTo.join(", ")}`);
+		}
+		return super._update(address, updates, context);
+	}
 };
 var account_default = AccountStateDB;
 

package/lib/db.cjs

@@ -97,6 +97,16 @@ var MemoryStateDB = class extends _ocap_statedb.StateDB {
 		});
 		this.attachReadyListeners();
 	}
+	/**
+	* Execute function - Memory adapter has no real transaction support
+	* This is a no-op wrapper that simply executes the callback
+	*
+	* @param fn - Function to execute (txn parameter will be null)
+	* @returns Result of the function
+	*/
+	async runAsLambda(fn) {
+		return fn(null);
+	}
 };
 var db_default = MemoryStateDB;
 

package/lib/db.d.cts

@@ -1,6 +1,6 @@
 import { StateDB } from "@ocap/statedb";
 import { IAccountState, IAssetFactoryState, IAssetState, IBalanceTable, IChainState, IDelegateState, IEvidenceState, IRollupBlock, IRollupTable, IStakeState, IStateTable, ITokenFactoryState, ITokenTable, ITxState } from "@ocap/types";
-import Loki from "lokijs";
+import Lokijs from "lokijs";
 
 //#region src/db.d.ts
 
@@ -11,7 +11,7 @@ import Loki from "lokijs";
 declare class MemoryStateDB extends StateDB {
   name: string;
   version: string;
-  db: Loki;
+  db: Lokijs;
   balance: IBalanceTable;
   account: IStateTable<IAccountState>;
   factory: IStateTable<IAssetFactoryState>;
@@ -26,6 +26,14 @@ declare class MemoryStateDB extends StateDB {
   evidence: IStateTable<IEvidenceState>;
   tokenFactory: IStateTable<ITokenFactoryState>;
   constructor();
+  /**
+   * Execute function - Memory adapter has no real transaction support
+   * This is a no-op wrapper that simply executes the callback
+   *
+   * @param fn - Function to execute (txn parameter will be null)
+   * @returns Result of the function
+   */
+  runAsLambda<T>(fn: (txn: null) => T | Promise<T>): Promise<T>;
 }
 //#endregion
 export { MemoryStateDB as default };

package/lib/package.cjs

@@ -12,7 +12,10 @@ var package_default = {
 	},
 	publishConfig: { "access": "public" },
 	contributors: ["wangshijun <shijun@arcblock.io> (https://www.arcblock.io)"],
-	devDependencies: { "@types/lokijs": "^1.5.14" },
+	devDependencies: {
+		"@ocap/statedb-test": "workspace:*",
+		"@types/lokijs": "^1.5.14"
+	},
 	homepage: "https://github.com/ArcBlock/blockchain/tree/master/statedb/memory",
 	keywords: [
 		"ocap",

package/lib/table/account.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
 const require_table_base = require('./base.cjs');
+let _ocap_statedb = require("@ocap/statedb");
 let _ocap_state_lib_states_account = require("@ocap/state/lib/states/account");
 
 //#region src/table/account.ts
@@ -10,18 +11,30 @@ let _ocap_state_lib_states_account = require("@ocap/state/lib/states/account");
 */
 var AccountStateDB = class extends require_table_base.default {
 	async _get(address, context = {}) {
-		const { traceMigration = true, ...restContext } = context;
-		const current = await super._get((0, _ocap_state_lib_states_account.ensureChecksumAddress)(address), restContext);
-		if (current && traceMigration && Array.isArray(current.migratedTo) && current.migratedTo.length) return this._get(current.migratedTo[0], context);
-		return current;
+		const { traceMigration = true } = context;
+		const normalizedAddress = (0, _ocap_state_lib_states_account.ensureChecksumAddress)(address);
+		if (!traceMigration) return super._get(normalizedAddress, context);
+		return (0, _ocap_statedb.followMigrationChain)(normalizedAddress, (addr) => super._get(addr, context), _ocap_state_lib_states_account.ensureChecksumAddress);
 	}
-	_create(key, attrs = {}, context) {
+	async _create(key, attrs = {}, context) {
 		const address = (0, _ocap_state_lib_states_account.ensureChecksumAddress)(key);
+		const { migratedTo } = attrs;
+		if (migratedTo?.length) {
+			if (await (0, _ocap_statedb.wouldCreateMigrationCycle)(address, migratedTo, (addr) => super._get(addr, context), _ocap_state_lib_states_account.ensureChecksumAddress)) throw new Error(`Circular migration detected: ${address} -> ${migratedTo.join(", ")}`);
+		}
 		return super._create(address, {
 			...attrs,
 			[this.uniqIndex]: address
 		}, context);
 	}
+	async _update(key, updates, context) {
+		const address = (0, _ocap_state_lib_states_account.ensureChecksumAddress)(key);
+		const { migratedTo } = updates;
+		if (migratedTo?.length) {
+			if (await (0, _ocap_statedb.wouldCreateMigrationCycle)(address, migratedTo, (addr) => super._get(addr, context), _ocap_state_lib_states_account.ensureChecksumAddress)) throw new Error(`Circular migration detected: ${address} -> ${migratedTo.join(", ")}`);
+		}
+		return super._update(address, updates, context);
+	}
 };
 var account_default = AccountStateDB;
 

package/lib/table/account.d.cts

@@ -12,6 +12,7 @@ interface AccountOperationContext extends IOperationContext {
 declare class AccountStateDB extends MemoryTable<IAccountState> {
   _get(address: string, context?: AccountOperationContext): Promise<IAccountState | null>;
   _create(key: string, attrs?: Partial<IAccountState>, context?: IOperationContext): Promise<IAccountState>;
+  _update(key: string, updates: Partial<IAccountState>, context?: IOperationContext): Promise<IAccountState>;
 }
 //#endregion
 export { AccountStateDB as default };

package/lib/table/base.d.cts

@@ -1,6 +1,6 @@
 import { StateDBTable } from "@ocap/statedb";
 import { IBalanceTable, IOperationContext } from "@ocap/types";
-import Loki from "lokijs";
+import Lokijs from "lokijs";
 
 //#region src/table/base.d.ts
 interface TableOptions {
@@ -8,7 +8,7 @@ interface TableOptions {
   uniqIndex: string | string[];
   syncBalance?: boolean;
   balanceTable?: IBalanceTable;
-  db: Loki;
+  db: Lokijs;
 }
 /**
  * 内存表基类

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/statedb-memory",
   "description": "OCAP statedb adapter that uses memory as backend statedb, just for test purpose",
-  "version": "1.29.3",
+  "version": "1.29.5",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/blockchain/issues",
@@ -14,6 +14,7 @@
     "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)"
   ],
   "devDependencies": {
+    "@ocap/statedb-test": "1.29.5",
     "@types/lokijs": "^1.5.14"
   },
   "homepage": "https://github.com/ArcBlock/blockchain/tree/master/statedb/memory",
@@ -62,10 +63,10 @@
   },
   "gitHead": "87990c8b5e215107fc587c1ced0d6b3e2cd2483e",
   "dependencies": {
-    "@ocap/state": "1.29.3",
-    "@ocap/statedb": "1.29.3",
-    "@ocap/types": "1.29.3",
-    "@ocap/util": "1.29.3",
+    "@ocap/state": "1.29.5",
+    "@ocap/statedb": "1.29.5",
+    "@ocap/types": "1.29.5",
+    "@ocap/util": "1.29.5",
     "debug": "^4.4.3",
     "lodash": "^4.17.23",
     "lokijs": "^1.5.12"