brainchain-worker 0.17.0 → 0.18.1

package/README.md

@@ -228,9 +228,9 @@ Earnings come back the same way:
 BRAINCHAIN_NETWORK=mainnet npx brainchain-worker exit --to-solana <your Solana address>
 ```
 
-`exit` sends the worker's USDG on BrainChain to the desk, which pays it out on Robinhood Chain within minutes, less a
-0.5% fee, instead of the bridge's seven-day withdrawal. `--to-solana` then moves it on to USDC on Solana through Relay.
-Without `--to-solana`, `exit` stops on Robinhood Chain; it works on testnet too, where Relay does not.
+`exit` sends the worker's USDG on BrainChain to the desk, which pays it back within a minute, less a 0.5% fee, instead
+of the bridge's seven-day withdrawal. With `--to-solana` the desk pays it as USDC on Solana through Relay, and the
+worker needs nothing on Robinhood Chain; without it, the desk pays on Robinhood Chain, which also works on testnet.
 
 Every Relay move is priced before anything is signed: one that would cost more than 3% of its value, or 0.50 USD on
 a small move, stops the command and nothing is sent.

package/dist/cli.js

@@ -76,11 +76,10 @@ const COMMAND_USAGE = {
                                             minute. --eth works on both networks, the tokens on mainnet. --dry
                                             checks the balances and sends nothing.`,
     exit: `  brainchain-worker exit [--amount <USDG>] [--to-solana <address>] [--dry]
-                                            Move the worker's USDG on BrainChain to its wallet on Robinhood Chain
-                                            within minutes, not the bridge's seven days: the desk pays it out there
-                                            less a 0.5% fee. Without --amount, the whole balance. --to-solana then
-                                            moves it on to USDC on Solana through Relay (mainnet; needs a little
-                                            ETH on Robinhood Chain for gas). --dry checks and sends nothing.`,
+                                            Get the worker's USDG on BrainChain back within a minute, not the
+                                            bridge's seven days: the desk pays it on Robinhood Chain less a 0.5%
+                                            fee, or as USDC on Solana with --to-solana (mainnet). Without --amount,
+                                            the whole balance. --dry checks and sends nothing.`,
     fund: `  brainchain-worker fund --from-solana --usdc <amount> [--stake] [--gas-usdc <amount>] [--dry]
                                             Fund the worker from a Solana wallet: Relay turns its USDC into ETH
                                             for gas (2 USDC by default) and, with --stake, the rest into the stake

package/dist/exit.js

@@ -1,13 +1,25 @@
-// `exit`: the worker's USDG on BrainChain back on Robinhood Chain within minutes instead of the bridge's seven days.
-// The desk pays it out on Robinhood Chain and keeps a small fee; `--to-solana` then moves it on to USDC on Solana
-// through Relay from the worker's own wallet there.
-import { createPublicClient, createWalletClient, erc20Abi, formatUnits, http, parseUnits } from "viem";
+// `exit`: the worker's USDG on BrainChain paid back within a minute instead of the bridge's seven days. The desk pays
+// it on Robinhood Chain, or, with `--to-solana`, as USDC on Solana through Relay: the transfer to the desk carries the
+// Solana address after its arguments, so nothing else is signed and nothing is needed on Robinhood Chain.
+import bs58 from "bs58";
+import { createPublicClient, createWalletClient, encodeFunctionData, erc20Abi, formatUnits, http, parseUnits } from "viem";
 import { RECEIPT_MS } from "./chain.js";
