Merge pull request #7 from Peersyst/dapp/feat/relayer-client

[TA-4556]: Implement near relayer dapp client calls

Author: AdriaCarrera

README.md

@@ -1 +1 @@
-# one-click-connect
+# one-click-connect

packages/dapp/core/src/clients/relayer/index.ts

@@ -1 +1,2 @@
 export * from "./relayer.client";
+export * from "./relayer.client.config";

packages/dapp/core/src/clients/relayer/relayer.client.config.ts

@@ -0,0 +1,6 @@
+import { NearDAppClientConfig } from "../base";
+import { RelayerAPI } from "@one-click-connect/core/relayer";
+
+export type NearRelayerDAppClientConfig = {
+    relayerAPI?: RelayerAPI;
+} & NearDAppClientConfig;

packages/dapp/core/src/clients/relayer/relayer.client.ts

@@ -1,53 +1,95 @@
-import { INearRelayerDAppClient } from "@one-click-connect/core/relayer";
+import { INearRelayerDAppClient, RelayerAPI } from "@one-click-connect/core/relayer";
 import { SignInitialTxRequest, SignWithFakRequest } from "@one-click-connect/core/common";
+import { NearRelayerDAppClientConfig } from "./relayer.client.config";
+import { IAccountService } from "../../common/client/interfaces/i-account.service";
+import { DAppClient } from "../../common/client";
+import { Account } from "../../common/account";
+import { ClientError, ClientErrorCodes } from "../../common/client/errors";
+import { MsgFakSign, MsgSignInitialTx } from "@one-click-connect/core/base";
 
