From fa3a883ff7c88611ce766f58bdd4b8ac90814470 Mon Sep 17 00:00:00 2001
From: Richard Moore <github@ricmoo.com>
Date: Sun, 23 Jul 2023 23:48:47 -0400
Subject: [PATCH] Fixed filter encoding for bytesX (#4244).

---
 src.ts/_tests/test-abi.ts | 19 ++++++++++++++++++-
 src.ts/abi/interface.ts   | 18 +++++++++---------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src.ts/_tests/test-abi.ts b/src.ts/_tests/test-abi.ts
index a92da84e5f..88cf7df477 100644
--- a/src.ts/_tests/test-abi.ts
+++ b/src.ts/_tests/test-abi.ts
@@ -73,7 +73,9 @@ describe("Test Bytes32 strings", function() {
 describe("Test Interface", function() {
     const iface = new Interface([
         "function balanceOf(address owner) returns (uint)",
-        "event Transfer(address indexed from, address indexed to, uint amount)"
+        "event Transfer(address indexed from, address indexed to, uint amount)",
+        // #4244
+        "event RedemptionRequested(bytes20 indexed walletPubKeyHash, bytes redeemerOutputScript, address indexed redeemer, uint64 requestedAmount, uint64 treasuryFee, uint64 txMaxFee)"
     ]);
 
     it("does interface stuff; @TODO expand this", function() {
@@ -111,6 +113,21 @@ describe("Test Interface", function() {
         assert.equal(filter[1], "0x0000000000000000000000008ba1f109551bd432803012645ac136ddd64dba72");
         assert.equal(filter[2], "0x000000000000000000000000ac1639cf97a3a46d431e6d1216f576622894cbb5");
 
+
+        // See: #4244
+        // https://goerli.etherscan.io/tx/0xe61cef4cd706db8e23114717a207d76cc6b0df0b74ec52805551c4d1bf347a27#eventlog
+        // See `RedemptionRequested` event.
+        {
+            const walletPubKeyHash = "0x03b74d6893ad46dfdd01b9e0e3b3385f4fce2d1e"
+            const redeemer = "0x086813525A7dC7dafFf015Cdf03896Fd276eab60"
+            const filterWithBytes20 = iface.encodeFilterTopics("RedemptionRequested", [ walletPubKeyHash, undefined, redeemer ]);
+            assert.equal(filterWithBytes20.length, 3);
+            assert.equal(filterWithBytes20[0], "0x97a0199072f487232635d50ab75860891afe0b91c976ed2fc76502c4d82d0d95");
+            assert.equal(filterWithBytes20[1], "0x03b74d6893ad46dfdd01b9e0e3b3385f4fce2d1e000000000000000000000000");
+            assert.equal(filterWithBytes20[2], "0x000000000000000000000000086813525a7dc7dafff015cdf03896fd276eab60");
+        }
+
+
         const eventLog = iface.encodeEventLog("Transfer", [ addr, addr2, 234 ]);
         assert.equal(eventLog.data, "0x00000000000000000000000000000000000000000000000000000000000000ea");
         assert.deepEqual(eventLog.topics, [
diff --git a/src.ts/abi/interface.ts b/src.ts/abi/interface.ts
index e412b49669..110f89ebf9 100644
--- a/src.ts/abi/interface.ts
+++ b/src.ts/abi/interface.ts
@@ -14,8 +14,8 @@ import { keccak256 } from "../crypto/index.js"
 import { id } from "../hash/index.js"
 import {
     concat, dataSlice, getBigInt, getBytes, getBytesCopy,
-    hexlify, zeroPadValue, isHexString, defineProperties, assertArgument, toBeHex,
-    assert
+    hexlify, zeroPadBytes, zeroPadValue, isHexString, defineProperties,
+    assertArgument, toBeHex, assert
 } from "../utils/index.js";
 
 import { AbiCoder } from "./abi-coder.js";
@@ -1027,16 +1027,16 @@ export class Interface {
 
             if (param.type === "bool" && typeof(value) === "boolean") {
                 value = (value ? "0x01": "0x00");
+            } else if (param.type.match(/^u?int/)) {
+                value = toBeHex(value);  // @TODO: Should this toTwos??
+            } else if (param.type.match(/^bytes/)) {
+                value = zeroPadBytes(value, 32);
+            } else if (param.type === "address") {
+                // Check addresses are valid
+                this.#abiCoder.encode( [ "address" ], [ value ]);
             }
 
-            if (param.type.match(/^u?int/)) {
-                value = toBeHex(value);
-            }
-
-            // Check addresses are valid
-            if (param.type === "address") { this.#abiCoder.encode( [ "address" ], [ value ]); }
             return zeroPadValue(hexlify(value), 32);
-            //@TOOD should probably be return toHex(value, 32)
         };
 
         values.forEach((value, index) => {