Skip to content

Commit

Permalink
Merge pull request #115 from QuickSwap/release/0.1.0
Browse files Browse the repository at this point in the history
Release/0.1.0
  • Loading branch information
totop716 authored Mar 27, 2022
2 parents e86ebc4 + 2b1a685 commit e411fad
Show file tree
Hide file tree
Showing 90 changed files with 3,152 additions and 3,116 deletions.
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ IPFS_DEPLOY_PINATA__API_KEY=16f568d2ab3bbb712be5
IPFS_DEPLOY_PINATA__SECRET_API_KEY=d17f8f50c3e6a633b12843890a8fb537908f0632f642bc9b97e54f3ac321ecbb
REACT_APP_PORTIS_ID="e086c1f2-2d26-4443-804f-3398bbab069e"
REACT_APP_FORTMATIC_KEY="pk_live_F937DF033A1666BF"
REACT_APP_MOONPAY_KEY="pk_live_72EGoobLnlgc8WB7AaxyiWu2S43dj8eY"
REACT_APP_TRANSAK_KEY="258960cf-1e17-4419-bf7f-77443282f5da"
2 changes: 2 additions & 0 deletions .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ REACT_APP_NETWORK_URL="https://mainnet.infura.io/v3/099fc58e0de9451d80b18d7c74ca
REACT_APP_PORTIS_ID="c0e2bf01-4b08-4fd5-ac7b-8e26b58cd236"
REACT_APP_FORTMATIC_KEY="pk_live_F937DF033A1666BF"
REACT_APP_GOOGLE_ANALYTICS_ID="UA-188438708-1"
REACT_APP_MOONPAY_KEY="pk_live_72EGoobLnlgc8WB7AaxyiWu2S43dj8eY"
REACT_APP_TRANSAK_KEY="258960cf-1e17-4419-bf7f-77443282f5da"
87 changes: 87 additions & 0 deletions .github/workflows/dev_release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: Release
on:
push:
branches:
- dev

# manual trigger
workflow_dispatch:

jobs:
bump_version:
name: Bump Version
runs-on: ubuntu-latest
outputs:
new_tag: ${{ steps.github_tag_action.outputs.new_tag }}
changelog: ${{ steps.github_tag_action.outputs.changelog }}
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Bump version and push tag
id: github_tag_action
uses: mathieudutour/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
release_branches: dev

create_release:
name: Create Release
runs-on: ubuntu-latest
needs: bump_version
if: ${{ needs.bump_version.outputs.new_tag != null }}
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up node
uses: actions/setup-node@v2
with:
node-version: 16
registry-url: https://registry.npmjs.org

- name: Install dependencies
run: npm install

- name: Build the IPFS bundle
run: yarn build

- name: Pin to IPFS(PINATA)
id: upload
uses: anantaramdas/ipfs-pinata-deploy-action@39bbda1ce1fe24c69c6f57861b8038278d53688d
with:
pin-name: QuickSwap ${{ needs.bump_version.outputs.new_tag }}
path: './build'
pinata-api-key: ${{ secrets.PINATA_API_KEY }}
pinata-secret-api-key: ${{ secrets.PINATA_API_SECRET_KEY }}

- name: Pin to Crust
uses: crustio/[email protected]
continue-on-error: true
timeout-minutes: 2
with:
cid: ${{ steps.upload.outputs.hash }}
seeds: ${{ secrets.SUBSTRATE_SEEDS }}

- name: Convert CIDv0 to CIDv1
id: convert_cidv0
uses: uniswap/[email protected]
with:
cidv0: ${{ steps.upload.outputs.hash }}

- name: Update DNS with new IPFS hash
env:
CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
RECORD_DOMAIN: 'quickswap.exchange'
RECORD_NAME: '_dnslink.dev'
CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
uses: textileio/cloudflare-update-dnslink@0fe7b7a1ffc865db3a4da9773f0f987447ad5848
with:
cid: ${{ steps.upload.outputs.hash }}

