From f38e3ef56b0fe4d6eed5838d07bc3b00e860457d Mon Sep 17 00:00:00 2001
From: sklppy88 <esau@aztecprotocol.com>
Date: Fri, 4 Apr 2025 17:17:47 +0000
Subject: [PATCH] init

---
 yarn-project/cli-wallet/src/utils/options/fees.ts    | 12 ++++++------
 .../cmds/misc/get_canonical_sponsored_fpc_address.ts |  7 +++++++
 yarn-project/cli/src/cmds/misc/index.ts              |  8 ++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 yarn-project/cli/src/cmds/misc/get_canonical_sponsored_fpc_address.ts

diff --git a/yarn-project/cli-wallet/src/utils/options/fees.ts b/yarn-project/cli-wallet/src/utils/options/fees.ts
index 6847beef500a..01037cbe46c7 100644
--- a/yarn-project/cli-wallet/src/utils/options/fees.ts
+++ b/yarn-project/cli-wallet/src/utils/options/fees.ts
@@ -77,7 +77,11 @@ function printOptionParams(params: OptionParams) {
       params[name].default ? `Default: ${params[name].default}` : '',
     ].join(' '),
   );
-  return descriptionList.length ? `\n   Parameters:\n${descriptionList.join('\n')}` : '';
+  return descriptionList.length
+    ? `\n   Parameters:\n${descriptionList.join('\n')}\nFormat: --payment ${Object.keys(params)
+        .slice(0, 3)
+        .map(name => `${name}=${params[name].type}`)} ${Object.keys(params).length > 3 ? '...' : ''}`
+    : '';
 }
 
 function getFeePaymentMethodParams(allowCustomFeePayer: boolean): OptionParams {
@@ -122,11 +126,7 @@ function getFeePaymentMethodParams(allowCustomFeePayer: boolean): OptionParams {
 
 function getPaymentMethodOption(allowCustomFeePayer: boolean) {
   const params = getFeePaymentMethodParams(allowCustomFeePayer);
-  const paramList = Object.keys(params).map(name => `${name}=${params[name].type}`);
-  return new Option(
-    `--payment <${paramList.join(',')}>`,
-    `Fee payment method and arguments.${printOptionParams(params)}`,
-  );
+  return new Option(`--payment <options>`, `Fee payment method and arguments.${printOptionParams(params)}`);
 }
 
 function getFeeOptions(allowCustomFeePayer: boolean) {
diff --git a/yarn-project/cli/src/cmds/misc/get_canonical_sponsored_fpc_address.ts b/yarn-project/cli/src/cmds/misc/get_canonical_sponsored_fpc_address.ts
new file mode 100644
index 000000000000..8fea9c8ea5fa
--- /dev/null
+++ b/yarn-project/cli/src/cmds/misc/get_canonical_sponsored_fpc_address.ts
@@ -0,0 +1,7 @@
+import type { LogFn } from '@aztec/foundation/log';
+
+import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
+
+export async function getCanonicalSponsoredFPCAddress(log: LogFn) {
+  log(`Canonical SponsoredFPC Address: ${(await getSponsoredFPCAddress()).toString()}`);
+}
diff --git a/yarn-project/cli/src/cmds/misc/index.ts b/yarn-project/cli/src/cmds/misc/index.ts
index 1d37ad3fb7cb..1226f5895562 100644
--- a/yarn-project/cli/src/cmds/misc/index.ts
+++ b/yarn-project/cli/src/cmds/misc/index.ts
@@ -77,6 +77,14 @@ export function injectCommands(program: Command, log: LogFn) {
       generateSecretAndHash(log);
     });
 
+  program
+    .command('get-canonical-sponsored-fpc-address')
+    .description('Gets the canonical SponsoredFPC address for this any testnet running on the same version as this CLI')
+    .action(async () => {
+      const { getCanonicalSponsoredFPCAddress } = await import('./get_canonical_sponsored_fpc_address.js');
+      await getCanonicalSponsoredFPCAddress(log);
+    });
+
   program
     .command('update')
     .description('Updates Nodejs and Noir dependencies')