npm - @agoric/portfolio-api - Versions diffs - 0.1.1-dev-94f7dd3.0.94f7dd3 → 0.1.1-dev-a98a0f0.0.a98a0f0 - Mend

@agoric/portfolio-api 0.1.1-dev-94f7dd3.0.94f7dd3 → 0.1.1-dev-a98a0f0.0.a98a0f0

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.

Files changed (16) hide show

package/package.json +4 -4
package/src/evm-wallet/eip712-messages.d.ts +108 -34
package/src/evm-wallet/eip712-messages.d.ts.map +1 -1
package/src/evm-wallet/eip712-messages.js +123 -60
package/src/evm-wallet/message-handler-helpers.d.ts +1 -2
package/src/evm-wallet/message-handler-helpers.d.ts.map +1 -1
package/src/evm-wallet/message-handler-helpers.js +101 -43
package/src/portfolio-permissions.d.ts +3 -0
package/src/portfolio-permissions.d.ts.map +1 -1
package/src/portfolio-permissions.js +19 -4
package/src/type-guards.d.ts +4 -1
package/src/type-guards.d.ts.map +1 -1
package/src/type-guards.js +23 -0
package/src/types.d.ts +8 -0
package/src/types.d.ts.map +1 -1
package/src/types.js +10 -0

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/portfolio-api",
-  "version": "0.1.1-dev-94f7dd3.0.94f7dd3",
+  "version": "0.1.1-dev-a98a0f0.0.a98a0f0",
   "description": "API for Portfolio management",
   "repository": {
     "type": "git",
@@ -46,8 +46,8 @@
     "generate:ymax-machine": "npx tsx scripts/gen-ymax-machine.mts"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-94f7dd3.0.94f7dd3",
-    "@agoric/orchestration": "0.1.1-dev-94f7dd3.0.94f7dd3",
+    "@agoric/internal": "0.3.3-dev-a98a0f0.0.a98a0f0",
+    "@agoric/orchestration": "0.1.1-dev-a98a0f0.0.a98a0f0",
     "@endo/common": "^1.4.0",
     "@endo/errors": "^1.3.1",
     "@endo/patterns": "^1.9.1"
@@ -73,5 +73,5 @@
   "engines": {
     "node": "^22.11 || ^24.14"
   },
-  "gitHead": "94f7dd333365233251880bd61ef8c803433ecf4d"
+  "gitHead": "a98a0f0d9930b1875bea2f51b43f5daeeada23c8"
 }

package/src/evm-wallet/eip712-messages.d.ts CHANGED Viewed

@@ -9,9 +9,9 @@
  * Currently all types and helpers are built around a hard-coded Ymax product
  * name but with some effort this could be parametrizable
  */
-import type { Address, TypedDataDomain, TypedDataToPrimitiveTypes } from 'abitype';
+import type { Address, TypedDataDomain } from 'abitype';
 import type { TypedDataDefinition } from 'viem';
-import type { TypedDataParameter } from '@agoric/orchestration/src/utils/abitype.js';
+import type { TypedDataParameter, TypedDataToStructType } from '@agoric/orchestration/src/utils/abitype.js';
 import { type Witness, type getPermitWitnessTransferFromData, type getPermitBatchWitnessTransferFromData } from '@agoric/orchestration/src/utils/permit2.js';
 declare const YMAX_DOMAIN_NAME = "Ymax";
 declare const YMAX_DOMAIN_VERSION = "1";
