Skip to content

Clarify USDC funding network for billing top-ups #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
swairshah wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Clarify USDC funding network for billing top-ups #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions packages/cli/src/commands/billing/__tests__/top-up.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@ describe("ecloud billing top-up", () => {
vi.useRealTimers();
});

function setupOnChainState(overrides: {
usdcAddress?: string;
minimumPurchase?: bigint;
usdcBalance?: bigint;
currentAllowance?: bigint;
} = {}) {
function setupOnChainState(
overrides: {
usdcAddress?: string;
minimumPurchase?: bigint;
usdcBalance?: bigint;
currentAllowance?: bigint;
} = {},
) {
const {
usdcAddress = "0xUSDCAddress0000000000000000000000000000",
minimumPurchase = BigInt(1_000_000), // 1 USDC
Expand Down Expand Up @@ -122,7 +124,7 @@ describe("ecloud billing top-up", () => {
});
});

it("zero USDC balance: exits with fund wallet message", async () => {
it("zero USDC balance: exits with Sepolia fund wallet message for sepolia-dev", async () => {
setupOnChainState({ usdcBalance: BigInt(0) });
mockBilling.getStatus.mockResolvedValue({ subscriptionStatus: "inactive" });

Expand All @@ -138,6 +140,22 @@ describe("ecloud billing top-up", () => {
expect(mockBilling.topUp).not.toHaveBeenCalled();
});

it("zero USDC balance: shows Ethereum mainnet funding network for prod sepolia billing", async () => {
setupOnChainState({ usdcBalance: BigInt(0) });
mockBilling.getStatus.mockResolvedValue({ subscriptionStatus: "inactive" });

const cmd = createCommand({ amount: "50", environment: "sepolia" });
await cmd.run();
const fullOutput = logOutput.join("\n");

expect(fullOutput).toContain("No USDC in wallet");
expect(fullOutput).toContain("Send USDC on Ethereum mainnet to");
expect(fullOutput).toContain(WALLET_ADDRESS);

// Should not have called topUp
expect(mockBilling.topUp).not.toHaveBeenCalled();
});

it("below minimum purchase: shows error", async () => {
setupOnChainState({ minimumPurchase: BigInt(10_000_000) }); // 10 USDC minimum
mockBilling.getStatus.mockResolvedValue({ subscriptionStatus: "inactive" });
Expand Down
48 changes: 34 additions & 14 deletions packages/cli/src/commands/billing/top-up.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ import { withTelemetry } from "../../telemetry";
const POLL_INTERVAL_MS = 5_000;
const POLL_TIMEOUT_MS = 3 * 60 * 1000; // 3 minutes

function getUsdcFundingNetwork(environment: string): string {
// Prod "sepolia" deploys compute to Sepolia, but billing uses the mainnet USDC credits contract.
switch (environment) {
case "sepolia-dev":
return "Sepolia";
case "sepolia":
case "mainnet-alpha":
return "Ethereum mainnet";
default:
return "the configured billing network";
}
}

export default class BillingTopUp extends Command {
static description = "Purchase EigenCompute credits with USDC";

Expand Down Expand Up @@ -73,7 +86,9 @@ export default class BillingTopUp extends Command {
const applied = status.creditsApplied ?? 0;
baselineTotal = remaining + applied;
if (status.remainingCredits !== undefined) {
this.log(` ${chalk.bold("Credits:")} ${chalk.cyan(`$${status.remainingCredits.toFixed(2)}`)}`);
this.log(
` ${chalk.bold("Credits:")} ${chalk.cyan(`$${status.remainingCredits.toFixed(2)}`)}`,
);
}
} catch {
this.debug("Could not fetch current credit balance");
Expand All @@ -87,8 +102,9 @@ export default class BillingTopUp extends Command {
this.log(` ${chalk.bold("USDC:")} ${balanceFormatted} USDC`);

if (usdcBalance === BigInt(0)) {
const fundingNetwork = getUsdcFundingNetwork(flags.environment);
this.log(`\n${chalk.yellow(" No USDC in wallet.")}`);
this.log(` Send USDC on Sepolia to: ${chalk.cyan(walletAddress)}`);
this.log(` Send USDC on ${fundingNetwork} to: ${chalk.cyan(walletAddress)}`);
this.log(` Then re-run: ${chalk.cyan("ecloud billing top-up")}\n`);
return;
}
Expand All @@ -103,10 +119,8 @@ export default class BillingTopUp extends Command {
const n = parseFloat(val);
if (isNaN(n) || n <= 0) return "Enter a positive number";
const raw = BigInt(Math.round(n * 1e6));
if (raw < minimumPurchase)
return `Minimum purchase is ${minimumFormatted} USDC`;
if (raw > usdcBalance)
return `Insufficient balance. You have ${balanceFormatted} USDC`;
if (raw < minimumPurchase) return `Minimum purchase is ${minimumFormatted} USDC`;
if (raw > usdcBalance) return `Insufficient balance. You have ${balanceFormatted} USDC`;
return true;
},
}));
Expand Down Expand Up @@ -144,23 +158,29 @@ export default class BillingTopUp extends Command {
const remaining = status.remainingCredits ?? 0;
const applied = status.creditsApplied ?? 0;
const currentTotal = remaining + applied;
this.debug(`Poll: remaining=${remaining}, applied=${applied}, total=${currentTotal}, baseline=${baselineTotal}`);
if (
baselineTotal === undefined || currentTotal > baselineTotal
) {
const creditsAdded = baselineTotal !== undefined ? currentTotal - baselineTotal : undefined;
const isMatched = creditsAdded !== undefined && Math.abs(creditsAdded - amountFloat * 2) < 0.01;
this.debug(
`Poll: remaining=${remaining}, applied=${applied}, total=${currentTotal}, baseline=${baselineTotal}`,
);
if (baselineTotal === undefined || currentTotal > baselineTotal) {
const creditsAdded =
baselineTotal !== undefined ? currentTotal - baselineTotal : undefined;
const isMatched =
creditsAdded !== undefined && Math.abs(creditsAdded - amountFloat * 2) < 0.01;
const appliedFromTopUp = creditsAdded !== undefined ? creditsAdded - remaining : 0;

this.log(`\n ${chalk.green("✓")} Credits received: ${chalk.cyan(`$${(creditsAdded ?? amountFloat).toFixed(2)}`)}`);
this.log(
`\n ${chalk.green("✓")} Credits received: ${chalk.cyan(`$${(creditsAdded ?? amountFloat).toFixed(2)}`)}`,
);
if (isMatched) {
this.log(` ${chalk.green("✓")} Includes $${amountFloat.toFixed(2)} match bonus!`);
}
if (remaining > 0) {
this.log(` Remaining balance: ${chalk.cyan(`$${remaining.toFixed(2)}`)}`);
}
if (appliedFromTopUp > 0) {
this.log(` ${chalk.gray(`$${appliedFromTopUp.toFixed(2)} applied to current bill`)}`);
this.log(
` ${chalk.gray(`$${appliedFromTopUp.toFixed(2)} applied to current bill`)}`,
);
}
this.log();
return;
Expand Down