@infernetprotocol/cli 0.1.64 → 0.1.65

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/commands/help.js CHANGED
@@ -38,7 +38,7 @@ Diagnostics:
38
38
  doctor End-to-end health check across all three sides
39
39
 
40
40
  Payments:
41
- payout Manage payout coin/address
41
+ payout Earnings, withdrawals and payout address
42
42
  payments Show recent payment transactions
43
43
 
44
44
  Managed endpoints:
@@ -1,24 +1,65 @@
1
1
  /**
2
- * `infernet payout` — manage this provider's payout coin/address via the
2
+ * `infernet payout` — earnings, withdrawals and the payout address, via the
3
3
  * signed node API.
4
4
  *
5
5
  * Subcommands:
6
+ * infernet payout list balance, recent credits, withdrawals, addresses
6
7
  * infernet payout set <coin> <address> [--network <name>]
7
- * infernet payout list
8
+ * infernet payout request [--amount <usd>] withdraw (queued for admin approval)
9
+ * infernet payout admin list|approve|reject|settings (INFERNET_ADMIN_TOKEN)
8
10
  */
9
11
 
10
12
  import { PAYMENT_COINS, PAYMENT_COIN_CODES } from '@infernetprotocol/config/payment-coins';
13
+ import { resolveClientOptions } from '../lib/reservations-client.js';
11
14
 
12
- const HELP = `infernet payout — manage payout coin/address
15
+ const HELP = `infernet payout — earnings, withdrawals and payout address
13
16
 
14
17
  Usage:
18
+ infernet payout list Balance, recent credits, withdrawals, addresses
15
19
  infernet payout set <coin> <address> [--network <name>]
16
- infernet payout list
20
+ infernet payout request [--amount <usd>] Withdraw (default: whole available balance)
17
21
  infernet payout --help
18
22
 
23
+ Every completed job credits your node. Free (playground) jobs earn a house
24
+ subsidy per 1k output tokens, "pending approval" until the rate is approved;
25
+ paid jobs earn your share of the client's payment once it is confirmed.
26
+ Earnings accrue with or without a payout address: you only need one to
27
+ withdraw. Withdrawals are queued and sent through CoinPay after approval.
28
+
29
+ Admin (needs INFERNET_ADMIN_TOKEN or --token):
30
+ infernet payout admin list [--status requested|sending|sent|all]
31
+ infernet payout admin approve <request-id> SENDS REAL FUNDS via CoinPay
32
+ infernet payout admin reject <request-id> [--reason <text>]
33
+ infernet payout admin mark-sent <request-id> --tx <hash>
34
+ infernet payout admin mark-failed <request-id>
35
+ infernet payout admin settings [--rate <usd per 1k>] [--fee <pct>] [--min <usd>] [--approve-subsidy]
36
+
19
37
  Supported coins: ${PAYMENT_COIN_CODES.join(', ')}
