Merge pull request #80 from bitsnark/feat/FF-87

8 decimals amount

Author: njaume

src/components/tabs-switcher/transfer-tab.tsx

@@ -7,7 +7,7 @@ import { Button } from '../ui/button';
 import { isValidBitcoinAddress } from '@/lib/utils';
 import { Network, Currency } from './types';
 import { useChainId } from 'wagmi';
-import { Address, parseEther } from 'viem';
+import { Address, parseEther, parseUnits } from 'viem';
 import { useExchange } from '@/hooks/useExchange';
 import { Position, Reservation } from '@/types';
 import { useMaxMinBtc } from '@/hooks/queries/useMaxMinBtc';
@@ -137,7 +137,7 @@ export function TransferTab({ onTransactionCreated }: TransferTabProps) {
 
   const handleBridgeFunds = async () => {
     const normalizedAmount = fromAmount.replace(',', '.');
-    const parsedAmount = parseEther(normalizedAmount);
+    const parsedAmount = parseUnits(normalizedAmount, 8);
     let transaction: Position | Reservation | undefined;
     if (fromNetwork === 'bitcoin') {
       transaction = await reservePosition({

src/hooks/useExchange.ts

@@ -85,7 +85,7 @@ export const useExchange = () => {
     try {
       setLoading(true);
       setError(null);
-
+      console.log('openPosition', tokenAmount, exchangeRate, bitcoinAddresses, deadline, owner, chainId);
       const contractManager = await ContractManager.getInstance();
       const contractAddress = CONTRACTS_ADDRESS[
         chainId as keyof typeof CONTRACTS_ADDRESS
@@ -101,18 +101,20 @@ export const useExchange = () => {
         tokenAddress
       );
 
+      console.log('tokenName', tokenName);
       const nonce = await contractManager.readContract(
         'ERC20BitSnark',
         'nonces',
         [owner],
         tokenAddress
       );
+      console.log('nonce', nonce);
       const domain = {
         name: tokenName,
         version: '1',
         verifyingContract: tokenAddress,
       };
-
+      console.log('domain', domain);
       const types = {
         Permit: [
           { name: 'owner', type: 'address' },
@@ -122,25 +124,25 @@ export const useExchange = () => {
           { name: 'deadline', type: 'uint256' },
         ],
       };
-
+      console.log('types', types);
       const message = {
         owner,
         spender: contractAddress,
         value: tokenAmount,
         nonce,
         deadline,
       };
-
+      console.log('message', message);
       const signature = await contractManager.signTypedData({
         domain,
         types,
         primaryType: 'Permit',
         message,
       });
-
+      console.log('signature', signature);
       const { r, s, v } = contractManager.getRSV(signature);
       const bytes32 = bech32ToBytes32(bitcoinAddresses);
-
+      console.log('bytes32', bytes32);
       const { hash, wait } = await contractManager.writeContract(
         'AMMExchange',
         'openPosition',

src/services/ContractManager.ts

@@ -256,6 +256,7 @@ export class ContractManager {
     primaryType: string;
     message: T;
   }): Promise<`0x${string}`> {
+    console.log('signTypedData', params, this.walletClient?.account, this.walletClient?.chain?.id);
     if (!this.walletClient?.account) {
       throw new CMError('Wallet client not initialized');
     }