Skip to content

Commit 8567bbc

Browse files
ilge-ustunilge-ustun
authored
Merge pull request #140 from gnosischain/staging
feat: remove tokens not deployed by Omni (UDT) && small fixes
2 parents dcac0c8 + f4db208 commit 8567bbc

File tree

12 files changed

+365
-231
lines changed

12 files changed

+365
-231
lines changed

‎app/.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ NEXT_PUBLIC_GA_MEASUREMENT_ID=
1313
NEXT_PUBLIC_POLLING_INTERVAL=10000
1414

1515
# RPCs
16-
NEXT_PUBLIC_RPC_MAINNET=https://rpc.ankr.com/eth
16+
NEXT_PUBLIC_RPC_MAINNET=
1717
NEXT_PUBLIC_RPC_GNOSIS=https://rpc.gnosischain.com
1818
NEXT_PUBLIC_RPC_CHIADO=https://rpc.chiadochain.net
1919

‎app/.yarn/install-state.gz‎

1.05 KB
Binary file not shown.

‎app/next-env.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
/// <reference types="next/image-types/global" />
33

44
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
5+
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

‎app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"graphql-tag": "^2.12.6",
4545
"loader-utils": "^2.0.4",
4646
"lodash": "^4.17.21",
47-
"next": "^15.0.3",
47+
"next": "15.2.3",
4848
"nextjs-google-analytics": "^1.2.0",
4949
"nullthrows": "^1.1.1",
5050
"polished": "^4.2.2",

‎app/src/constants/bridged_tokens.json‎

