Merge branch 'akash-network:main' into remote-deploy

apps/api/CHANGELOG.md

@@ -1,5 +1,21 @@
 
 
+## [2.27.0](https://github.com/akash-network/console/compare/console-api/v2.27.0-beta.1...console-api/v2.27.0) (2024-10-30)
+
+## [2.27.0-beta.1](https://github.com/akash-network/console/compare/console-api/v2.27.0-beta.0...console-api/v2.27.0-beta.1) (2024-10-30)
+
+
+### Bug Fixes
+
+* improve perf ([d9de0eb](https://github.com/akash-network/console/commit/d9de0eba93d0c4ee4d7e051f98843578ba30a258)), closes [#427](https://github.com/akash-network/console/issues/427)
+
+## [2.27.0-beta.0](https://github.com/akash-network/console/compare/console-api/v2.26.0...console-api/v2.27.0-beta.0) (2024-10-29)
+
+
+### Features
+
+* **deployment:** implements basic top up handler w/o implementation ([a4cd312](https://github.com/akash-network/console/commit/a4cd3122cf1b1d22691ea5c14a320b5b743d217b)), closes [#395](https://github.com/akash-network/console/issues/395)
+
 ## [2.26.0](https://github.com/akash-network/console/compare/console-api/v2.26.0-beta.0...console-api/v2.26.0) (2024-10-23)
 
 ## [2.26.0-beta.0](https://github.com/akash-network/console/compare/console-api/v2.25.0...console-api/v2.26.0-beta.0) (2024-10-23)

apps/api/env/.env.functional.test

@@ -2,6 +2,8 @@ AKASH_SANDBOX_DATABASE_CS=postgres://postgres:password@localhost:5432/console-ak
 USER_DATABASE_CS=postgres://postgres:password@localhost:5432/console-users
 POSTGRES_DB_URI=postgres://postgres:password@localhost:5432/console-users
 MASTER_WALLET_MNEMONIC="motion isolate mother convince snack twenty tumble boost elbow bundle modify balcony"
+UAKT_TOP_UP_MASTER_WALLET_MNEMONIC="motion isolate mother convince snack twenty tumble boost elbow bundle modify balcony"
+USDC_TOP_UP_MASTER_WALLET_MNEMONIC="motion isolate mother convince snack twenty tumble boost elbow bundle modify balcony"
 NETWORK=sandbox
 RPC_NODE_ENDPOINT=https://rpc.sandbox-01.aksh.pw:443
 TRIAL_DEPLOYMENT_ALLOWANCE_AMOUNT=20000000

apps/api/nginx.conf

@@ -1,6 +1,9 @@
 # nginx.conf
 
+worker_processes auto;
+
 events {
+    worker_connections 10000;
 }
 
 http {

apps/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akashnetwork/console-api",
-  "version": "2.26.0",
+  "version": "2.27.0",
   "description": "Api providing data to the deploy tool",
   "repository": {
     "type": "git",

apps/api/src/billing/config/env.config.ts

@@ -2,6 +2,8 @@ import { z } from "zod";
 
 const envSchema = z.object({
   MASTER_WALLET_MNEMONIC: z.string(),
+  UAKT_TOP_UP_MASTER_WALLET_MNEMONIC: z.string(),
+  USDC_TOP_UP_MASTER_WALLET_MNEMONIC: z.string(),
   NETWORK: z.enum(["mainnet", "testnet", "sandbox"]),
   RPC_NODE_ENDPOINT: z.string(),
   TRIAL_ALLOWANCE_EXPIRATION_DAYS: z.number({ coerce: true }).default(14),

apps/api/src/billing/providers/index.ts

@@ -1,4 +1,5 @@
 import "./config.provider";
 import "./http-sdk.provider";
+import "./wallet.provider";
 
 export * from "./config.provider";

apps/api/src/billing/providers/signing-client.provider.ts

@@ -0,0 +1,24 @@
+import { container, inject } from "tsyringe";
+
+import { config } from "@src/billing/config";
+import { TYPE_REGISTRY } from "@src/billing/providers/type-registry.provider";
+import { MANAGED_MASTER_WALLET, UAKT_TOP_UP_MASTER_WALLET, USDC_TOP_UP_MASTER_WALLET } from "@src/billing/providers/wallet.provider";
+import { MasterSigningClientService } from "@src/billing/services";
+import { MasterWalletType } from "@src/billing/types/wallet.type";
+
+export const MANAGED_MASTER_SIGNING_CLIENT = "MANAGED_MASTER_SIGNING_CLIENT";
+container.register(MANAGED_MASTER_SIGNING_CLIENT, {
+  useFactory: c => new MasterSigningClientService(config, c.resolve(MANAGED_MASTER_WALLET), c.resolve(TYPE_REGISTRY), MANAGED_MASTER_SIGNING_CLIENT)
+});
+
+export const UAKT_TOP_UP_MASTER_SIGNING_CLIENT = "UAKT_TOP_UP_MASTER_SIGNING_CLIENT";
+container.register(UAKT_TOP_UP_MASTER_SIGNING_CLIENT, {
+  useFactory: c => new MasterSigningClientService(config, c.resolve(UAKT_TOP_UP_MASTER_WALLET), c.resolve(TYPE_REGISTRY), UAKT_TOP_UP_MASTER_SIGNING_CLIENT)
+});
+
+export const USDC_TOP_UP_MASTER_SIGNING_CLIENT = "USDC_TOP_UP_MASTER_SIGNING_CLIENT";
+container.register(USDC_TOP_UP_MASTER_SIGNING_CLIENT, {
+  useFactory: c => new MasterSigningClientService(config, c.resolve(USDC_TOP_UP_MASTER_WALLET), c.resolve(TYPE_REGISTRY), USDC_TOP_UP_MASTER_SIGNING_CLIENT)
+});
+
+export const InjectSigningClient = (walletType: MasterWalletType) => inject(`${walletType}_MASTER_SIGNING_CLIENT`);

apps/api/src/billing/providers/wallet.provider.ts

@@ -0,0 +1,16 @@
+import { container, inject } from "tsyringe";
+
+import { config } from "@src/billing/config";
+import { MasterWalletService } from "@src/billing/services/master-wallet/master-wallet.service";
+import { MasterWalletType } from "@src/billing/types/wallet.type";
+
+export const MANAGED_MASTER_WALLET = "MANAGED_MASTER_WALLET";
+container.register(MANAGED_MASTER_WALLET, { useFactory: () => new MasterWalletService(config.MASTER_WALLET_MNEMONIC) });
+
+export const UAKT_TOP_UP_MASTER_WALLET = "TOP_UP_UAKT_MASTER_WALLET";
+container.register(UAKT_TOP_UP_MASTER_WALLET, { useFactory: () => new MasterWalletService(config.UAKT_TOP_UP_MASTER_WALLET_MNEMONIC) });
+
+export const USDC_TOP_UP_MASTER_WALLET = "TOP_UP_USDC_MASTER_WALLET";
+container.register(USDC_TOP_UP_MASTER_WALLET, { useFactory: () => new MasterWalletService(config.USDC_TOP_UP_MASTER_WALLET_MNEMONIC) });
+
+export const InjectWallet = (walletType: MasterWalletType) => inject(`${walletType}_MASTER_WALLET`);

apps/api/src/billing/services/balances/balances.service.ts

@@ -2,6 +2,7 @@ import { AllowanceHttpService } from "@akashnetwork/http-sdk";
 import { singleton } from "tsyringe";
 
 import { BillingConfig, InjectBillingConfig } from "@src/billing/providers";
+import { InjectWallet } from "@src/billing/providers/wallet.provider";
 import { UserWalletInput, UserWalletOutput, UserWalletRepository } from "@src/billing/repositories";
 import { MasterWalletService } from "@src/billing/services";
 
@@ -10,7 +11,7 @@ export class BalancesService {
   constructor(
     @InjectBillingConfig() private readonly config: BillingConfig,
     private readonly userWalletRepository: UserWalletRepository,
-    private readonly masterWalletService: MasterWalletService,
+    @InjectWallet("MANAGED") private readonly masterWalletService: MasterWalletService,
     private readonly allowanceHttpService: AllowanceHttpService
   ) {}
 

apps/api/src/billing/services/managed-user-wallet/managed-user-wallet.service.ts

@@ -6,6 +6,8 @@ import add from "date-fns/add";
 import { singleton } from "tsyringe";
 
 import { BillingConfig, InjectBillingConfig } from "@src/billing/providers";
+import { InjectSigningClient } from "@src/billing/providers/signing-client.provider";
+import { InjectWallet } from "@src/billing/providers/wallet.provider";
 import { MasterSigningClientService } from "@src/billing/services/master-signing-client/master-signing-client.service";
 import { MasterWalletService } from "@src/billing/services/master-wallet/master-wallet.service";
 import { RpcMessageService, SpendingAuthorizationMsgOptions } from "@src/billing/services/rpc-message-service/rpc-message.service";
@@ -34,11 +36,13 @@ export class ManagedUserWalletService {
 
   constructor(
     @InjectBillingConfig() private readonly config: BillingConfig,
-    private readonly masterWalletService: MasterWalletService,
-    private readonly masterSigningClientService: MasterSigningClientService,
+    @InjectWallet("MANAGED") private readonly masterWalletService: MasterWalletService,
+    @InjectSigningClient("MANAGED") private readonly masterSigningClientService: MasterSigningClientService,
     private readonly rpcMessageService: RpcMessageService,
     private readonly allowanceHttpService: AllowanceHttpService
-  ) {}
+  ) {
+    console.log("DEBUG masterSigningClientService", masterSigningClientService);
+  }
 
   async createAndAuthorizeTrialSpending({ addressIndex }: { addressIndex: number }) {
     const { address } = await this.createWallet({ addressIndex });

apps/api/src/billing/services/master-signing-client/master-signing-client.service.ts

@@ -9,10 +9,8 @@ import { Sema } from "async-sema";
 import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import DataLoader from "dataloader";
 import assert from "http-assert";
-import { singleton } from "tsyringe";
 
-import { BillingConfig, InjectBillingConfig } from "@src/billing/providers";
-import { InjectTypeRegistry } from "@src/billing/providers/type-registry.provider";
+import { BillingConfig } from "@src/billing/providers";
 import { BatchSigningStargateClient } from "@src/billing/services/batch-signing-stargate-client/batch-signing-stargate-client";
 import { MasterWalletService } from "@src/billing/services/master-wallet/master-wallet.service";
 import { LoggerService } from "@src/core";
@@ -22,8 +20,9 @@ interface ShortAccountInfo {
   sequence: number;
 }
 
-@singleton()
 export class MasterSigningClientService {
+  private readonly FEES_DENOM = "uakt";
+
   private clientAsPromised: Promise<BatchSigningStargateClient>;
 
   private readonly semaphore = new Sema(1);
@@ -39,12 +38,13 @@ export class MasterSigningClientService {
     { cache: false, batchScheduleFn: callback => setTimeout(callback, this.config.MASTER_WALLET_BATCHING_INTERVAL_MS) }
   );
 
-  private readonly logger = new LoggerService({ context: MasterWalletService.name });
+  private readonly logger = new LoggerService({ context: this.loggerContext });
 
   constructor(
-    @InjectBillingConfig() private readonly config: BillingConfig,
+    private readonly config: BillingConfig,
     private readonly masterWalletService: MasterWalletService,
-    @InjectTypeRegistry() private readonly registry: Registry
+    private readonly registry: Registry,
+    private readonly loggerContext = MasterSigningClientService.name
   ) {
     this.clientAsPromised = this.initClient();
   }
@@ -110,7 +110,7 @@ export class MasterSigningClientService {
 
     while (txIndex < messages.length) {
       txes.push(
-        await client.sign(masterAddress, messages[txIndex], await this.estimateFee(messages[txIndex], this.config.DEPLOYMENT_GRANT_DENOM, { mock: true }), "", {
+        await client.sign(masterAddress, messages[txIndex], await this.estimateFee(messages[txIndex], this.FEES_DENOM, { mock: true }), "", {
           accountNumber: this.accountInfo.accountNumber,
           sequence: this.accountInfo.sequence++,
           chainId: this.chainId
@@ -137,7 +137,7 @@ export class MasterSigningClientService {
   private async estimateFee(messages: readonly EncodeObject[], denom: string, options?: { mock?: boolean }) {
     if (options?.mock) {
       return {
-        amount: [{ denom: "uakt", amount: "15000" }],
+        amount: [{ denom: this.FEES_DENOM, amount: "15000" }],
         gas: "500000"
       };
     }

apps/api/src/billing/services/master-wallet/master-wallet.service.ts

@@ -1,17 +1,13 @@
 import { DirectSecp256k1HdWallet, OfflineDirectSigner } from "@cosmjs/proto-signing";
 import { SignDoc } from "cosmjs-types/cosmos/tx/v1beta1/tx";
-import { singleton } from "tsyringe";
 
-import { BillingConfig, InjectBillingConfig } from "@src/billing/providers";
-
-@singleton()
 export class MasterWalletService implements OfflineDirectSigner {
   private readonly PREFIX = "akash";
 
   private readonly instanceAsPromised: Promise<DirectSecp256k1HdWallet>;
 
-  constructor(@InjectBillingConfig() private readonly config: BillingConfig) {
-    this.instanceAsPromised = DirectSecp256k1HdWallet.fromMnemonic(this.config.MASTER_WALLET_MNEMONIC, { prefix: this.PREFIX });
+  constructor(mnemonic: string) {
+    this.instanceAsPromised = DirectSecp256k1HdWallet.fromMnemonic(mnemonic, { prefix: this.PREFIX });
   }
 
   async getAccounts() {

apps/api/src/billing/services/tx-signer/tx-signer.service.ts

@@ -9,6 +9,7 @@ import { singleton } from "tsyringe";
 import { AuthService } from "@src/auth/services/auth.service";
 import { BillingConfig, InjectBillingConfig } from "@src/billing/providers";
 import { InjectTypeRegistry } from "@src/billing/providers/type-registry.provider";
+import { InjectWallet } from "@src/billing/providers/wallet.provider";
 import { UserWalletOutput, UserWalletRepository } from "@src/billing/repositories";
 import { MasterWalletService } from "@src/billing/services";
 import { BalancesService } from "@src/billing/services/balances/balances.service";
@@ -30,7 +31,7 @@ export class TxSignerService {
     @InjectBillingConfig() private readonly config: BillingConfig,
     @InjectTypeRegistry() private readonly registry: Registry,
     private readonly userWalletRepository: UserWalletRepository,
-    private readonly masterWalletService: MasterWalletService,
+    @InjectWallet("MANAGED") private readonly masterWalletService: MasterWalletService,
     private readonly balancesService: BalancesService,
     private readonly authService: AuthService,
     private readonly chainErrorService: ChainErrorService,

apps/api/src/billing/types/wallet.type.ts

@@ -0,0 +1 @@
+export type MasterWalletType = "MANAGED" | "USDC_TOP_UP" | "UAKT_TOP_UP";

apps/api/src/console.ts

@@ -8,6 +8,7 @@ import { container } from "tsyringe";
 
 import { WalletController } from "@src/billing/controllers/wallet/wallet.controller";
 import { LoggerService } from "@src/core";
+import { TopUpDeploymentsController } from "@src/deployment/controllers/deployment/deployment.controller";
 
 const program = new Command();
 
@@ -17,19 +18,34 @@ const tracer = trace.getTracer("API Console");
 program
   .command("refill-wallets")
   .description("Refill draining wallets")
-  .action(async () => {
-    await context.with(trace.setSpan(context.active(), tracer.startSpan("refill-wallets")), async () => {
-      const logger = new LoggerService({ context: "CLI" });
-      logger.info("Refilling wallets");
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const { migratePG, closeConnections } = await require("./core/providers/postgres.provider");
-      await migratePG();
-
+  .action(async (options, command) => {
+    await executeCliHandler(command.name(), async () => {
       await container.resolve(WalletController).refillWallets();
+    });
+  });
 
-      await closeConnections();
-      logger.info("Finished refilling wallets");
+program
+  .command("top-up-deployments")
+  .description("Refill deployments with auto top up enabled")
+  .action(async (options, command) => {
+    await executeCliHandler(command.name(), async () => {
+      await container.resolve(TopUpDeploymentsController).topUpDeployments();
     });
   });
 
+async function executeCliHandler(name: string, handler: () => Promise<void>) {
+  await context.with(trace.setSpan(context.active(), tracer.startSpan(name)), async () => {
+    const logger = new LoggerService({ context: "CLI" });
+    logger.info({ event: "COMMAND_START", name });
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const { migratePG, closeConnections } = await require("./core/providers/postgres.provider");
+    await migratePG();
+
+    await handler();
+
+    await closeConnections();
+    logger.info({ event: "COMMAND_END", name });
+  });
+}
+
 program.parse();

apps/api/src/deployment/controllers/deployment/deployment.controller.ts

@@ -0,0 +1,12 @@
+import { singleton } from "tsyringe";
+
+import { TopUpDeploymentsService } from "@src/deployment/services/top-up-deployments/top-up-deployments.service";
+
+@singleton()
+export class TopUpDeploymentsController {
+  constructor(private readonly topUpDeploymentsService: TopUpDeploymentsService) {}
+
+  async topUpDeployments() {
+    await this.topUpDeploymentsService.topUpDeployments();
+  }
+}

apps/api/src/deployment/services/top-up-deployments/top-up-deployments.service.ts

@@ -0,0 +1,12 @@
+import { singleton } from "tsyringe";
+
+import { LoggerService } from "@src/core";
+
+@singleton()
+export class TopUpDeploymentsService {
+  private readonly logger = new LoggerService({ context: TopUpDeploymentsService.name });
+
+  async topUpDeployments() {
+    this.logger.warn("Top up deployments not implemented");
+  }
+}

apps/api/src/routes/v1/providers/list.ts

@@ -106,6 +106,6 @@ const route = createRoute({
 });
 
 export default new OpenAPIHono().openapi(route, async c => {
-  const providers = await cacheResponse(60, cacheKeys.getProviderList, getProviderList);
+  const providers = await cacheResponse(60, cacheKeys.getProviderList, getProviderList, true);
   return c.json(providers);
 });

apps/api/src/routes/v1/templates.ts

@@ -41,6 +41,6 @@ const route = createRoute({
 });
 
 export default new OpenAPIHono().openapi(route, async c => {
-  const response = await cacheResponse(60 * 5, cacheKeys.getTemplates, async () => await getTemplateGallery());
+  const response = await cacheResponse(60 * 5, cacheKeys.getTemplates, async () => await getTemplateGallery(), true);
   return c.json(response);
 });

apps/api/test/functional/app.spec.ts

@@ -17,7 +17,7 @@ describe("app", () => {
           rss: expect.stringMatching(/^[0-9.]+ (M|G)B$/)
         },
         tasks: [],
-        version: expect.stringMatching(/^[0-9]+.[0-9]+.[0-9]+$/)
+        version: expect.stringMatching(/^[0-9]+.[0-9]+.[0-9]+(-beta\.[0-9]+)?$/)
       });
     });
   });

apps/api/test/functional/create-deployment.spec.ts

@@ -11,6 +11,7 @@ import { container } from "tsyringe";
 import { app } from "@src/app";
 import { config } from "@src/billing/config";
 import { TYPE_REGISTRY } from "@src/billing/providers/type-registry.provider";
+import { MANAGED_MASTER_WALLET } from "@src/billing/providers/wallet.provider";
 import { MasterWalletService } from "@src/billing/services";
 
 jest.setTimeout(30000);
@@ -21,7 +22,7 @@ const yml = fs.readFileSync(path.resolve(__dirname, "../mocks/hello-world-sdl.ym
 describe("Tx Sign", () => {
   const registry = container.resolve<Registry>(TYPE_REGISTRY);
   const walletService = new WalletTestingService(app);
-  const masterWalletService = container.resolve(MasterWalletService);
+  const masterWalletService = container.resolve<MasterWalletService>(MANAGED_MASTER_WALLET);
   const dbService = container.resolve(DbTestingService);
 
   afterEach(async () => {

apps/deploy-web/CHANGELOG.md

@@ -1,5 +1,21 @@
 
 
+## [2.20.2](https://github.com/akash-network/console/compare/console-web/v2.20.2-beta.1...console-web/v2.20.2) (2024-10-30)
+
+## [2.20.2-beta.1](https://github.com/akash-network/console/compare/console-web/v2.20.2-beta.0...console-web/v2.20.2-beta.1) (2024-10-30)
+
+
+### Bug Fixes
+
+* improve perf ([d9de0eb](https://github.com/akash-network/console/commit/d9de0eba93d0c4ee4d7e051f98843578ba30a258)), closes [#427](https://github.com/akash-network/console/issues/427)
+
+## [2.20.2-beta.0](https://github.com/akash-network/console/compare/console-web/v2.20.1...console-web/v2.20.2-beta.0) (2024-10-29)
+
+
+### Bug Fixes
+
+* **wallet:** ensure proper network and manage wallet switch ([39ee991](https://github.com/akash-network/console/commit/39ee991731145c3d3d8b3a6cb0ef37fe453b0d29))
+
 ## [2.20.1](https://github.com/akash-network/console/compare/console-web/v2.20.1-beta.0...console-web/v2.20.1) (2024-10-26)
 
 ## [2.20.1-beta.0](https://github.com/akash-network/console/compare/console-web/v2.20.0...console-web/v2.20.1-beta.0) (2024-10-26)

apps/deploy-web/env/.env.production

@@ -5,8 +5,9 @@ NEXT_PUBLIC_DEFAULT_NETWORK_ID=mainnet
 NEXT_PUBLIC_BILLING_ENABLED=true
 NEXT_PUBLIC_MANAGED_WALLET_NETWORK_ID=mainnet
 NEXT_PUBLIC_MANAGED_WALLET_DENOM=usdc
-# TODO: replace with a fresh master wallet before release
 NEXT_PUBLIC_MASTER_WALLET_ADDRESS=akash1p4k0jer30g25mf62h5yc42agtjeumw4gxk8z37
+NEXT_PUBLIC_UAKT_TOP_UP_MASTER_WALLET_ADDRESS=akash19rlpd2spv5ngl8zkdzrgw7h37hz3egumz8nmj2
+NEXT_PUBLIC_USDC_TOP_UP_MASTER_WALLET_ADDRESS=akash1xh3zxza7jkd6scfa9hea3cmmzumjshlaa4pl6l
 
 NEXT_PUBLIC_STATS_APP_URL=https://stats.akash.network
 NEXT_PUBLIC_PROVIDER_PROXY_URL=https://console-provider-proxy.akash.network