-export class NearRelayerDAppClient implements INearRelayerDAppClient {
-    /**
-     * @inheritdoc
-     */
-    signIn(_accountID: string, _signingURL: string): boolean {
-        throw new Error("Method not implemented.");
+export class NearRelayerDAppClient<C extends NearRelayerDAppClientConfig> extends DAppClient<C> implements INearRelayerDAppClient {
+    constructor(config: C, accountService: IAccountService) {
+        super(config, accountService);
     }
 
     /**
      * @inheritdoc
      */
-    signOut(): void {
-        throw new Error("Method not implemented.");
+    signIn(accountID: string, signingURL: string, relayerAPI: RelayerAPI): boolean {
+        if (this.getActiveAccount()?.accountID === accountID) {
+            return true;
+        }
+
+        const account = this.accountService.getAccount(accountID);
+        if (!account) {
+            return false;
+        }
+
+        if (account.signingURL !== signingURL || (account.relayerAPI && account.relayerAPI !== relayerAPI)) {
+            this.accountService.updateAccount(accountID, signingURL, relayerAPI);
+        }
+
+        this.accountService.setActive(accountID);
+        return true;
     }
 
     /**
      * @inheritdoc
      */
-    signInitialTx(_request: SignInitialTxRequest): string {
-        throw new Error("Method not implemented.");
+    getActiveAccount(): Account | undefined {
+        return this.accountService.getActive();
     }
 
     /**
      * @inheritdoc
      */
-    signWithFullAccessKey(_request: SignWithFakRequest): string {
-        throw new Error("Method not implemented.");
+    signOut(): void {
+        this.accountService.clearActiveAccount();
     }
 
     /**
      * @inheritdoc
      */
-    accountId(): string {
-        throw new Error("Method not implemented.");
+    signInitialTx(request: SignInitialTxRequest): string {
+        if (!this.config.redirectURL) {
+            throw new ClientError(ClientErrorCodes.REDIRECT_URL_NOT_SET);
+        }
+
+        if (!this.config.relayerAPI) {
+            throw new ClientError(ClientErrorCodes.RELAYER_API_NOT_SET);
+        }
+
+        const { accountID, signingURL, permissions } = request;
+
+        const account = this.accountService.getAccount(accountID);
+        if (account) {
+            throw new ClientError(ClientErrorCodes.ACCOUNT_ALREADY_EXISTS);
+        }
+
+        const { keypair } = this.accountService.createAccount(accountID, signingURL, this.config.relayerAPI);
+
+        const msg = new MsgSignInitialTx(this.config.redirectURL, permissions, keypair.getPublicKey());
+        return msg.toURL(signingURL);
     }
 
     /**
      * @inheritdoc
      */
-    relayerAPI(): string {
-        throw new Error("Method not implemented.");
+    signWithFullAccessKey(request: SignWithFakRequest): string {
+        if (!this.config.redirectURL) {
+            throw new ClientError(ClientErrorCodes.REDIRECT_URL_NOT_SET);
+        }
+
+        const { transaction, signingURL } = request;
+
+        const msg = new MsgFakSign(transaction, this.config.redirectURL);
+        return msg.toURL(signingURL);
     }
 
     /**
      * @inheritdoc
      */
-    signingURL(): string {
-        throw new Error("Method not implemented.");
+    getConfig(): C {
+        return this.config;
     }
 }

packages/dapp/core/src/common/account/account.service.ts

@@ -2,6 +2,7 @@ import { KeyPair } from "near-api-js/lib/utils";
 import { IAccountRepository } from "./interfaces";
 import { IAccountService } from "../client/interfaces/i-account.service";
 import { Account } from "./account.types";
+import { RelayerAPI } from "@one-click-connect/core/relayer";
 
 export class AccountService implements IAccountService {
     constructor(private readonly accountRepository: IAccountRepository) {}
@@ -37,9 +38,9 @@ export class AccountService implements IAccountService {
     /**
      * @inheritdoc
      */
-    createAccount(accountId: string, signingURL: string, curve: string = "ed25519"): Account {
-        const keypair = KeyPair.fromRandom(curve);
-        const account = this.accountRepository.create(accountId, keypair, signingURL);
+    createAccount(accountId: string, signingURL: string, relayerAPI?: RelayerAPI): Account {
+        const keypair = KeyPair.fromRandom("ed25519");
+        const account = this.accountRepository.create(accountId, keypair, signingURL, relayerAPI);
         this.accountRepository.setActive(accountId);
         return account;
     }

packages/dapp/core/src/common/account/account.types.ts

@@ -1,7 +1,9 @@
+import { RelayerAPI } from "@one-click-connect/core/relayer";
 import { KeyPair } from "near-api-js/lib/utils";
 
 export type Account = {
     accountID: string;
     keypair: KeyPair;
     signingURL: string;
+    relayerAPI?: RelayerAPI;
 };

packages/dapp/core/src/common/account/interfaces/i-account.repository.ts

@@ -1,5 +1,6 @@
 import { KeyPair } from "near-api-js/lib/utils";
 import { Account } from "../account.types";
+import { RelayerAPI } from "@one-click-connect/core/relayer";
 
 export interface IAccountRepository {
     /**
@@ -18,13 +19,13 @@ export interface IAccountRepository {
      * @param accountId The account ID to create.
      * @param keypair The keypair to associate with the account.
      */
-    create(accountId: string, keypair: KeyPair, signingURL: string): Account;
+    create(accountId: string, keypair: KeyPair, signingURL: string, relayerAPI?: RelayerAPI): Account;
     /**
      * Updates an existing account entry.
      * @param accountId The account ID to update.
      * @param keypair The new keypair to associate with the account.
      */
-    update(accountId: string, keypair?: KeyPair, signingURL?: string): void;
+    update(accountId: string, keypair?: KeyPair, signingURL?: string, relayerAPI?: RelayerAPI): void;
     /**
      * Deletes an account entry.
      * @param accountId The account ID to delete.

packages/dapp/core/src/common/account/states/account-store.state.ts

@@ -1,3 +1,4 @@
+import { RelayerAPI } from "@one-click-connect/core/relayer";
 import { KeyPair } from "near-api-js/lib/utils";
 
 export type AccountStoreState = {
@@ -8,4 +9,5 @@ export type AccountStoreState = {
 export type AccountStoreAccount = {
     keypair: KeyPair;
     signingURL: string;
+    relayerAPI?: RelayerAPI;
 };

packages/dapp/core/src/common/client/errors/client.error-codes.ts

@@ -1,4 +1,5 @@
 export enum ClientErrorCodes {
     ACCOUNT_ALREADY_EXISTS = "ACCOUNT_ALREADY_EXISTS",
     REDIRECT_URL_NOT_SET = "REDIRECT_URL_NOT_SET",
+    RELAYER_API_NOT_SET = "RELAYER_API_NOT_SET",
 }

packages/dapp/core/src/common/client/interfaces/i-account.service.ts

@@ -1,4 +1,5 @@
 import { Account } from "../../account/account.types";
+import { RelayerAPI } from "@one-click-connect/core/relayer";
 
 export interface IAccountService {
     /**
@@ -24,9 +25,11 @@ export interface IAccountService {
     /**
      * Creates a new account.
      * @param accountId The ID of the account to create.
+     * @param signingURL The signing URL of the account.
+     * @param relayerAPI The relayer API of the account.
      * @returns The created account.
      */
-    createAccount(accountId: string, signingURL: string): Account;
+    createAccount(accountId: string, signingURL: string, relayerAPI?: RelayerAPI): Account;
     /**
      * Deletes an account.
      * @param accountId The ID of the account to delete.
@@ -36,6 +39,7 @@ export interface IAccountService {
      * Updates an account.
      * @param accountId The ID of the account to update.
      * @param signingURL The signing URL of the account.
+     * @param relayerAPI The relayer API of the account.
      */
-    updateAccount(accountId: string, signingURL: string): void;
+    updateAccount(accountId: string, signingURL: string, relayerAPI?: RelayerAPI): void;
 }