- name: Purge cloudflare cache
uses: jakejarvis/cloudflare-purge-action@master
env:
# Zone is required by both authentication methods
CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE_ID }}
CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"devDependencies": {
"@arkane-network/web3-arkane-provider": "^0.23.0",
"@ethersproject/experimental": "^5.4.0",
"@gelatonetwork/limit-orders-react": "^1.0.11",
"@gelatonetwork/limit-orders-react": "^2.4.0",
"@gnosis.pm/safe-apps-sdk": "^4.0.0",
"@reduxjs/toolkit": "^1.3.5",
"@transak/transak-sdk": "^1.0.28",
Expand Down Expand Up @@ -82,8 +82,8 @@
"react-virtualized-auto-sizer": "^1.0.6",
"react-window": "^1.8.6",
"redux-localstorage-simple": "^2.4.1",
"source-map-explorer": "^2.5.2",
"serve": "^11.3.2",
"source-map-explorer": "^2.5.2",
"start-server-and-test": "^1.11.0",
"typescript": "^4.1.2",
"wcag-contrast": "^3.0.0",
Expand Down
48 changes: 47 additions & 1 deletion public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,51 @@
"forAtLeast": "for at least ",
"brokenToken": "The selected token is not compatible with Uniswap V1. Adding liquidity will result in locked funds.",
"toleranceExplanation": "Lowering this limit decreases your risk of frontrunning. However, this makes more likely that your transaction will fail due to normal price movements.",
"tokenSearchPlaceholder": "Search name or paste address"
"tokenSearchPlaceholder": "Search name or paste address",
"txnSwapMessage": "Swap {{ token0Symbol }} for {{ token1Symbol }}",
"txnAddMessage": "Add {{ token0Symbol }} and {{ token1Symbol }}",
"txnRemoveMessage": "Remove {{ token0Symbol }} and {{ token1Symbol }}",
"supplyingTokens": "Supplying {{ amountA }} {{ symbolA }} and {{ amountB }} {{ symbolB }}",
"addLiquidityTokens": "Add {{ amountA }} {{ symbolA }} and {{ amountB }} {{ symbolB }}",
"receiveLPTokens": "You will receive {{ amount }} {{ symbolA }} / {{ symbolB }} LP Tokens",
"outputEstimated": "Output is estimated. If the price changes by more than {{ slippage }}% your transaction will revert.",
"approving": "Approving",
"approve": "Approve",
"lpTokenReceived": "LP Tokens Received",
"lpTokens": "LP Tokens",
"token": "Token",
"supply": "Supply",
"confirmSupply": "Confirm Supply",
"supplyingliquidity": "Supplying Liquidity",
"submittedTxLiquidity": "Submitted transaction to add liquidity",
"successAddedliquidity": "Successfully added liquidity",
"switchPolygon": "Switch to Polygon",
"connectWallet": "Connect Wallet",
"errorInTx": "There is an error in transaction.",
"txRejected": "Transaction rejected.",
"slippageHelper": "Your transaction will revert if the price changes unfavorably by more than this percentage.",
"txLimitHelper": "Your transaction will revert if there is a large, unfavorable price movement before it is confirmed.",
"priceImpactHelper": "The difference between the market price and estimated price due to trade size.",
"liquidityProviderFeeHelper": "A portion of each trade (0.30%) goes to liquidity providers as a protocol incentive.",
"swapRouteHelper": "Routing through these tokens resulted in the best price for your trade.",
"minReceived": "Minimum Received",
"maxSold": "Maximum Sold",
"swapTokens": "Swap Tokens",
"featureTradeDesc": "Trade any combination of ERC-20 tokens permissionless, with ease.",
"supplyLiquidity": "Supply Liquidity",
"featureLiquidityDesc": "Earn 0.25% fee on trades proportional to your share of the pool.",
"earndQUICK": "Earn dQUICK",
"featureDepositDesc": "Deposit your LP tokens to earn additional rewards.",
"dragonLair": "Dragon’s Lair",
"featureDragonDesc": "Dragon’s Lair is a single staking pool for QUICK token. Stake your QUICK to receive dQUICK, and earn your share of .04% of all trading fees.",
"buyWithFiat": "Buy Crypto with Fiat",
"featureBuyFiatDesc": "Simple way to buy with Apple Pay, credit card, bank transfer & more.",
"analytics": "Analytics",
"featureAnalyticsDesc": "Scan through QuickSwap analytics & Historical Data.",
"quickInfoTitle": "QuickSwap is a next-generation layer-2 decentralized exchange and Automated Market Maker.",
"earnRewardsbyDeposit": "Earn additional rewards by depositing your LP tokens",
"depositLPTokensRewards": "Deposit your Liquidity Provider tokens to receive rewards in addition to LP fees.",
"seeAllPairs": "See all pairs",
"features": "Features",
"joinCommunity": "Join our ever-growing Community"
}
34 changes: 34 additions & 0 deletions src/apollo/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,22 @@ export const ETH_PRICE: any = (block?: number) => {
return gql(queryString);
};

export const ETH_ALLPRICE: any = (block?: number) => {
const queryString = `
query bundles {
oneDayBackPrice: bundles(where: { id: ${GlobalConst.utils.BUNDLE_ID} } block: {number: ${block}}) {
id
ethPrice
}
currentPrice: bundles(where: { id: ${GlobalConst.utils.BUNDLE_ID} }) {
id
ethPrice
}
}
`;
return gql(queryString);
};

export const PAIRS_HISTORICAL_BULK: any = (block: number, pairs: any[]) => {
let pairsString = `[`;
pairs.map((pair) => {
Expand Down Expand Up @@ -509,6 +525,24 @@ export const GLOBAL_DATA: any = (block?: number) => {
return gql(queryString);
};

export const GLOBAL_ALLDATA: any = (reqData: any) => {
const queryString = reqData.map((each: any, index: any) => {
return `${each.index}: uniswapFactories(
${each.block ? `block: { number: ${each.block} }` : ``}
where: { id: "${GlobalConst.addresses.FACTORY_ADDRESS}" }) {
id
totalVolumeUSD
totalVolumeETH
untrackedVolumeUSD
totalLiquidityUSD
totalLiquidityETH
txCount
pairCount
}`;
});
return gql(`query uniswapFactories {${queryString.join(' ')}}`);
};

export const GLOBAL_CHART = gql`
query uniswapDayDatas($startTime: Int!, $skip: Int!) {
uniswapDayDatas(
Expand Down
18 changes: 18 additions & 0 deletions src/assets/images/AlertIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 80 additions & 1 deletion src/assets/images/DragonBg1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e411fad

Please sign in to comment.