Fix transactionsRoot and sha3Uncles in eth_getBlockByNumber. (#141

)
aurora-is-near · Dec 20, 2021 · 751e58a · 751e58a
1 parent 7d5bc8d
commit 751e58a
Show file tree

Hide file tree

Showing 15 changed files with 350 additions and 35 deletions.
diff --git a/.docker/docker-entrypoint-initdb.d/init.txt b/.docker/docker-entrypoint-initdb.d/init.txt
@@ -44,7 +44,7 @@ CREATE TYPE block_result AS (
  "size" int4,
  "gasLimit" int8,
  "gasUsed" int8,
- "mixHash" hash, 
+ "mixHash" hash,
  "timestamp" int4
 );
 DROP TYPE IF EXISTS filter_result CASCADE;
@@ -221,7 +221,7 @@ BEGIN
  hash, -- hash
  parent_hash, -- parentHash
  repeat('\000', 8)::bytea, -- nonce
- repeat('\000', 32)::bytea,  -- sha3Uncles
+ '\x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', -- sha3Uncles keccak256(rlp.encode([]))
  repeat('\000', 256)::bytea, -- logsBloom
  transactions_root, -- transactionsRoot
  state_root, -- stateRoot

diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+## 2021-12-14
+
+- Run `node lib/data_migrations/2021-12-14-empty-blocks.js` to reindex all historical empty blocks.
+In addition, reload the following stored procedures:
+
+- `etc/schema/functions/eth_getBlockByNumber.sql`
+
+or
+
+```bash
+$ cd migrations
+$ goose postgres "user=<USERNAME> password=<PASSWORD> dbname=aurora sslmode=disable" up
+```
+
 ## 2021-12-08
 
 A new column `from` was added into the `event` table. Check out this PR [#120](https://github.com/aurora-is-near/aurora-relayer/pull/120) for more info.

diff --git a/etc/schema/functions/eth_getBlockByNumber.sql b/etc/schema/functions/eth_getBlockByNumber.sql
@@ -9,7 +9,7 @@ BEGIN
  hash, -- hash
  parent_hash, -- parentHash
  repeat('\000', 8)::bytea, -- nonce
- repeat('\000', 32)::bytea,  -- sha3Uncles
+ '\x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', -- sha3Uncles keccak256(rlp.encode([]))
  repeat('\000', 256)::bytea, -- logsBloom
  transactions_root, -- transactionsRoot
  state_root, -- stateRoot

diff --git a/lib/data_migrations/2021-12-14-empty-blocks.d.ts b/lib/data_migrations/2021-12-14-empty-blocks.d.ts
@@ -0,0 +1,7 @@
+import { ConnectEnv } from '@aurora-is-near/engine';
+declare global {
+ namespace NodeJS {
+ interface ProcessEnv extends ConnectEnv {
+ }
+ }
+}
diff --git a/lib/data_migrations/2021-12-14-empty-blocks.js b/lib/data_migrations/2021-12-14-empty-blocks.js
diff --git a/lib/indexer_worker.js b/lib/indexer_worker.js
diff --git a/lib/utils.d.ts b/lib/utils.d.ts
@@ -15,3 +15,4 @@ export declare type EmptyBlock = {
 };
 export declare function computeBlockHash(blockHeight: number, accountId: string, chainId: number): Buffer;
 export declare function generateEmptyBlock(blockHeight: number, accountId: string, chainId: number): EmptyBlock;
+export declare function emptyTransactionsRoot(): Buffer;
diff --git a/lib/utils.js b/lib/utils.js
diff --git a/migrations/20211215003309_change_sha3_uncles_in_eth_getblockbynumber.sql b/migrations/20211215003309_change_sha3_uncles_in_eth_getblockbynumber.sql
@@ -0,0 +1,67 @@
+-- +goose Up
+-- +goose StatementBegin
+CREATE OR REPLACE FUNCTION eth_getBlockByNumber(block_id blockno) RETURNS block_result AS $$
+DECLARE
+ result block_result;
+BEGIN
+ SELECT
+ id, -- number
+ hash, -- hash
+ parent_hash, -- parentHash
+ repeat('\000', 8)::bytea, -- nonce
+ '\x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347', -- sha3Uncles keccak256(rlp.encode([]))
+ repeat('\000', 256)::bytea, -- logsBloom
+ transactions_root, -- transactionsRoot
+ state_root, -- stateRoot
+ receipts_root, -- receiptsRoot
+ repeat('\000', 20)::bytea, -- miner
+ 0, -- difficulty
+ 0, -- totalDifficulty
+ ''::bytea, -- extraData
+ size, -- size
+ gas_limit, -- gasLimit
+ gas_used, -- gasUsed
+ repeat('\000', 32)::hash, -- mixHash
+ COALESCE(EXTRACT(EPOCH FROM timestamp), 0)::int4 -- timestamp
+ FROM block
+ WHERE id = block_id
+ LIMIT 1
+ INTO STRICT result;
+ RETURN result;
+END;
+$$ LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE;
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+CREATE OR REPLACE FUNCTION eth_getBlockByNumber(block_id blockno) RETURNS block_result AS $$
+DECLARE
+ result block_result;
+BEGIN
+ SELECT
+ id, -- number
+ hash, -- hash
+ parent_hash, -- parentHash
+ repeat('\000', 8)::bytea, -- nonce
+ repeat('\000', 32)::bytea, -- sha3Uncles
+ repeat('\000', 256)::bytea, -- logsBloom
+ transactions_root, -- transactionsRoot
+ state_root, -- stateRoot
+ receipts_root, -- receiptsRoot
+ repeat('\000', 20)::bytea, -- miner
+ 0, -- difficulty
+ 0, -- totalDifficulty
+ ''::bytea, -- extraData
+ size, -- size
+ gas_limit, -- gasLimit
+ gas_used, -- gasUsed
+ repeat('\000', 32)::hash, -- mixHash
+ COALESCE(EXTRACT(EPOCH FROM timestamp), 0)::int4 -- timestamp
+ FROM block
+ WHERE id = block_id
+ LIMIT 1
+ INTO STRICT result;
+ RETURN result;
+END;
+$$ LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE;
+-- +goose StatementEnd
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
  "node-worker-threads-pool": "^1.5.1",
  "pg": "^8.7.1",
  "pg-format": "^1.0.4",
- "rlp": "^2.2.6",
+ "rlp": "^2.2.7",
  "sql-bricks-postgres": "^0.5.0",
  "ts-jest": "^27.0.3",
  "ws": "^8.2.3"