Change to remove temporary accounts immediately after use

bosagora · Jun 14, 2024 · 150c782 · 150c782
1 parent f33a041
commit 150c782
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/packages/relay/src/routers/LedgerRouter.ts b/packages/relay/src/routers/LedgerRouter.ts
@@ -364,7 +364,7 @@ export class LedgerRouter {
         try {
             let account: string = String(req.params.account).trim();
             if (ContractUtils.isTemporaryAccount(account)) {
-                const realAccount = await this.storage.getRealAccount(account);
+                const realAccount = await this.storage.getRealAccountOnTemporary(account);
                 if (realAccount === undefined) {
                     return res.status(200).json(ResponseMessage.getErrorMessage("2004"));
                 } else {

diff --git a/packages/relay/src/routers/PaymentRouter.ts b/packages/relay/src/routers/PaymentRouter.ts
@@ -211,7 +211,7 @@ export class PaymentRouter {
             if (!ContractUtils.verifyMessage(account, message, signature)) {
                 return res.status(200).json(ResponseMessage.getErrorMessage("1501"));
             }
-            const temporaryAccount = await this.storage.getTemporaryAccount(account);
+            const temporaryAccount = await this.storage.getAccountOnTemporary(account);
             this.metrics.add("success", 1);
             return res.status(200).json(
                 this.makeResponseData(0, {
@@ -242,7 +242,7 @@ export class PaymentRouter {
         try {
             let account: string = String(req.query.account).trim();
             if (ContractUtils.isTemporaryAccount(account)) {
-                const realAccount = await this.storage.getRealAccount(account);
+                const realAccount = await this.storage.getRealAccountOnTemporary(account);
                 if (realAccount === undefined) {
                     return res.status(200).json(ResponseMessage.getErrorMessage("2004"));
                 } else {
@@ -320,11 +320,13 @@ export class PaymentRouter {
             }
 
             let account: string = String(req.body.account).trim();
+            let temporaryAccount: string = "";
             if (ContractUtils.isTemporaryAccount(account)) {
-                const realAccount = await this.storage.getRealAccount(account);
+                const realAccount = await this.storage.getRealAccountOnTemporary(account);
                 if (realAccount === undefined) {
                     return res.status(200).json(ResponseMessage.getErrorMessage("2004"));
                 } else {
+                    temporaryAccount = account;
                     account = realAccount;
                 }
             }
@@ -432,6 +434,12 @@ export class PaymentRouter {
                 await this._sender.send(to, title, contents.join(", "), data);
             }
 
+            try {
+                if (temporaryAccount !== "") await this.storage.removeAccountTemporary(temporaryAccount);
+            } catch (_) {
+                //
+            }
+
             this.metrics.add("success", 1);
             return res.status(200).json(
                 this.makeResponseData(0, {

diff --git a/packages/relay/src/scheduler/CloseScheduler.ts b/packages/relay/src/scheduler/CloseScheduler.ts
@@ -230,6 +230,6 @@ export class CloseScheduler extends Scheduler {
     }
 
     private async onRemoveExpiredAccount() {
-        await this.storage.removeExpiredAccount();
+        await this.storage.removeExpiredAccountOnTemporary();
     }
 }
diff --git a/packages/relay/src/storage/RelayStorage.ts b/packages/relay/src/storage/RelayStorage.ts
@@ -840,19 +840,17 @@ export class RelayStorage extends Storage {
     }
     /// endregion
 
-    public async getTemporaryAccount(account: string): Promise<string> {
+    public async getAccountOnTemporary(account: string): Promise<string> {
         let temporary_account: string;
         while (true) {
             temporary_account = ContractUtils.getTemporaryAccount();
-            if ((await this.getRealAccount(temporary_account)) === undefined) break;
+            if ((await this.getRealAccountOnTemporary(temporary_account)) === undefined) break;
         }
 
-        const timestamp = ContractUtils.getTimeStampBigInt();
         return new Promise<string>(async (resolve, reject) => {
             this.queryForMapper("temporary_accounts", "postAccount", {
                 account: account.toLowerCase(),
                 temporary_account: temporary_account.toLowerCase(),
-                timestamp: timestamp.toString(),
             })
                 .then(() => {
                     return resolve(temporary_account);
@@ -864,11 +862,10 @@ export class RelayStorage extends Storage {
         });
     }
 
-    public getRealAccount(temporary_account: string): Promise<string | undefined> {
+    public getRealAccountOnTemporary(temporary_account: string): Promise<string | undefined> {
         return new Promise<string | undefined>(async (resolve, reject) => {
             this.queryForMapper("temporary_accounts", "getRealAccount", {
                 temporary_account,
-                timestamp: (ContractUtils.getTimeStampBigInt() - BigInt(60)).toString(),
             })
                 .then((result) => {
                     if (result.rows.length > 0) {
@@ -884,7 +881,7 @@ export class RelayStorage extends Storage {
         });
     }
 
-    public removeExpiredAccount(): Promise<void> {
+    public removeExpiredAccountOnTemporary(): Promise<void> {
         return new Promise<void>(async (resolve, reject) => {
             this.queryForMapper("temporary_accounts", "removeExpiredAccount", {})
                 .then((result) => {
@@ -897,6 +894,19 @@ export class RelayStorage extends Storage {
         });
     }
 
+    public removeAccountTemporary(temporary_account: string): Promise<void> {
+        return new Promise<void>(async (resolve, reject) => {
+            this.queryForMapper("temporary_accounts", "removeAccount", { temporary_account })
+                .then((result) => {
+                    return resolve();
+                })
+                .catch((reason) => {
+                    if (reason instanceof Error) return reject(reason);
+                    return reject(new Error(reason));
+                });
+        });
+    }
+
     // region Delegator
     public async createDelegator(account: string, key: string): Promise<string> {
         const wallet = hre.ethers.Wallet.createRandom();

diff --git a/packages/relay/src/storage/mapper/temporary_accounts.xml b/packages/relay/src/storage/mapper/temporary_accounts.xml
@@ -30,4 +30,8 @@
     <select id="removeExpiredAccount">
         DELETE FROM temporary_accounts WHERE EXTRACT(EPOCH FROM (now() - "timestamp")) <![CDATA[>]]> 300;
     </select>
+
+    <select id="removeAccount">
+        DELETE FROM temporary_accounts WHERE LOWER("temporary_account") = LOWER(#{temporary_account});
+    </select>
 </mapper>