refactor: allowed destinations

rsksmart · Feb 13, 2024 · dc9af6e · dc9af6e
1 parent e6760c1
commit dc9af6e
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 61 deletions.
diff --git a/Readme.md b/Readme.md
@@ -113,7 +113,6 @@ File [./config/default.json5](config/default.json5) contains all configuration p
    fixedUsdFee: 0 ,
 
    sponsoredDestinations: [],
-   allowedDestinations: [],
    requestMinValidSeconds: 43200,
 
   },

diff --git a/config/default.json5 b/config/default.json5
@@ -51,7 +51,6 @@
    fixedUsdFee: 0 ,
 
    sponsoredDestinations: [],
-   allowedDestinations: [],
    requestMinValidSeconds: 43200,
 
   },

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/RelayServer.ts b/src/RelayServer.ts
@@ -61,7 +61,6 @@ import {
   convertGasToTokenAndNative,
   calculateFee,
   validateExpirationTime,
-  isDestinationAllowed,
 } from './relayServerUtils';
 import { getPastEventsForHub } from './getPastEventsForHub';
 import type { PastEventOptions } from './definitions';
@@ -295,8 +294,6 @@ export class RelayServer extends EventEmitter {
       relayRequest.request.validUntilTime,
       requestMinValidSeconds
     );
-
-    await isDestinationAllowed(relayRequest, this.config.app);
   }
 
   async validateVerifier(

diff --git a/src/ServerConfigParams.ts b/src/ServerConfigParams.ts
@@ -21,7 +21,6 @@ type AppConfig = {
   gasFeePercentage: number;
   disableSponsoredTx: boolean;
   sponsoredDestinations: Array<string>;
-  allowedDestinations: Array<string>;
   requestMinValidSeconds: number;
   transferFeePercentage: number;
   fixedUsdFee: number;

diff --git a/src/relayServerUtils.ts b/src/relayServerUtils.ts
@@ -176,19 +176,6 @@ async function isSponsorshipAllowed(
   );
 }
 
-async function isDestinationAllowed(
-  envelopingRequest: EnvelopingRequest,
-  config: AppConfig
-): Promise<void> {
-  const { allowedDestinations } = config;
-
-  const to = await envelopingRequest.request.to;
-
-  if (to != constants.AddressZero && !allowedDestinations.includes(to)) {
-    throw new Error('Destination contract is not allowed');
-  }
-}
-
 function getMethodHashFromData(data: string) {
   return data.substring(2, 10);
 }
@@ -413,7 +400,6 @@ export {
   calculateFee,
   convertGasToTokenAndNative,
   isSponsorshipAllowed,
-  isDestinationAllowed,
   TRANSFER_HASH,
   TRANSFER_FROM_HASH,
   validateExpirationTime,

diff --git a/src/serverConfigParamsUtils.ts b/src/serverConfigParamsUtils.ts
@@ -66,7 +66,6 @@ const appSchema = Joi.object({
   fixedUsdFee: Joi.number().optional(),
   disableSponsoredTx: Joi.boolean().required(),
   sponsoredDestinations: Joi.array().items(Joi.string().custom(isAddress)),
-  allowedDestinations: Joi.array().items(Joi.string().custom(isAddress)),
   requestMinValidSeconds: Joi.number().min(0).required(),
 });