@aztec/cli-wallet 0.78.1 → 0.79.0

package/dest/utils/options/fees.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAEzB,KAAK,gBAAgB,EACrB,KAAK,GAAG,EACR,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAI3D,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAC3E;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX;AAuGD,qBAAa,OAAQ,YAAW,QAAQ;IAE7B,YAAY,EAAE,OAAO;IACrB,WAAW,EAAE,WAAW;IAC/B,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;gBAPZ,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,WAAW,EACvB,oBAAoB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,EAC1E,eAAe,EAAE,CACvB,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gBAAgB,KAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,EAC/B,WAAW,EAAE,OAAO;IAGxB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAU7D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAa/E,MAAM,CAAC,mBAAmB;IAI1B,MAAM,CAAC,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CAsB3E;AAED,qBAAa,mBAAoB,SAAQ,OAAO;WAC9B,mBAAmB;WAInB,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CA2BpF;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,mBAAmB,EAAE,OAAO,EAC5B,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,GACZ,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAwEtD;AAsBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAerD"}
+{"version":3,"file":"fees.d.ts","sourceRoot":"","sources":["../../../src/utils/options/fees.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAEzB,KAAK,gBAAgB,EACrB,KAAK,GAAG,EACR,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAK3D,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAC3E;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,QAAQ,EACjB,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,EAClE,GAAG,EAAE,KAAK,QAIX;AAuGD,qBAAa,OAAQ,YAAW,QAAQ;IAE7B,YAAY,EAAE,OAAO;IACrB,WAAW,EAAE,WAAW;IAC/B,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,WAAW;gBAPZ,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,WAAW,EACvB,oBAAoB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,EAC1E,eAAe,EAAE,CACvB,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gBAAgB,KAC5B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,EAC/B,WAAW,EAAE,OAAO;IAGxB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAU7D,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAa/E,MAAM,CAAC,mBAAmB;IAI1B,MAAM,CAAC,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CAsB3E;AAED,qBAAa,mBAAoB,SAAQ,OAAO;WAC9B,mBAAmB;WAInB,UAAU;WAIJ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ;CA2BpF;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,mBAAmB,EAAE,OAAO,EAC5B,GAAG,EAAE,KAAK,EACV,EAAE,CAAC,EAAE,QAAQ,GACZ,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,gBAAgB,CAAC,CA+EtD;AAsBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAerD"}

package/dest/utils/options/fees.js

@@ -4,6 +4,7 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas';
 import { Option } from 'commander';
 import { createOrRetrieveAccount } from '../accounts.js';
+import { SponsoredFeePaymentMethod } from '../sponsored_fee_payment.js';
 import { aliasedAddressParser } from './options.js';
 export function printGasEstimates(feeOpts, gasEstimates, log) {
     log(`Estimated gas usage:    ${formatGasEstimate(gasEstimates)}`);
@@ -46,7 +47,7 @@ function getFeePaymentMethodParams(allowCustomFeePayer) {
     return {
         method: {
             type: 'name',
-            description: 'Valid values: "fee_juice", "fpc-public", "fpc-private".',
+            description: 'Valid values: "fee_juice", "fpc-public", "fpc-private", "fpc-sponsored"',
             default: 'fee_juice'
         },
         ...feePayer ? {
@@ -54,7 +55,7 @@ function getFeePaymentMethodParams(allowCustomFeePayer) {
         } : {},
         asset: {
             type: 'address',
-            description: 'The asset used for fee payment. Not required for the "fee_juice" method.'
+            description: 'The asset used for fee payment. Required for "fpc-public" and "fpc-private".'
         },
         fpc: {
             type: 'address',
@@ -183,18 +184,17 @@ export function parsePaymentMethod(payment, allowCustomFeePayer, log, db) {
         acc[dimension] = value ?? 1;
         return acc;
     }, {});
-    const getFpcOpts = (parsed, db)=>{
+    const getFpc = ()=>{
         if (!parsed.fpc) {
             throw new Error('Missing "fpc" in payment option');
         }
+        return aliasedAddressParser('contracts', parsed.fpc, db);
+    };
+    const getAsset = ()=>{
         if (!parsed.asset) {
             throw new Error('Missing "asset" in payment option');
         }
-        const fpc = aliasedAddressParser('contracts', parsed.fpc, db);
-        return [
-            AztecAddress.fromString(parsed.asset),
-            fpc
-        ];
+        return AztecAddress.fromString(parsed.asset);
     };
     return async (sender)=>{
         switch(parsed.method){
@@ -223,18 +223,25 @@ export function parsePaymentMethod(payment, allowCustomFeePayer, log, db) {
                 }
             case 'fpc-public':
                 {
-                    const [asset, fpc] = getFpcOpts(parsed, db);
+                    const fpc = getFpc();
+                    const asset = getAsset();
                     log(`Using public fee payment with asset ${asset} via paymaster ${fpc}`);
                     const { PublicFeePaymentMethod } = await import('@aztec/aztec.js/fee');
                     return new PublicFeePaymentMethod(fpc, sender);
                 }
             case 'fpc-private':
                 {
-                    const [asset, fpc] = getFpcOpts(parsed, db);
+                    const fpc = getFpc();
+                    const asset = getAsset();
                     log(`Using private fee payment with asset ${asset} via paymaster ${fpc}`);
                     const { PrivateFeePaymentMethod } = await import('@aztec/aztec.js/fee');
                     return new PrivateFeePaymentMethod(fpc, sender);
                 }
+            case 'fpc-sponsored':
+                {
+                    const sponsor = getFpc();
+                    return new SponsoredFeePaymentMethod(sponsor);
+                }
             case undefined:
                 throw new Error('Missing "method" in payment option');
             default:

package/dest/utils/sponsored_fee_payment.d.ts

@@ -0,0 +1,19 @@
+import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
+import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+export declare class SponsoredFeePaymentMethod implements FeePaymentMethod {
+    private paymentContract;
+    constructor(paymentContract: AztecAddress);
+    getAsset(): Promise<AztecAddress>;
+    getFeePayer(): Promise<AztecAddress>;
+    getFunctionCalls(): Promise<{
+        name: string;
+        to: AztecAddress;
+        selector: FunctionSelector;
+        type: FunctionType;
+        isStatic: boolean;
+        args: never[];
+        returnTypes: never[];
+    }[]>;
+}
+//# sourceMappingURL=sponsored_fee_payment.d.ts.map

package/dest/utils/sponsored_fee_payment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sponsored_fee_payment.d.ts","sourceRoot":"","sources":["../../src/utils/sponsored_fee_payment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,qBAAa,yBAA0B,YAAW,gBAAgB;IACpD,OAAO,CAAC,eAAe;gBAAf,eAAe,EAAE,YAAY;IAEjD,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAIjC,WAAW;IAIL,gBAAgB;;;;;;;;;CAavB"}

package/dest/utils/sponsored_fee_payment.js

@@ -0,0 +1,26 @@
+import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+export class SponsoredFeePaymentMethod {
+    paymentContract;
+    constructor(paymentContract){
+        this.paymentContract = paymentContract;
+    }
+    getAsset() {
+        throw new Error('Asset is not required for sponsored fpc.');
+    }
+    getFeePayer() {
+        return Promise.resolve(this.paymentContract);
+    }
+    async getFunctionCalls() {
+        return [
+            {
+                name: 'sponsor_unconditionally',
+                to: this.paymentContract,
+                selector: await FunctionSelector.fromSignature('sponsor_unconditionally()'),
+                type: FunctionType.PRIVATE,
+                isStatic: false,
+                args: [],
+                returnTypes: []
+            }
+        ];
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli-wallet",
-  "version": "0.78.1",
+  "version": "0.79.0",
   "type": "module",
   "exports": {
     ".": "./dest/cmds/index.js",
@@ -65,15 +65,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.78.1",
-    "@aztec/aztec.js": "0.78.1",
-    "@aztec/cli": "0.78.1",
-    "@aztec/ethereum": "0.78.1",
-    "@aztec/foundation": "0.78.1",
-    "@aztec/kv-store": "0.78.1",
-    "@aztec/noir-contracts.js": "0.78.1",
-    "@aztec/pxe": "0.78.1",
-    "@aztec/stdlib": "0.78.1",
+    "@aztec/accounts": "0.79.0",
+    "@aztec/aztec.js": "0.79.0",
+    "@aztec/cli": "0.79.0",
+    "@aztec/ethereum": "0.79.0",
+    "@aztec/foundation": "0.79.0",
+    "@aztec/kv-store": "0.79.0",
+    "@aztec/noir-contracts.js": "0.79.0",
+    "@aztec/pxe": "0.79.0",
+    "@aztec/stdlib": "0.79.0",
     "commander": "^12.1.0",
     "inquirer": "^10.1.8",
     "source-map-support": "^0.5.21",

package/src/utils/options/fees.ts

@@ -15,6 +15,7 @@ import { Option } from 'commander';
 
 import type { WalletDB } from '../../storage/wallet_db.js';
 import { createOrRetrieveAccount } from '../accounts.js';
+import { SponsoredFeePaymentMethod } from '../sponsored_fee_payment.js';
 import { aliasedAddressParser } from './options.js';
 
 export type CliFeeArgs = {
@@ -85,13 +86,13 @@ function getFeePaymentMethodParams(allowCustomFeePayer: boolean): OptionParams {
   return {
     method: {
       type: 'name',
-      description: 'Valid values: "fee_juice", "fpc-public", "fpc-private".',
+      description: 'Valid values: "fee_juice", "fpc-public", "fpc-private", "fpc-sponsored"',
       default: 'fee_juice',
     },
     ...(feePayer ? { feePayer } : {}),
     asset: {
       type: 'address',
-      description: 'The asset used for fee payment. Not required for the "fee_juice" method.',
+      description: 'The asset used for fee payment. Required for "fpc-public" and "fpc-private".',
     },
     fpc: {
       type: 'address',
@@ -260,17 +261,18 @@ export function parsePaymentMethod(
     return acc;
   }, {} as Record<string, string>);
 
-  const getFpcOpts = (parsed: Record<string, string>, db?: WalletDB) => {
+  const getFpc = () => {
     if (!parsed.fpc) {
       throw new Error('Missing "fpc" in payment option');
     }
+    return aliasedAddressParser('contracts', parsed.fpc, db);
+  };
+
+  const getAsset = () => {
     if (!parsed.asset) {
       throw new Error('Missing "asset" in payment option');
     }
-
-    const fpc = aliasedAddressParser('contracts', parsed.fpc, db);
-
-    return [AztecAddress.fromString(parsed.asset), fpc];
+    return AztecAddress.fromString(parsed.asset);
   };
 
   return async (sender: AccountWallet) => {
@@ -308,17 +310,23 @@ export function parsePaymentMethod(
         }
       }
       case 'fpc-public': {
-        const [asset, fpc] = getFpcOpts(parsed, db);
+        const fpc = getFpc();
+        const asset = getAsset();
         log(`Using public fee payment with asset ${asset} via paymaster ${fpc}`);
         const { PublicFeePaymentMethod } = await import('@aztec/aztec.js/fee');
         return new PublicFeePaymentMethod(fpc, sender);
       }
       case 'fpc-private': {
-        const [asset, fpc] = getFpcOpts(parsed, db);
+        const fpc = getFpc();
+        const asset = getAsset();
         log(`Using private fee payment with asset ${asset} via paymaster ${fpc}`);
         const { PrivateFeePaymentMethod } = await import('@aztec/aztec.js/fee');
         return new PrivateFeePaymentMethod(fpc, sender);
       }
+      case 'fpc-sponsored': {
+        const sponsor = getFpc();
+        return new SponsoredFeePaymentMethod(sponsor);
+      }
       case undefined:
         throw new Error('Missing "method" in payment option');
       default:

package/src/utils/sponsored_fee_payment.ts

@@ -0,0 +1,29 @@
+import type { FeePaymentMethod } from '@aztec/aztec.js/fee';
+import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+
+export class SponsoredFeePaymentMethod implements FeePaymentMethod {
+  constructor(private paymentContract: AztecAddress) {}
+
+  getAsset(): Promise<AztecAddress> {
+    throw new Error('Asset is not required for sponsored fpc.');
+  }
+
+  getFeePayer() {
+    return Promise.resolve(this.paymentContract);
+  }
+
+  async getFunctionCalls() {
+    return [
+      {
+        name: 'sponsor_unconditionally',
+        to: this.paymentContract,
+        selector: await FunctionSelector.fromSignature('sponsor_unconditionally()'),
+        type: FunctionType.PRIVATE,
+        isStatic: false,
+        args: [],
+        returnTypes: [],
+      },
+    ];
+  }
+}