From e727efc33eaa31c3af6adbb64a893caf354d0ba7 Mon Sep 17 00:00:00 2001
From: Richard Moore <github@ricmoo.com>
Date: Mon, 1 Feb 2021 15:50:27 -0500
Subject: [PATCH] Added support for networks with slightly incorrect EIP-658
 implementations (#952, #1251).

---
 packages/providers/src.ts/formatter.ts | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/providers/src.ts/formatter.ts b/packages/providers/src.ts/formatter.ts
index c83141a7db..fbac3096ed 100644
--- a/packages/providers/src.ts/formatter.ts
+++ b/packages/providers/src.ts/formatter.ts
@@ -101,7 +101,8 @@ export class Formatter {
             from: Formatter.allowNull(this.address, null),
             contractAddress: Formatter.allowNull(address, null),
             transactionIndex: number,
-            root: Formatter.allowNull(hash),
+            // should be allowNull(hash), but broken-EIP-658 support is handled in receipt
+            root: Formatter.allowNull(hex),
             gasUsed: bigNumber,
             logsBloom: Formatter.allowNull(data),// @TODO: should this be data?
             blockHash: hash,
@@ -383,7 +384,28 @@ export class Formatter {
     receipt(value: any): TransactionReceipt {
         const result: TransactionReceipt = Formatter.check(this.formats.receipt, value);
 
-        if (value.status != null) {
+        // RSK incorrectly implemented EIP-658, so we munge things a bit here for it
+        if (result.root != null) {
+            if (result.root.length <= 4) {
+                // Could be 0x00, 0x0, 0x01 or 0x1
+                const value = BigNumber.from(result.root).toNumber();
+                if (value === 0 || value === 1) {
+                    // Make sure if both are specified, they match
+                    if (result.status != null && (result.status !== value)) {
+                        logger.throwArgumentError("alt-root-status/status mismatch", "value", { root: result.root, status: result.status });
+                    }
+                    result.status = value;
+                    delete result.root;
+                } else {
+                    logger.throwArgumentError("invalid alt-root-status", "value.root", result.root);
+                }
+            } else if (result.root.length !== 66) {
+                // Must be a valid bytes32
+                logger.throwArgumentError("invalid root hash", "value.root", result.root);
+            }
+        }
+
+        if (result.status != null) {
             result.byzantium = true;
         }