Skip to content

Commit

Permalink
chore: initial repo clean (#392)
Browse files Browse the repository at this point in the history
  • Loading branch information
dutterbutter authored May 19, 2022
1 parent 4fee717 commit c58117a
Show file tree
Hide file tree
Showing 69 changed files with 50 additions and 808 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/pr-any.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
yarn install --frozen-lockfile
yarn lint
test:
name: Test
ts-check:
name: ts-check
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -31,10 +31,10 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: test
- name: check
run: |
yarn install --frozen-lockfile
yarn test
yarn ts-check
build_code:
name: Build Code
Expand All @@ -52,5 +52,3 @@ jobs:
run: |
yarn install --frozen-lockfile
yarn build:dapp:production
# yarn build:dashboard
3 changes: 0 additions & 3 deletions packages/apps/public/assets/websnark.js
Original file line number Diff line number Diff line change
Expand Up @@ -5702,7 +5702,6 @@ object-assign

triggerComponent(c) {
this.log('Component Treiggered: ' + this.circuit.components[c].name);
// console.log("Start Component Treiggered: " + this.circuit.components[c].name);

// Set notInitSignals to -1 to not initialize again
this.notInitSignals[c]--;
Expand All @@ -5723,7 +5722,6 @@ object-assign
this.circuit.templates[template](this);
this.scopes = oldScope;
this.currentComponent = oldComponent;
// console.log("End Component Treiggered: " + this.circuit.components[c].name);
}

callFunction(functionName, params) {
Expand Down Expand Up @@ -5943,7 +5941,6 @@ object-assign
return S;
};
const S = `[ ${lc2str(c[0])} ] * [ ${lc2str(c[1])} ] - [ ${lc2str(c[2])} ] = 0`;
console.log(S);
}

