@ocap/statedb-fs 1.6.3 → 1.6.10

package/README.md

@@ -1,4 +1,4 @@
-# [**@ocap/statedb-fs**](https://github.com/arcblock/ocap-js)
+# [**@ocap/statedb-fs**](https://github.com/arcblock/asset-chain)
 
 [![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 

package/lib/db.js

@@ -1,9 +1,9 @@
 const { StateDB } = require('@ocap/statedb');
 
-const AccountStateDB = require('./table/account');
-const AssetStateDB = require('./table/asset');
-const DelegationStateDB = require('./table/delegation');
-const TxStateDB = require('./table/tx');
+const Table = require('./table/base');
+const Account = require('./table/account');
+const Token = require('./table/token');
+const Rollup = require('./table/rollup');
 
 const { name, version } = require('../package.json');
 
@@ -14,15 +14,19 @@ class FsStateDB extends StateDB {
     this.name = name;
     this.version = version;
 
-    this.account = new AccountStateDB('account', dataDir, 'address');
-    this.asset = new AssetStateDB('asset', dataDir, 'address');
-    this.delegation = new DelegationStateDB('delegation', dataDir, 'address');
-    this.tx = new TxStateDB('tx', dataDir, 'hash');
+    this.account = new Account('account', dataDir, 'address');
+    this.asset = new Table('asset', dataDir, 'address');
+    this.factory = new Table('factory', dataDir, 'address');
+    this.delegation = new Table('delegation', dataDir, 'address');
+    this.tx = new Table('tx', dataDir, 'hash');
+    this.token = new Token('token', dataDir, 'address');
+    this.chain = new Table('chain', dataDir, 'address');
+    this.stake = new Table('stake', dataDir, 'address');
+    this.rollup = new Rollup('rollup', dataDir, 'address');
+    this.rollupBlock = new Table('rollupBlock', dataDir, 'hash');
+    this.evidence = new Table('evidence', dataDir, 'hash');
 
-    this.account.onReady(() => this.markReady('account'));
-    this.asset.onReady(() => this.markReady('asset'));
-    this.delegation.onReady(() => this.markReady('delegation'));
-    this.tx.onReady(() => this.markReady('tx'));
+    this.attachReadyListeners();
   }
 }
 

package/lib/table/account.js

@@ -1,15 +1,30 @@
-/* eslint-disable no-underscore-dangle */
+const { ensureChecksumAddress } = require('@ocap/state/lib/states/account');
+const debug = require('debug')(require('../../package.json').name);
 const FsTable = require('./base');
 
 class AccountTable extends FsTable {
   async _get(address, { final = true } = {}) {
-    const current = await this.collection.by(this.uniqIndex, address);
+    const current = await this.collection.by(this.uniqIndex, ensureChecksumAddress(address));
     if (current && final && Array.isArray(current.migratedTo) && current.migratedTo.length) {
       return this.collection.by(this.uniqIndex, current.migratedTo[0]);
     }
 
     return current;
   }
+
+  async _create(key, attrs) {
+    const doc = await this._get(key);
+    if (doc) {
+      throw new Error(`${this.name} already exists: ${key}`);
+    }
+
+    debug(`insert ${this.name}`, attrs);
+    const newDoc = { [this.uniqIndex]: key, ...attrs };
+    newDoc[this.uniqIndex] = ensureChecksumAddress(newDoc[this.uniqIndex]);
+    const result = await this.collection.insert(newDoc);
+
+    return result;
+  }
 }
 
 module.exports = AccountTable;

package/lib/table/base.js

@@ -39,15 +39,21 @@ class FsTable extends StateDBTable {
       throw new Error(`${this.name} already exists: ${key}`);
     }
     debug(`insert ${this.name}`, attrs);
-    return this.collection.insert({ [this.uniqIndex]: key, ...attrs });
+    const result = await this.collection.insert({ [this.uniqIndex]: key, ...attrs });
+
+    return result;
   }
 
   _get(key) {
-    return this.collection.by(this.uniqIndex, key);
+    return key ? this.collection.by(this.uniqIndex, key) : null;
+  }
+
+  _history() {
+    return [];
   }
 
   async _update(key, updates) {
-    const doc = await this._get(key);
+    const doc = await this.collection.by(this.uniqIndex, key);
     if (!doc) {
       throw new Error(`${this.name} does not exists: ${key}`);
     }
@@ -55,9 +61,22 @@ class FsTable extends StateDBTable {
     debug(`update ${this.name}`, { key, updates });
     Object.assign(doc, updates);
     await this.collection.update(doc);
+
     return doc;
   }
 
+  updateOrCreate(exist, state, ctx) {
+    if (!state[this.uniqIndex]) {
+      throw new Error('Cannot update or create without uniq index');
+    }
+
+    if (exist) {
+      return this.update(state[this.uniqIndex], state, ctx);
+    }
+
+    return this.create(state[this.uniqIndex], state, ctx);
+  }
+
   _reset() {
     this.collection.removeWhere({});
   }

package/lib/table/rollup.js

@@ -0,0 +1,13 @@
+const FsTable = require('./base');
+
+class RollupTable extends FsTable {
+  async existByToken(token) {
+    if (!token) {
+      return false;
+    }
+
+    return this.collection.count({ tokenAddress: token }) > 0;
+  }
+}
+
+module.exports = RollupTable;

package/lib/table/token.js

@@ -0,0 +1,13 @@
+const FsTable = require('./base');
+
+class TokenTable extends FsTable {
+  async existBySymbol(symbol) {
+    if (!symbol) {
+      throw new Error('param symbol is required');
+    }
+
+    return this.collection.count({ symbol }) > 0;
+  }
+}
+
+module.exports = TokenTable;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@ocap/statedb-fs",
   "description": "OCAP statedb adapter that uses fs as backend",
-  "version": "1.6.3",
+  "version": "1.6.10",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
-    "url": "https://github.com/ArcBlock/ocap-js/issues",
+    "url": "https://github.com/ArcBlock/asset-chain/issues",
     "email": "shijun@arcblock.io"
   },
   "publishConfig": {
@@ -14,9 +14,9 @@
     "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)"
   ],
   "devDependencies": {
-    "jest": "^26.6.3"
+    "jest": "^27.3.1"
   },
