Merge pull request #10 from zama-ai/update-dapps

chore: use new version

package.json

@@ -28,7 +28,7 @@
     "eip-712": "^1.0.0",
     "env-cmd": "^10.1.0",
     "ethers": "^6.6.2",
-    "fhevmjs": "^0.3.2",
+    "fhevmjs": "^0.4.0",
     "gatsby": "^5.13.3",
     "gatsby-plugin-emotion": "^8.13.1",
     "gatsby-plugin-postcss": "^6.13.1",

src/components/Bid/Bid.tsx

@@ -13,7 +13,7 @@ import {
   TextField,
 } from '@mui/material';
 import { Loader } from '../Loader';
-import { getInstance, getTokenSignature } from '../../wallet';
+import { getInstance, getPublicKeySignature } from '../../wallet';
 
 export const Bid: React.FC<{
   abi: any;
@@ -39,7 +39,7 @@ export const Bid: React.FC<{
   const getCurrentBid = async () => {
     try {
       const contractAddress = await contract.getAddress();
-      const { publicKey, signature } = await getTokenSignature(contractAddress, account);
+      const { publicKey, signature } = await getPublicKeySignature(contractAddress, account);
       const encryptedBid = await contract.getBid(publicKey, signature);
       const bid = getInstance().decrypt(contractAddress, encryptedBid);
       console.log('get', account, bid);
@@ -89,7 +89,7 @@ export const Bid: React.FC<{
       }
       setLoading('Decrypting do I have highest bid...');
       const contractAddress = await contract.getAddress();
-      const { publicKey, signature } = await getTokenSignature(contractAddress, account);
+      const { publicKey, signature } = await getPublicKeySignature(contractAddress, account);
       const ciphertext = await contract.doIHaveHighestBid(publicKey, signature);
       const hb = getInstance().decrypt(contractAddress, ciphertext);
       setHighestBid(Boolean(hb));

src/components/EIP712/EIP712.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Contract, BrowserProvider, isAddress } from 'ethers';
 import { Button, Card, CardActions, CardContent, CardHeader } from '@mui/material';
 import { Loader } from '../Loader';
-import { getTokenSignature } from '../../wallet';
+import { getPublicKeySignature } from '../../wallet';
 
 export const EIP712: React.FC<{
   account: string;
@@ -32,7 +32,7 @@ export const EIP712: React.FC<{
   const verifyToken = async () => {
     setVerified(false);
 
-    const { publicKey, signature } = await getTokenSignature(contractAddress, account);
+    const { publicKey, signature } = await getPublicKeySignature(contractAddress, account);
     await contract.verify(publicKey, signature);
     setVerified(true);
     setLoading('');

src/components/TokenBalance/TokenBalance.tsx

@@ -12,7 +12,7 @@ import {
   ListItemText,
 } from '@mui/material';
 import { Loader } from '../Loader';
-import { getInstance, getTokenSignature } from '../../wallet';
+import { getInstance, getPublicKeySignature } from '../../wallet';
 
 export const TokenBalance: React.FC<{
   abi: any;
@@ -45,7 +45,7 @@ export const TokenBalance: React.FC<{
     try {
       const contractAddress = await contract.getAddress();
       setLoading('Decrypting your balance...');
-      const { publicKey, signature } = await getTokenSignature(contractAddress, account);
+      const { publicKey, signature } = await getPublicKeySignature(contractAddress, account);
       const ciphertext = await contract.balanceOf(account, publicKey, signature);
       const balance = await getInstance().decrypt(contractAddress, ciphertext);
       setDecryptedBalance(balance);

src/components/TokenInfo/TokenInfo.tsx

@@ -12,7 +12,6 @@ import {
   ListItemText,
 } from '@mui/material';
 import { Loader } from '../Loader';
-import { getInstance, getTokenSignature } from '../../wallet';
 
 const NO_SUPPLY = 'NO_SUPPLY';
 const toHexString = (bytes: Uint8Array) => {

src/components/TokenTransfer/TokenTransfer.tsx

@@ -30,7 +30,7 @@ export const TokenTransfer: React.FC<{
         return;
       }
       setLoading(`Encrypting "${Number(amount)}" and generating ZK proof...`);
-      const encryptedAmount = await getInstance().encrypt32(Number(amount));
+      const encryptedAmount = await getInstance().encrypt64(Number(amount));
       setLoading('Sending transaction...');
       const transaction = await contract['transfer(address,bytes)'](address, encryptedAmount);
       setLoading('Waiting for transaction validation...');

src/modules/private-bet/components/BetAction/BetAction.tsx

@@ -15,7 +15,7 @@ import {
   TextField,
 } from '@mui/material';
 import { Loader } from '../../../../components/Loader';
-import { getInstance, getTokenSignature } from '../../../../wallet';
+import { getInstance, getPublicKeySignature } from '../../../../wallet';
 import { Game } from '../../types';
 import { GAME_STATE } from '../../constants';
 
@@ -93,7 +93,7 @@ export const BetAction: React.FC<{
   const getCurrentBet = async () => {
     try {
       const contractAddress = await contract.getAddress();
-      const { publicKey, signature } = await getTokenSignature(contractAddress, account);
+      const { publicKey, signature } = await getPublicKeySignature(contractAddress, account);
       const response = await contract.getBet(gameId, publicKey, signature);
       const bet = response.toObject();
       const betAmount = getInstance().decrypt(contractAddress, bet.amount);

src/wallet/index.ts

@@ -16,9 +16,9 @@ export const getInstance = () => {
   return instance;
 };
 
-export const getTokenSignature = async (contractAddress: string, userAddress: string) => {
+export const getPublicKeySignature = async (contractAddress: string, userAddress: string) => {
   if (getInstance().hasKeypair(contractAddress)) {
-    return getInstance().getTokenSignature(contractAddress)!;
+    return getInstance().getPublicKey(contractAddress)!;
   } else {
     const { publicKey, eip712 } = getInstance().generatePublicKey({ verifyingContract: contractAddress });
     const params = [userAddress, JSON.stringify(eip712)];