printConstraints() {
Expand Down
34 changes: 0 additions & 34 deletions packages/apps/src/configs/chains/chain-config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// import ArbitrumLogo from '@webb-dapp/apps/configs/logos/chains/ArbitrumLogo';
// import EdgewareLogo from '@webb-dapp/apps/configs/logos/chains/EdgewareLogo';
import GanacheLogo from '@webb-dapp/apps/configs/logos/chains/GanacheLogo';
// import HarmonyLogo from '@webb-dapp/apps/configs/logos/chains/HarmonyLogo';
// import OptimismLogo from '@webb-dapp/apps/configs/logos/chains/OptimismLogo';
Expand Down Expand Up @@ -33,39 +32,6 @@ export const chainsConfig: AppConfig['chains'] = {
currencies: [WebbCurrencyId.WEBB, WebbCurrencyId.TEST],
nativeCurrencyId: WebbCurrencyId.WEBB,
},
// this is the EVM edgeware
// [InternalChainId.EdgewareTestNet]: {
// chainType: ChainType.EVM,
// group: 'edgeware',
// tag: 'test',
// id: InternalChainId.EdgewareTestNet,
// chainId: EVMChainId.Beresheet,
// name: 'Beresheet (Edgeware Testnet)',
// url: 'wss://beresheet1.edgewa.re',
// evmRpcUrls: ['https://beresheet.edgewa.re/evm'],
// logo: EdgewareLogo,
// currencies: [WebbCurrencyId.TEDG],
// nativeCurrencyId: WebbCurrencyId.TEDG,
// },
// [ChainId.Edgeware]: {
// chainType: ChainType,
// group: 'edgeware',
// tag: 'live',
// id: ChainId.Edgeware,
// evmId: EVMChain.Edgeware,
// name: 'Edgeware',
// evmRpcUrls: ['https://mainnet.edgewa.re/evm'],
// url: 'wss://mainnet1.edgewa.re',
// logo: EdgewareLogo,
// currencies: [
// {
// currencyId: WebbCurrencyId.EDG,
// enabled: true,
// },
// ],
// nativeCurrencyId: WebbCurrencyId.EDG,
// },

// [InternalChainId.Rinkeby]: {
// chainType: ChainType.EVM,
// group: 'eth',
Expand Down
23 changes: 0 additions & 23 deletions packages/apps/src/configs/currencies/currency-config.ts
Original file line number Diff line number Diff line change
@@ -1,44 +1,21 @@
import EdgewareLogo from '@webb-dapp/apps/configs/logos/chains/EdgewareLogo';
import GanacheLogo from '@webb-dapp/apps/configs/logos/chains/GanacheLogo';
import HarmonyLogo from '@webb-dapp/apps/configs/logos/chains/HarmonyLogo';
import PolygonLogo from '@webb-dapp/apps/configs/logos/chains/PolygonLogo';
import ShidenLogo from '@webb-dapp/apps/configs/logos/chains/ShidenLogo';
import WEBBLogo from '@webb-dapp/apps/configs/logos/chains/WebbLogo';
import EtherLogo from '@webb-dapp/apps/configs/logos/Eth';
import { PolkaLogo } from '@webb-dapp/apps/configs/logos/PolkaLogo';
import WebbWrappedLogo from '@webb-dapp/apps/configs/logos/WebbWrappedLogo';
import {
AppConfig,
CurrencyRole,
CurrencyType,
InternalChainId,
WebbCurrencyId,
ZERO,
zeroAddress,
} from '@webb-tools/api-providers';
import React from 'react';

export const currenciesConfig: AppConfig['currencies'] = {
[WebbCurrencyId.EDG]: {
name: 'Edgeware token',
symbol: 'EDG',
color: '',
id: WebbCurrencyId.EDG,
type: CurrencyType.ORML,
role: CurrencyRole.Wrappable,
icon: React.createElement(EdgewareLogo),
addresses: new Map(),
},
[WebbCurrencyId.TEDG]: {
name: 'Edgeware testnet token',
symbol: 'tEDG',
color: '',
id: WebbCurrencyId.TEDG,
type: CurrencyType.ORML,
role: CurrencyRole.Wrappable,
icon: React.createElement(EdgewareLogo),
addresses: new Map(),
},
[WebbCurrencyId.ETH]: {
name: 'Ethereum',
symbol: 'ETH',
Expand Down
1 change: 1 addition & 0 deletions packages/apps/src/configs/ipfs/evm/anchors.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// @ts-ignore
import { getCachedFixtureURI, withLocalFixtures } from '@webb-dapp/utils/misc';

export const fetchWasmForEdges = async (maxEdges: number) => {
Expand Down
31 changes: 0 additions & 31 deletions packages/apps/src/configs/logos/chains/EdgewareLogo.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

export const TornadoPageLogo: React.FC = () => {
export const MixerPageLogo: React.FC = () => {
return (
<svg width='14' height='22' viewBox='0 0 14 22' fill='none' xmlns='http://www.w3.org/2000/svg'>
<path
Expand Down
2 changes: 0 additions & 2 deletions packages/apps/src/configs/relayer-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ export function relayerNameToChainId(name: string): InternalChainId {
case 'ganache':
return InternalChainId.Ganache;
case 'webb':
case 'edgeware':
case 'hedgeware':
break;
case 'ropsten':
return InternalChainId.Ropsten;
Expand Down
3 changes: 0 additions & 3 deletions packages/apps/src/configs/wallets/wallets-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import { InternalChainId } from '@webb-tools/api-providers';
import { WalletId } from '../wallets/wallet-id.enum';

const ANY_EVM = [
InternalChainId.Edgeware,
InternalChainId.EdgewareTestNet,
InternalChainId.EthereumMainNet,
InternalChainId.Rinkeby,
InternalChainId.Kovan,
Expand Down Expand Up @@ -37,7 +35,6 @@ export const walletsConfig: AppConfig['wallet'] = {
return true;
},
supportedChainIds: [
InternalChainId.EdgewareLocalNet,
InternalChainId.EggStandalone,
InternalChainId.EggDevelopStandalone,
InternalChainId.DkgSubstrateStandalone,
Expand Down
6 changes: 3 additions & 3 deletions packages/apps/src/sidebar-config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { CommonWealthLogo } from './configs/logos/CommonWealthLogo';
import { DiscordLogo } from './configs/logos/DiscordLogo';
import { GithubLogo } from './configs/logos/GithubLogo';
import { BridgePageLogo } from './configs/logos/pages/BridgePageLogo';
import { TornadoPageLogo } from './configs/logos/pages/TornadoPageLogo';
import { MixerPageLogo } from './configs/logos/pages/MixerPageLogo';
import { WrapPageLogo } from './configs/logos/pages/WrapPageLogo';
import { TelegramLogo } from './configs/logos/TelegramLogo';
import { TwitterLogo } from './configs/logos/TwitterLogo';
Expand All @@ -15,7 +15,7 @@ export const sideBarConfig: SidebarConfig = {
{
path: 'mixer',
name: 'Mixers',
icon: <TornadoPageLogo />,
icon: <MixerPageLogo />,
},
{
path: 'bridge',
Expand All @@ -36,7 +36,7 @@ export const sideBarConfig: SidebarConfig = {
rel: 'twitter',
},
{
href: 'https://discord.gg/cBQHf6B7',
href: 'https://discord.gg/cv8EfJu3Tn',
icon: <DiscordLogo />,
name: 'Discord',
rel: 'discord',
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge/src/components/Deposit/Deposit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const Deposit: React.FC<DepositProps> = () => {

const { tokens: bridgeCurrencies } = useBridge();
const bridgeDepositApi = useBridgeDeposit();
const { depositApi, selectedBridgeCurrency, setSelectedCurrency } = bridgeDepositApi;
const { selectedBridgeCurrency, setSelectedCurrency } = bridgeDepositApi;

const { setWrappableToken, wrappableToken, wrappableTokens } = useWrapUnwrap();
const { activeApi, activeChain, activeWallet, chains, loading, switchChain } = useWebContext();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ interface DepositAmountDecalProps {
}

export const DepositAmountDecal: React.FC<DepositAmountDecalProps> = ({ amount, symbol }) => {
const palette = useColorPallet();
useColorPallet();

return (
<DecalWrapper>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ export const DepositConfirm: React.FC<DepositInfoProps> = ({
destChain,
mixerSize,
onClose,
onSuccess,
open,
provider,
wrappableAsset,
}) => {
Expand Down
5 changes: 1 addition & 4 deletions packages/bridge/src/components/Withdraw/Withdraw.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import { FeesInfo, RelayerApiAdapter, RelayerInput } from '@webb-dapp/ui-compone
import { Modal } from '@webb-dapp/ui-components/Modal/Modal';
import { Pallet } from '@webb-dapp/ui-components/styling/colors';
import {
ActiveWebbRelayer,
ChainType,
chainTypeIdToInternalId,
getChainNameFromChainId,
parseChainIdType,
Expand All @@ -24,7 +22,7 @@ import {
import { WalletConfig } from '@webb-tools/api-providers/types/wallet-config.interface';
import { Note } from '@webb-tools/sdk-core';
import { ethers } from 'ethers';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import React, { useEffect, useMemo, useState } from 'react';
import styled, { css } from 'styled-components';

const WithdrawWrapper = styled.div<{ wallet: WalletConfig | undefined }>`
Expand Down Expand Up @@ -160,7 +158,6 @@ export const Withdraw: React.FC<WithdrawProps> = () => {
note: depositNote,
});
const appConfig = useAppConfig();
const { currencies: currenciesConfig } = appConfig;

const shouldSwitchChain = useMemo(() => {
if (!depositNote || !activeChain) {
Expand Down
6 changes: 0 additions & 6 deletions packages/bridge/src/hooks/deposit/useBridgeDeposit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ import {
MixerDeposit,
MixerSize,
} from '@webb-tools/api-providers';
import { LoggerService } from '@webb-tools/app-util';
import { useCallback, useEffect, useMemo, useState } from 'react';

const logger = LoggerService.get('useBridgeDeposit');

export interface BridgeDepositApi {
mixerSizes: MixerSize[];

Expand Down Expand Up @@ -71,12 +67,10 @@ export const useBridgeDeposit = (): BridgeDepositApi => {
const subscribe = bridgeApi.$store.subscribe((bridge) => {
depositApi.getSizes().then((mixerSizes) => {
mixerSizes.filter((mixerSize) => {
console.log('mixerSize: ', mixerSize);
mixerSize.id === selectedBridgeCurrency?.id;
});
setMixerSizes(mixerSizes);
});
console.log(bridgeApi.currency);
setSelectedBridgeCurrency(bridgeApi.currency);
});
return () => {
Expand Down
3 changes: 0 additions & 3 deletions packages/bridge/src/hooks/withdraw/useWithdraw.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@ import {
WebbRelayer,
WithdrawState,
} from '@webb-tools/api-providers';
import { LoggerService } from '@webb-tools/app-util';
import { Note } from '@webb-tools/sdk-core';
import { useCallback, useEffect, useMemo, useState } from 'react';

import { useBridge } from '../bridge/use-bridge';

const logger = LoggerService.get('useWithdrawHook');

export type UseWithdrawProps = {
note: Note | null;
recipient: string;
Expand Down
20 changes: 0 additions & 20 deletions packages/bridge/src/utils/currency/coins-icon/EDG.svg

This file was deleted.

18 changes: 4 additions & 14 deletions packages/bridge/src/utils/currency/constants.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
import EdgewareIcon from './coins-icon/EDG.svg';
import WebbIcon from './coins-icon/webb-icon.svg';
const WebbIcon = require('./coins-icon/webb-icon.svg') as string;

export const TOKEN_COLOR: Map<string, string> = new Map([
['SYSTEM', '#173DC9'],
['EDG', '#173dc9'],
]);
export const TOKEN_COLOR: Map<string, string> = new Map([['SYSTEM', '#173DC9']]);

export const TOKEN_IMAGES: Map<string, string> = new Map([
['EDG', EdgewareIcon],
['WEBB', WebbIcon],
]);
export const TOKEN_IMAGES: Map<string, string> = new Map([['WEBB', WebbIcon]]);

export const TOKEN_FULLNAMES: Map<string, string> = new Map([
['EDG', 'Edgeware'],
['WEBB', 'WebbToken'],
]);
export const TOKEN_FULLNAMES: Map<string, string> = new Map([['WEBB', 'WebbToken']]);
1 change: 0 additions & 1 deletion packages/mixer/src/components/Deposit/Deposit.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Typography } from '@material-ui/core';
import { chainsConfig } from '@webb-dapp/apps/configs';
import { DepositConfirm } from '@webb-dapp/mixer/components/DepositConfirm/DepositConfirm';
import { useDeposit } from '@webb-dapp/mixer/hooks/deposit/useDeposit';
import { RequiredWalletSelection } from '@webb-dapp/react-components/RequiredWalletSelection/RequiredWalletSelection';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ export const DepositConfirm: React.FC<DepositInfoProps> = ({ mixerSize, onClose,
return;
}
let desiredMixer: string | number = '';
console.log('mixerId in depositConfirm: ', mixerSize.id);
// MixerIds may be strings or numbers. EVM Mixer ids will have a 'Bridge' prefix.
if (typeof mixerSize.id === 'string') {
mixerSize.id.includes('Bridge') ? (desiredMixer = mixerSize.id) : (desiredMixer = Number(mixerSize.id));
Expand Down
Loading

0 comments on commit c58117a

Please sign in to comment.