-import { chainOf, parentChainOf } from "./network.js";
-import { checkReturn, relayQuote, SOLANA_CHAIN_ID, SOLANA_USDC, waitForRelay } from "./relay.js";
-/** A Solana address: 32 to 44 base58 characters. */
+import { chainOf } from "./network.js";
+/** A Solana address: 32 bytes in base58. */
 export function isSolanaAddress(value) {
-    return /^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(value);
+    if (!/^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(value))
+        return false;
+    try {
+        return bs58.decode(value).length === 32;
+    }
+    catch {
+        return false;
+    }
+}
+/** A transfer to the desk with the Solana address after its arguments, which the desk reads to pay there. */
+export function exitCalldata(desk, amount, solana) {
+    const transfer = encodeFunctionData({ abi: erc20Abi, functionName: "transfer", args: [desk, amount] });
+    return solana ? `${transfer}${Buffer.from(bs58.decode(solana)).toString("hex")}` : transfer;
 }
 export function exitFee(amount, terms) {
     const proportional = (amount * BigInt(terms.feeBps)) / 10000n;
@@ -32,35 +44,20 @@ export async function exitRecord(service, tx, fetchImpl = fetch) {
     return (await response.json()).exits[0];
 }
 export function createExitChain(network, account) {
-    const bridge = network.bridge;
-    const l3 = { read: createPublicClient({ chain: chainOf(network), transport: http(network.rpc, { timeout: 20_000 }) }) };
-    const l3Wallet = createWalletClient({ account, chain: chainOf(network), transport: http(network.rpc, { timeout: 20_000 }) });
-    const parent = bridge ? createPublicClient({ chain: parentChainOf(bridge), transport: http(bridge.rpc, { timeout: 20_000 }) }) : undefined;
-    const parentWallet = bridge ? createWalletClient({ account, chain: parentChainOf(bridge), transport: http(bridge.rpc, { timeout: 20_000 }) }) : undefined;
+    const read = createPublicClient({ chain: chainOf(network), transport: http(network.rpc, { timeout: 20_000 }) });
+    const wallet = createWalletClient({ account, chain: chainOf(network), transport: http(network.rpc, { timeout: 20_000 }) });
     return {
         account: account.address,
-        bountyBalance: (token) => l3.read.readContract({ address: token, abi: erc20Abi, functionName: "balanceOf", args: [account.address] }),
-        async sendToDesk(token, desk, amount) {
-            const hash = await l3Wallet.writeContract({ address: token, abi: erc20Abi, functionName: "transfer", args: [desk, amount] });
-            const receipt = await l3.read.waitForTransactionReceipt({ hash, timeout: RECEIPT_MS });
+        bountyBalance: (token) => read.readContract({ address: token, abi: erc20Abi, functionName: "balanceOf", args: [account.address] }),
+        async sendToDesk(token, desk, amount, solana) {
+            const hash = await wallet.sendTransaction({ to: token, data: exitCalldata(desk, amount, solana) });
+            const receipt = await read.waitForTransactionReceipt({ hash, timeout: RECEIPT_MS });
             if (receipt.status !== "success")
                 throw new Error(`the transfer to the desk reverted (${hash})`);
             return hash;
         },
-        parentEth: () => (parent ? parent.getBalance({ address: account.address }) : Promise.resolve(0n)),
-        async sendParent(item) {
-            if (!parent || !parentWallet)
-                throw new Error(`${network.name} has no parent chain`);
-            const hash = await parentWallet.sendTransaction({ to: item.to, data: item.data, value: BigInt(item.value ?? "0") });
-            const receipt = await parent.waitForTransactionReceipt({ hash, timeout: RECEIPT_MS });
-            if (receipt.status !== "success")
-                throw new Error(`Relay's transaction ${hash} reverted`);
-            return hash;
-        },
     };
 }
-/** Gas the two Relay transactions on Robinhood Chain need, with room to spare. */
-export const RELAY_GAS_WEI = 20000000000000n;
 export async function exit(network, chain, options) {
     const { log, dry } = options;
     const fetchImpl = options.fetchImpl ?? fetch;
@@ -89,25 +86,14 @@ export async function exit(network, chain, options) {
     const fee = exitFee(amount, terms);
     const net = amount - fee;
     log(`Exit ${show(amount)} from ${network.name}: ${show(net)} arrives on the parent chain (chain ${terms.payoutChainId}) after a ${show(fee)} fee.`);
-    if (options.toSolana !== undefined) {
-        const eth = await chain.parentEth();
-        if (eth < RELAY_GAS_WEI) {
-            throw new Error(`Moving it on to Solana needs about 0.00002 ETH on ${network.bridge?.name ?? "the parent chain"} for gas; the wallet holds ${formatUnits(eth, 18)}. \`fund --from-solana\` brings some.`);
-        }
-    }
-    const solanaQuote = (net) => (options.quote ?? relayQuote)({ user: chain.account, recipient: options.toSolana, originChainId: terms.payoutChainId, destinationChainId: SOLANA_CHAIN_ID, originCurrency: terms.payoutToken, destinationCurrency: SOLANA_USDC, amount: net }, fetchImpl);
-    // Priced before anything leaves BrainChain, so a refused Solana leg never strands the exit halfway.
-    if (options.toSolana !== undefined) {
-        const preview = await solanaQuote(net);
-        checkReturn(preview);
-        log(`Relay quotes ${preview.outFormatted} USDC on Solana for it.`);
-    }
+    if (options.toSolana !== undefined)
+        log(`Paid as USDC on Solana to ${options.toSolana}, less Relay's own fee, unless the move would cost more than 3% (or 0.50 USD); then it is paid on the parent chain.`);
     if (dry) {
         log("Dry run, nothing sent.");
         return;
     }
-    const tx = await chain.sendToDesk(terms.token, terms.desk, amount);
-    log(`Sent to the desk on ${network.name} (${tx}). Waiting for the payout; the desk picks it up within a round, usually a few minutes.`);
+    const tx = await chain.sendToDesk(terms.token, terms.desk, amount, options.toSolana);
+    log(`Sent to the desk on ${network.name} (${tx}). Waiting for the payout, usually under a minute.`);
     const end = Date.now() + (options.waitMs ?? 1_800_000);
     let last = "";
     let record;
@@ -129,24 +115,9 @@ export async function exit(network, chain, options) {
         process.exitCode = 1;
         return;
     }
-    log(`Paid on the parent chain: ${show(BigInt(record.net))} (${record.payoutTx}).`);
-    if (options.toSolana === undefined)
+    if (record.solana && record.relayRequest) {
+        log(`Paid on Solana: ${show(BigInt(record.net))} as USDC to ${record.solana} (Relay request ${record.relayRequest}).`);
         return;
-    const quote = await solanaQuote(BigInt(record.net));
-    checkReturn(quote);
-    await sendEvmSteps(quote, chain);
-    log(`Moving ${show(BigInt(record.net))} to Solana: ${quote.outFormatted} USDC to ${options.toSolana}.`);
-    const status = await waitForRelay(quote.requestId, 600_000, fetchImpl);
-    if (status === "success")
-        log(`Arrived on Solana. Relay request ${quote.requestId}.`);
-    else {
-        log(`Relay reports "${status}" for request ${quote.requestId}. A refund comes back to the wallet on the parent chain.`);
-        process.exitCode = 1;
-    }
-}
-async function sendEvmSteps(quote, chain) {
-    for (const step of quote.steps) {
-        for (const item of step.items)
-            await chain.sendParent(item.data);
     }
+    log(`Paid on the parent chain: ${show(BigInt(record.net))} (${record.payoutTx})${record.reason ? `. ${record.reason}` : ""}.`);
 }

package/dist/network.js

@@ -78,11 +78,12 @@ export const MAINNET = {
         weth: "0x0Bd7D308f8E1639FAb988df18A8011f41EAcAD73",
         gas: "Send it a little ETH there for gas",
         income: "0xeb1b4168D4b87D3d9F0D64E13B7071251BBB63b7",
-        // Shipped's registry and StaticCallCheck. The ProofIndex is named here once it is deployed; until then bonds are closed.
+        // Shipped's registry and StaticCallCheck, and BrainChain's ProofIndex the check reads.
         bonds: {
             registry: "0xD5Da523ee49CB7Fe855B0C6fa38707190A9D531F",
             check: "0x2e7C4F0F2e6079C3B5F7Cd2440308234CBDc537D",
             usdg: "0x5fc5360D0400a0Fd4f2af552ADD042D716F1d168",
+            proofIndex: "0x0fb02559e704549794EdF3FBBBe91DB88bB849ee",
         },
     },
     identity: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brainchain-worker",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "description": "Earn on BrainChain and propose changes to it: stake, apply, do the tasks Jev hires your agent for, and bond BRAIN to put a change to Jev.",
   "license": "MIT",
   "author": "BrainChain <hello@usebrainchain.com>",