Merge pull request #78 from decentraland/fix/eth-transfers-topic

fix: decode the eth LAND transfers

Author: juanmahidalgo

package-lock.json

@@ -9,9 +9,9 @@
     "@graphile/pg-aggregates": "^0.1.1",
     "@subsquid/evm-abi": "^0.3.1",
     "@subsquid/evm-codec": "^0.3.0",
-    "@subsquid/evm-processor": "^1.21.1",
+    "@subsquid/evm-processor": "^1.21.2",
     "@subsquid/file-store": "^2.0.0",
-    "@subsquid/graphql-server": "^4.7.0",
+    "@subsquid/graphql-server": "^4.9.0",
     "@subsquid/typeorm-migration": "^1.3.0",
     "@subsquid/typeorm-store": "^1.5.1",
     "dotenv": "^16.4.5",

package.json

@@ -113,15 +113,66 @@ processor.run(
           ].topic:
           case erc721abi.events[
             "Transfer(address indexed,address indexed,uint256 indexed)"
+          ].topic:
+          case erc721abi.events[
+            "Transfer(address indexed,address indexed,uint256)"
           ].topic: {
-            const event =
+            let event;
+            if (
+              topic ===
+              erc721abi.events[
+                "Transfer(address indexed,address indexed,uint256)"
+              ].topic
+            ) {
+              event =
+                erc721abi.events[
+                  "Transfer(address indexed,address indexed,uint256 indexed)"
+                ].decode(log);
+            } else if (
+              topic ===
               erc721abi.events[
                 "Transfer(address indexed,address indexed,uint256 indexed)"
-              ].decode(log);
+              ].topic
+            ) {
+              event =
+                erc721abi.events[
+                  "Transfer(address indexed,address indexed,uint256 indexed)"
+                ].decode(log);
+            } else if (
+              topic ===
+              erc721abi.events[
+                "Transfer(address indexed,address indexed,uint256 indexed,address,bytes)"
+              ].topic
+            ) {
+              event =
+                erc721abi.events[
+                  "Transfer(address indexed,address indexed,uint256 indexed,address,bytes)"
+                ].decode(log);
+            } else if (
+              topic ===
+              erc721abi.events[
+                "Transfer(address indexed,address indexed,uint256 indexed,address,bytes,bytes)"
+              ].topic
+            ) {
+              event =
+                erc721abi.events[
+                  "Transfer(address indexed,address indexed,uint256 indexed,address,bytes,bytes)"
+                ].decode(log);
+            }
+
+            if (!event) {
+              console.log("ERROR: event could not be decoded");
+              break;
+            }
+
             const contractAddress = log.address;
             markteplaceEvents.push({
               topic,
-              event,
+              event: {
+                from: event.from,
+                to: event.to,
+                tokenId: event.tokenId,
+              },
               block,
               log,
               marketplaceOwnerCutPerMillion: getMarketplaceOwnerCutPerMillion(),

src/eth/main.ts

@@ -45,11 +45,8 @@ export const processor = new EvmBatchProcessor()
     address: [
       addresses.LANDRegistry,
       addresses.EstateRegistry,
-      addresses.Marketplace,
       addresses.DCLRegistrar,
-      addresses.ERC721Bid,
-      addresses.DCLControllerV2,
-      ...Object.values(addresses.collections),
+      ...Object.values(addresses.collections as string[]),
     ],
     topic0: [
       erc721Abi.events[
@@ -58,26 +55,50 @@ export const processor = new EvmBatchProcessor()
       erc721Abi.events[
         "Transfer(address indexed,address indexed,uint256 indexed,address,bytes)"
       ].topic,
+      erc721Abi.events[
+        "Transfer(address indexed,address indexed,uint256 indexed)"
+      ].topic,
       erc721Abi.events["Transfer(address indexed,address indexed,uint256)"]
         .topic,
       erc721Abi.events.OwnershipTransferred.topic,
       erc721Abi.events.AddWearable.topic,
+    ],
+  })
+  .addLog({
+    address: [addresses.LANDRegistry, addresses.EstateRegistry],
+    topic0: [
       landRegistryAbi.events.Update.topic,
       estateRegistryAbi.events.CreateEstate.topic,
       estateRegistryAbi.events.AddLand.topic,
       estateRegistryAbi.events.RemoveLand.topic,
       estateRegistryAbi.events.Update.topic,
+    ],
+  })
+  .addLog({
+    address: [addresses.Marketplace],
+    topic0: [
       marketplaceAbi.events.OrderCreated.topic,
       marketplaceAbi.events.OrderSuccessful.topic,
       marketplaceAbi.events.OrderCancelled.topic,
       marketplaceAbi.events.ChangedOwnerCutPerMillion.topic,
-      dclRegistrarAbi.events.NameRegistered.topic,
-      dclControllerV2.events.NameBought.topic,
+    ],
+  })
+  .addLog({
+    address: [addresses.DCLRegistrar],
+    topic0: [dclRegistrarAbi.events.NameRegistered.topic],
+  })
+  .addLog({
+    address: [addresses.ERC721Bid],
+    topic0: [
       erc721BidAbi.events.BidAccepted.topic,
       erc721BidAbi.events.BidCreated.topic,
       erc721BidAbi.events.BidCancelled.topic,
       erc721BidAbi.events.ChangedOwnerCutPerMillion.topic,
     ],
+  })
+  .addLog({
+    address: [addresses.DCLControllerV2],
+    topic0: [dclControllerV2.events.NameBought.topic],
   });
 
 export type Fields = EvmBatchProcessorFields<typeof processor>;