Use SnarkyJS number types

o1-labs · Mar 9, 2023 · 8aec801 · 8aec801
1 parent 0cb36fe
commit 8aec801
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 36 deletions.
diff --git a/src/lib/fetch.ts b/src/lib/fetch.ts
@@ -594,10 +594,10 @@ async function fetchEvents(
     });
     return {
       events,
-      blockHeight: event.blockInfo.height.toString(),
+      blockHeight: UInt32.from(event.blockInfo.height),
       blockHash: event.blockInfo.stateHash,
       parentBlockHash: event.blockInfo.parentHash,
-      globalSlot: event.blockInfo.globalSlotSinceGenesis.toString(),
+      globalSlot: UInt32.from(event.blockInfo.globalSlotSinceGenesis),
       chainStatus: event.blockInfo.chainStatus,
       transactionHash: event.transactionInfo.hash,
       transactionStatus: event.transactionInfo.status,

diff --git a/src/lib/mina.ts b/src/lib/mina.ts
@@ -464,8 +464,8 @@ function LocalBlockchain({
           }
           events[addr][tokenId].push({
             events: p.body.events,
-            blockHeight: networkState.blockchainLength.toString(),
-            globalSlot: networkState.globalSlotSinceGenesis.toString(),
+            blockHeight: networkState.blockchainLength,
+            globalSlot: networkState.globalSlotSinceGenesis,
             // The following fields are fetched from the Mina network. For now, we mock these values out
             // since networkState does not contain these fields.
             blockHash: '',

diff --git a/src/lib/zkapp.ts b/src/lib/zkapp.ts
@@ -1055,10 +1055,10 @@ super.init();
     {
       type: string;
       event: ProvablePure<any>;
-      blockHeight: string;
+      blockHeight: UInt32;
       blockHash: string;
       parentBlockHash: string;
-      globalSlot: string;
+      globalSlot: UInt32;
       chainStatus: string;
       transactionHash: string;
       transactionStatus: string;
@@ -1083,15 +1083,8 @@ super.init();
       .map((event) => {
         return event.events.map((eventData) => {
           return {
+            ...event,
             event: eventData,
-            blockHeight: event.blockHeight.toString(),
-            blockHash: event.blockHash,
-            parentBlockHash: event.parentBlockHash,
-            globalSlot: event.globalSlot.toString(),
-            chainStatus: event.chainStatus,
-            transactionHash: event.transactionHash,
-            transactionStatus: event.transactionStatus,
-            transactionMemo: event.transactionMemo,
           };
         });
       })
@@ -1104,39 +1097,27 @@ super.init();
       // if there is only one event type, the event structure has no index and can directly be matched to the event type
       if (sortedEventTypes.length === 1) {
         let type = sortedEventTypes[0];
+        let event = this.events[type].fromFields(
+          eventData.event.map((f: string) => Field(f))
+        );
         return {
+          ...eventData,
           type,
-          event: this.events[type].fromFields(
-            eventData.event.map((f: string) => Field(f))
-          ),
-          blockHeight: eventData.blockHeight,
-          blockHash: eventData.blockHash,
-          parentBlockHash: eventData.parentBlockHash,
-          globalSlot: eventData.globalSlot,
-          chainStatus: eventData.chainStatus,
-          transactionHash: eventData.transactionHash,
-          transactionStatus: eventData.transactionStatus,
-          transactionMemo: eventData.transactionMemo,
+          event,
         };
       } else {
         // if there are multiple events we have to use the index event[0] to find the exact event type
         let eventObjectIndex = Number(eventData.event[0]);
         let type = sortedEventTypes[eventObjectIndex];
         // all other elements of the array are values used to construct the original object, we can drop the first value since its just an index
         let eventProps = eventData.event.slice(1);
+        let event = this.events[type].fromFields(
+          eventProps.map((f: string) => Field(f))
+        );
         return {
+          ...eventData,
           type,
-          event: this.events[type].fromFields(
-            eventProps.map((f: string) => Field(f))
-          ),
-          blockHeight: eventData.blockHeight,
-          blockHash: eventData.blockHash,
-          parentBlockHash: eventData.parentBlockHash,
-          globalSlot: eventData.globalSlot,
-          chainStatus: eventData.chainStatus,
-          transactionHash: eventData.transactionHash,
-          transactionStatus: eventData.transactionStatus,
-          transactionMemo: eventData.transactionMemo,
+          event,
         };
       }
     });