Merge pull request nounsDAO#1276 from nounsDAO/fix/transaction-errors

webapp: fix proposal encoding issues

Author: modrovsky

packages/nouns-webapp/src/components/ProposalActionsModal/steps/TransferFundsReviewStep/index.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 
 import { Trans } from '@lingui/react/macro';
-import { encodeFunctionData, parseAbi, parseEther } from 'viem';
+import { encodeAbiParameters, parseEther } from 'viem';
 
 import ModalBottomButtonRow from '@/components/ModalBottomButtonRow';
 import ModalTitle from '@/components/ModalTitle';
 import ShortAddress from '@/components/ShortAddress';
-import { nounsPayerAbi, stEthAddress, nounsPayerAddress } from '@/contracts';
+import { stEthAddress, nounsPayerAddress } from '@/contracts';
 import { Address, Hex } from '@/utils/types';
 import { defaultChain } from '@/wagmi';
 
@@ -40,14 +40,7 @@ const handleActionAdd = (
     const value = parseEther((state.amount ?? 0).toString()).toString();
     const args = [state.address, BigInt(value)] as const;
 
-    // Define the transfer function ABI
-    const transferAbi = parseAbi(['function transfer(address to, uint256 value) returns (bool)']);
-
-    const calldata = encodeFunctionData({
-      abi: transferAbi,
-      functionName: 'transfer',
-      args,
-    });
+    const calldata = encodeAbiParameters([{ type: 'address' }, { type: 'uint256' }], args);
 
     onActionAdd({
       address: stEthAddress[chainId],
@@ -59,11 +52,10 @@ const handleActionAdd = (
   } else if (state.TransferFundsCurrency === SupportedCurrency.USDC) {
     // Convert USDC amount - USDC has 6 decimals
     const usdcAmount = Math.round(parseFloat(state.amount ?? '0') * 1_000_000).toString();
-    const calldata = encodeFunctionData({
-      abi: nounsPayerAbi,
-      functionName: 'sendOrRegisterDebt',
-      args: [state.address, BigInt(usdcAmount)],
-    });
+    const calldata = encodeAbiParameters(
+      [{ type: 'address' }, { type: 'uint256' }],
+      [state.address, BigInt(usdcAmount)],
+    );
 
     onActionAdd({
       address: nounsPayerAddress[chainId],

packages/nouns-webapp/src/hooks/useStreamPaymentTransactions.ts

@@ -1,16 +1,13 @@
 import type { Address } from '@/utils/types';
 
-import { encodeFunctionData, parseEther } from 'viem';
+import { encodeAbiParameters, parseEther } from 'viem';
 
 import { ProposalActionModalState } from '@/components/ProposalActionsModal';
 import { SupportedCurrency } from '@/components/ProposalActionsModal/steps/TransferFundsDetailsStep';
 import {
-  nounsPayerAbi,
   nounsPayerAddress,
-  nounsStreamFactoryAbi,
   nounsStreamFactoryAddress,
   usdcAddress,
-  wethAbi,
   wethAddress,
 } from '@/contracts';
 import {
@@ -63,19 +60,26 @@ export default function useStreamPaymentTransactions({
         0,
         predictedAddress,
       ]),
-      calldata: encodeFunctionData({
-        abi: nounsStreamFactoryAbi,
-        functionName: fundStreamFunction,
-        args: [
+      calldata: encodeAbiParameters(
+        [
+          { type: 'address' },
+          { type: 'uint256' },
+          { type: 'address' },
+          { type: 'uint256' },
+          { type: 'uint256' },
+          { type: 'uint8' },
+          { type: 'address' },
+        ],
+        [
           state.address,
           formatTokenAmount(Number(amount), state.TransferFundsCurrency),
           getTokenAddressForCurrency(state.TransferFundsCurrency),
-          BigInt(state.streamStartTimestamp ? state.streamStartTimestamp : 0),
-          BigInt(state.streamEndTimestamp ? state.streamEndTimestamp : 0),
+          BigInt(state.streamStartTimestamp ?? 0),
+          BigInt(state.streamEndTimestamp ?? 0),
           0,
           predictedAddress,
         ],
-      }),
+      ),
     },
   ];
 
@@ -98,11 +102,10 @@ export default function useStreamPaymentTransactions({
         predictedAddress,
         parseEther((amount ?? 0).toString()).toString(),
       ]),
-      calldata: encodeFunctionData({
-        abi: wethAbi,
-        functionName: wethTransfer,
-        args: [predictedAddress, parseEther(amount.toString())],
-      }),
+      calldata: encodeAbiParameters(
+        [{ type: 'address' }, { type: 'uint256' }],
+        [predictedAddress, parseEther(amount.toString())],
+      ),
     });
   } else {
     const signature = 'sendOrRegisterDebt';
@@ -112,11 +115,10 @@ export default function useStreamPaymentTransactions({
       usdcValue: Number(human2ContractUSDCFormat(amount)),
       signature: signature,
       decodedCalldata: JSON.stringify([predictedAddress, human2ContractUSDCFormat(amount)]),
-      calldata: encodeFunctionData({
-        abi: nounsPayerAbi,
-        functionName: signature,
-        args: [predictedAddress, BigInt(human2ContractUSDCFormat(amount))],
-      }),
+      calldata: encodeAbiParameters(
+        [{ type: 'address' }, { type: 'uint256' }],
+        [predictedAddress, BigInt(human2ContractUSDCFormat(amount))],
+      ),
     });
   }
 

packages/nouns-webapp/src/wrappers/nounsDao.ts

@@ -493,7 +493,7 @@ export const formatProposalTransactionDetails = (details: {
       return {
         target,
         functionSig: name,
-        callData: (decoded as string[]).join() as Hex,
+        callData: decoded.map(v => String(v)).join(',') as Hex,
         value,
       };
     } catch (err) {