Lines changed: 83 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -560,22 +560,6 @@
560560
"total_supply": "500000000000000",
561561
"type": "ERC-20"
562562
},
563-
{
564-
"bridge_type": "omni",
565-
"foreign_address": "0x0Cf0Ee63788A0849fE5297F3407f701E122cC023",
566-
"origin_chain_id": "1",
567-
"address": "0x796879025A627d34042E3eDd2E239E75ba4445e6",
568-
"circulating_market_cap": null,
569-
"decimals": "18",
570-
"exchange_rate": null,
571-
"holders": "4",
572-
"icon_url": null,
573-
"is_bridged": true,
574-
"name": "Streamr DATAcoin on xDai",
575-
"symbol": "DATA",
576-
"total_supply": "22001500000000000000",
577-
"type": "ERC-20"
578-
},
579563
{
580564
"bridge_type": "omni",
581565
"foreign_address": "0x0d438F3b5175Bebc262bF23753C1E53d03432bDE",
@@ -1232,22 +1216,6 @@
12321216
"total_supply": "5301790048175626811742",
12331217
"type": "ERC-20"
12341218
},
1235-
{
1236-
"bridge_type": "omni",
1237-
"foreign_address": "0x1A5F9352Af8aF974bFC03399e3767DF6370d82e4",
1238-
"origin_chain_id": "1",
1239-
"address": "0x750eCf8c11867Ce5Dbc556592c5bb1E0C6d16538",
1240-
"circulating_market_cap": null,
1241-
"decimals": "18",
1242-
"exchange_rate": null,
1243-
"holders": "2",
1244-
"icon_url": null,
1245-
"is_bridged": true,
1246-
"name": "OWL Token on xDai",
1247-
"symbol": "OWL",
1248-
"total_supply": "1100500000000000000",
1249-
"type": "ERC-20"
1250-
},
12511219
{
12521220
"bridge_type": "omni",
12531221
"foreign_address": "0x1a7e4e63778B4f12a199C062f3eFdD288afCBce8",
@@ -5504,22 +5472,6 @@
55045472
"total_supply": "99999999000000000000000000",
55055473
"type": "ERC-20"
55065474
},
5507-
{
5508-
"bridge_type": "omni",
5509-
"foreign_address": "0x90DE74265a416e1393A450752175AED98fe11517",
5510-
"origin_chain_id": "1",
5511-
"address": "0x24Cb95c7f0c39759c4165b053730126C7102BbE8",
5512-
"circulating_market_cap": null,
5513-
"decimals": "18",
5514-
"exchange_rate": null,
5515-
"holders": "25",
5516-
"icon_url": null,
5517-
"is_bridged": true,
5518-
"name": "Unlock Discount Token on xDai",
5519-
"symbol": "UDT",
5520-
"total_supply": "9936213363153110036806",
5521-
"type": "ERC-20"
5522-
},
55235475
{
55245476
"bridge_type": "omni",
55255477
"foreign_address": "0x910524678C0B1B23FFB9285a81f99C29C11CBaEd",
@@ -6208,22 +6160,6 @@
62086160
"total_supply": "9996401094414808439",
62096161
"type": "ERC-20"
62106162
},
6211-
{
6212-
"bridge_type": "omni",
6213-
"foreign_address": "0xA130E3a33a4d84b04c3918c4E5762223Ae252F80",
6214-
"origin_chain_id": "1",
6215-
"address": "0x601541640D14b0c707591b7e74b05E25C3983586",
6216-
"circulating_market_cap": null,
6217-
"decimals": "18",
6218-
"exchange_rate": null,
6219-
"holders": "1",
6220-
"icon_url": null,
6221-
"is_bridged": true,
6222-
"name": "Swash Token from Mainnet",
6223-
"symbol": "SWASH",
6224-
"total_supply": "600000000000000000000",
6225-
"type": "ERC-20"
6226-
},
62276163
{
62286164
"bridge_type": "omni",
62296165
"foreign_address": "0xA15C7Ebe1f07CaF6bFF097D8a589fb8AC49Ae5B3",
@@ -8464,22 +8400,6 @@
84648400
"total_supply": "15000000000000000000",
84658401
"type": "ERC-20"
84668402
},
8467-
{
8468-
"bridge_type": "omni",
8469-
"foreign_address": "0xe1cA72ff3434B131765c62Cbcbc26060F7Aba03D",
8470-
"origin_chain_id": "1",
8471-
"address": "0xF18CBdcD3E48E84eb12c2E38511f1eF4C5fbe9e4",
8472-
"circulating_market_cap": null,
8473-
"decimals": "18",
8474-
"exchange_rate": null,
8475-
"holders": "1",
8476-
"icon_url": null,
8477-
"is_bridged": true,
8478-
"name": "MOONs on Ethereum from Mainnet",
8479-
"symbol": "MOON",
8480-
"total_supply": "4674734745586225830",
8481-
"type": "ERC-20"
8482-
},
84838403
{
84848404
"bridge_type": "omni",
84858405
"foreign_address": "0xe28b3B32B6c345A34Ff64674606124Dd5Aceca30",
@@ -9759,6 +9679,89 @@
97599679
"symbol": "crvUSD",
97609680
"total_supply": "716174073000000000000000000",
97619681
"type": "ERC-20"
9682+
},
9683+
9684+
{
9685+
"bridge_type": "omni",
9686+
"foreign_address": "0x1A5F9352Af8aF974bFC03399e3767DF6370d82e4",
9687+
"origin_chain_id": "1",
9688+
"address": "0x750eCf8c11867Ce5Dbc556592c5bb1E0C6d16538",
9689+
"circulating_market_cap": null,
9690+
"decimals": "18",
9691+
"exchange_rate": null,
9692+
"holders": "2",
9693+
"icon_url": null,
9694+
"is_bridged": true,
9695+
"name": "OWL Token on xDai",
9696+
"symbol": "OWL",
9697+
"total_supply": "1100500000000000000",
9698+
"type": "ERC-20"
9699+
},
9700+
9701+
{
9702+
"bridge_type": "omni",
9703+
"foreign_address": "0xe1cA72ff3434B131765c62Cbcbc26060F7Aba03D",
9704+
"origin_chain_id": "1",
9705+
"address": "0xF18CBdcD3E48E84eb12c2E38511f1eF4C5fbe9e4",
9706+
"circulating_market_cap": null,
9707+
"decimals": "18",
9708+
"exchange_rate": null,
9709+
"holders": "1",
9710+
"icon_url": null,
9711+
"is_bridged": true,
9712+
"name": "MOONs on Ethereum from Mainnet",
9713+
"symbol": "MOON",
9714+
"total_supply": "4674734745586225830",
9715+
"type": "ERC-20"
9716+
},
9717+
9718+
{
9719+
"bridge_type": "omni",
9720+
"foreign_address": "0x0Cf0Ee63788A0849fE5297F3407f701E122cC023",
9721+
"origin_chain_id": "1",
9722+
"address": "0x796879025A627d34042E3eDd2E239E75ba4445e6",
9723+
"circulating_market_cap": null,
9724+
"decimals": "18",
9725+
"exchange_rate": null,
9726+
"holders": "4",
9727+
"icon_url": null,
9728+
"is_bridged": true,
9729+
"name": "Streamr DATAcoin on xDai",
9730+
"symbol": "DATA",
9731+
"total_supply": "22001500000000000000",
9732+
"type": "ERC-20"
9733+
},
9734+
{
9735+
"bridge_type": "omni",
9736+
"foreign_address": "0xA130E3a33a4d84b04c3918c4E5762223Ae252F80",
9737+
"origin_chain_id": "1",
9738+
"address": "0x601541640D14b0c707591b7e74b05E25C3983586",
9739+
"circulating_market_cap": null,
9740+
"decimals": "18",
9741+
"exchange_rate": null,
9742+
"holders": "1",
9743+
"icon_url": null,
9744+
"is_bridged": true,
9745+
"name": "Swash Token from Mainnet",
9746+
"symbol": "SWASH",
9747+
"total_supply": "600000000000000000000",
9748+
"type": "ERC-20"
9749+
},
9750+
{
9751+
"bridge_type": "omni",
9752+
"foreign_address": "0x90DE74265a416e1393A450752175AED98fe11517",
9753+
"origin_chain_id": "1",
9754+
"address": "0x24Cb95c7f0c39759c4165b053730126C7102BbE8",
9755+
"circulating_market_cap": null,
9756+
"decimals": "18",
9757+
"exchange_rate": null,
9758+
"holders": "25",
9759+
"icon_url": null,
9760+
"is_bridged": true,
9761+
"name": "Unlock Discount Token on xDai",
9762+
"symbol": "UDT",
9763+
"total_supply": "9936213363153110036806",
9764+
"type": "ERC-20"
97629765
}
97639766
]
97649767
}

