Store thinned archive blocks only

Author: web3blind

tools/archive-node/archive-node.test.js

@@ -130,6 +130,8 @@ async function run() {
             assert.strictEqual(block.status, 200);
             assert.strictEqual(block.body.block.block_id, TEST_BLOCK.block_id);
             assert.strictEqual(block.body.eventCount, 3);
+            assert.strictEqual(block.body.block.transactions[0].operations.length, 3);
+            assert.ok(JSON.stringify(block.body.block).indexOf('dice.id') === -1, 'served block must be thinned to game operations');
 
             var range = await getJson(port, '/archive-mirror/v1/range?start=100&end=200&protocol=VM,V,VE,award');
             assert.strictEqual(range.status, 200);

tools/archive-node/storage.js

@@ -153,6 +153,35 @@ ArchiveStore.prototype.getBlockRecord = function(blockNum) {
     };
 };
 
+ArchiveStore.prototype.eventKey = function(event) {
+    return [event.blockNum, event.txIndex, event.opIndex, event.protocol, event.type, event.sender || event.account || ''].join(':');
+};
+
+ArchiveStore.prototype._thinBlock = function(block, events) {
+    var thin = {
+        previous: block && (block.previous || block.previous_block_id || '') || '',
+        timestamp: block && block.timestamp || '',
+        block_id: block && (block.block_id || block.id || '') || '',
+        transactions: []
+    };
+    var byTx = {};
+    events = events || [];
+    for (var i = 0; i < events.length; i += 1) {
+        var ev = events[i];
+        var txIndex = Number(ev.txIndex) || 0;
+        if (!byTx[txIndex]) {
+            byTx[txIndex] = { operations: [] };
+            thin.transactions.push(byTx[txIndex]);
+        }
+        if (ev.opType === 'custom') {
+            byTx[txIndex].operations.push(['custom', ev.raw || {}]);
+        } else if (ev.opType === 'award') {
+            byTx[txIndex].operations.push(['award', ev.raw || {}]);
+        }
+    }
+    return thin;
+};
+
 ArchiveStore.prototype.putBlock = function(blockNum, block, sourceNode, events) {
     var now = new Date().toISOString();
     var bn = Number(blockNum);
@@ -163,21 +192,18 @@ ArchiveStore.prototype.putBlock = function(blockNum, block, sourceNode, events)
     try {
         this.db.prepare('DELETE FROM event_accounts WHERE block_num = ?').run(bn);
         this.db.prepare('DELETE FROM events WHERE block_num = ?').run(bn);
+        var storedBlock = this._thinBlock(block, events || []);
         this.db.prepare([
             'INSERT OR REPLACE INTO blocks(block_num, block_id, previous, timestamp, source_node, indexed_at, event_count, raw_json)',
             'VALUES(?, ?, ?, ?, ?, ?, ?, ?)'
-        ].join(' ')).run(bn, blockId, previous, timestamp, sourceNode || '', now, events ? events.length : 0, JSON.stringify(block || {}));
+        ].join(' ')).run(bn, blockId, previous, timestamp, sourceNode || '', now, events ? events.length : 0, JSON.stringify(storedBlock));
         this.db.exec('COMMIT');
     } catch (err) {
         this.db.exec('ROLLBACK');
         throw err;
     }
 };
 
-ArchiveStore.prototype.eventKey = function(event) {
-    return [event.blockNum, event.txIndex, event.opIndex, event.protocol, event.type, event.sender || event.account || ''].join(':');
-};
-
 ArchiveStore.prototype.putEventsForBlock = function(events) {
     var insertEvent = this.db.prepare([
         'INSERT OR REPLACE INTO events(id, block_num, block_id, previous, timestamp, tx_index, op_index, op_type, protocol, type, sender, account, accounts_json, payload_json, raw_json)',