Merge pull request #15 from blockworks-foundation/max/ip-block2

Max/ip block2
This commit is contained in:
Maximilian Schneider 2021-08-10 00:54:04 +02:00 committed by GitHub
commit b2348923e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions

View File

@ -36,10 +36,17 @@ export default function useIpAddress() {
useEffect(() => {
const checkIpLocation = async () => {
const response = await fetch(`https://www.cloudflare.com/cdn-cgi/trace`)
const parsedResponse = await response.text()
const ipLocation = parsedResponse.match(/loc=(.+)/)
const ipCountryCode = ipLocation ? ipLocation[1] : ''
let ipCountryCode
try {
const response = await fetch(`https://www.cloudflare.com/cdn-cgi/trace`)
const parsedResponse = await response.text()
const ipLocation = parsedResponse.match(/loc=(.+)/)
ipCountryCode = ipLocation ? ipLocation[1] : ''
} catch {
const response = await fetch(`https://countrycode.bonfida.workers.dev/`)
const parsedResponse = await response.json()
ipCountryCode = parsedResponse.countryCode
}
if (ipCountryCode) {
setIpAllowed(!SANCTIONED_COUNTRY_CODES.includes(ipCountryCode))

View File

@ -26,8 +26,8 @@ import { calculateNativeAmountUnsafe } from '../utils/balance'
export const ENDPOINTS: EndpointInfo[] = [
{
name: 'mainnet-beta',
url: 'https://mango.rpcpool.com/',
websocket: 'https://mango.rpcpool.com/',
url: 'https://cache-mango.rpcpool.com',
websocket: 'https://cache-mango.rpcpool.com/cache',
programId: '6QXNNAPkPsWjd1j3qQJTvRFgSNPARMhF2tE8g1WeGyrM',
poolKey: 'AHBj9LAjxStT2YQHN6QdfHKpZLtEVr8ACqeFgYcPsTnr',
},