Allow extra_conditions in make_offer (#2896)

* add extra_conditions to createOfferForIds

* extra_conditions added to take_offer

* add new optional param to createOfferForIds to specify coin

* explicitly map to snake_case when appropriate

Author: matt-o-how

packages/api/src/services/WalletService.test.ts

@@ -686,7 +686,7 @@ describe('WalletService', () => {
     const expected = [
       new Message({
         command: 'create_offer_for_ids',
-        data: { driver_dict: driverDict, ...restArgs },
+        data: { driver_dict: driverDict, extra_conditions: undefined, coin_ids: undefined, ...restArgs },
         destination: 'chia_wallet',
         origin: 'test_origin' as ServiceNameValue,
       }),

packages/api/src/services/WalletService.ts

@@ -265,11 +265,13 @@ export default class Wallet extends Service {
     validateOnly?: boolean;
     disableJSONFormatting?: boolean;
     maxTime?: number;
+    extraConditions?: any[];
+    coinIds?: string[];
   }) {
-    const { disableJSONFormatting, driverDict, ...restArgs } = args;
+    const { disableJSONFormatting, driverDict, extraConditions, coinIds, ...restArgs } = args;
     return this.command<{ offer: string; tradeRecord: TradeRecord }>(
       'create_offer_for_ids',
-      { driver_dict: driverDict, ...restArgs },
+      { driver_dict: driverDict, extra_conditions: extraConditions, coin_ids: coinIds, ...restArgs },
       false,
       undefined,
       disableJSONFormatting,
@@ -284,7 +286,7 @@ export default class Wallet extends Service {
     return this.command<{ id: string; valid: boolean }>('check_offer_validity', args);
   }
 
-  async takeOffer(args: { offer: string; fee: number | string }) {
+  async takeOffer(args: { offer: string; fee: number | string; extraConditions?: any[] }) {
     return this.command<{ tradeRecord: TradeRecord }>('take_offer', args);
   }
 

packages/gui/src/@types/WalletConnectCommandParamName.ts

@@ -22,6 +22,7 @@ enum WalletConnectCommandParamName {
   EDITION_TOTAL = 'editionTotal',
   END = 'end',
   END_HEIGHT = 'endHeight',
+  EXTRA_CONDITIONS = 'extraConditions',
   FEE = 'fee',
   FINGERPRINT = 'fingerprint',
   FINGERPRINTS = 'fingerprints',

packages/gui/src/constants/WalletConnectCommands.tsx

@@ -464,6 +464,20 @@ const walletConnectCommands: WalletConnectCommand[] = [
         type: 'BigNumber',
         displayComponent: (value) => <MojoToChia value={value} />,
       },
+      {
+        name: WalletConnectCommandParamName.EXTRA_CONDITIONS,
+        label: <Trans>Extra Conditions</Trans>,
+        isOptional: true,
+        type: 'object',
+        displayComponent: (value) => <>{JSON.stringify(value)}</>,
+      },
+      {
+        name: WalletConnectCommandParamName.COIN_IDS,
+        label: <Trans>Coin IDs</Trans>,
+        isOptional: true,
+        type: 'object',
+        displayComponent: (value) => <>{JSON.stringify(value)}</>,
+      },
     ],
   },
   {
@@ -522,6 +536,13 @@ const walletConnectCommands: WalletConnectCommand[] = [
         type: 'BigNumber',
         displayComponent: (value) => <MojoToChia value={value} />,
       },
+      {
+        name: WalletConnectCommandParamName.EXTRA_CONDITIONS,
+        label: <Trans>Extra Conditions</Trans>,
+        isOptional: true,
+        type: 'object',
+        displayComponent: (value) => <>{JSON.stringify(value)}</>,
+      },
     ],
   },
   {