20
38
  `;
21
39
 
40
+ /** Sub-cent credits must not print as $0.00. */
41
+ export function fmtUsd(n) {
42
+ const v = Number(n) || 0;
43
+ if (v === 0) return '$0.00';
44
+ if (Math.abs(v) >= 0.01) return `$${v.toFixed(2)}`;
45
+ return `$${v.toFixed(6).replace(/0+$/, '')}`;
46
+ }
47
+
48
+ const STATUS_LABEL = {
49
+ pending_approval: 'pending approval',
50
+ pending: 'awaiting client payment',
51
+ confirmed: 'confirmed',
52
+ void: 'void'
53
+ };
54
+
55
+ export function formatBalance(b = {}) {
56
+ return [
57
+ `Earnings: ${fmtUsd(b.pending_approval_usd)} pending approval, ${fmtUsd(b.pending_usd)} awaiting client payment, ${fmtUsd(b.confirmed_usd)} confirmed`,
58
+ `Payouts: ${fmtUsd(b.paid_usd)} paid, ${fmtUsd(b.requested_usd)} requested, ${fmtUsd(b.available_usd)} available to withdraw`,
59
+ `Jobs: ${b.jobs_credited ?? 0} credited`
60
+ ].join('\n');
61
+ }
62
+
22
63
  function pickNetwork(coin, requestedNetwork) {
23
64
  const upper = String(coin).toUpperCase();
24
65
  const matches = PAYMENT_COINS.filter((c) => c.code === upper);
@@ -38,6 +79,12 @@ async function runList(args, ctx) {
38
79
  return 1;
39
80
  }
40
81
 
82
+ let earnings = null;
83
+ try {
84
+ earnings = await client.earnings(Number.parseInt(args.get('limit') ?? '10', 10) || 10);
85
+ } catch (err) {
86
+ process.stderr.write(`earnings lookup failed: ${err?.message ?? err}\n`);
87
+ }
41
88
  let result;
42
89
  try {
43
90
  result = await client.listPayouts();
@@ -45,12 +92,52 @@ async function runList(args, ctx) {
45
92
  process.stderr.write(`payout list failed: ${err?.message ?? err}\n`);
46
93
  return 1;
47
94
  }
95
+
96
+ if (args.has('json')) {
97
+ process.stdout.write(JSON.stringify({ earnings, addresses: result?.rows ?? [] }, null, 2) + '\n');
98
+ return 0;
99
+ }
100
+
101
+ if (earnings) {
102
+ const cfg = earnings.config ?? {};
103
+ process.stdout.write(formatBalance(earnings.balance) + '\n');
104
+ process.stdout.write(
105
+ `Rates: free jobs ${fmtUsd(cfg.subsidy_per_1k_output_usd)}/1k output tokens` +
106
+ `${cfg.subsidy_approved ? '' : ' (pending approval)'}, house fee on paid jobs ${cfg.house_fee_pct ?? 0}%, ` +
107
+ `minimum withdrawal ${fmtUsd(cfg.min_payout_usd)}\n`
108
+ );
109
+ const recent = earnings.recent ?? [];
110
+ if (recent.length) {
111
+ process.stdout.write('\nRecent credits:\n');
112
+ for (const e of recent) {
113
+ const when = String(e.earned_at ?? '').replace('T', ' ').slice(0, 16);
114
+ process.stdout.write(
115
+ ` ${when} ${String(e.job_id).slice(0, 8)} ${(e.model_name ?? '-').padEnd(18)} ` +
116
+ `${String(e.output_tokens ?? 0).padStart(6)} tok ${fmtUsd(e.amount_usd).padStart(11)} ` +
117
+ `${e.kind} ${STATUS_LABEL[e.status] ?? e.status}\n`
118
+ );
119
+ }
120
+ }
121
+ const payouts = earnings.payouts ?? [];
122
+ if (payouts.length) {
123
+ process.stdout.write('\nWithdrawals:\n');
124
+ for (const p of payouts) {
125
+ process.stdout.write(
126
+ ` ${String(p.created_at).slice(0, 10)} ${fmtUsd(p.amount_usd)} ${p.coin} ${p.status}` +
127
+ `${p.tx_hash ? ` tx ${p.tx_hash}` : ''}${p.status === 'rejected' && p.error ? ` (${p.error})` : ''}\n`
128
+ );
129
+ }
130
+ }
131
+ process.stdout.write('\n');
132
+ }
133
+
48
134
  const rows = result?.rows ?? [];
49
135
  if (!rows.length) {
50
- process.stdout.write('(no payout addresses configured)\n');
51
- process.stdout.write('Use `infernet payout set <coin> <address>` to add one.\n');
136
+ process.stdout.write('(no payout addresses configured: earnings still accrue)\n');
137
+ process.stdout.write('Use `infernet payout set <coin> <address>` before you withdraw.\n');
52
138
  return 0;
53
139
  }
140
+ process.stdout.write('Payout addresses:\n');
54
141
  for (const row of rows) {
55
142
  const marker = row.is_default ? '* ' : ' ';
56
143
  const net = row.network ? ` (${row.network})` : '';
@@ -59,6 +146,132 @@ async function runList(args, ctx) {
59
146
  return 0;
60
147
  }
61
148
 
149
+ async function runRequest(args, ctx) {
150
+ const { config, client } = ctx;
151
+ if ((config.node?.role) !== 'provider') {
152
+ process.stderr.write('Payouts are only available to providers.\n');
153
+ return 1;
154
+ }
155
+ const raw = args.get('amount');
156
+ const amount = raw == null || raw === true ? null : Number(raw);
157
+ if (amount !== null && !(amount > 0)) {
158
+ process.stderr.write('--amount must be a positive USD amount\n');
159
+ return 1;
160
+ }
161
+ try {
162
+ const out = await client.requestPayout(amount);
163
+ const r = out?.request ?? {};
164
+ process.stdout.write(
165
+ `Requested ${fmtUsd(r.amount_usd)} to ${r.coin}${r.network ? ` (${r.network})` : ''} ${r.address}.\n` +
166
+ `Request ${r.id} is waiting for approval; \`infernet payout list\` shows its status.\n`
167
+ );
168
+ return 0;
169
+ } catch (err) {
170
+ process.stderr.write(`payout request failed: ${err?.body?.error ?? err?.message ?? err}\n`);
171
+ return 1;
172
+ }
173
+ }
174
+
175
+ async function adminCall(opts, method, path, body) {
176
+ const { baseUrl, adminToken } = await resolveClientOptions(opts);
177
+ if (!adminToken) throw new Error('set INFERNET_ADMIN_TOKEN (or pass --token)');
178
+ const res = await fetch(`${baseUrl}${path}`, {
179
+ method,
180
+ headers: {
181
+ accept: 'application/json',
182
+ authorization: `Bearer ${adminToken}`,
183
+ ...(body === undefined ? {} : { 'content-type': 'application/json' })
184
+ },
185
+ body: body === undefined ? undefined : JSON.stringify(body)
186
+ });
187
+ const text = await res.text();
188
+ let json = null;
189
+ try { json = text ? JSON.parse(text) : null; } catch { /* non-JSON */ }
190
+ if (!res.ok) throw new Error(`${method} ${path} -> HTTP ${res.status} ${json?.error ?? text.slice(0, 200)}`);
191
+ return json?.data ?? json;
192
+ }
193
+
194
+ async function runAdmin(args, positional) {
195
+ const [action, id] = positional;
196
+ const opts = {
197
+ url: args.get('url') === true ? undefined : args.get('url'),
198
+ token: args.get('token') === true ? undefined : args.get('token')
199
+ };
200
+ const enc = encodeURIComponent;
201
+ try {
202
+ if (!action || action === 'list') {
203
+ const status = args.get('status') && args.get('status') !== true ? args.get('status') : 'requested';
204
+ const data = await adminCall(opts, 'GET', `/api/v1/admin/payouts?status=${enc(status)}`);
205
+ if (args.has('json')) {
206
+ process.stdout.write(JSON.stringify(data, null, 2) + '\n');
207
+ return 0;
208
+ }
209
+ const t = data?.totals ?? {};
210
+ const tot = t.totals_usd ?? {};
211
+ process.stdout.write(
212
+ `Ledger: ${t.credits ?? 0} credits, ${t.providers ?? 0} providers; subsidy ${fmtUsd(tot['subsidy:pending_approval'])} pending approval, ` +
213
+ `${fmtUsd(tot['subsidy:confirmed'])} confirmed; paid jobs ${fmtUsd(tot['paid:pending'])} pending, ${fmtUsd(tot['paid:confirmed'])} confirmed\n`
214
+ );
215
+ const c = t.config ?? {};
216
+ process.stdout.write(
217
+ `Config: subsidy ${fmtUsd(c.subsidy_per_1k_output_usd)}/1k (${c.subsidy_approved ? 'approved' : 'NOT approved'}), fee ${c.house_fee_pct}%, minimum ${fmtUsd(c.min_payout_usd)}\n\n`
218
+ );
219
+ const rows = data?.rows ?? [];
220
+ if (!rows.length) {
221
+ process.stdout.write(`(no ${status} payout requests)\n`);
222
+ return 0;
223
+ }
224
+ for (const r of rows) {
225
+ process.stdout.write(
226
+ `${r.id} ${String(r.created_at).slice(0, 16)} ${(r.provider_name ?? r.provider_id).slice(0, 32).padEnd(32)} ` +
227
+ `${fmtUsd(r.amount_usd).padStart(10)} ${r.coin}${r.network ? `/${r.network}` : ''} ${r.address} ${r.status}` +
228
+ `${r.error ? ` (${r.error})` : ''}\n`
229
+ );
230
+ }
231
+ return 0;
232
+ }
233
+ if (action === 'settings') {
234
+ const body = {};
235
+ if (args.get('rate') != null) body.subsidy_per_1k_output_usd = Number(args.get('rate'));
236
+ if (args.get('fee') != null) body.house_fee_pct = Number(args.get('fee'));
237
+ if (args.get('min') != null) body.min_payout_usd = Number(args.get('min'));
238
+ if (args.has('approve-subsidy')) body.subsidy_approved = true;
239
+ if (args.has('unapprove-subsidy')) body.subsidy_approved = false;
240
+ const data = Object.keys(body).length
241
+ ? await adminCall(opts, 'POST', '/api/v1/admin/earnings/settings', body)
242
+ : await adminCall(opts, 'GET', '/api/v1/admin/earnings/settings');
243
+ process.stdout.write(JSON.stringify(data, null, 2) + '\n');
244
+ return 0;
245
+ }
246
+ const actions = { approve: 'approve', reject: 'reject', 'mark-sent': 'mark_sent', 'mark-failed': 'mark_failed' };
247
+ if (!actions[action]) {
248
+ process.stderr.write(`Unknown payout admin action "${action}".\n`);
249
+ return 1;
250
+ }
251
+ if (!id) {
252
+ process.stderr.write(`Usage: infernet payout admin ${action} <request-id>\n`);
253
+ return 1;
254
+ }
255
+ const body = { action: actions[action] };
256
+ if (action === 'reject' && args.get('reason') && args.get('reason') !== true) body.reason = args.get('reason');
257
+ if (action === 'mark-sent') {
258
+ const tx = args.get('tx');
259
+ if (!tx || tx === true) {
260
+ process.stderr.write('mark-sent needs --tx <hash>\n');
261
+ return 1;
262
+ }
263
+ body.tx_hash = tx;
264
+ }
265
+ const data = await adminCall(opts, 'POST', `/api/v1/admin/payouts/${enc(id)}`, body);
266
+ const r = data?.request ?? {};
267
+ process.stdout.write(`${r.id}: ${r.status}${data?.outcome ? ` (outcome ${data.outcome})` : ''}${r.tx_hash ? ` tx ${r.tx_hash}` : ''}${r.error ? ` ${r.error}` : ''}\n`);
268
+ return r.status === 'failed' ? 1 : 0;
269
+ } catch (err) {
270
+ process.stderr.write(`payout admin ${action ?? 'list'} failed: ${err?.message ?? err}\n`);
271
+ return 1;
272
+ }
273
+ }
274
+
62
275
  async function runSet(args, ctx, positional) {
63
276
  const [coinArg, addressArg] = positional;
64
277
  if (!coinArg || !addressArg) {
@@ -118,6 +331,11 @@ export default async function payout(args, ctx) {
118
331
  return runList(args, ctx);
119
332
  case 'set':
120
333
  return runSet(args, ctx, rest);
334
+ case 'request':
335
+ case 'withdraw':
336
+ return runRequest(args, ctx);
337
+ case 'admin':
338
+ return runAdmin(args, rest);
121
339
  default:
122
340
  process.stderr.write(`Unknown payout subcommand "${sub}".\n`);
123
341
  process.stderr.write(HELP);
@@ -7,6 +7,7 @@
7
7
 
8
8
  import { isDaemonAlive, sendToDaemon } from '../lib/ipc.js';
9
9
  import { formatEndpoint } from '../lib/network.js';
10
+ import { formatBalance } from './payout.js';
10
11
 
11
12
  const HELP = `infernet status — show this node's state
12
13
 
@@ -98,14 +99,11 @@ export default async function status(args, ctx) {
98
99
 
99
100
  if (node.role === 'provider') {
100
101
  try {
101
- const { rows } = await client.listPayments(100);
102
- const sum = (list) => list.reduce((a, t) => a + (Number.parseFloat(t.amount_usd) || 0), 0);
103
- const outbound = (rows ?? []).filter((t) => t.direction === 'outbound');
104
- const confirmed = outbound.filter((t) => t.status === 'confirmed');
105
- const pending = outbound.filter((t) => t.status === 'pending');
106
- process.stdout.write(
107
- `Earnings: $${sum(confirmed).toFixed(2)} confirmed, $${sum(pending).toFixed(2)} pending (USD)\n`
108
- );
102
+ const earnings = await client.earnings(1);
103
+ process.stdout.write(formatBalance(earnings?.balance) + '\n');
104
+ if (!earnings?.config?.subsidy_approved && Number(earnings?.balance?.pending_approval_usd) > 0) {
105
+ process.stdout.write(' free-job credits are pending approval of the subsidy rate; see `infernet payout list`\n');
106
+ }
109
107
  } catch (err) {
110
108
  process.stderr.write(`earnings query failed: ${err?.message ?? err}\n`);
111
109
  }
package/index.js CHANGED
@@ -171,7 +171,11 @@ async function main() {
171
171
 
172
172
  const helpRequested = args.has('help') || args.has('h');
173
173
 
174
- if (!NO_CONFIG.has(sub) && !helpRequested) {
174
+ // `infernet payout admin ...` runs on an admin's machine with only the
175
+ // admin token, not a node config.
176
+ const adminOnly = sub === 'payout' && rest[0] === 'admin';
177
+
178
+ if (!NO_CONFIG.has(sub) && !helpRequested && !adminOnly) {
175
179
  const config = await loadConfig();
176
180
  if (!config) {
177
181
  process.stderr.write(
@@ -109,6 +109,14 @@ export function createNodeClient({ url, publicKey, privateKey, role, timeoutMs =
109
109
  return signedFetch('/api/v1/node/me', { role });
110
110
  },
111
111
 
112
+ earnings(recent = 20) {
113
+ return signedFetch('/api/v1/node/earnings', { recent });
114
+ },
115
+
116
+ requestPayout(amountUsd = null) {
117
+ return signedFetch('/api/v1/node/payouts/request', amountUsd == null ? {} : { amount_usd: amountUsd });
118
+ },
119
+
112
120
  listPayments(limit = 20) {
113
121
  return signedFetch('/api/v1/node/payments/list', { role, limit });
114
122
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@infernetprotocol/cli",
3
- "version": "0.1.64",
3
+ "version": "0.1.65",
4
4
  "description": "GPU-node CLI / daemon for the Infernet Protocol — register a GPU server with a Supabase control plane and start earning.",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -30,12 +30,12 @@
30
30
  "ora": "^9.4.0",
31
31
  "react": "^17.0.2",
32
32
  "react-blessed": "^0.7.2",
33
- "@infernetprotocol/auth": "0.1.64",
34
- "@infernetprotocol/deploy-providers": "0.1.64",
35
- "@infernetprotocol/config": "0.1.64",
36
- "@infernetprotocol/engine": "0.1.64",
37
- "@infernetprotocol/gpu": "0.1.64",
38
- "@infernetprotocol/rpc-adapter": "0.1.64"
33
+ "@infernetprotocol/auth": "0.1.65",
34
+ "@infernetprotocol/config": "0.1.65",
35
+ "@infernetprotocol/deploy-providers": "0.1.65",
36
+ "@infernetprotocol/gpu": "0.1.65",
37
+ "@infernetprotocol/engine": "0.1.65",
38
+ "@infernetprotocol/rpc-adapter": "0.1.65"
39
39
  },
40
40
  "repository": {
41
41
  "type": "git",