Fix card decrypt shares

JetonDAO · Oct 12, 2024 · a646812 · a646812
1 parent eddbc67
commit a646812
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ts-sdk/src/Jeton/Jeton.ts b/packages/ts-sdk/src/Jeton/Jeton.ts
@@ -146,6 +146,7 @@ export class Jeton extends EventEmitter<GameEventMap> {
   };
 
   private playerShuffledDeck = async (data: OnChainShuffledDeckData) => {
+    console.log("player shuffled deck");
     const onChainTableObject = await this.pendingMemo.memoize(this.queryGameState);
     const shufflingPlayer = getShufflingPlayer(onChainTableObject);
     if (!shufflingPlayer) {
@@ -161,6 +162,7 @@ export class Jeton extends EventEmitter<GameEventMap> {
   };
 
   private async createAndSharePrivateKeyShares(state: OnChainTableObject) {
+    console.log("create and share private key shares");
     if (!this.zkDeck) throw new Error("zkDeck should be present");
     // TODO: do not call if your player is not active player
 
@@ -177,6 +179,7 @@ export class Jeton extends EventEmitter<GameEventMap> {
     const sharesToSend = filteredPAS.map((pas) => pas.decryptionCardShare);
     this.myPrivateCardsShares = proofsAndShares
       .filter((pas) => myPrivateCardsIndexes.includes(pas.cardIndex))
+      .sort((a, b) => a.cardIndex - b.cardIndex)
       .map((pas) => pas.decryptionCardShare) as [DecryptionCardShare, DecryptionCardShare];
     this.onChainDataSource.privateCardsDecryptionShares(
       this.tableInfo.id,

diff --git a/packages/ts-sdk/src/Jeton/helpers.ts b/packages/ts-sdk/src/Jeton/helpers.ts
@@ -36,12 +36,15 @@ export function getCardShares(tableObject: OnChainTableObject, indexes: number):
 export function getCardShares(tableObject: OnChainTableObject, indexes: number[]): Uint8Array[];
 export function getCardShares(tableObject: OnChainTableObject, indexes: number | number[]) {
   if (tableObject.state.__variant__ !== "Playing") throw new Error("must be playing");
+  const arrayedShares = new Array(52);
+  const mapShares = tableObject.state.decryption_card_shares.data;
+  for (const mapShare of mapShares) {
+    arrayedShares[mapShare.key] = mapShare.value;
+  }
 
-  if (!Array.isArray(indexes)) return tableObject.state.decryption_card_shares[indexes];
+  if (!Array.isArray(indexes)) return hexStringToUint8Array(arrayedShares[indexes]!);
 
-  return indexes.map(
-    (cardIndex) => (tableObject.state as PlayingState).decryption_card_shares[cardIndex]!,
-  );
+  return indexes.map((cardIndex) => hexStringToUint8Array(arrayedShares[cardIndex]));
 }
 
 export function getCardIndexes(tableObject: OnChainTableObject, round: PublicCardRounds) {

diff --git a/packages/ts-sdk/src/OnChainDataSource/onChainObjects.types.ts b/packages/ts-sdk/src/OnChainDataSource/onChainObjects.types.ts
@@ -57,8 +57,7 @@ export type PlayingState = {
   __variant__: "Playing";
   timeout: string;
   deck: string;
-  // TODO: what does it represent?
-  decryption_card_shares: Record<number, Uint8Array>;
+  decryption_card_shares: { data: { key: number; value: string }[] };
   phase: OnChainPhase;
 };
 

diff --git a/packages/ts-sdk/src/contracts/contractInteractions.ts b/packages/ts-sdk/src/contracts/contractInteractions.ts
@@ -11,6 +11,7 @@ import {
   contractCreateTableFunctionName,
   contractDecryptShareFunctionName,
   contractShuffleEncryptDeckFunctionName,
+  contractShuffleEventType,
   contractTableCreatedEventType,
   contractTableType,
 } from "./contractData";
@@ -158,7 +159,7 @@ export async function queryEvents(tableId: string) {
   const document = gql`
         query MyQuery {
           events(
-            where: {indexed_type: {_in: ["${contractTableCreatedEventType}", "${contractCheckedInEventType}", "${contractCardDecryptionShareEventType}"]},
+            where: {indexed_type: {_in: ["${contractTableCreatedEventType}", "${contractCheckedInEventType}","${contractShuffleEventType}", "${contractCardDecryptionShareEventType}"]},
             data: {_cast: {String: {_like: "%${tableId}%"}}}},
             order_by: {transaction_block_height: desc}
           ) {