‎app/src/hooks/useWeb3Name.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import useSWR from 'swr'
22
import { createWeb3Name } from '@web3-name-sdk/core'
33

4-
const web3name = createWeb3Name()
4+
const web3name = createWeb3Name({ rpcUrl: process.env.NEXT_PUBLIC_RPC_MAINNET })
55

66
interface UseWeb3NameProps {
77
address?: string

‎app/src/pagePartials/bridge/bridgeForm/index.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import {
4747
import { UnifiedBridgeButton } from './button/UnifiedBridgeButton'
4848
import { useRouter } from 'next/router'
4949
import { useSanitizedQuery } from '@/src/hooks/useSanitizedQuery'
50+
import { isBlockedToken } from '@/src/utils/blockedTokens'
5051

5152
const Title = styled.h2`
5253
align-items: center;
@@ -247,10 +248,14 @@ const Main = () => {
247248
})
248249

249250
const isNotBridgedErc20 =
250-
tokenOut?.chainId === 1 && tokenOut.extensions.bridgeInfo[1]?.tokenAddress === ZERO_ADDRESS
251+
(tokenOut?.chainId === 1 && tokenOut.extensions.bridgeInfo[1]?.tokenAddress === ZERO_ADDRESS) ||
252+
isBlockedToken(formState.token?.address || '')
251253
? true
252254
: false
253255

256+
console.log('tokenIn', formState.token)
257+
console.log('tokenOut', tokenOut)
258+
254259
return (
255260
<Wrapper>
256261
<FormWrapper>

‎app/src/pagePartials/bridge/sidebar/ExternalLinks.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ export const ExternalLinks: React.FC = ({ ...restProps }) => {
3030
name: 'symbiosis.finance',
3131
url: 'https://app.symbiosis.finance/swap',
3232
},
33+
{
34+
name: 'swaps.io',
35+
url: 'https://swaps.io/',
36+
},
3337
]
3438

3539
return (

‎app/src/pagePartials/faq/FAQContents.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ export const FAQContents: React.FC = () => {
9696
Symbiosis
9797
</a>
9898
</li>
99+
<li>
100+
<a href="https://swaps.io/" rel="noreferrer" target="_blank">
101+
Swaps.io
102+
</a>
103+
</li>
99104
</ul>
100105
</Paragraph>
101106
<EmphasizedTitle id="q_1d">How do I bridge from Gnosis to Ethereum?</EmphasizedTitle>

0 commit comments

Comments
 (0)