change to increase_allowance for cw funds + minor improvements

terra-money · Mar 17, 2024 · ca26a18 · ca26a18
1 parent 9e4b9d7
commit ca26a18
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/src/composers/job.ts b/src/composers/job.ts
@@ -49,6 +49,7 @@ export class CreateJobMsgComposer {
   private _executions: Execution[] = [];
   private _durationDays: string;
   private _fundingAccount: string;
+  private _cwFunds: warp_controller.CwFund[] = [];
   private _operationalAmount: warp_controller.Uint128 | undefined;
 
   static new(): CreateJobMsgComposer {
@@ -90,6 +91,11 @@ export class CreateJobMsgComposer {
     return this;
   }
 
+  cwFunds(cwFunds: warp_controller.CwFund[]): CreateJobMsgComposer {
+    this._cwFunds = cwFunds;
+    return this;
+  }
+
   operationalAmount(operationalAmount: warp_controller.Uint128): CreateJobMsgComposer {
     this._operationalAmount = operationalAmount;
     return this;
@@ -136,6 +142,7 @@ export class CreateJobMsgComposer {
       vars: JSON.stringify(this._vars),
       assets_to_withdraw: this._assetsToWithdraw,
       operational_amount: this._operationalAmount,
+      cw_funds: this._cwFunds,
       funding_account: this._fundingAccount,
     };
 

diff --git a/src/modules/tx.ts b/src/modules/tx.ts
@@ -1,5 +1,5 @@
 import { warp_controller, warp_account, warp_resolver, warp_templates } from '../types/contracts';
-import { base64encode, nativeTokenDenom, Token, TransferMsg, TransferNftMsg } from '../utils';
+import { ApproveNft, base64encode, IncreaseAllowanceMsg, nativeTokenDenom, Token, TransferMsg } from '../utils';
 import { Coins, CreateTxOptions } from '@terra-money/feather.js';
 import { TxBuilder } from '../tx';
 import { JobSequenceMsgComposer } from '../composers';
@@ -260,19 +260,19 @@ export class TxModule {
       if ('cw20' in fund) {
         const { amount, contract_addr } = fund.cw20;
 
-        txBuilder = txBuilder.execute<TransferMsg>(sender, contract_addr, {
-          transfer: {
+        txBuilder = txBuilder.execute<IncreaseAllowanceMsg>(sender, contract_addr, {
+          increase_allowance: {
             amount,
-            recipient: this.warpSdk.chain.contracts.controller,
+            spender: this.warpSdk.chain.contracts.controller,
           },
         });
       } else if ('cw721' in fund) {
         const { contract_addr, token_id } = fund.cw721;
 
-        txBuilder = txBuilder.execute<TransferNftMsg>(sender, contract_addr, {
-          transfer_nft: {
+        txBuilder = txBuilder.execute<ApproveNft>(sender, contract_addr, {
+          approve: {
             token_id,
-            recipient: this.warpSdk.chain.contracts.controller,
+            spender: this.warpSdk.chain.contracts.controller,
           },
         });
       }

diff --git a/src/utils/contract.ts b/src/utils/contract.ts
@@ -8,6 +8,13 @@ export const contractQuery = async <QueryMsg extends {}, QueryResponse>(
   return await lcd.wasm.contractQuery<QueryResponse>(contractAddress, msg);
 };
 
+export type IncreaseAllowanceMsg = {
+  increase_allowance: {
+    spender: string;
+    amount: string;
+  };
+};
+
 export type TransferMsg = {
   transfer: {
     recipient: string;
@@ -22,6 +29,13 @@ export type TransferNftMsg = {
   };
 };
 
+export type ApproveNft = {
+  approve: {
+    spender: string;
+    token_id: string;
+  };
+};
+
 export const base64encode = (input: any): string => {
   return Buffer.from(JSON.stringify(JSON.parse(JSON.stringify(input)))).toString('base64');
 };