From 70446e7a2709dcb47727a856467dabc969aa77cf Mon Sep 17 00:00:00 2001
From: alvrs <alvarius@lattice.xyz>
Date: Tue, 31 Oct 2023 22:23:08 +0100
Subject: [PATCH] use toTopic

---
 .../world-modules/src/modules/erc20-puppet/ERC20System.sol | 7 ++++---
 packages/world-modules/src/modules/erc20-puppet/utils.sol  | 4 ----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/world-modules/src/modules/erc20-puppet/ERC20System.sol b/packages/world-modules/src/modules/erc20-puppet/ERC20System.sol
index ca385310cd..878f51f39b 100644
--- a/packages/world-modules/src/modules/erc20-puppet/ERC20System.sol
+++ b/packages/world-modules/src/modules/erc20-puppet/ERC20System.sol
@@ -10,6 +10,7 @@ import { ALLOWANCES_NAME, BALANCES_NAME, METADATA_NAME } from "./constants.sol";
 
 import { AccessControlLib } from "../../utils/AccessControlLib.sol";
 import { PuppetMaster } from "../puppet/PuppetMaster.sol";
+import { toTopic } from "../puppet/utils.sol";
 
 import { IERC20Mintable } from "./IERC20Mintable.sol";
 
@@ -18,7 +19,7 @@ import { Balances } from "./tables/Balances.sol";
 import { TotalSupply } from "./tables/TotalSupply.sol";
 import { Metadata } from "./tables/Metadata.sol";
 
-import { _allowancesTableId, _balancesTableId, _totalSupplyTableId, _metadataTableId, _toBytes32 } from "./utils.sol";
+import { _allowancesTableId, _balancesTableId, _totalSupplyTableId, _metadataTableId } from "./utils.sol";
 
 contract ERC20System is System, IERC20Mintable, PuppetMaster {
   using WorldResourceIdInstance for ResourceId;
@@ -231,7 +232,7 @@ contract ERC20System is System, IERC20Mintable, PuppetMaster {
     }
 
     // Emit Transfer event on puppet
-    puppet().log(Transfer.selector, _toBytes32(from), _toBytes32(to), abi.encode(value));
+    puppet().log(Transfer.selector, toTopic(from), toTopic(to), abi.encode(value));
   }
 
   /**
@@ -252,7 +253,7 @@ contract ERC20System is System, IERC20Mintable, PuppetMaster {
     Allowances.set(_allowancesTableId(_namespace()), owner, spender, value);
 
     // Emit Approval event on puppet
-    puppet().log(Approval.selector, _toBytes32(owner), _toBytes32(spender), abi.encode(value));
+    puppet().log(Approval.selector, toTopic(owner), toTopic(spender), abi.encode(value));
   }
 
   /**
diff --git a/packages/world-modules/src/modules/erc20-puppet/utils.sol b/packages/world-modules/src/modules/erc20-puppet/utils.sol
index a65696ac84..cc319de053 100644
--- a/packages/world-modules/src/modules/erc20-puppet/utils.sol
+++ b/packages/world-modules/src/modules/erc20-puppet/utils.sol
@@ -25,10 +25,6 @@ function _metadataTableId(bytes14 namespace) pure returns (ResourceId) {
   return WorldResourceIdLib.encode({ typeId: RESOURCE_TABLE, namespace: namespace, name: METADATA_NAME });
 }
 
-function _toBytes32(address addr) pure returns (bytes32) {
-  return bytes32(uint256(uint160(addr)));
-}
-
 function _erc20SystemId(bytes14 namespace) pure returns (ResourceId) {
   return WorldResourceIdLib.encode({ typeId: RESOURCE_SYSTEM, namespace: namespace, name: ERC20_SYSTEM_NAME });
 }