(fix) (openai/gpt-5.5, reviewed T, tested T) select mainnet clients for b20 wraps

Author: paoloanzn

packages/cli/src/b20/b20-ops.ts

@@ -3,10 +3,15 @@ import { isAddress, parseAbi, parseEther } from "viem";
 
 import FCFWrapperAbi from "../abi/FCFWrapper.json" with { type: "json" };
 
-const fcfWrapperAbi = FCFWrapperAbi as Abi;
+const erc20ErrorAbi = parseAbi([
+    "error ERC20InsufficientAllowance(address spender, uint256 allowance, uint256 needed)",
+    "error ERC20InsufficientBalance(address sender, uint256 balance, uint256 needed)",
+]);
+const fcfWrapperAbi = [...FCFWrapperAbi, ...erc20ErrorAbi] as Abi;
 const erc20Abi = parseAbi([
     "function allowance(address owner, address spender) view returns (uint256)",
     "function approve(address spender, uint256 amount) returns (bool)",
+    "error ERC20InsufficientAllowance(address spender, uint256 allowance, uint256 needed)",
 ]);
 
 export type TransactionReceipt = {
@@ -152,5 +157,17 @@ async function approveIfNeeded(params: Omit<B20OperationParams, "amount"> & {
         account: params.account,
     });
     const receipt = await params.publicClient.waitForTransactionReceipt({ hash });
-    return { approved: true, hash, receipt };
+    if (receipt.status !== "success") throw new Error(`approval reverted: ${hash}`);
+    for (let attempt = 0; attempt < 10; attempt++) {
+        const updatedAllowance = await params.publicClient.readContract({
+            address: params.token,
+            abi: erc20Abi,
+            functionName: "allowance",
+            args: [params.account.address, params.spender],
+        });
+        if (typeof updatedAllowance !== "bigint") throw new Error("invalid ERC-20 allowance result");
+        if (updatedAllowance >= params.amount) return { approved: true, hash, receipt };
+        await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    throw new Error(`approval not visible after receipt: ${hash}`);
 }

packages/cli/src/index.ts

@@ -4,10 +4,10 @@ import { dirname } from "node:path";
 import { exit } from "node:process";
 
 import { Command } from "commander";
-import type { Abi } from "viem";
+import type { Abi, Chain } from "viem";
 import { createPublicClient, createWalletClient, http, isAddress, parseAbi, parseAbiItem, parseEther, toHex } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
-import { foundry, baseSepolia } from "viem/chains";
+import { base, foundry, baseSepolia } from "viem/chains";
 import { DopplerSDK } from "@whetstone-research/doppler-sdk/evm";
 
 import { importAbi } from "@/utils/importAbi.js";
@@ -44,6 +44,11 @@ const ENABLE_MARKET_COMMAND             = process.env.ENABLE_MARKET_COMMAND ? tr
 const RIK_ROYALTY_SPLITTER_ADDRESS      = process.env.RIK_ROYALTY_SPLITTER_ADDRESS;
 const RIK_LAUNCHER_ADDRESS              = process.env.RIK_LAUNCHER_ADDRESS;
 
+type ClientsOptions = {
+    readonly chain?: Chain;
+    readonly rpcUrl?: string;
+};
+
 const abi = loadAbi();
 const RIKLauncherAbi = parseAbi([
     "function launch(uint256 repoId, (uint256 initialSupply, uint256 numTokensToSell, address numeraire, address tokenFactory, bytes tokenFactoryData, address governanceFactory, bytes governanceFactoryData, address poolInitializer, bytes poolInitializerData, address liquidityMigrator, bytes liquidityMigratorData, address integrator, bytes32 salt) p) returns (address asset)",
@@ -83,7 +88,10 @@ function addB20Command(program: Command): void {
         .argument("<amount>", "fcf amount to wrap")
         .option("--wrapper <addr>", "deployed FCFWrapper address")
         .action(async (amount: string, opts: { wrapper?: string }) => {
-            const { account, publicClient, walletClient } = clients();
+            const { account, publicClient, walletClient } = clients({
+                chain: base,
+                rpcUrl: process.env.B20_RPC_URL ?? process.env.BASE_MAINNET_RPC_URL ?? "https://mainnet.base.org",
+            });
             const wrapperAddress = resolveFcfWrapperAddress(opts.wrapper);
             try {
                 const result = await wrapB20({ amount, wrapperAddress, account, publicClient, walletClient });
@@ -98,7 +106,10 @@ function addB20Command(program: Command): void {
         .argument("<amount>", "wrapped B20 amount to unwrap")
         .option("--wrapper <addr>", "deployed FCFWrapper address")
         .action(async (amount: string, opts: { wrapper?: string }) => {
-            const { account, publicClient, walletClient } = clients();
+            const { account, publicClient, walletClient } = clients({
+                chain: base,
+                rpcUrl: process.env.B20_RPC_URL ?? process.env.BASE_MAINNET_RPC_URL ?? "https://mainnet.base.org",
+            });
             const wrapperAddress = resolveFcfWrapperAddress(opts.wrapper);
             try {
                 const result = await unwrapB20({ amount, wrapperAddress, account, publicClient, walletClient });
@@ -120,9 +131,9 @@ function addMarketCommand(program: Command): void {
             if(!RIK_ROYALTY_SPLITTER_ADDRESS) die("Missing RIK_ROYALTY_SPLITTER_ADDRESS");
             if(!RIK_LAUNCHER_ADDRESS) die("Missing RIK_ROYALTY_SPLITTER_ADDRESS");
 
-            const { account, publicClient, walletClient } = clients();
+            const { account, publicClient, walletClient, chain } = clients();
             let doppler: DopplerSDK | null = null;
-            try { doppler = new DopplerSDK({ publicClient, walletClient, chainId: baseSepolia.id }); } catch (err) { die(err); }
+            try { doppler = new DopplerSDK({ publicClient, walletClient, chainId: chain.id }); } catch (err) { die(err); }
             if (!doppler) die("Failed to initialize doppler sdk");
 
             // NOTE: share token config is hardcoded right now
@@ -409,19 +420,24 @@ function addGithubVarsCommand(program: Command): void {
         });
 }
 
-function clients() {
+function clients(options: ClientsOptions = {}) {
     const privateKey = (() => {
         let key;
         if (process.env.PRIVATE_KEY) key = process.env.PRIVATE_KEY as `0x${string}`;
         else try { const wallet = getLocalWallet(); key = wallet.privateKey; } catch (err) { die(err) };
         return key;
     })();
-    const rpcUrl = process.env.RPC_URL ?? "https://sepolia.base.org";
-    const chain = rpcUrl.includes("sepolia") ? baseSepolia : foundry;
+    const rpcUrl = options.rpcUrl ?? process.env.RPC_URL ?? "https://sepolia.base.org";
+    const chain = options.chain ?? (
+        rpcUrl.includes("mainnet.base.org") ? base :
+        rpcUrl.includes("sepolia") ? baseSepolia :
+        foundry
+    );
     const account = privateKeyToAccount(privateKey);
 
     return {
         account,
+        chain,
         publicClient: createPublicClient({ chain, transport: http(rpcUrl) }),
         walletClient: createWalletClient({ account, chain, transport: http(rpcUrl) }),
     };

packages/cli/test/b20-ops.test.ts

@@ -28,6 +28,7 @@ function makeClients(allowance: bigint): {
 } {
     const reads: ReadCall[] = [];
     const writes: WriteCall[] = [];
+    let currentAllowance = allowance;
 
     return {
         reads,
@@ -37,7 +38,7 @@ function makeClients(allowance: bigint): {
                 reads.push(args);
                 if (args.functionName === "fcfToken") return fcfToken;
                 if (args.functionName === "wrappedB20") return wrappedB20;
-                if (args.functionName === "allowance") return allowance;
+                if (args.functionName === "allowance") return currentAllowance;
                 throw new Error(`unexpected read: ${args.functionName}`);
             },
             async waitForTransactionReceipt() {
@@ -47,6 +48,10 @@ function makeClients(allowance: bigint): {
         walletClient: {
             async writeContract(args) {
                 writes.push(args);
+                if (args.functionName === "approve") {
+                    const amount = args.args[1];
+                    if (typeof amount === "bigint") currentAllowance = amount;
+                }
                 return `0x${String(writes.length).padStart(64, "0")}` as Hash;
             },
         },