fix(billing): properly check fee grant before tx

akash-network · Dec 30, 2024 · b721141 · b721141
1 parent 0cb2d0d
commit b721141
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/apps/api/src/billing/services/managed-user-wallet/managed-user-wallet.service.ts b/apps/api/src/billing/services/managed-user-wallet/managed-user-wallet.service.ts
@@ -94,7 +94,7 @@ export class ManagedUserWalletService {
 
   private async authorizeFeeSpending(options: Omit<SpendingAuthorizationMsgOptions, "denom">) {
     const messages: EncodeObject[] = [];
-    const hasValidFeeAllowance = await this.authzHttpService.hasValidFeeAllowance(options.granter, options.grantee);
+    const hasValidFeeAllowance = await this.authzHttpService.hasFeeAllowance(options.granter, options.grantee);
 
     if (hasValidFeeAllowance) {
       messages.push(this.rpcMessageService.getRevokeAllowanceMsg(options));
@@ -119,7 +119,7 @@ export class ManagedUserWalletService {
       deploymentGrant: false
     };
 
-    if (await this.authzHttpService.hasValidFeeAllowance(params.granter, params.grantee)) {
+    if (await this.authzHttpService.hasFeeAllowance(params.granter, params.grantee)) {
       revokeSummary.feeAllowance = true;
       messages.push(this.rpcMessageService.getRevokeAllowanceMsg(params));
     }

diff --git a/apps/api/test/functional/start-trial.spec.ts b/apps/api/test/functional/start-trial.spec.ts
@@ -45,7 +45,7 @@ describe("start trial", () => {
       const masterWalletAddress = await resolveWallet("MANAGED").getFirstAddress();
       const allowances = await Promise.all([
         authzHttpService.getDepositDeploymentGrantsForGranterAndGrantee(masterWalletAddress, userWallet.address),
-        authzHttpService.getFeeAllowancesForGrantee(userWallet.address)
+        authzHttpService.getValidFeeAllowancesForGrantee(userWallet.address)
       ]);
 
       expect(createWalletResponse.status).toBe(200);

diff --git a/apps/deploy-web/src/hooks/useWalletBalance.ts b/apps/deploy-web/src/hooks/useWalletBalance.ts
@@ -144,7 +144,7 @@ export const useDenomData = (denom: string) => {
 
       setDepositData(depositData);
     }
-  }, [denom, isLoaded, price, walletBalance, usdcIbcDenom, minDeposit]);
+  }, [denom, isLoaded, price, walletBalance, usdcIbcDenom, minDeposit, isManaged, txFeeBuffer, aktToUSD]);
 
   return depositData;
 };
diff --git a/packages/http-sdk/src/authz/authz-http.service.ts b/packages/http-sdk/src/authz/authz-http.service.ts
@@ -58,7 +58,12 @@ export class AuthzHttpService extends HttpService {
 
   async getFeeAllowancesForGrantee(address: string) {
     const allowances = this.extractData(await this.get<FeeAllowanceListResponse>(`cosmos/feegrant/v1beta1/allowances/${address}`));
-    return allowances.allowances.filter(allowance => this.isValidFeeAllowance(allowance));
+    return allowances.allowances;
+  }
+
+  async getValidFeeAllowancesForGrantee(address: string) {
+    const allowances = await this.getFeeAllowancesForGrantee(address);
+    return allowances.filter(allowance => this.isValidFeeAllowance(allowance));
   }
 
   async getFeeAllowanceForGranterAndGrantee(granter: string, grantee: string): Promise<FeeAllowance | undefined> {
@@ -86,11 +91,16 @@ export class AuthzHttpService extends HttpService {
     return response.grants.find(grant => this.isValidDepositDeploymentGrant(grant));
   }
 
-  async hasValidFeeAllowance(granter: string, grantee: string) {
+  async hasFeeAllowance(granter: string, grantee: string) {
     const feeAllowances = await this.getFeeAllowancesForGrantee(grantee);
     return feeAllowances.some(allowance => allowance.granter === granter);
   }
 
+  async hasValidFeeAllowance(granter: string, grantee: string) {
+    const feeAllowances = await this.getValidFeeAllowancesForGrantee(grantee);
+    return feeAllowances.some(allowance => allowance.granter === granter);
+  }
+
   async hasValidDepositDeploymentGrant(granter: string, grantee: string) {
     return !!(await this.getDepositDeploymentGrantsForGranterAndGrantee(granter, grantee))
   }