chore: flatten config directory (#94)

Author: dan-ziv

src/__tests__/utils/blockchain/starknet.spec.js

@@ -1,9 +1,21 @@
 import {ChainType, TransactionHashPrefix} from '../../../enums';
 import utils from '../../../utils';
 
-describe('starknet', () => {
+const {getTransactionHash, hashEquals} = utils.blockchain.starknet;
+
+describe('starknet blockchain utils', () => {
+  describe('hashEquals', () => {
+    it('should compare hashes', () => {
+      expect(hashEquals([1, 2])).toBeTruthy();
+      expect(hashEquals([1, 2, 3], [1, 2, 3])).toBeTruthy();
+      expect(hashEquals([1, 2, 3], [1, 2, 3], [1, 2, 3])).toBeTruthy();
+      expect(hashEquals([1, 2, 3], [1, 2, 3], [1])).toBeFalsy();
+      expect(hashEquals([1, 2, 3], [1, 2])).toBeFalsy();
+    });
+  });
+
   describe('getTransactionHash', () => {
-    it('should calc tx hash', () => {
+    it('should calc tx hash from message params', () => {
       const from_address = '0xc3511006C04EF1d78af4C8E0e74Ec18A6E64Ff9e';
       const to_address =
         '3256441166037631918262930812410838598500200462657642943867372734773841898370';
@@ -17,7 +29,7 @@ describe('starknet', () => {
       ];
 
       expect(
-        utils.blockchain.starknet.getTransactionHash(
+        getTransactionHash(
           TransactionHashPrefix.L1_HANDLER,
           from_address,
           to_address,

src/__tests__/utils/date.spec.js

@@ -3,13 +3,13 @@ import utils from '../../utils';
 const {get24Time, getDate} = utils.date;
 
 describe('getDate', () => {
-  it('should get date', () => {
+  it('should return date of the form DD/MM/YYYY from timestamp', () => {
     expect(getDate(1644828892412)).toEqual('14/02/2022');
   });
 });
 
 describe('get24Time', () => {
-  it('should get 24 time', () => {
+  it('should return 24 time of the form HH:MM:SS from timestamp', () => {
     expect(get24Time(1644828892412).endsWith(':54:52')).toBeTruthy();
   });
 });

src/__tests__/utils/hash.spec.js

@@ -1,4 +1,4 @@
-import L2_ERC20_ABI from './ERC20.json';
+import L2_ERC20_ABI from './erc20.json';
 import L2_BRIDGE_ABI from './token_bridge.json';
 
 export {L2_ERC20_ABI, L2_BRIDGE_ABI};

src/abis/l2/ERC20.json src/abis/l2/erc20.json

@@ -1,4 +1,4 @@
-import {ChainType} from '../../../enums';
+import {ChainType} from '../enums';
 
 export const STARKNET_CONTRACT_ADDRESS = {
   [ChainType.MAIN.id]: '',

src/abis/l2/index.js

@@ -1,6 +1,83 @@
-import {ChainType, NetworkType} from '../../../enums';
+import {ChainType, NetworkType} from '../enums';
 
-export const L2Tokens = [
+const l1tokens = [
+  {
+    name: NetworkType.L1.tokenName,
+    symbol: NetworkType.L1.symbol,
+    decimals: 18,
+    bridgeAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0xc3511006C04EF1d78af4C8E0e74Ec18A6E64Ff9e'
+    }
+  },
+  {
+    name: 'Wrapped BTC',
+    symbol: 'WBTC',
+    decimals: 8,
+    bridgeAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0xf29aE3446Ce4688fCc792b232C21D1B9581E7baC'
+    },
+    tokenAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0xC04B0d3107736C32e19F1c62b2aF67BE61d63a05'
+    }
+  },
+  {
+    name: 'Goerli USD Coin',
+    symbol: 'USDC',
+    decimals: 6,
+    bridgeAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0xBA9cE9F22A3Cfa7Fcb5c31f6B2748b1e72C06204'
+    },
+    tokenAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0x07865c6e87b9f70255377e024ace6630c1eaa37f'
+    }
+  },
+  {
+    name: 'Tether USD',
+    symbol: 'USDT',
+    decimals: 6,
+    bridgeAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0xA1f590F18b23EFece02804704E5006E91348C997'
+    },
+    tokenAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0x509Ee0d083DdF8AC028f2a56731412edD63223B9'
+    }
+  },
+  {
+    name: 'DAI',
+    symbol: 'DAI',
+    decimals: 18,
+    bridgeAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0x3ebB6C28BD63aDa2feA81f1e6c5a50aFe53B5feE'
+    },
+    tokenAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0x11fE4B6AE13d2a6055C8D9cF65c55bac32B5d844'
+    }
+  },
+  {
+    name: 'SelfService',
+    symbol: 'SLF',
+    decimals: 6,
+    bridgeAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0x160e7631f22035149A01420cADD1012267551181'
+    },
+    tokenAddress: {
+      [ChainType.MAIN.id]: '',
+      [ChainType.GOERLI.id]: '0xd44BB808bfE43095dBb94c83077766382D63952a'
+    }
+  }
+];
+
+const l2tokens = [
   {
     name: NetworkType.L1.tokenName,
     symbol: NetworkType.L1.symbol,
@@ -80,3 +157,5 @@ export const L2Tokens = [
     }
   }
 ];
+
+export {l1tokens, l2tokens};

src/config/addresses/index.js

@@ -3,7 +3,7 @@ import {useCallback, useMemo} from 'react';
 import {L1_ERC20_ABI, L1_ERC20_BRIDGE_ABI, L1_ETH_BRIDGE_ABI, L1_MESSAGING_ABI} from '../abis/l1';
 import {L2_BRIDGE_ABI, L2_ERC20_ABI} from '../abis/l2';
 import {useTransferData} from '../components/Features/Transfer/Transfer.hooks';
-import {STARKNET_CONTRACT_ADDRESS} from '../config/addresses';
+import {STARKNET_CONTRACT_ADDRESS} from '../config/contracts';
 import {NetworkType} from '../enums';
 import {useL1Token} from '../providers/TokensProvider';
 import {useL1Wallet, useWallets} from '../providers/WalletsProvider';

src/config/addresses/tokens/tokens.l1.js

@@ -1,12 +1,13 @@
-import {L1Tokens, L2Tokens} from '../../config/addresses';
+import {l1tokens, l2tokens} from '../../config/tokens';
 
 export const actions = {
   UPDATE_TOKEN_STATE: 'Tokens/UPDATE_TOKEN_STATE'
 };
 
-const l1Tokens = L1Tokens.map(t => ({...t, isL1: true}));
-const l2Tokens = L2Tokens.map(t => ({...t, isL2: true}));
-export const initialState = [...l1Tokens, ...l2Tokens];
+export const initialState = [
+  ...l1tokens.map(t => ({...t, isL1: true})),
+  ...l2tokens.map(t => ({...t, isL2: true}))
+];
 
 export const reducer = (state, action) => {
   switch (action.type) {

src/config/addresses/contracts/contracts.l1.js src/config/contracts.js

@@ -81,3 +81,9 @@ export const getTransactionHash = (
     ...additionalData
   ]);
 };
+
+export const hashEquals = (...data) => {
+  return !!data.reduce((d1, d2) =>
+    starknet.hash.computeHashOnElements(d1) === starknet.hash.computeHashOnElements(d2) ? d1 : ''
+  );
+};

src/config/addresses/tokens/tokens.l2.js src/config/tokens.js

@@ -2,7 +2,6 @@ import strings from '../config/strings';
 import * as blockchain from './blockchain';
 import * as browser from './browser';
 import * as date from './date';
-import * as hash from './hash';
 import * as logger from './logger';
 import * as object from './object';
 import * as parser from './parser';
@@ -28,7 +27,6 @@ const utils = {
   string,
   token,
   parser,
-  hash,
   date,
   object,
   blockchain,