refactor: support xdc address in api

src/chains/ethereum/ethereum-base.ts

@@ -18,6 +18,7 @@ import fse from 'fs-extra';
 import { ConfigManagerCertPassphrase } from '../../services/config-manager-cert-passphrase';
 import { logger } from '../../services/logger';
 import { ReferenceCountingCloseable } from '../../services/refcounting-closeable';
+import { convertXdcPublicKey } from '../../helpers';
 
 // information about an Ethereum token
 export interface TokenInfo {
@@ -191,7 +192,7 @@ export class EthereumBase {
     const path = `${walletPath}/${this.chainName}`;
 
     const encryptedPrivateKey: string = await fse.readFile(
-      `${path}/${address}.json`,
+      `${path}/${convertXdcPublicKey(address)}.json`,
       'utf8'
     );
 

src/chains/ethereum/ethereum.validators.ts

@@ -32,7 +32,7 @@ export const invalidNetworkError: string = 'The network param is not a string.';
 
 // test if a string matches the shape of an Ethereum address
 export const isAddress = (str: string): boolean => {
-  return /^0x[a-fA-F0-9]{40}$/.test(str);
+  return /^(0x|xdc)[a-fA-F0-9]{40}$/.test(str);
 };
 
 // given a request, look for a key called address that is an Ethereum wallet

src/chains/xdc/xdc.ts

@@ -8,6 +8,7 @@ import { XsswapConfig } from '../../connectors/xsswap/xsswap.config';
 import { GlobianceConfig } from '../../connectors/globiance/globiance.config';
 import { Ethereumish } from '../../services/common-interfaces';
 import { ConfigManagerV2 } from '../../services/config-manager-v2';
+import { convertXdcPublicKey } from '../../helpers';
 
 export class Xdc extends EthereumBase implements Ethereumish {
   private static _instances: { [name: string]: Xdc };
@@ -71,7 +72,7 @@ export class Xdc extends EthereumBase implements Ethereumish {
     } else if (reqSpender === 'globiance') {
       spender = GlobianceConfig.config.routerAddress(this._chain);
     } else {
-      spender = reqSpender;
+      spender = convertXdcPublicKey(reqSpender);
     }
     return spender;
   }

src/chains/xdc/xdc.validators.ts

@@ -14,7 +14,7 @@ import {
 } from '../ethereum/ethereum.validators';
 
 export const invalidSpenderError: string =
-  'The spender param is not a valid xdc address (0x followed by 40 hexidecimal characters).';
+  'The spender param is invalid (should be 0x|xdc followed by 40 hexidecimal characters).';
 
 // given a request, look for a key called spender that is 'xsswap' or 'globiance' or an Ethereum address
 export const validateSpender: Validator = mkValidator(

src/helpers.ts

@@ -0,0 +1,16 @@
+/**
+ * Returns the new address.
+ *
+ * This function convert xdc address prefix to 0x.
+ */
+export function convertXdcPublicKey(publicKey: string): string {
+  return publicKey.length === 43 && publicKey.slice(0, 3) === 'xdc'
+    ? '0x' + publicKey.slice(3)
+    : publicKey;
+}
+
+export function convertXdcPrivateKey(privateKey: string): string {
+  return privateKey.length === 67 && privateKey.slice(0, 3) === 'xdc'
+    ? '0x' + privateKey.slice(3)
+    : privateKey;
+}

src/services/wallet/wallet.controllers.ts

@@ -29,6 +29,8 @@ import {
 import { EthereumBase } from '../../chains/ethereum/ethereum-base';
 import { Near } from '../../chains/near/near';
 
+import { convertXdcPrivateKey } from '../../helpers';
+
 const walletPath = './conf/wallets';
 export async function mkdirIfDoesNotExist(path: string): Promise<void> {
   const exists = await fse.pathExists(path);
@@ -86,6 +88,7 @@ export async function addWallet(
 
   try {
     if (connection instanceof EthereumBase) {
+      req.privateKey = convertXdcPrivateKey(req.privateKey);
       address = connection.getWalletFromPrivateKey(req.privateKey).address;
       encryptedPrivateKey = await connection.encrypt(
         req.privateKey,

src/services/wallet/wallet.validators.ts

@@ -18,7 +18,7 @@ export const invalidCosmosPrivateKeyError: string =
 
 // test if a string matches the shape of an Ethereum private key
 export const isEthPrivateKey = (str: string): boolean => {
-  return /^(0x)?[a-fA-F0-9]{64}$/.test(str);
+  return /^(0x|xdc)?[a-fA-F0-9]{64}$/.test(str);
 };
 
 // test if a string matches the Near private key encoding format (i.e. <curve>:<encoded key>')