@@ -52,10 +52,39 @@ declare const PortfolioStandaloneTypeParams: [{
  * The set of portfolio operations supported by EVM Wallets, and their associated params
  */
 declare const OperationTypes: {
+    /**
+     * Open a portfolio, optionally in the same signed message enabling
+     * auto-features and/or granting portfolio permissions to an automation
+     * agent's Agoric address, now that `features`/`grantee` can be marked
+     * `optional` in the EIP-712 type definition. This is the preferred,
+     * general form of the former separate {@link OpenPortfolioWithAutoFeatures}
+     * / {@link OpenPortfolioWithGrant} operations, which remain supported as
+     * distinct operation types for backward compatibility with existing
+     * clients/messages, but should not be needed for new callers. Granting
+     * delivers the delegation to `grantee.address`, exactly as a standalone
+     * {@link Grant} would; enabling auto-features behaves exactly as a
+     * standalone {@link SetAutoFeatures} would.
+     *
+     * - allocations: initial target allocation across instruments
+     * - features: auto-features to enable on open, if any
+     * - grantee: delegation recipient and encoded portfolio permissions, if any
+     */
     readonly OpenPortfolio: readonly [{
         readonly name: "allocations";
         readonly type: "Allocation[]";
+    }, {
+        readonly name: "features";
+        readonly type: "PortfolioAutoFeatures";
+        readonly optional: true;
+    }, {
+        readonly name: "grantee";
+        readonly type: "DelegationGrantee";
+        readonly optional: true;
     }];
+    /**
+     * @deprecated prefer {@link OpenPortfolio} with its optional `features`
+     * field. Kept as a distinct operation type for backward compatibility.
+     */
     readonly OpenPortfolioWithAutoFeatures: readonly [{
         readonly name: "allocations";
         readonly type: "Allocation[]";
@@ -64,18 +93,8 @@ declare const OperationTypes: {
         readonly type: "PortfolioAutoFeatures";
     }];
     /**
-     * Open a portfolio and, in the same signed message, grant portfolio
-     * permissions to an automation agent's Agoric address. This collapses the
-     * former two-step "create portfolio" + "Grant" flow into a single user
-     * signature: the contract creates the portfolio with the given allocations
-     * and then delivers the delegation to `grantee.address`, exactly as a
-     * standalone {@link Grant} would.
-     *
-     * Like {@link OpenPortfolio}, this is a permit2-wrapped (funds-bearing)
-     * operation; the accompanying Permit2 supplies the initial deposit.
-     *
-     * - allocations: initial target allocation across instruments
-     * - grantee: delegation recipient and encoded portfolio permissions
+     * @deprecated prefer {@link OpenPortfolio} with its optional `grantee`
+     * field. Kept as a distinct operation type for backward compatibility.
      */
     readonly OpenPortfolioWithGrant: readonly [{
         readonly name: "allocations";
@@ -164,6 +183,14 @@ declare const OperationSubTypes: {
     readonly PortfolioPermissions: readonly [{
         readonly name: "allocation";
         readonly type: "bool";
+    }, {
+        readonly name: "rebalance";
+        readonly type: "bool";
+        readonly optional: true;
+    }, {
+        readonly name: "claimRewards";
+        readonly type: "bool";
+        readonly optional: true;
     }];
     readonly DelegationGrantee: readonly [{
         readonly name: "address";
@@ -172,10 +199,20 @@ declare const OperationSubTypes: {
         readonly name: "permissions";
         readonly type: "PortfolioPermissions";
     }];
-    /** @see {@link PortfolioAutoFeatures} */
+    /**
+     * @see {@link PortfolioAutoFeatures}
+     *
+     * Both fields are `optional` so a `SetAutoFeatures` message can flip a
+     * single feature while leaving the other at its current on-chain value.
+     */
     readonly PortfolioAutoFeatures: readonly [{
         readonly name: "rebalance";
         readonly type: "bool";
+        readonly optional: true;
+    }, {
+        readonly name: "claimRewards";
+        readonly type: "bool";
+        readonly optional: true;
     }];
 };
 /**
@@ -187,9 +224,9 @@ declare const OperationSubTypes: {
  * - [{instrument: 'A', portion: 60}, {instrument: 'B', portion: 40}] => 60:40 ratio
  * - [{instrument: 'A', portion: 6}, {instrument: 'B', portion: 4}] => 6:4 ratio (same as 60:40)
  */
-export type TargetAllocation = TypedDataToPrimitiveTypes<typeof OperationSubTypes>['Allocation'];
-export type PortfolioPermissionsEIP712 = TypedDataToPrimitiveTypes<typeof OperationSubTypes>['PortfolioPermissions'];
-export type PortfolioAutoFeaturesEIP712 = TypedDataToPrimitiveTypes<typeof OperationSubTypes>['PortfolioAutoFeatures'];
+export type TargetAllocation = TypedDataToStructType<typeof OperationSubTypes, 'Allocation'>;
+export type PortfolioPermissionsEIP712 = TypedDataToStructType<typeof OperationSubTypes, 'PortfolioPermissions'>;
+export type PortfolioAutoFeaturesEIP712 = TypedDataToStructType<typeof OperationSubTypes, 'PortfolioAutoFeatures'>;
 /**
  * In the wrapped case, the domain is fixed by permit2, so we can't choose name/version there.
  * so we put the ymax-specifc domain name and version in the type name.
@@ -216,14 +253,43 @@ type YmaxStandaloneOperationTypes<T extends OperationTypeNames = OperationTypeNa
 type YmaxStandaloneTypes<T extends OperationTypeNames = OperationTypeNames> = YmaxStandaloneOperationTypes<T> & typeof OperationSubTypes & {
     EIP712Domain: typeof StandaloneDomainTypeParams;
 };
-export type YmaxOperationType<T extends OperationTypeNames> = TypedDataToPrimitiveTypes<OperationTypes & typeof OperationSubTypes>[T];
-type YmaxWitnessData<T extends OperationTypeNames> = TypedDataToPrimitiveTypes<YmaxWitnessTypes<T>>[YmaxWitnessTypeParam<T>['type']];
-type YmaxStandaloneData<T extends OperationTypeNames> = TypedDataToPrimitiveTypes<YmaxStandaloneTypes<T>>[T];
+export type YmaxOperationType<T extends OperationTypeNames> = TypedDataToStructType<OperationTypes & typeof OperationSubTypes, T>;
+type YmaxWitnessData<T extends OperationTypeNames> = TypedDataToStructType<YmaxWitnessTypes<T>, YmaxWitnessTypeParam<T>['type']>;
+type YmaxStandaloneData<T extends OperationTypeNames> = TypedDataToStructType<YmaxStandaloneTypes<T>, T>;
 export declare const getYmaxOperationTypes: <T extends OperationTypeNames>(operation: T) => { [K in T]: {
+    /**
+     * Open a portfolio, optionally in the same signed message enabling
+     * auto-features and/or granting portfolio permissions to an automation
+     * agent's Agoric address, now that `features`/`grantee` can be marked
+     * `optional` in the EIP-712 type definition. This is the preferred,
+     * general form of the former separate {@link OpenPortfolioWithAutoFeatures}
+     * / {@link OpenPortfolioWithGrant} operations, which remain supported as
+     * distinct operation types for backward compatibility with existing
+     * clients/messages, but should not be needed for new callers. Granting
+     * delivers the delegation to `grantee.address`, exactly as a standalone
+     * {@link Grant} would; enabling auto-features behaves exactly as a
+     * standalone {@link SetAutoFeatures} would.
+     *
+     * - allocations: initial target allocation across instruments
+     * - features: auto-features to enable on open, if any
+     * - grantee: delegation recipient and encoded portfolio permissions, if any
+     */
     readonly OpenPortfolio: readonly [{
         readonly name: "allocations";
         readonly type: "Allocation[]";
+    }, {
+        readonly name: "features";
+        readonly type: "PortfolioAutoFeatures";
+        readonly optional: true;
+    }, {
+        readonly name: "grantee";
+        readonly type: "DelegationGrantee";
+        readonly optional: true;
     }];
+    /**
+     * @deprecated prefer {@link OpenPortfolio} with its optional `features`
+     * field. Kept as a distinct operation type for backward compatibility.
+     */
     readonly OpenPortfolioWithAutoFeatures: readonly [{
         readonly name: "allocations";
         readonly type: "Allocation[]";
@@ -232,18 +298,8 @@ export declare const getYmaxOperationTypes: <T extends OperationTypeNames>(opera
         readonly type: "PortfolioAutoFeatures";
     }];
     /**
-     * Open a portfolio and, in the same signed message, grant portfolio
-     * permissions to an automation agent's Agoric address. This collapses the
-     * former two-step "create portfolio" + "Grant" flow into a single user
-     * signature: the contract creates the portfolio with the given allocations
-     * and then delivers the delegation to `grantee.address`, exactly as a
-     * standalone {@link Grant} would.
-     *
-     * Like {@link OpenPortfolio}, this is a permit2-wrapped (funds-bearing)
-     * operation; the accompanying Permit2 supplies the initial deposit.
-     *
-     * - allocations: initial target allocation across instruments
-     * - grantee: delegation recipient and encoded portfolio permissions
+     * @deprecated prefer {@link OpenPortfolio} with its optional `grantee`
+     * field. Kept as a distinct operation type for backward compatibility.
      */
     readonly OpenPortfolioWithGrant: readonly [{
         readonly name: "allocations";
@@ -329,6 +385,14 @@ export declare const getYmaxOperationTypes: <T extends OperationTypeNames>(opera
     readonly PortfolioPermissions: readonly [{
         readonly name: "allocation";
         readonly type: "bool";
+    }, {
+        readonly name: "rebalance";
+        readonly type: "bool";
+        readonly optional: true;
+    }, {
+        readonly name: "claimRewards";
+        readonly type: "bool";
+        readonly optional: true;
     }];
     readonly DelegationGrantee: readonly [{
         readonly name: "address";
@@ -337,10 +401,20 @@ export declare const getYmaxOperationTypes: <T extends OperationTypeNames>(opera
         readonly name: "permissions";
         readonly type: "PortfolioPermissions";
     }];
-    /** @see {@link PortfolioAutoFeatures} */
+    /**
+     * @see {@link PortfolioAutoFeatures}
+     *
+     * Both fields are `optional` so a `SetAutoFeatures` message can flip a
+     * single feature while leaving the other at its current on-chain value.
+     */
     readonly PortfolioAutoFeatures: readonly [{
         readonly name: "rebalance";
         readonly type: "bool";
+        readonly optional: true;
+    }, {
+        readonly name: "claimRewards";
+        readonly type: "bool";
+        readonly optional: true;
     }];
 };
 export declare const getYmaxWitness: <T extends OperationTypeNames>(operation: T, data: NoInfer<YmaxWitnessData<T>>) => Witness<YmaxWitnessTypes<T>, YmaxWitnessTypeParam<T>>;

package/src/evm-wallet/eip712-messages.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"eip712-messages.d.ts","sourceRoot":"","sources":["eip712-messages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,~~EACV~~,OAAO,~~EAEP~~,eAAe,~~EACf~~,~~yBAAyB,EAC1B,~~MAAM,SAAS,CAAC;~~AACjB~~,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,KAAK,~~EAAE~~,kBAAkB,~~EAAE~~,MAAM,4CAA4C,CAAC;~~AACrF~~,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAG3C,MAAM,4CAA4C,CAAC;~~AAGpD~~,QAAA,MAAM,gBAAgB,SAAS,CAAC;AAChC,QAAA,MAAM,mBAAmB,MAAM,CAAC;AAIhC,QAAA,MAAM,0BAA0B;;;;;;;;;;;;EAKS,CAAC;AAE1C,QAAA,MAAM,wBAAwB;;;CAGM,CAAC;AACrC,MAAM,MAAM,cAAc,GAAG,OAAO,wBAAwB,GAAG;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AASF,QAAA,MAAM,yBAAyB,IAA6C,CAAC;AAE7E;;;GAGG;AACH,QAAA,MAAM,6BAA6B;;;;;;EAGM,CAAC;AAE1C;;GAEG;AACH,QAAA,MAAM,cAAc~~;;;;;;;;;;;;IAMlB~~;;;;;;;;;;;;;~~OAaG~~;;;;;;;;;;;;;;;;;;;;;;;IAWH;;;;;OAKG;;;;;;;;IAEH;;;;;;;;OAQG;;;;;;;;;;;IAMH;;;OAGG;;;;;;;;~~CAKyB~~,CAAC;~~AAC/B~~,KAAK,cAAc,GAAG,OAAO,cAAc,CAAC;AAC5C,MAAM,MAAM,kBAAkB,GAAG,MAAM,cAAc,CAAC;AAEtD,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;IAMrB,wCAAwC~~;;;;;;;;;;;;IAMxC,yCAAyC~~;;;;;~~CAEb~~,CAAC;~~AAE/B~~;;;;;;;;GAQG;AACH,MAAM,MAAM,gBAAgB,GAAG,~~yBAAyB~~,~~CACtD~~,OAAO,iBAAiB,~~CACzB~~,~~CAAC,~~YAAY,~~CAAC~~,CAAC;~~AAQhB~~,MAAM,MAAM,0BAA0B,GAAG,~~yBAAyB~~,~~CAChE~~,OAAO,iBAAiB,~~CACzB~~,~~CAAC,~~sBAAsB,~~CAAC~~,CAAC;~~AAE1B~~,MAAM,MAAM,2BAA2B,GAAG,~~yBAAyB~~,~~CACjE~~,OAAO,iBAAiB,~~CACzB~~,~~CAAC,~~uBAAuB,~~CAAC~~,CAAC;~~AAE3B~~;;;GAGG;AACH,QAAA,MAAM,sBAAsB,GAAI,CAAC,SAAS,kBAAkB,EAAE,WAAW,CAAC,iBACP,CAAC;AACpE,KAAK,mBAAmB,CAAC,CAAC,SAAS,kBAAkB,IAAI,UAAU,CACjE,OAAO,sBAAsB,CAAC,CAAC,CAAC,CACjC,CAAC;AACF,QAAA,MAAM,uBAAuB,GAAI,CAAC,SAAS,kBAAkB,EAAE,WAAW,CAAC,eACjB,CAAC;AAC3D,KAAK,oBAAoB,CAAC,CAAC,SAAS,kBAAkB,IAAI,UAAU,CAClE,OAAO,uBAAuB,CAAC,CAAC,CAAC,CAClC,CAAC;AACF,MAAM,MAAM,oBAAoB,CAC9B,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C,kBAAkB,CACpB,oBAAoB,CAAC,CAAC,CAAC,EACvB,OAAO,CAAC,MAAM,yBAAyB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CACpD,CAAC;AAcF,KAAK,yBAAyB,CAC5B,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C;KACD,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,GAAG;QAClC,GAAG,cAAc,CAAC,CAAC,CAAC;QACpB,GAAG,OAAO,yBAAyB;KACpC;CACF,CAAC;AACF,KAAK,gBAAgB,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IACrE,yBAAyB,CAAC,CAAC,CAAC,GAAG,OAAO,iBAAiB,CAAC;AAC1D,KAAK,4BAA4B,CAC/B,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C;KACD,CAAC,IAAI,CAAC,GAAG;QACR,GAAG,cAAc,CAAC,CAAC,CAAC;QACpB,GAAG,OAAO,yBAAyB;QACnC,GAAG,OAAO,6BAA6B;KACxC;CACF,CAAC;AACF,KAAK,mBAAmB,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IACxE,4BAA4B,CAAC,CAAC,CAAC,GAC7B,OAAO,iBAAiB,GAAG;IACzB,YAAY,EAAE,OAAO,0BAA0B,CAAC;CACjD,CAAC;AAEN,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,kBAAkB,IACxD,~~yBAAyB~~,CAAC,cAAc,GAAG,OAAO,iBAAiB,~~CAAC~~,CAAC,CAAC,CAAC~~,CAAC~~;~~AAE1E~~,KAAK,eAAe,CAAC,CAAC,SAAS,kBAAkB,IAAI,~~yBAAyB~~,~~CAC5E~~,gBAAgB,CAAC,CAAC,CAAC,~~CACpB~~,~~CAAC,~~oBAAoB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,~~CAAC~~,CAAC;~~AACnC~~,KAAK,kBAAkB,CAAC,CAAC,SAAS,kBAAkB,~~IAClD~~,~~yBAAyB~~,~~CAAC~~,mBAAmB,CAAC,CAAC,CAAC,~~CAAC~~,CAAC,~~CAAC~~,CAAC~~,CAAC~~;~~AA8BvD~~,eAAO,MAAM,qBAAqB,GAAI,CAAC,SAAS,kBAAkB,EAChE,WAAW,CAAC,QAGT,CAAC~~;;;;;;;;;;;;IAvMJ~~;;;;;;;;;;;;;~~OAaG~~;;;;;;;;;;;;;;;;;;;;;;;IAWH;;;;;OAKG;;;;;;;;IAEH;;;;;;;;OAQG;;;;;;;;;;;IAMH;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;~~IAeH~~,wCAAwC~~;;;;;;;;;;;;IAMxC,yCAAyC~~;;;;;~~CAmIO~~,CAAC;AAEnD,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,kBAAkB,EACzD,WAAW,CAAC,EACZ,MAAM,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAChC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,~~CAKpD~~,CAAC;~~AAEJ~~,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,GAAG,MAAM,EACxB,mBAAmB,OAAO,KACzB,cAID,CAAC;AAEH,eAAO,MAAM,8BAA8B,GAAI,CAAC,SAAS,kBAAkB,EACzE,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EACpC,WAAW,CAAC,EACZ,SAAS,MAAM,GAAG,MAAM,EACxB,mBAAmB,OAAO,KACzB,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG;IACrD,MAAM,EAAE,cAAc,CAAC;~~CAYxB~~,CAAC;AAEF,MAAM,MAAM,2BAA2B,CACrC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzD,MAAM,MAAM,iCAAiC,CAC3C,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C,UAAU,CACZ,OAAO,gCAAgC,CACrC,gBAAgB,CAAC,CAAC,CAAC,EACnB,oBAAoB,CAAC,CAAC,CAAC,CACxB,CACF,CAAC;AAEF,MAAM,MAAM,sCAAsC,CAChD,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C,UAAU,CACZ,OAAO,qCAAqC,CAC1C,gBAAgB,CAAC,CAAC,CAAC,EACnB,oBAAoB,CAAC,CAAC,CAAC,CACxB,CACF,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,MAAM,IAAI,OAAO,wBAAwB,CAWnD;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,eAAe,EACvB,sBAAsB,CAAC,EACnB,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC,GACzC,SAAS,GACZ,OAAO,CAAC,MAAM,IAAI,cAAc,~~CA+BlC~~;AAED,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,kBAAkB,EACxE,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,IAAI,CAAC,CAMvB;AAED,eAAO,MAAM,qBAAqB,GAAI,CAAC,SAAS,kBAAkB,EAChE,WAAW,GAAG,OAAO,gBAAgB,IAAI,OAAO,mBAAmB,GAAG,CAAC,EAAE;;;;;;CAqB1E,CAAC"}
1	+ {"version":3,"file":"eip712-messages.d.ts","sourceRoot":"","sources":["eip712-messages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAa,eAAe,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,KAAK,EACV,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,gCAAgC,EACrC,KAAK,qCAAqC,EAG3C,MAAM,4CAA4C,CAAC;AAIpD,QAAA,MAAM,gBAAgB,SAAS,CAAC;AAChC,QAAA,MAAM,mBAAmB,MAAM,CAAC;AAIhC,QAAA,MAAM,0BAA0B;;;;;;;;;;;;EAKS,CAAC;AAE1C,QAAA,MAAM,wBAAwB;;;CAGM,CAAC;AACrC,MAAM,MAAM,cAAc,GAAG,OAAO,wBAAwB,GAAG;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AASF,QAAA,MAAM,yBAAyB,IAA6C,CAAC;AAE7E;;;GAGG;AACH,QAAA,MAAM,6BAA6B;;;;;;EAGM,CAAC;AAE1C;;GAEG;AACH,QAAA,MAAM,cAAc;IAClB;;;;;;;;;;;;;;;;OAgBG;;;;;;;;;;;;;IAMH;;;OAGG;;;;;;;;IAKH;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;IAWH;;;;;OAKG;;;;;;;;IAEH;;;;;;;;OAQG;;;;;;;;;;;IAMH;;;OAGG;;;;;;;;CAa6D,CAAC;AACnE,KAAK,cAAc,GAAG,OAAO,cAAc,CAAC;AAC5C,MAAM,MAAM,kBAAkB,GAAG,MAAM,cAAc,CAAC;AAEtD,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;IAMrB,wCAAwC;;;;;;;;;;;;;;;;;;;;IAUxC;;;;;OAKG;;;;;;;;;;CAK6D,CAAC;AAEnE;;;;;;;;GAQG;AACH,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,CAClD,OAAO,iBAAiB,EACxB,YAAY,CACb,CAAC;AAQF,MAAM,MAAM,0BAA0B,GAAG,qBAAqB,CAC5D,OAAO,iBAAiB,EACxB,sBAAsB,CACvB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,qBAAqB,CAC7D,OAAO,iBAAiB,EACxB,uBAAuB,CACxB,CAAC;AAEF;;;GAGG;AACH,QAAA,MAAM,sBAAsB,GAAI,CAAC,SAAS,kBAAkB,EAAE,WAAW,CAAC,iBACP,CAAC;AACpE,KAAK,mBAAmB,CAAC,CAAC,SAAS,kBAAkB,IAAI,UAAU,CACjE,OAAO,sBAAsB,CAAC,CAAC,CAAC,CACjC,CAAC;AACF,QAAA,MAAM,uBAAuB,GAAI,CAAC,SAAS,kBAAkB,EAAE,WAAW,CAAC,eACjB,CAAC;AAC3D,KAAK,oBAAoB,CAAC,CAAC,SAAS,kBAAkB,IAAI,UAAU,CAClE,OAAO,uBAAuB,CAAC,CAAC,CAAC,CAClC,CAAC;AACF,MAAM,MAAM,oBAAoB,CAC9B,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C,kBAAkB,CACpB,oBAAoB,CAAC,CAAC,CAAC,EACvB,OAAO,CAAC,MAAM,yBAAyB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CACpD,CAAC;AAcF,KAAK,yBAAyB,CAC5B,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C;KACD,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,GAAG;QAClC,GAAG,cAAc,CAAC,CAAC,CAAC;QACpB,GAAG,OAAO,yBAAyB;KACpC;CACF,CAAC;AACF,KAAK,gBAAgB,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IACrE,yBAAyB,CAAC,CAAC,CAAC,GAAG,OAAO,iBAAiB,CAAC;AAC1D,KAAK,4BAA4B,CAC/B,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C;KACD,CAAC,IAAI,CAAC,GAAG;QACR,GAAG,cAAc,CAAC,CAAC,CAAC;QACpB,GAAG,OAAO,yBAAyB;QACnC,GAAG,OAAO,6BAA6B;KACxC;CACF,CAAC;AACF,KAAK,mBAAmB,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IACxE,4BAA4B,CAAC,CAAC,CAAC,GAC7B,OAAO,iBAAiB,GAAG;IACzB,YAAY,EAAE,OAAO,0BAA0B,CAAC;CACjD,CAAC;AAEN,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,kBAAkB,IACxD,qBAAqB,CAAC,cAAc,GAAG,OAAO,iBAAiB,EAAE,CAAC,CAAC,CAAC;AAEtE,KAAK,eAAe,CAAC,CAAC,SAAS,kBAAkB,IAAI,qBAAqB,CACxE,gBAAgB,CAAC,CAAC,CAAC,EACnB,oBAAoB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAChC,CAAC;AACF,KAAK,kBAAkB,CAAC,CAAC,SAAS,kBAAkB,IAAI,qBAAqB,CAC3E,mBAAmB,CAAC,CAAC,CAAC,EACtB,CAAC,CACF,CAAC;AA8BF,eAAO,MAAM,qBAAqB,GAAI,CAAC,SAAS,kBAAkB,EAChE,WAAW,CAAC,QAGT,CAAC;IArPJ;;;;;;;;;;;;;;;;OAgBG;;;;;;;;;;;;;IAMH;;;OAGG;;;;;;;;IAKH;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;IAWH;;;;;OAKG;;;;;;;;IAEH;;;;;;;;OAQG;;;;;;;;;;;IAMH;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;IAuBH,wCAAwC;;;;;;;;;;;;;;;;;;;;IAUxC;;;;;OAKG;;;;;;;;;;CA4I6C,CAAC;AAEnD,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,kBAAkB,EACzD,WAAW,CAAC,EACZ,MAAM,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAChC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAiBtD,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,GAAG,MAAM,EACxB,mBAAmB,OAAO,KACzB,cAID,CAAC;AAEH,eAAO,MAAM,8BAA8B,GAAI,CAAC,SAAS,kBAAkB,EACzE,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EACpC,WAAW,CAAC,EACZ,SAAS,MAAM,GAAG,MAAM,EACxB,mBAAmB,OAAO,KACzB,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG;IACrD,MAAM,EAAE,cAAc,CAAC;CAqBxB,CAAC;AAEF,MAAM,MAAM,2BAA2B,CACrC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzD,MAAM,MAAM,iCAAiC,CAC3C,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C,UAAU,CACZ,OAAO,gCAAgC,CACrC,gBAAgB,CAAC,CAAC,CAAC,EACnB,oBAAoB,CAAC,CAAC,CAAC,CACxB,CACF,CAAC;AAEF,MAAM,MAAM,sCAAsC,CAChD,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C,UAAU,CACZ,OAAO,qCAAqC,CAC1C,gBAAgB,CAAC,CAAC,CAAC,EACnB,oBAAoB,CAAC,CAAC,CAAC,CACxB,CACF,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,MAAM,IAAI,OAAO,wBAAwB,CAWnD;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,eAAe,EACvB,sBAAsB,CAAC,EACnB,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC,GACzC,SAAS,GACZ,OAAO,CAAC,MAAM,IAAI,cAAc,CAiClC;AAED,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,kBAAkB,EACxE,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,IAAI,CAAC,CAMvB;AAED,eAAO,MAAM,qBAAqB,GAAI,CAAC,SAAS,kBAAkB,EAChE,WAAW,GAAG,OAAO,gBAAgB,IAAI,OAAO,mBAAmB,GAAG,CAAC,EAAE;;;;;;CAqB1E,CAAC"}

package/src/evm-wallet/eip712-messages.js CHANGED Viewed

@@ -10,14 +10,12 @@
  * name but with some effort this could be parametrizable
  */
 import {
@@ -26,6 +24,7 @@ import {
   TokenPermissionsComponents,
 } from '@agoric/orchestration/src/utils/permit2.js';
 import { sameEvmAddress } from '@agoric/orchestration/src/utils/address.js';
+import { normalizeAndValidateEIP712Data } from '@agoric/orchestration/src/utils/viem-utils/eip712-normalize.js';
 const YMAX_DOMAIN_NAME = 'Ymax';
 const YMAX_DOMAIN_VERSION = '1';
@@ -70,24 +69,39 @@ const PortfolioStandaloneTypeParams = [
  * The set of portfolio operations supported by EVM Wallets, and their associated params
  */
 const OperationTypes = {
-  OpenPortfolio: [{ name: 'allocations', type: 'Allocation[]' }],
+  /**
+   * Open a portfolio, optionally in the same signed message enabling
+   * auto-features and/or granting portfolio permissions to an automation
+   * agent's Agoric address, now that `features`/`grantee` can be marked
+   * `optional` in the EIP-712 type definition. This is the preferred,
+   * general form of the former separate {@link OpenPortfolioWithAutoFeatures}
+   * / {@link OpenPortfolioWithGrant} operations, which remain supported as
+   * distinct operation types for backward compatibility with existing
+   * clients/messages, but should not be needed for new callers. Granting
+   * delivers the delegation to `grantee.address`, exactly as a standalone
+   * {@link Grant} would; enabling auto-features behaves exactly as a
+   * standalone {@link SetAutoFeatures} would.
+   *
+   * - allocations: initial target allocation across instruments
+   * - features: auto-features to enable on open, if any
+   * - grantee: delegation recipient and encoded portfolio permissions, if any
+   */
+  OpenPortfolio: [
+    { name: 'allocations', type: 'Allocation[]' },
+    { name: 'features', type: 'PortfolioAutoFeatures', optional: true },
+    { name: 'grantee', type: 'DelegationGrantee', optional: true },
+  ],
+  /**
+   * @deprecated prefer {@link OpenPortfolio} with its optional `features`
+   * field. Kept as a distinct operation type for backward compatibility.
+   */
   OpenPortfolioWithAutoFeatures: [
     { name: 'allocations', type: 'Allocation[]' },
     { name: 'features', type: 'PortfolioAutoFeatures' },
   ],
   /**
-   * Open a portfolio and, in the same signed message, grant portfolio
-   * permissions to an automation agent's Agoric address. This collapses the
-   * former two-step "create portfolio" + "Grant" flow into a single user
-   * signature: the contract creates the portfolio with the given allocations
-   * and then delivers the delegation to `grantee.address`, exactly as a
-   * standalone {@link Grant} would.
-   *
-   * Like {@link OpenPortfolio}, this is a permit2-wrapped (funds-bearing)
-   * operation; the accompanying Permit2 supplies the initial deposit.
-   *
-   * - allocations: initial target allocation across instruments
-   * - grantee: delegation recipient and encoded portfolio permissions
+   * @deprecated prefer {@link OpenPortfolio} with its optional `grantee`
+   * field. Kept as a distinct operation type for backward compatibility.
    */
   OpenPortfolioWithGrant: [
     { name: 'allocations', type: 'Allocation[]' },
@@ -128,7 +142,15 @@ const OperationTypes = {
     { name: 'features', type: 'PortfolioAutoFeatures' },
     PortfolioIdParam,
   ],
-}                             ;
+  // `satisfies Record<string, readonly TypedDataParameter[]>` rather than
+  // abitype's own `TypedData` (whose `TypedDataParameter` is strictly
+  // `{name, type}`) so struct fields here can carry the repo-local `optional`
+  // marker without tripping excess-property checks on this literal. Downstream
+  // consumption (e.g. `satisfies TypedData` on values derived from `typeof
+  // OperationTypes`) is unaffected: those check a type reference structurally,
+  // and an extra optional `optional?` property doesn't break assignability to
+  // abitype's `TypedData`.
+}                                                                 ;
 ;
 ;
@@ -139,14 +161,26 @@ const OperationSubTypes = {
   ],
   Asset: TokenPermissionsComponents,
   /** @see {@link PortfolioPermissions} */
-  PortfolioPermissions: [{ name: 'allocation', type: 'bool' }],
+  PortfolioPermissions: [
+    { name: 'allocation', type: 'bool' },
+    { name: 'rebalance', type: 'bool', optional: true },
+    { name: 'claimRewards', type: 'bool', optional: true },
+  ],
   DelegationGrantee: [
     { name: 'address', type: 'string' },
     { name: 'permissions', type: 'PortfolioPermissions' },
   ],
-  /** @see {@link PortfolioAutoFeatures} */
-  PortfolioAutoFeatures: [{ name: 'rebalance', type: 'bool' }],
-}                             ;
+  /**
+   * @see {@link PortfolioAutoFeatures}
+   *
+   * Both fields are `optional` so a `SetAutoFeatures` message can flip a
+   * single feature while leaving the other at its current on-chain value.
+   */
+  PortfolioAutoFeatures: [
+    { name: 'rebalance', type: 'bool', optional: true },
+    { name: 'claimRewards', type: 'bool', optional: true },
+  ],
+}                                                                 ;
 /**
  * Target allocation for portfolio positions.
@@ -157,9 +191,10 @@ const OperationSubTypes = {
  * - [{instrument: 'A', portion: 60}, {instrument: 'B', portion: 40}] => 60:40 ratio
  * - [{instrument: 'A', portion: 6}, {instrument: 'B', portion: 4}] => 6:4 ratio (same as 60:40)
  */
-;
+;
 ;
@@ -167,13 +202,15 @@ const OperationSubTypes = {
-;
+;
-;
+;
 /**
  * In the wrapped case, the domain is fixed by permit2, so we can't choose name/version there.
@@ -234,13 +271,16 @@ const getYmaxWitnessTypeParam =                               (
 ;
-;
-;
+;
+;
 const getYmaxOperationAndSubTypes = (
@@ -280,12 +320,24 @@ export const getYmaxOperationTypes =                               (
 export const getYmaxWitness =                               (
   operation   ,
   data                             ,
-                                                       ) =>
-  makeWitness                                              (
-    data,
-    getYmaxWitnessTypes(operation),
-    getYmaxWitnessTypeParam(operation),
+                                                       ) => {
+  const witnessTypeParam = getYmaxWitnessTypeParam(operation);
+  // Normalize away unused `optional` fields (and their now-unreferenced
+  // types) so that e.g. omitting `grantee`/`features` on `OpenPortfolio`
+  // produces a `types`/`message` pair that real EIP-712 hashing can encode.
+  // This is the authoring side, not adversarial input, so extra fields are
+  // dropped rather than rejected.
+  const { message, types } = normalizeAndValidateEIP712Data({
+    message: data                           ,
+    types: getYmaxWitnessTypes(operation),
+    primaryType: witnessTypeParam.type,
+  });
+  return makeWitness                                              (
+    message                      ,
+    types                       ,
+    witnessTypeParam,
   );
+};
 export const getYmaxStandaloneDomain = (
   chainId                 ,
@@ -304,13 +356,22 @@ export const getYmaxStandaloneOperationData =                               (
 ) => {
-  const types = getYmaxStandaloneTypes(operation);
+  // Normalize away unused `optional` fields (and their now-unreferenced
+  // types) so that e.g. omitting unchanged `features` on `SetAutoFeatures`
+  // produces a `types`/`message` pair that real EIP-712 hashing can encode.
+  // This is the authoring side, not adversarial input, so extra fields are
+  // dropped rather than rejected.
+  const { message, types } = normalizeAndValidateEIP712Data({
+    message: data                           ,
+    types: getYmaxStandaloneTypes(operation),
+    primaryType: operation,
+  });
   return {
     domain: getYmaxStandaloneDomain(chainId, verifyingContract),
     types,
     primaryType: operation,
-    message: data                                                        ,
+    message: message                                                    ,
   }
    ;
@@ -359,36 +420,38 @@ export function validateYmaxDomain(
                ,
 )                                   {
-  const baseDomain = domain;
-  validateYmaxDomainBase(baseDomain);
+  // Destructure before narrowing `domain` below, so `chainId`/`verifyingContract`
+  // remain accessible as independent bindings afterward.
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { name, version, chainId, verifyingContract, ...extra } = domain;
+  validateYmaxDomainBase(domain);
-  if (
-    typeof domain.chainId !== 'bigint' ||
-    domain.verifyingContract === undefined
-  ) {
+  if (typeof chainId !== 'bigint' || verifyingContract === undefined) {
     throw new Error(`Ymax domain must include chain ID and verifying contract`);
   }
   if (validContractAddresses) {
-    const chainIdStr = String(domain.chainId);
+    const chainIdStr = String(chainId);
     if (!(chainIdStr in validContractAddresses)) {
-      throw new Error(`Unknown chain ID in Ymax domain: ${domain.chainId}`);
+      throw new Error(`Unknown chain ID in Ymax domain: ${chainId}`);
     }
     if (
-      !sameEvmAddress(
-        domain.verifyingContract,
-        validContractAddresses[chainIdStr],
-      )
+      !sameEvmAddress(verifyingContract, validContractAddresses[chainIdStr])
     ) {
       throw new Error(
-        `Invalid verifying contract for chain ID ${domain.chainId}: ${domain.verifyingContract} (expected ${validContractAddresses[chainIdStr]})`,
+        `Invalid verifying contract for chain ID ${chainId}: ${verifyingContract} (expected ${validContractAddresses[chainIdStr]})`,
       );
     }
   }
-  // XXX: check no extra fields?
+  const extraKeys = Object.keys(extra);
+  if (extraKeys.length) {
+    throw new Error(
+      `Unexpected field(s) in Ymax domain: ${extraKeys.join(', ')}`,
+    );
+  }
 }
 export function validateYmaxOperationTypeName                              (

package/src/evm-wallet/message-handler-helpers.d.ts CHANGED Viewed

@@ -7,7 +7,7 @@
  */
 import type { AbiParameterToPrimitiveType, Address } from 'abitype';
 import type { getTypesForEIP712Domain } from 'viem';
-import type { hashStruct, isHex, recoverTypedDataAddress, validateTypedData } from 'viem/utils';
+import type { hashStruct, isHex, recoverTypedDataAddress } from 'viem/utils';
 import type { encodeType, WithSignature } from '@agoric/orchestration/src/utils/viem.js';
 import { type Permit2Domain, type PermitWitnessTransferFromInputComponents } from '@agoric/orchestration/src/utils/permit2.js';
 import { type OperationTypeNames, type YmaxStandaloneOperationData, type YmaxPermitWitnessTransferFromData, type YmaxOperationType, type YmaxFullDomain } from './eip712-messages.js';
@@ -44,7 +44,6 @@ export declare const makeEVMHandlerUtils: (viemUtils: {
     isHex: typeof isHex;
     hashStruct: typeof hashStruct;
     recoverTypedDataAddress: typeof recoverTypedDataAddress;
-    validateTypedData: typeof validateTypedData;
     encodeType: typeof encodeType;
     getTypesForEIP712Domain: typeof getTypesForEIP712Domain;
 }) => {

package/src/evm-wallet/message-handler-helpers.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"message-handler-helpers.d.ts","sourceRoot":"","sources":["message-handler-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,2BAA2B,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,KAAK,EACV,UAAU,EACV,KAAK,EACL,uBAAuB,~~EAEvB~~,~~iBAAiB,EAClB,~~MAAM,YAAY,CAAC;~~AAEpB~~,OAAO,KAAK,EACV,UAAU,EACV,aAAa,EACd,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,wCAAwC,EAC9C,MAAM,4CAA4C,CAAC;AACpD,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAChC,KAAK,iCAAiC,EACtC,KAAK,iBAAiB,EAKtB,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,MAAM,oBAAoB,CAC9B,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C;KACD,CAAC,IAAI,CAAC,GAAG;QACR,SAAS,EAAE,CAAC,CAAC;QACb,MAAM,EAAE,cAAc,CAAC;QACvB,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;KAC5B;CACF,CAAC,CAAC,CAAC,CAAC;AAEL,MAAM,MAAM,gCAAgC,GAAG,2BAA2B,CAAC;IACzE,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,OAAO,wCAAwC,CAAC;CAC7D,CAAC,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,IAAI,CAAC,gCAAgC,EAAE,iBAAiB,CAAC,CAAC;CAC3E,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,IAC/C,oBAAoB,CAAC,CAAC,CAAC,GAAG;IAC5B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAI,WAAW;IAC7C,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,uBAAuB,EAAE,OAAO,uBAAuB,CAAC;IACxD,~~iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,~~UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,uBAAuB,EAAE,OAAO,uBAAuB,CAAC;CACzD;~~gDAwCG~~,CAAC,SAAS,kBAAkB,QAEtB,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;QACrD,MAAM,EAAE,cAAc,CAAC;KACxB,2BACwB,SAAS,KACjC,oBAAoB,CAAC,CAAC,CAAC;~~oDAwCxB~~,CAAC,SAAS,kBAAkB,QAEtB,IAAI,CAAC,iCAAiC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;QAC3D,MAAM,EAAE,aAAa,CAAC;KACvB,KACA,oBAAoB,CAAC,CAAC,CAAC;;~~SA4BvB~~,CAAC,SAAS,kBAAkB,QACrB,IAAI,CAAC,iCAAiC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;YAC3D,MAAM,EAAE,aAAa,CAAC;YACtB,OAAO,EAAE,OAAO,CAAC;YACjB,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;SAC/C,GACA,aAAa;SACf,CAAC,SAAS,kBAAkB,QACrB,IAAI,CAAC,iCAAiC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;YAC3D,MAAM,EAAE,aAAa,CAAC;SACvB,SACM,OAAO,aACH,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,GAC5C,aAAa;;~~iDA+FhB~~,CAAC,SAAS,kBAAkB,oLAEtB,CACF,aAAa,CAAC,iCAAiC,CAAC,CAAC,CAAC,CAAC,GACnD,2BAA2B,CAAC,CAAC,CAAC,CACjC,GAAG;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,sBACL;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACpD,kBAAkB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KAChE,KACA,kBAAkB,CAAC,CAAC,CAAC;~~4CAiGtB~~,CAAC,SAAS,kBAAkB,0LAEhB,aAAa,CACvB,iCAAiC,CAAC,CAAC,CAAC,GAAG,2BAA2B,CAAC,CAAC,CAAC,CACtE,GAAG;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,6CACkB,OAAO,CAChD,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CACjC,KACA,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;CA0BlC,CAAC"}
1	+ {"version":3,"file":"message-handler-helpers.d.ts","sourceRoot":"","sources":["message-handler-helpers.ts"],"names":[],"mappings":"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"}

package/src/evm-wallet/message-handler-helpers.js CHANGED Viewed

@@ -14,8 +14,8 @@
 import { sameEvmAddress } from '@agoric/orchestration/src/utils/address.js';
+import { normalizeAndValidateEIP712Data } from '@agoric/orchestration/src/utils/viem-utils/eip712-normalize.js';
 ;
@@ -82,7 +82,6 @@ export const makeEVMHandlerUtils = (viemUtils
  ) => {
@@ -90,21 +89,19 @@ export const makeEVMHandlerUtils = (viemUtils
     isHex,
     hashStruct,
     recoverTypedDataAddress,
-    validateTypedData,
     encodeType,
     getTypesForEIP712Domain,
   } = viemUtils;
-  for (const util of [
+  for (const [utilName, util] of Object.entries({
     isHex,
     hashStruct,
     recoverTypedDataAddress,
-    validateTypedData,
     encodeType,
     getTypesForEIP712Domain,
-  ]) {
+  })) {
     if (typeof util !== 'function') {
-      throw new Error(`Expected viemUtils.${util} to be a function`);
+      throw new Error(`Expected viemUtils.${utilName} to be a function`);
     }
   }
@@ -114,10 +111,19 @@ export const makeEVMHandlerUtils = (viemUtils
   /**
    * Extract operation type name and data from an EIP-712 standalone Ymax typed data.
-   * Validates that the message data satisfies the expected types for the operation,
-   * but does not validate that the supplied data types exactly match the expected
-   * types. In particular the message data may be a superset of the expected types,
-   * and extra fields are included in the returned extracted details.
+   *
+   * By the time this is called, `data.message` has already been through the
+   * "reject anything unsigned" normalize pass (see
+   * `extractOperationDetailsFromDataWithAddress`), so any field here was
+   * actually part of what was signed. This function normalizes *and
+   * validates* it a second time against the types this (possibly older)
+   * version of the code expects for the operation: any field the signer's
+   * client signed but this version doesn't know about is dropped (not
+   * rejected -- it was signed, just not supported yet), and any `optional`
+   * field is resolved based on whether it's actually present in the
+   * message. The returned `data` is exactly the normalized/expected shape,
+   * never a superset of it, and is guaranteed to satisfy the expected types
+   * (required fields present, values of the right shape/range).
    *
    * Assumes the domain has the expected shape of a Ymax domain.
    *
@@ -145,24 +151,40 @@ export const makeEVMHandlerUtils = (viemUtils
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { nonce, deadline, ..._operationData } =
       standaloneData.message                                          ;
-    const operationData = _operationData                        ;
+    const operationData = _operationData                                   ;
     const operation = standaloneData.primaryType;
-    // @ts-expect-error inference issue
-    validateTypedData({
-      types: getYmaxOperationTypes(operation),
-      message: operationData,
-      primaryType: operation,
-    });
-    return { operation, domain, data: operationData };
+    const { message: normalizedData } = normalizeAndValidateEIP712Data(
+      {
+        message: operationData                           ,
+        types: getYmaxOperationTypes(operation),
+        primaryType: operation,
+      },
+      { onExtraField: 'drop' },
+    );
+    return {
+      operation,
+      domain,
+      data: normalizedData                        ,
+    };
   };
   /**
    * Extract operation type name and data from an EIP-712 Permit2 witness typed data.
    * Validates that the supplied types exactly match types of a permit2 message.
-   * Validates that the witness data satisfies the expected types for the operation,
-   * but does not validate that the supplied data types exactly match the expected
-   * types. In particular the witness data may be a superset of the expected types,
-   * and extra fields are included in the returned witness data.
+   *
+   * By the time this is called, `data.message`/`data.types` have already been
+   * through the "reject anything unsigned" normalize pass (see
+   * `extractOperationDetailsFromDataWithAddress`), so any field in the
+   * witness data here was actually part of what was signed. This function
+   * normalizes *and validates* it a second time against the types this
+   * (possibly older) version of the code expects for the operation: any
+   * field the signer's client signed but this version doesn't know about is
+   * dropped (not rejected -- it was signed, just not supported yet), and
+   * any `optional` field is resolved based on whether it's actually present
+   * in the witness data. The returned `data` is exactly the
+   * normalized/expected shape, never a superset of it, and is guaranteed to
+   * satisfy the expected types (required fields present, values of the
+   * right shape/range).
    *
    * Assumes the message has already been validated against the types from the data.
    * Assumes the domain has the expected shape of a permit2 domain.
@@ -183,23 +205,24 @@ export const makeEVMHandlerUtils = (viemUtils
     const witnessField = extractWitnessFieldFromTypes(permitData.types);
     const witnessData = permitData.message[
       witnessField.name
-    ]                        ;
+    ]                                   ;
     const { primaryType, domain } = splitWitnessFieldType(witnessField.type);
     const chainId = BigInt(data.domain.chainId);
     const operation = primaryType     ;
-    // Validates the witness data satisfies the expected types for the operation
-    // @ts-expect-error inference issue
-    validateTypedData({
-      types: getYmaxOperationTypes(operation),
-      message: witnessData,
-      primaryType: operation,
-    });
+    const { message: normalizedWitnessData } = normalizeAndValidateEIP712Data(
+      {
+        message: witnessData                           ,
+        types: getYmaxOperationTypes(operation),
+        primaryType: operation,
+      },
+      { onExtraField: 'drop' },
+    );
     const spender = permitData.message.spender;
     return {
       operation,
       domain: { ...domain, chainId, verifyingContract: spender },
-      data: witnessData,
+      data: normalizedWitnessData                        ,
     };
   };
@@ -306,6 +329,23 @@ export const makeEVMHandlerUtils = (viemUtils
    * Validates the domain of the typed data, and optionally the verifying
    * contract and spender against the provided contract addresses.
    *
+   * Before anything else, the message is normalized *and validated* against
+   * its own (untrusted) wire-supplied `types`, rejecting any field not
+   * declared there: such a field was never part of the signed struct, so it
+   * never affected the EIP-712 hash and could have been added after signing
+   * without invalidating the signature. This is the AGO-874 defense. The
+   * same function also validates that the message actually satisfies those
+   * wire-supplied types (required fields present, values in range/shape),
+   * recursing correctly through arrays -- something real EIP-712 tooling
+   * (e.g. viem's `validateTypedData`) does not do. The domain is validated
+   * the same way, separately (its values live outside `message`).
+   * A *different*, later normalize pass (in
+   * `extractOperationDetailsFromStandaloneData` /
+   * `extractOperationDetailsFromPermit2WitnessData`) drops -- rather than
+   * rejects -- fields that were genuinely signed but aren't supported by
+   * this version's generated operation types; those are legitimate,
+   * merely unsupported (yet), not a security concern.
+   *
    * @param data The operation data with an `address` field of the signing owner.
    * @param contractAddresses Optionally, a set of valid contract addresses to validate against
    * @param contractAddresses.permit2 If provided, validates a permit2 based message's verifying contract
@@ -331,24 +371,42 @@ export const makeEVMHandlerUtils = (viemUtils
                             ;
-    const { nonce, deadline } = otherData.message;
     if (!domain) {
       throw new Error(`Missing domain in typed data`);
     }
-    validateTypedData({
+    // Reject anything not part of the actual signed structure (see doc above).
+    const { message: signedMessage, types: signedTypes } =
+      normalizeAndValidateEIP712Data(
+        {
+          message: otherData.message                           ,
+          types: otherData.types,
+          primaryType: otherData.primaryType,
+        },
+        { onExtraField: 'throw' },
+      );
+    const signedData = {
       ...otherData,
-      // @ts-expect-error inference issue
-      domain,
-      types: {
-        ...otherData.types,
-        // Do not trust the type definitions coming from the message for the domain
-        EIP712Domain: getTypesForEIP712Domain({ domain }),
-      },
+      message: signedMessage,
+      types: signedTypes,
+    };
+    const { nonce, deadline } =
+      signedMessage                                          ;
+    // Do not trust type definitions coming from the message for the domain;
+    // derive them from `domain`'s own shape instead, then validate `domain`
+    // against that (e.g. `chainId` range, `verifyingContract` shape).
+    // Domain-specific checks (name/version/contract match) happen later, in
+    // `validateYmaxDomain`/`validatePermit2Domain`.
+    normalizeAndValidateEIP712Data({
+      message: domain                           ,
+      types: { EIP712Domain: getTypesForEIP712Domain({ domain }) },
+      primaryType: 'EIP712Domain',
     });
     if (isPermit2MessageType(data.primaryType)) {
-      const { signature, ...permit2Data } = otherData
+      const { signature, ...permit2Data } = signedData
        ;
@@ -383,7 +441,7 @@ export const makeEVMHandlerUtils = (viemUtils
         deadline,
       };
     } else {
-      const standaloneData = otherData
+      const standaloneData = signedData
        ;

package/src/portfolio-permissions.d.ts CHANGED Viewed

@@ -12,6 +12,8 @@ export type PortfolioPermissions = {
     allocation?: boolean;
     /** whether the agent may trigger a rebalance using the current policy. */
     rebalance?: boolean;
+    /** whether the agent may trigger a claim of external protocol rewards. */
+    claimRewards?: boolean;
 };
 /**
  * Extensible app-level type for portfolio permissions.
@@ -35,6 +37,7 @@ export declare const PortfolioPermissionsExtShape: TypedPattern<PortfolioPermiss
 /** A set of auto-features that can be enabled for a portfolio. */
 export type PortfolioAutoFeatures = {
     rebalance?: boolean;
+    claimRewards?: boolean;
 };
 /**
  * Shape enforcing the current known auto-features accepted by the system.

package/src/portfolio-permissions.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"portfolio-permissions.d.ts","sourceRoot":"","sources":["portfolio-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EACV,2BAA2B,EAC3B,0BAA0B,EAC3B,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,OAAO,CAAC;~~CACrB~~,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,oBAAoB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7E;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,oBAAoB,~~CACG~~,CAAC;~~AAE7E~~,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,0BAA0B,~~CACzC~~,CAAC;~~AAE7C~~;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,uBAAuB,CAC9C,CAAC;AAElC,kEAAkE;AAClE,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;~~CACrB~~,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,qBAAqB,~~CACxB~~,CAAC;~~AAEpD~~,eAAO,MAAM,gCAAgC,EAAE,YAAY,CAAC,2BAA2B,~~CAC5C~~,CAAC;~~AAE5C~~,uEAAuE;AACvE,MAAM,MAAM,wBAAwB,GAAG,qBAAqB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE/E,mEAAmE;AACnE,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,wBAAwB,CAChD,CAAC"}
1	+ {"version":3,"file":"portfolio-permissions.d.ts","sourceRoot":"","sources":["portfolio-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EACV,2BAA2B,EAC3B,0BAA0B,EAC3B,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,0EAA0E;IAC1E,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,oBAAoB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE7E;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,EAAE,YAAY,CAAC,oBAAoB,CAStE,CAAC;AAEJ,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,0BAA0B,CAKlF,CAAC;AAEJ;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,uBAAuB,CAC9C,CAAC;AAElC,kEAAkE;AAClE,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,qBAAqB,CACG,CAAC;AAE/E,eAAO,MAAM,gCAAgC,EAAE,YAAY,CAAC,2BAA2B,CACT,CAAC;AAE/E,uEAAuE;AACvE,MAAM,MAAM,wBAAwB,GAAG,qBAAqB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAE/E,mEAAmE;AACnE,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,wBAAwB,CAChD,CAAC"}

package/src/portfolio-permissions.js CHANGED Viewed

@@ -17,6 +17,8 @@ import { M } from '@endo/patterns';
 /**
@@ -31,10 +33,22 @@ import { M } from '@endo/patterns';
  * grant paths may still require specific permissions before creating a grant.
  */
 export const PortfolioPermissionsShape                                     =
-  M.splitRecord({}, { allocation: M.boolean(), rebalance: M.boolean() }, {});
+  M.splitRecord(
+    {},
+    {
+      allocation: M.boolean(),
+      rebalance: M.boolean(),
+      claimRewards: M.boolean(),
+    },
+    {},
+  );
 export const PortfolioPermissionsEIP712Shape                                           =
-  M.splitRecord({ allocation: M.boolean() });
+  M.splitRecord(
+    { allocation: M.boolean() },
+    { rebalance: M.boolean(), claimRewards: M.boolean() },
+    {},
+  );
 /**
  * Extensible app-level shape for portfolio permissions.
@@ -48,6 +62,7 @@ export const PortfolioPermissionsExtShape
 /** A set of auto-features that can be enabled for a portfolio. */
 ;
 /**
@@ -55,10 +70,10 @@ export const PortfolioPermissionsExtShape
  * Changes to this shape should be backward compatible.
  */
 export const PortfolioAutoFeaturesShape                                      =
-  M.splitRecord({}, { rebalance: M.boolean() }, {});
+  M.splitRecord({}, { rebalance: M.boolean(), claimRewards: M.boolean() }, {});
 export const PortfolioAutoFeaturesEIP712Shape                                            =
-  M.splitRecord({ rebalance: M.boolean() });
+  M.splitRecord({}, { rebalance: M.boolean(), claimRewards: M.boolean() }, {});
 /** Extensible type compatible with future auto-features definitions */
 ;

package/src/type-guards.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { TypedPattern } from '@agoric/internal';
 import type { BeefyInstrumentId, ChainTokenMetadata, ERC4626InstrumentId, TokenMetadata } from './places.js';
-import type { DepositFromChainRef, LocalChainAccountRef, PortfolioAgentKey, InterChainAccountRef, WithdrawToChainRef } from './types.js';
+import type { DepositFromChainRef, LocalChainAccountRef, PortfolioAgentKey, InterChainAccountRef, PortfolioDelegatedClaimRewardsParams, PortfolioDelegatedRebalanceParams, PortfolioSyncState, WithdrawToChainRef } from './types.js';
 export { isInstrumentId, makeTokenIdKey } from './places.js';
 export type { ChainTokenMetadata, ChainTokenMetadataEntry, TokenIdKey, TokenMetadata, } from './places.js';
 export declare const TokenUsageShape: import("@endo/patterns").MatcherOf<"or", ["swapFrom", "swapTo"]>;
@@ -44,4 +44,7 @@ export declare const isBeefyInstrumentId: (ref: string) => ref is BeefyInstrumen
 export declare const PortfolioAgentKeyShape: TypedPattern<PortfolioAgentKey>;
 /** The shape for the optional `agentMemo` field for flows started by an agent */
 export declare const PortfolioFlowAgentMemoShape: TypedPattern<string>;
+export declare const PortfolioSyncStateShape: TypedPattern<PortfolioSyncState>;
+export declare const PortfolioDelegatedRebalanceParamsShape: TypedPattern<PortfolioDelegatedRebalanceParams>;
+export declare const PortfolioDelegatedClaimRewardsParamsShape: TypedPattern<PortfolioDelegatedClaimRewardsParams>;
 //# sourceMappingURL=type-guards.d.ts.map

package/src/type-guards.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"type-guards.d.ts","sourceRoot":"","sources":["type-guards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACd,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7D,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,EACV,aAAa,GACd,MAAM,aAAa,CAAC;AAErB,eAAO,MAAM,eAAe,kEAA6B,CAAC;AAG1D,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,aAAa,CAW1D,CAAC;AAGF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,kBAAkB,CAWlE,CAAC;AAGJ;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,KAAK,MAAM,KACV,GAAG,IAAI,mBAA0C,CAAC;AAGrD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,KAAK,MAAM,KACV,GAAG,IAAI,oBAA2C,CAAC;AAGtD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,KAAK,MAAM,KACV,GAAG,IAAI,oBAA2C,CAAC;AAGtD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,MAAM,KAAG,GAAG,IAAI,kBACrC,CAAC;AAGtB;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,KAAK,MAAM,KACV,GAAG,IAAI,mBAAiD,CAAC;AAG5D;;;GAGG;AACH,eAAO,MAAM,2BAA2B,GACtC,KAAK,MAAM,KACV,GAAG,IAAI,mBAAuD,CAAC;AAGlE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,KAAK,MAAM,KAAG,GAAG,IAAI,iBAC/B,CAAC;AAG3B,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,iBAAiB,CACvD,CAAC;AAEb,iFAAiF;AACjF,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,MAAM,CAE3D,CAAC"}
1	+ {"version":3,"file":"type-guards.d.ts","sourceRoot":"","sources":["type-guards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACd,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,EACpB,oCAAoC,EACpC,iCAAiC,EACjC,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7D,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,EACV,aAAa,GACd,MAAM,aAAa,CAAC;AAErB,eAAO,MAAM,eAAe,kEAA6B,CAAC;AAG1D,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,aAAa,CAW1D,CAAC;AAGF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,kBAAkB,CAWlE,CAAC;AAGJ;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,KAAK,MAAM,KACV,GAAG,IAAI,mBAA0C,CAAC;AAGrD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,KAAK,MAAM,KACV,GAAG,IAAI,oBAA2C,CAAC;AAGtD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,KAAK,MAAM,KACV,GAAG,IAAI,oBAA2C,CAAC;AAGtD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,MAAM,KAAG,GAAG,IAAI,kBACrC,CAAC;AAGtB;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,KAAK,MAAM,KACV,GAAG,IAAI,mBAAiD,CAAC;AAG5D;;;GAGG;AACH,eAAO,MAAM,2BAA2B,GACtC,KAAK,MAAM,KACV,GAAG,IAAI,mBAAuD,CAAC;AAGlE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,KAAK,MAAM,KAAG,GAAG,IAAI,iBAC/B,CAAC;AAG3B,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,iBAAiB,CACvD,CAAC;AAEb,iFAAiF;AACjF,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,MAAM,CAE3D,CAAC;AAEH,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,kBAAkB,CAIjE,CAAC;AAEL,eAAO,MAAM,sCAAsC,EAAE,YAAY,CAAC,iCAAiC,CAKhG,CAAC;AAEJ,eAAO,MAAM,yCAAyC,EAAE,YAAY,CAAC,oCAAoC,CAKtG,CAAC"}

package/src/type-guards.js CHANGED Viewed

@@ -11,6 +11,9 @@ import { M } from '@endo/patterns';
@@ -121,3 +124,23 @@ export const PortfolioAgentKeyShape                                  =
 export const PortfolioFlowAgentMemoShape                       = M.string({
   stringLengthLimit: 64,
 });
+export const PortfolioSyncStateShape                                   =
+  M.splitRecord({
+    policyVersion: M.number(),
+    rebalanceCount: M.number(),
+  });
+export const PortfolioDelegatedRebalanceParamsShape                                                  =
+  M.splitRecord(
+    { syncState: PortfolioSyncStateShape },
+    { agentMemo: PortfolioFlowAgentMemoShape },
+    {},
+  );
+export const PortfolioDelegatedClaimRewardsParamsShape                                                     =
+  M.splitRecord(
+    { syncState: PortfolioSyncStateShape },
+    { agentMemo: PortfolioFlowAgentMemoShape },
+    {},
+  );

package/src/types.d.ts CHANGED Viewed

@@ -110,6 +110,10 @@ export type FlowDetail = {
     type: 'rebalance';
     agent?: PortfolioAgentKey;
     agentMemo?: string;
+} | {
+    type: 'claimRewards';
+    agent?: PortfolioAgentKey;
+    agentMemo?: string;
 };
 /** linked list of concurrent failures, including dependencies */
 export type FlowErrors = {
@@ -384,6 +388,10 @@ export type PortfolioDelegatedRebalanceParams = {
     syncState: PortfolioSyncState;
     agentMemo?: string;
 };
+export type PortfolioDelegatedClaimRewardsParams = {
+    syncState: PortfolioSyncState;
+    agentMemo?: string;
+};
 export type PortfolioDelegatedSetTargetAllocationParams = {
     syncState: PortfolioSyncState;
     targetAllocation: TargetAllocation;

package/src/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"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"}

package/src/types.js CHANGED Viewed

@@ -131,6 +131,11 @@ import {
@@ -449,6 +454,11 @@ import {
+;
 ;