-  "homepage": "https://github.com/ArcBlock/ocap-js/tree/master/statedb/fs",
+  "homepage": "https://github.com/ArcBlock/asset-chain/tree/master/statedb/fs",
   "keywords": [
     "ocap",
     "statedb",
@@ -29,18 +29,19 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/ArcBlock/ocap-js/tree/master/statedb/fs"
+    "url": "https://github.com/ArcBlock/asset-chain/tree/master/statedb/fs"
   },
   "scripts": {
     "lint": "eslint tests lib",
     "lint:fix": "eslint --fix tests lib",
-    "test": "node tools/jest.js",
+    "test": "jest --forceExit --detectOpenHandles",
     "coverage": "npm run test -- --coverage & exit 0"
   },
-  "gitHead": "5246168dbbc268a3e6f95c3992d9d343647ca25b",
+  "gitHead": "ab272e8db3a15c6571cc7fae7cc3d3e0fdd4bdb1",
   "dependencies": {
-    "@ocap/statedb": "^1.6.3",
-    "debug": "^4.3.1",
+    "@ocap/state": "1.6.10",
+    "@ocap/statedb": "1.6.10",
+    "debug": "^4.3.3",
     "lodash": "^4.17.21",
     "lokijs": "^1.5.11"
   }

package/lib/table/asset.js

@@ -1,5 +0,0 @@
-const FsTable = require('./base');
-
-class AssetTable extends FsTable {}
-
-module.exports = AssetTable;

package/lib/table/delegation.js

@@ -1,5 +0,0 @@
-const FsTable = require('./base');
-
-class DelegationTable extends FsTable {}
-
-module.exports = DelegationTable;

package/lib/table/tx.js

@@ -1,5 +0,0 @@
-const FsTable = require('./base');
-
-class TxTable extends FsTable {}
-
-module.exports = TxTable;