@optimystic/db-p2p-storage-ns 1.26.0 → 1.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -4
- package/dist/src/db.d.ts +6 -3
- package/dist/src/db.d.ts.map +1 -1
- package/dist/src/db.js +10 -2
- package/dist/src/db.js.map +1 -1
- package/dist/src/sqlite-storage.d.ts +3 -3
- package/dist/src/sqlite-storage.d.ts.map +1 -1
- package/dist/src/sqlite-storage.js +15 -12
- package/dist/src/sqlite-storage.js.map +1 -1
- package/package.json +3 -3
- package/src/db.ts +10 -2
- package/src/sqlite-storage.ts +17 -13
package/README.md
CHANGED
|
@@ -9,7 +9,7 @@ Android, native — not React Native). Provides:
|
|
|
9
9
|
It is the shared `KvRawStorage` kernel over a `WriteGroupDriver` over
|
|
10
10
|
`SqliteBatchBackend`: the kernel owns all JSON serialization, the driver
|
|
11
11
|
holds each group of writes in memory until it is flushed, and the backend
|
|
12
|
-
applies the group as one SQLite transaction over the
|
|
12
|
+
applies the group as one SQLite transaction over the seven tables.
|
|
13
13
|
- **`SqliteKVStore`** — implements `IKVStore` for the persistent transaction
|
|
14
14
|
state used to recover crashed two-phase commits.
|
|
15
15
|
- **`loadOrCreateNSPeerKey`** — generates an Ed25519 libp2p private key on
|
|
@@ -98,8 +98,8 @@ still has armed would fire on a closed connection.
|
|
|
98
98
|
|
|
99
99
|
The package opens a single SQLite database (`optimystic.sqlite` by default; a
|
|
100
100
|
bare name goes in the app's databases folder on Android and its documents folder
|
|
101
|
-
on iOS, and a full path is used as given) with
|
|
102
|
-
engine is the SQLite the plugin bundles; on iOS it is the process's. The
|
|
101
|
+
on iOS, and a full path is used as given) with nine tables. On Android the
|
|
102
|
+
engine is the SQLite the plugin bundles; on iOS it is the process's. The seven
|
|
103
103
|
block-storage tables keep their original columns and keys, but their value
|
|
104
104
|
columns are **BLOB**: `SqliteBatchBackend` binds/reads the kernel's raw
|
|
105
105
|
`Uint8Array` bytes and the shared `KvRawStorage` kernel owns the JSON/UTF-8
|
|
@@ -114,7 +114,8 @@ into; keys stay TEXT/INTEGER.
|
|
|
114
114
|
| `revisions` | `(block_id, rev)` | `BLOB` (`action_id` col) | `ActionId` |
|
|
115
115
|
| `pending` | `(block_id, action_id)` | `BLOB` | `Transform` |
|
|
116
116
|
| `transactions` | `(block_id, action_id)` | `BLOB` | `Transform` |
|
|
117
|
-
| `proofs` | `(block_id, rev)` | `BLOB` | `BlockCommitProof`
|
|
117
|
+
| `proofs` | `(block_id, rev)` | `BLOB` | `StoredProofEntry`: a reference to a `commit_proofs` row (a whole `BlockCommitProof` when an earlier build wrote it) |
|
|
118
|
+
| `commit_proofs` | `message_hash` | `BLOB` | `BlockCommitProof` |
|
|
118
119
|
| `materialized` | `(block_id, action_id)` | `BLOB` | `IBlock` |
|
|
119
120
|
| `kv` | `key` | `s_val` (TEXT) or `b_val` (BLOB) | — (not kernel-backed) |
|
|
120
121
|
| `durability_mark` | `id` (always 1) | `n` (INTEGER), a counter nothing reads | — (the row a sync commits when it has nothing else to write) |
|
package/dist/src/db.d.ts
CHANGED
|
@@ -110,7 +110,7 @@ export declare const DEFAULT_DB_VERSION = 1;
|
|
|
110
110
|
/**
|
|
111
111
|
* Schema for the NativeScript storage backend.
|
|
112
112
|
*
|
|
113
|
-
* Mirrors the IndexedDB object stores 1:1. The
|
|
113
|
+
* Mirrors the IndexedDB object stores 1:1. The seven block-storage stores keep
|
|
114
114
|
* their original columns and keys, but their value columns are now BLOB: the
|
|
115
115
|
* shared `KvRawStorage` kernel (over `WriteGroupDriver` over `SqliteBatchBackend`)
|
|
116
116
|
* owns all JSON / UTF-8 (de)serialization, so the backend only ever binds/reads
|
|
@@ -125,6 +125,9 @@ export declare const DEFAULT_DB_VERSION = 1;
|
|
|
125
125
|
* - `proofs` → `BlockCommitProof` bytes keyed by `(block_id, rev)` — the same key
|
|
126
126
|
* shape as `revisions`, deliberately NOT the action keyspace (an action id is
|
|
127
127
|
* caller-chosen, so no reserved id could be relied on).
|
|
128
|
+
* - `commit_proofs` → `BlockCommitProof` bytes keyed by the proof's `message_hash`,
|
|
129
|
+
* one row per consensus message however many blocks it covers. A database file
|
|
130
|
+
* created before the table existed gains it on its next open.
|
|
128
131
|
* - `materialized` → materialized block bytes keyed by `(block_id, action_id)`.
|
|
129
132
|
* - `kv` → generic string keyspace shared by `IKVStore` (`s_val`) and the
|
|
130
133
|
* identity helper (`b_val`). NOT kernel-backed; unchanged. The two columns
|
|
@@ -143,9 +146,9 @@ export declare const DEFAULT_DB_VERSION = 1;
|
|
|
143
146
|
* throwing). There is no migration. Safe today because this backend is
|
|
144
147
|
* NativeScript-only with no shipped production data; if a build ever ships to
|
|
145
148
|
* devices that later upgrade, add a `user_version` bump that drops+recreates
|
|
146
|
-
*
|
|
149
|
+
* the block-storage tables (or a real migration) before assuming BLOB rows.
|
|
147
150
|
*/
|
|
148
|
-
export declare const SCHEMA_SQL = "\nCREATE TABLE IF NOT EXISTS metadata (\n\tblock_id TEXT PRIMARY KEY,\n\tvalue BLOB NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS revisions (\n\tblock_id TEXT NOT NULL,\n\trev INTEGER NOT NULL,\n\taction_id BLOB NOT NULL,\n\tPRIMARY KEY (block_id, rev)\n);\n\nCREATE TABLE IF NOT EXISTS pending (\n\tblock_id TEXT NOT NULL,\n\taction_id TEXT NOT NULL,\n\tvalue BLOB NOT NULL,\n\tPRIMARY KEY (block_id, action_id)\n);\n\nCREATE TABLE IF NOT EXISTS transactions (\n\tblock_id TEXT NOT NULL,\n\taction_id TEXT NOT NULL,\n\tvalue BLOB NOT NULL,\n\tPRIMARY KEY (block_id, action_id)\n);\n\nCREATE TABLE IF NOT EXISTS proofs (\n\tblock_id TEXT NOT NULL,\n\trev INTEGER NOT NULL,\n\tvalue BLOB NOT NULL,\n\tPRIMARY KEY (block_id, rev)\n);\n\nCREATE TABLE IF NOT EXISTS materialized (\n\tblock_id TEXT NOT NULL,\n\taction_id TEXT NOT NULL,\n\tvalue BLOB NOT NULL,\n\tPRIMARY KEY (block_id, action_id)\n);\n\nCREATE TABLE IF NOT EXISTS kv (\n\tkey TEXT PRIMARY KEY,\n\ts_val TEXT,\n\tb_val BLOB\n);\n\nCREATE TABLE IF NOT EXISTS durability_mark (\n\tid INTEGER PRIMARY KEY CHECK (id = 1),\n\tn INTEGER NOT NULL\n);\n";
|
|
151
|
+
export declare const SCHEMA_SQL = "\nCREATE TABLE IF NOT EXISTS metadata (\n\tblock_id TEXT PRIMARY KEY,\n\tvalue BLOB NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS revisions (\n\tblock_id TEXT NOT NULL,\n\trev INTEGER NOT NULL,\n\taction_id BLOB NOT NULL,\n\tPRIMARY KEY (block_id, rev)\n);\n\nCREATE TABLE IF NOT EXISTS pending (\n\tblock_id TEXT NOT NULL,\n\taction_id TEXT NOT NULL,\n\tvalue BLOB NOT NULL,\n\tPRIMARY KEY (block_id, action_id)\n);\n\nCREATE TABLE IF NOT EXISTS transactions (\n\tblock_id TEXT NOT NULL,\n\taction_id TEXT NOT NULL,\n\tvalue BLOB NOT NULL,\n\tPRIMARY KEY (block_id, action_id)\n);\n\nCREATE TABLE IF NOT EXISTS proofs (\n\tblock_id TEXT NOT NULL,\n\trev INTEGER NOT NULL,\n\tvalue BLOB NOT NULL,\n\tPRIMARY KEY (block_id, rev)\n);\n\nCREATE TABLE IF NOT EXISTS commit_proofs (\n\tmessage_hash TEXT PRIMARY KEY,\n\tvalue BLOB NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS materialized (\n\tblock_id TEXT NOT NULL,\n\taction_id TEXT NOT NULL,\n\tvalue BLOB NOT NULL,\n\tPRIMARY KEY (block_id, action_id)\n);\n\nCREATE TABLE IF NOT EXISTS kv (\n\tkey TEXT PRIMARY KEY,\n\ts_val TEXT,\n\tb_val BLOB\n);\n\nCREATE TABLE IF NOT EXISTS durability_mark (\n\tid INTEGER PRIMARY KEY CHECK (id = 1),\n\tn INTEGER NOT NULL\n);\n";
|
|
149
152
|
/**
|
|
150
153
|
* Apply pragmas, run the schema DDL, and stamp `user_version` so future
|
|
151
154
|
* migrations can branch on it. Idempotent — safe to call on every open.
|
package/dist/src/db.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,kFAAkF;AAClF,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC;AAE9D,oEAAoE;AACpE,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC/B,0EAA0E;IAC1E,GAAG,CAAC,GAAG,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,gEAAgE;IAChE,GAAG,CAAC,GAAG,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAC9D,oFAAoF;IACpF,GAAG,CAAC,GAAG,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;CACpD;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,iBAAiB;IACjC,6EAA6E;IAC7E,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;CACtC;AAED,+CAA+C;AAC/C,MAAM,WAAW,wBAAwB;IACxC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,QAAQ;IACxB,yFAAyF;IACzF,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,2FAA2F;IAC3F,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;IACtC;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1G,qCAAqC;IACrC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,uGAAuG;AACvG,MAAM,WAAW,qBAAqB;IACrC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACrC,IAAI,EAAE,qBAAqB,EAC3B,EAAE,EAAE,iBAAiB,EACrB,EAAE,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACzC,OAAO,CAAC,EAAE,wBAAwB,GAChC,OAAO,CAAC,CAAC,CAAC,CAkBZ;AAmBD,eAAO,MAAM,eAAe,sBAAsB,CAAC;AACnD,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC
|
|
1
|
+
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,kFAAkF;AAClF,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC;AAE9D,oEAAoE;AACpE,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC/B,0EAA0E;IAC1E,GAAG,CAAC,GAAG,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,gEAAgE;IAChE,GAAG,CAAC,GAAG,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAC9D,oFAAoF;IACpF,GAAG,CAAC,GAAG,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;CACpD;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,iBAAiB;IACjC,6EAA6E;IAC7E,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;CACtC;AAED,+CAA+C;AAC/C,MAAM,WAAW,wBAAwB;IACxC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,QAAQ;IACxB,yFAAyF;IACzF,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,2FAA2F;IAC3F,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;IACtC;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1G,qCAAqC;IACrC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,uGAAuG;AACvG,MAAM,WAAW,qBAAqB;IACrC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACrC,IAAI,EAAE,qBAAqB,EAC3B,EAAE,EAAE,iBAAiB,EACrB,EAAE,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACzC,OAAO,CAAC,EAAE,wBAAwB,GAChC,OAAO,CAAC,CAAC,CAAC,CAkBZ;AAmBD,eAAO,MAAM,eAAe,sBAAsB,CAAC;AACnD,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,eAAO,MAAM,UAAU,0vCAwDtB,CAAC;AAQF;;;GAGG;AACH,wBAAsB,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,GAAE,MAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAQnG;AAED;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC"}
|
package/dist/src/db.js
CHANGED
|
@@ -70,7 +70,7 @@ export const DEFAULT_DB_VERSION = 1;
|
|
|
70
70
|
/**
|
|
71
71
|
* Schema for the NativeScript storage backend.
|
|
72
72
|
*
|
|
73
|
-
* Mirrors the IndexedDB object stores 1:1. The
|
|
73
|
+
* Mirrors the IndexedDB object stores 1:1. The seven block-storage stores keep
|
|
74
74
|
* their original columns and keys, but their value columns are now BLOB: the
|
|
75
75
|
* shared `KvRawStorage` kernel (over `WriteGroupDriver` over `SqliteBatchBackend`)
|
|
76
76
|
* owns all JSON / UTF-8 (de)serialization, so the backend only ever binds/reads
|
|
@@ -85,6 +85,9 @@ export const DEFAULT_DB_VERSION = 1;
|
|
|
85
85
|
* - `proofs` → `BlockCommitProof` bytes keyed by `(block_id, rev)` — the same key
|
|
86
86
|
* shape as `revisions`, deliberately NOT the action keyspace (an action id is
|
|
87
87
|
* caller-chosen, so no reserved id could be relied on).
|
|
88
|
+
* - `commit_proofs` → `BlockCommitProof` bytes keyed by the proof's `message_hash`,
|
|
89
|
+
* one row per consensus message however many blocks it covers. A database file
|
|
90
|
+
* created before the table existed gains it on its next open.
|
|
88
91
|
* - `materialized` → materialized block bytes keyed by `(block_id, action_id)`.
|
|
89
92
|
* - `kv` → generic string keyspace shared by `IKVStore` (`s_val`) and the
|
|
90
93
|
* identity helper (`b_val`). NOT kernel-backed; unchanged. The two columns
|
|
@@ -103,7 +106,7 @@ export const DEFAULT_DB_VERSION = 1;
|
|
|
103
106
|
* throwing). There is no migration. Safe today because this backend is
|
|
104
107
|
* NativeScript-only with no shipped production data; if a build ever ships to
|
|
105
108
|
* devices that later upgrade, add a `user_version` bump that drops+recreates
|
|
106
|
-
*
|
|
109
|
+
* the block-storage tables (or a real migration) before assuming BLOB rows.
|
|
107
110
|
*/
|
|
108
111
|
export const SCHEMA_SQL = `
|
|
109
112
|
CREATE TABLE IF NOT EXISTS metadata (
|
|
@@ -139,6 +142,11 @@ CREATE TABLE IF NOT EXISTS proofs (
|
|
|
139
142
|
PRIMARY KEY (block_id, rev)
|
|
140
143
|
);
|
|
141
144
|
|
|
145
|
+
CREATE TABLE IF NOT EXISTS commit_proofs (
|
|
146
|
+
message_hash TEXT PRIMARY KEY,
|
|
147
|
+
value BLOB NOT NULL
|
|
148
|
+
);
|
|
149
|
+
|
|
142
150
|
CREATE TABLE IF NOT EXISTS materialized (
|
|
143
151
|
block_id TEXT NOT NULL,
|
|
144
152
|
action_id TEXT NOT NULL,
|
package/dist/src/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;AA2F/B;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CACnC,IAA2B,EAC3B,EAAqB,EACrB,EAAyC,EACzC,OAAkC;IAElC,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,IAAI,MAAM;QAAE,MAAM,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAC5D,IAAI,MAAS,CAAC;IACd,IAAI,CAAC;QACJ,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAI,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;YACnD,CAAC;YAAC,OAAO,UAAU,EAAE,CAAC;gBACrB,GAAG,CAAC,sEAAsE,EAAE,UAAU,CAAC,CAAC;YACzF,CAAC;QACF,CAAC;QACD,MAAM,GAAG,CAAC;IACX,CAAC;IACD,IAAI,MAAM;QAAE,MAAM,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC;AACf,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAI,IAA2B,EAAE,EAAqB,EAAE,EAAyC;IAC/H,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACtC,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,MAAM,CAAC;IACf,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,WAAW,EAAE,CAAC;YACtB,2EAA2E;YAC3E,GAAG,CAAC,gDAAgD,EAAE,WAAW,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,GAAG,CAAC;IACX,CAAC;AACF,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAC;AACnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAEpC
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;AA2F/B;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CACnC,IAA2B,EAC3B,EAAqB,EACrB,EAAyC,EACzC,OAAkC;IAElC,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,IAAI,MAAM;QAAE,MAAM,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAC5D,IAAI,MAAS,CAAC;IACd,IAAI,CAAC;QACJ,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAI,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;YACnD,CAAC;YAAC,OAAO,UAAU,EAAE,CAAC;gBACrB,GAAG,CAAC,sEAAsE,EAAE,UAAU,CAAC,CAAC;YACzF,CAAC;QACF,CAAC;QACD,MAAM,GAAG,CAAC;IACX,CAAC;IACD,IAAI,MAAM;QAAE,MAAM,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC;AACf,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAI,IAA2B,EAAE,EAAqB,EAAE,EAAyC;IAC/H,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACtC,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,MAAM,CAAC;IACf,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,WAAW,EAAE,CAAC;YACtB,2EAA2E;YAC3E,GAAG,CAAC,gDAAgD,EAAE,WAAW,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,GAAG,CAAC;IACX,CAAC;AACF,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAC;AACnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDzB,CAAC;AAEF,+EAA+E;AAC/E,MAAM,WAAW,GAAG;;;CAGnB,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,EAAY,EAAE,UAAkB,kBAAkB;IACnF,wFAAwF;IACxF,yFAAyF;IACzF,6CAA6C;IAC7C,MAAM,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,GAAG,EAAE,CAAC;IACpD,MAAM,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3B,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1B,MAAM,EAAE,CAAC,IAAI,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -6,9 +6,9 @@ export interface SqliteBatchBackendOptions {
|
|
|
6
6
|
readonly setTimer?: SetTimer;
|
|
7
7
|
}
|
|
8
8
|
/**
|
|
9
|
-
* SQLite {@link BatchBackend}: the
|
|
10
|
-
* tables (`metadata`, `revisions`, `pending`, `transactions`, `proofs`, `
|
|
11
|
-
* original columns and keys, every batch applied as ONE SQLite transaction. The reads are the
|
|
9
|
+
* SQLite {@link BatchBackend}: the seven logical block-storage stores mapped to the seven relational
|
|
10
|
+
* tables (`metadata`, `revisions`, `pending`, `transactions`, `proofs`, `commit_proofs`,
|
|
11
|
+
* `materialized`) with their original columns and keys, every batch applied as ONE SQLite transaction. The reads are the
|
|
12
12
|
* former per-write driver's statements unchanged, so the on-disk format did not change with the
|
|
13
13
|
* move to batches.
|
|
14
14
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite-storage.d.ts","sourceRoot":"","sources":["../../src/sqlite-storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACN,YAAY,EAKZ,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,QAAQ,EAEb,KAAK,iBAAiB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,QAAQ,EAAmD,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"sqlite-storage.d.ts","sourceRoot":"","sources":["../../src/sqlite-storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACN,YAAY,EAKZ,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,QAAQ,EAEb,KAAK,iBAAiB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,QAAQ,EAAmD,MAAM,SAAS,CAAC;AAwDzF,8GAA8G;AAC9G,MAAM,WAAW,yBAAyB;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,qBAAa,kBAAmB,YAAW,YAAY;IA2B1C,OAAO,CAAC,QAAQ,CAAC,EAAE;IA1B/B,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAgB;IAMpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAEzC,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAMpB;IAEF;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2B;IACrD,OAAO,CAAC,KAAK,CAAiC;gBAEjB,EAAE,EAAE,QAAQ,EAAE,OAAO,GAAE,yBAA8B;IAsBlF,sHAAsH;IACtH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,aAAa,IAAI,aAAa;IAMxB,GAAG,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAKnD,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;IAKzF,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAK1D,YAAY,IAAI,aAAa,CAAC,OAAO,CAAC;IAQvC,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC;IAe7C;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;IASpG,gJAAgJ;IAChJ,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAKd,cAAc;YAcd,YAAY;IAK1B;;;;;;;;;;OAUG;YACW,QAAQ;IAkBtB,0GAA0G;IAC1G,OAAO,CAAC,gBAAgB;IAMxB;;;OAGG;YACW,YAAY;IAiB1B,OAAO,CAAC,aAAa;IAIrB;;;OAGG;IACH,OAAO,CAAC,KAAK;CAKb;AAED,mJAAmJ;AACnJ,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,CAAC;AAExD;;;;;;;;;;;;;GAaG;AACH,qBAAa,gBAAiB,SAAQ,YAAY;IACzC,YAAY,EAAE,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAC3C,uBAAuB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/C,gBAAgB,EAAE,MAAM,aAAa,CAAC;IACtC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEvB,EAAE,EAAE,QAAQ,EAAE,OAAO,GAAE,uBAA4B;CAG/D"}
|
|
@@ -3,25 +3,28 @@ import { createLogger } from './logger.js';
|
|
|
3
3
|
import { bumpDurabilityMark } from './sqlite-sync.js';
|
|
4
4
|
const log = createLogger('storage:sqlite');
|
|
5
5
|
const LAYOUTS = {
|
|
6
|
-
metadata: { keyColumns: ['block_id'], valueColumn: 'value' },
|
|
7
|
-
revisions: { keyColumns: ['block_id', 'rev'], valueColumn: 'action_id' },
|
|
8
|
-
proofs: { keyColumns: ['block_id', 'rev'], valueColumn: 'value' },
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
6
|
+
metadata: { table: 'metadata', keyColumns: ['block_id'], valueColumn: 'value' },
|
|
7
|
+
revisions: { table: 'revisions', keyColumns: ['block_id', 'rev'], valueColumn: 'action_id' },
|
|
8
|
+
proofs: { table: 'proofs', keyColumns: ['block_id', 'rev'], valueColumn: 'value' },
|
|
9
|
+
commitProofs: { table: 'commit_proofs', keyColumns: ['message_hash'], valueColumn: 'value' },
|
|
10
|
+
pending: { table: 'pending', keyColumns: ['block_id', 'action_id'], valueColumn: 'value' },
|
|
11
|
+
transactions: { table: 'transactions', keyColumns: ['block_id', 'action_id'], valueColumn: 'value' },
|
|
12
|
+
materialized: { table: 'materialized', keyColumns: ['block_id', 'action_id'], valueColumn: 'value' },
|
|
12
13
|
};
|
|
13
14
|
const STORES = Object.keys(LAYOUTS);
|
|
14
15
|
const whereKey = (store) => LAYOUTS[store].keyColumns.map(column => `${column} = ?`).join(' AND ');
|
|
15
16
|
const sqlByStore = (build) => Object.fromEntries(STORES.map(store => [store, build(store)]));
|
|
16
|
-
const GET_SQL = sqlByStore(store => `SELECT ${LAYOUTS[store].valueColumn} FROM ${store} WHERE ${whereKey(store)}`);
|
|
17
|
+
const GET_SQL = sqlByStore(store => `SELECT ${LAYOUTS[store].valueColumn} FROM ${LAYOUTS[store].table} WHERE ${whereKey(store)}`);
|
|
17
18
|
const PUT_SQL = sqlByStore(store => {
|
|
18
19
|
const columns = [...LAYOUTS[store].keyColumns, LAYOUTS[store].valueColumn];
|
|
19
|
-
return `INSERT OR REPLACE INTO ${store} (${columns.join(', ')}) VALUES (${columns.map(() => '?').join(', ')})`;
|
|
20
|
+
return `INSERT OR REPLACE INTO ${LAYOUTS[store].table} (${columns.join(', ')}) VALUES (${columns.map(() => '?').join(', ')})`;
|
|
20
21
|
});
|
|
21
|
-
const DELETE_SQL = sqlByStore(store => `DELETE FROM ${store} WHERE ${whereKey(store)}`);
|
|
22
|
+
const DELETE_SQL = sqlByStore(store => `DELETE FROM ${LAYOUTS[store].table} WHERE ${whereKey(store)}`);
|
|
22
23
|
/** The key's bind parameters, in the order of its store's key columns. */
|
|
23
24
|
function keyParams(key) {
|
|
24
25
|
switch (key.store) {
|
|
26
|
+
case 'commitProofs':
|
|
27
|
+
return [key.messageHash];
|
|
25
28
|
case 'metadata':
|
|
26
29
|
return [key.blockId];
|
|
27
30
|
case 'revisions':
|
|
@@ -34,9 +37,9 @@ function keyParams(key) {
|
|
|
34
37
|
}
|
|
35
38
|
}
|
|
36
39
|
/**
|
|
37
|
-
* SQLite {@link BatchBackend}: the
|
|
38
|
-
* tables (`metadata`, `revisions`, `pending`, `transactions`, `proofs`, `
|
|
39
|
-
* original columns and keys, every batch applied as ONE SQLite transaction. The reads are the
|
|
40
|
+
* SQLite {@link BatchBackend}: the seven logical block-storage stores mapped to the seven relational
|
|
41
|
+
* tables (`metadata`, `revisions`, `pending`, `transactions`, `proofs`, `commit_proofs`,
|
|
42
|
+
* `materialized`) with their original columns and keys, every batch applied as ONE SQLite transaction. The reads are the
|
|
40
43
|
* former per-write driver's statements unchanged, so the on-disk format did not change with the
|
|
41
44
|
* move to batches.
|
|
42
45
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite-storage.js","sourceRoot":"","sources":["../../src/sqlite-storage.ts"],"names":[],"mappings":"AACA,OAAO,EACN,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,iBAAiB,GAWjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,GAAG,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sqlite-storage.js","sourceRoot":"","sources":["../../src/sqlite-storage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@optimystic/db-p2p-storage-ns",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.28.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "NativeScript SQLite storage backend for @optimystic/db-p2p",
|
|
6
6
|
"main": "dist/src/index.js",
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"typescript": "^5.9.3"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@optimystic/db-core": "^1.
|
|
57
|
-
"@optimystic/db-p2p": "^1.
|
|
56
|
+
"@optimystic/db-core": "^1.28.0",
|
|
57
|
+
"@optimystic/db-p2p": "^1.28.0",
|
|
58
58
|
"debug": "^4.4.3"
|
|
59
59
|
},
|
|
60
60
|
"peerDependencies": {
|
package/src/db.ts
CHANGED
|
@@ -164,7 +164,7 @@ export const DEFAULT_DB_VERSION = 1;
|
|
|
164
164
|
/**
|
|
165
165
|
* Schema for the NativeScript storage backend.
|
|
166
166
|
*
|
|
167
|
-
* Mirrors the IndexedDB object stores 1:1. The
|
|
167
|
+
* Mirrors the IndexedDB object stores 1:1. The seven block-storage stores keep
|
|
168
168
|
* their original columns and keys, but their value columns are now BLOB: the
|
|
169
169
|
* shared `KvRawStorage` kernel (over `WriteGroupDriver` over `SqliteBatchBackend`)
|
|
170
170
|
* owns all JSON / UTF-8 (de)serialization, so the backend only ever binds/reads
|
|
@@ -179,6 +179,9 @@ export const DEFAULT_DB_VERSION = 1;
|
|
|
179
179
|
* - `proofs` → `BlockCommitProof` bytes keyed by `(block_id, rev)` — the same key
|
|
180
180
|
* shape as `revisions`, deliberately NOT the action keyspace (an action id is
|
|
181
181
|
* caller-chosen, so no reserved id could be relied on).
|
|
182
|
+
* - `commit_proofs` → `BlockCommitProof` bytes keyed by the proof's `message_hash`,
|
|
183
|
+
* one row per consensus message however many blocks it covers. A database file
|
|
184
|
+
* created before the table existed gains it on its next open.
|
|
182
185
|
* - `materialized` → materialized block bytes keyed by `(block_id, action_id)`.
|
|
183
186
|
* - `kv` → generic string keyspace shared by `IKVStore` (`s_val`) and the
|
|
184
187
|
* identity helper (`b_val`). NOT kernel-backed; unchanged. The two columns
|
|
@@ -197,7 +200,7 @@ export const DEFAULT_DB_VERSION = 1;
|
|
|
197
200
|
* throwing). There is no migration. Safe today because this backend is
|
|
198
201
|
* NativeScript-only with no shipped production data; if a build ever ships to
|
|
199
202
|
* devices that later upgrade, add a `user_version` bump that drops+recreates
|
|
200
|
-
*
|
|
203
|
+
* the block-storage tables (or a real migration) before assuming BLOB rows.
|
|
201
204
|
*/
|
|
202
205
|
export const SCHEMA_SQL = `
|
|
203
206
|
CREATE TABLE IF NOT EXISTS metadata (
|
|
@@ -233,6 +236,11 @@ CREATE TABLE IF NOT EXISTS proofs (
|
|
|
233
236
|
PRIMARY KEY (block_id, rev)
|
|
234
237
|
);
|
|
235
238
|
|
|
239
|
+
CREATE TABLE IF NOT EXISTS commit_proofs (
|
|
240
|
+
message_hash TEXT PRIMARY KEY,
|
|
241
|
+
value BLOB NOT NULL
|
|
242
|
+
);
|
|
243
|
+
|
|
236
244
|
CREATE TABLE IF NOT EXISTS materialized (
|
|
237
245
|
block_id TEXT NOT NULL,
|
|
238
246
|
action_id TEXT NOT NULL,
|
package/src/sqlite-storage.ts
CHANGED
|
@@ -24,19 +24,21 @@ const log = createLogger('storage:sqlite');
|
|
|
24
24
|
|
|
25
25
|
type Store = StoreKey['store'];
|
|
26
26
|
|
|
27
|
-
/** How a logical store is laid out: its table
|
|
27
|
+
/** How a logical store is laid out: its table, with these key columns and this value column. */
|
|
28
28
|
interface TableLayout {
|
|
29
|
+
readonly table: string;
|
|
29
30
|
readonly keyColumns: readonly string[];
|
|
30
31
|
readonly valueColumn: string;
|
|
31
32
|
}
|
|
32
33
|
|
|
33
34
|
const LAYOUTS: Record<Store, TableLayout> = {
|
|
34
|
-
metadata: { keyColumns: ['block_id'], valueColumn: 'value' },
|
|
35
|
-
revisions: { keyColumns: ['block_id', 'rev'], valueColumn: 'action_id' },
|
|
36
|
-
proofs: { keyColumns: ['block_id', 'rev'], valueColumn: 'value' },
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
35
|
+
metadata: { table: 'metadata', keyColumns: ['block_id'], valueColumn: 'value' },
|
|
36
|
+
revisions: { table: 'revisions', keyColumns: ['block_id', 'rev'], valueColumn: 'action_id' },
|
|
37
|
+
proofs: { table: 'proofs', keyColumns: ['block_id', 'rev'], valueColumn: 'value' },
|
|
38
|
+
commitProofs: { table: 'commit_proofs', keyColumns: ['message_hash'], valueColumn: 'value' },
|
|
39
|
+
pending: { table: 'pending', keyColumns: ['block_id', 'action_id'], valueColumn: 'value' },
|
|
40
|
+
transactions: { table: 'transactions', keyColumns: ['block_id', 'action_id'], valueColumn: 'value' },
|
|
41
|
+
materialized: { table: 'materialized', keyColumns: ['block_id', 'action_id'], valueColumn: 'value' },
|
|
40
42
|
};
|
|
41
43
|
|
|
42
44
|
const STORES = Object.keys(LAYOUTS) as Store[];
|
|
@@ -46,16 +48,18 @@ const whereKey = (store: Store): string => LAYOUTS[store].keyColumns.map(column
|
|
|
46
48
|
const sqlByStore = (build: (store: Store) => string): Record<Store, string> =>
|
|
47
49
|
Object.fromEntries(STORES.map(store => [store, build(store)])) as Record<Store, string>;
|
|
48
50
|
|
|
49
|
-
const GET_SQL = sqlByStore(store => `SELECT ${LAYOUTS[store].valueColumn} FROM ${store} WHERE ${whereKey(store)}`);
|
|
51
|
+
const GET_SQL = sqlByStore(store => `SELECT ${LAYOUTS[store].valueColumn} FROM ${LAYOUTS[store].table} WHERE ${whereKey(store)}`);
|
|
50
52
|
const PUT_SQL = sqlByStore(store => {
|
|
51
53
|
const columns = [...LAYOUTS[store].keyColumns, LAYOUTS[store].valueColumn];
|
|
52
|
-
return `INSERT OR REPLACE INTO ${store} (${columns.join(', ')}) VALUES (${columns.map(() => '?').join(', ')})`;
|
|
54
|
+
return `INSERT OR REPLACE INTO ${LAYOUTS[store].table} (${columns.join(', ')}) VALUES (${columns.map(() => '?').join(', ')})`;
|
|
53
55
|
});
|
|
54
|
-
const DELETE_SQL = sqlByStore(store => `DELETE FROM ${store} WHERE ${whereKey(store)}`);
|
|
56
|
+
const DELETE_SQL = sqlByStore(store => `DELETE FROM ${LAYOUTS[store].table} WHERE ${whereKey(store)}`);
|
|
55
57
|
|
|
56
58
|
/** The key's bind parameters, in the order of its store's key columns. */
|
|
57
59
|
function keyParams(key: StoreKey): SqliteParam[] {
|
|
58
60
|
switch (key.store) {
|
|
61
|
+
case 'commitProofs':
|
|
62
|
+
return [key.messageHash];
|
|
59
63
|
case 'metadata':
|
|
60
64
|
return [key.blockId];
|
|
61
65
|
case 'revisions':
|
|
@@ -74,9 +78,9 @@ export interface SqliteBatchBackendOptions {
|
|
|
74
78
|
}
|
|
75
79
|
|
|
76
80
|
/**
|
|
77
|
-
* SQLite {@link BatchBackend}: the
|
|
78
|
-
* tables (`metadata`, `revisions`, `pending`, `transactions`, `proofs`, `
|
|
79
|
-
* original columns and keys, every batch applied as ONE SQLite transaction. The reads are the
|
|
81
|
+
* SQLite {@link BatchBackend}: the seven logical block-storage stores mapped to the seven relational
|
|
82
|
+
* tables (`metadata`, `revisions`, `pending`, `transactions`, `proofs`, `commit_proofs`,
|
|
83
|
+
* `materialized`) with their original columns and keys, every batch applied as ONE SQLite transaction. The reads are the
|
|
80
84
|
* former per-write driver's statements unchanged, so the on-disk format did not change with the
|
|
81
85
|
* move to batches.
|
|
82
86
|
*
|