Merge pull request #18 from Golem-Base/rvdp/dev

fix: make sure entity keys parsed from tx receipts are always 32 bytes

Author: r-vdp

src/client.ts

@@ -299,7 +299,7 @@ export async function createClient(
           return {
             ...receipts,
             createEntitiesReceipts: receipts.createEntitiesReceipts.concat([{
-              entityKey: toHex(parsed.args.entityKey),
+              entityKey: toHex(parsed.args.entityKey, { size: 32 }),
               expirationBlock: Number(parsed.args.expirationBlock),
             }]),
           }
@@ -308,7 +308,7 @@ export async function createClient(
           return {
             ...receipts,
             updateEntitiesReceipts: receipts.updateEntitiesReceipts.concat([{
-              entityKey: toHex(parsed.args.entityKey),
+              entityKey: toHex(parsed.args.entityKey, { size: 32 }),
               expirationBlock: Number(parsed.args.expirationBlock),
             }]),
           }
@@ -317,7 +317,7 @@ export async function createClient(
           return {
             ...receipts,
             extendEntitiesReceipts: receipts.extendEntitiesReceipts.concat([{
-              entityKey: toHex(parsed.args.entityKey),
+              entityKey: toHex(parsed.args.entityKey, { size: 32 }),
               newExpirationBlock: Number(parsed.args.newExpirationBlock),
               oldExpirationBlock: Number(parsed.args.oldExpirationBlock),
             }]),
@@ -327,7 +327,7 @@ export async function createClient(
           return {
             ...receipts,
             deleteEntitiesReceipts: receipts.deleteEntitiesReceipts.concat([{
-              entityKey: toHex(parsed.args.entityKey),
+              entityKey: toHex(parsed.args.entityKey, { size: 32 }),
             }]),
           }
         }

test/internal/client.spec.ts

@@ -15,12 +15,14 @@ import {
   Annotation,
   Tagged,
   type AccountData,
+  golemBaseABI,
 } from "../../src/index.ts"
 import {
   generateRandomBytes,
   generateRandomString,
 } from "../utils.ts"
 import { GolemBaseClient } from '../../src/internal/client.ts'
+import { decodeEventLog, toHex } from 'viem'
 
 const log = new Logger<ILogObj>({
   type: "pretty",
@@ -146,13 +148,26 @@ describe("the internal golem-base client", () => {
         numericAnnotations: [new Annotation("ix", 3)]
       }
     ]
-    const receipts = await client.walletClient.sendGolemBaseTransactionAndWaitForReceipt(creates)
+    const receipt = await client.walletClient.sendGolemBaseTransactionAndWaitForReceipt(creates)
     entitiesOwnedCount += creates.length;
-    // Save this key for later
-    [{ entityKey, expirationBlock }] = receipts.logs.map(txlog => ({
-      entityKey: txlog.topics[1] as Hex,
-      expirationBlock: parseInt(txlog.data),
-    }))
+
+    const txlog = receipt.logs[0]
+    const parsed = decodeEventLog({
+      abi: golemBaseABI,
+      data: txlog.data,
+      topics: txlog.topics
+    })
+
+    expect(parsed.eventName).to.eql("GolemBaseStorageEntityCreated")
+
+    if (parsed.eventName === "GolemBaseStorageEntityCreated") {
+      // Save these for later
+      entityKey = toHex(parsed.args.entityKey, { size: 32 })
+      expirationBlock = Number(parsed.args.expirationBlock)
+    }
+
+    expect(entityKey).to.exist
+    expect(expirationBlock).to.exist
 
     expect(await numOfEntitiesOwned(client)).to.eql(entitiesOwnedCount)
   })