feat: blackjack

.env.dev

@@ -1,14 +1,14 @@
-VITE_AGGREGATOR_API=https://aggregator-api.dev.kyberengineering.io
-VITE_AGGREGATOR_STATS_API=https://aggregator-stats.dev.kyberengineering.io
+VITE_AGGREGATOR_API=https://aggregator-api.kyberswap.com
+VITE_AGGREGATOR_STATS_API=https://aggregator-stats.kyberswap.com
 VITE_SENTRY_DNS=https://d94ee2d3c22043bdaec966758680b5a8@sentry.ops.kyberengineering.io/4
 
 VITE_SERVICE_WORKER=true
 
 VITE_MIXPANEL_PROJECT_TOKEN=fca28a30cb98d872c2079f214955cd5e
 VITE_REWARD_SERVICE_API=https://reward.dev.kyberengineering.io/api/v1
 
-VITE_PRICE_CHART_API=https://price-chart.dev.kyberengineering.io/api
-VITE_PRICE_API=https://price.dev.kyberengineering.io
+VITE_PRICE_CHART_API=https://price-chart.kyberswap.com/api
+VITE_PRICE_API=https://price.kyberswap.com
 
 VITE_NOTIFICATION_API=https://notification.dev.kyberengineering.io/api
 
@@ -19,17 +19,18 @@ VITE_TRANSAK_URL=https://staging-global.transak.com
 VITE_TRANSAK_API_KEY=327b8b63-626b-4376-baf2-70a304c48488
 
 VITE_KS_SETTING_API=https://ks-setting.dev.kyberengineering.io/api
+VITE_BLACKJACK_API=https://blackjack.dev.kyberengineering.io/api
 
 VITE_GTM_ID=
 
 VITE_GOOGLE_RECAPTCHA_KEY=6Lc7yg0iAAAAALhS4C4Ez5hqMBub8hKdFvvr9sfc
 VITE_POOL_FARM_BASE_URL=https://pool-farm.dev.kyberengineering.io
 
-VITE_LIMIT_ORDER_API=https://limit-order.dev.kyberengineering.io
+VITE_LIMIT_ORDER_API=https://limit-order.kyberswap.com
 VITE_BLOCK_SERVICE_API=https://block.kyberswap.com
 
 # Kyber DAO Apis
-VITE_KYBER_DAO_STATS_API=https://kyberswap-dao-stats.dev.kyberengineering.io
+VITE_KYBER_DAO_STATS_API=https://kyberswap-dao-stats-testnet.dev.kyberengineering.io
 
 # oauth
 VITE_ENV=development

.env.production

@@ -19,6 +19,7 @@ VITE_TRANSAK_URL=https://global.transak.com
 VITE_TRANSAK_API_KEY=48949c0b-2d20-4e3a-a311-51ca91ae8c0d
 
 VITE_KS_SETTING_API=https://ks-setting.kyberswap.com/api
+VITE_BLACKJACK_API=https://blackjack.kyberswap.com/api
 
 VITE_GTM_ID=GTM-TRQCJ8F
 

.env.stg

@@ -18,6 +18,7 @@ VITE_TRANSAK_URL=https://staging-global.transak.com
 VITE_TRANSAK_API_KEY=327b8b63-626b-4376-baf2-70a304c48488
 
 VITE_KS_SETTING_API=https://ks-setting.stg.kyberengineering.io/api
+VITE_BLACKJACK_API=https://blackjack.stg.kyberengineering.io/api
 
 VITE_GTM_ID=
 

.github/workflows/pr.yaml

@@ -114,7 +114,7 @@ jobs:
           VITE_TAG: ${{ needs.prepare.outputs.image_tag }}
           CURRENT_BRANCH: ${{ needs.prepare.outputs.current_branch }}
           NODE_OPTIONS: '--max_old_space_size=4096'
-        run: yarn build
+        run: yarn build-dev
 
       - name: Docker build and push
         uses: docker/build-push-action@v2

src/components/ProAmm/ProAmmFee.tsx

@@ -19,7 +19,11 @@ import FarmV21ABI from 'constants/abis/v2/farmv2.1.json'
 import FarmV2ABI from 'constants/abis/v2/farmv2.json'
 import { EVMNetworkInfo } from 'constants/networks/type'
 import { useActiveWeb3React, useWeb3React } from 'hooks'
-import { useContract, useProAmmNFTPositionManagerContract, useProMMFarmContract } from 'hooks/useContract'
+import {
+  useProAmmNFTPositionManagerReadingContract,
+  useProMMFarmSigningContract,
+  useSigningContract,
+} from 'hooks/useContract'
 import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel'
 import useProAmmPoolInfo from 'hooks/useProAmmPoolInfo'
 import useTheme from 'hooks/useTheme'
@@ -58,7 +62,7 @@ export default function ProAmmFee({
   const token0Shown = feeValue0?.currency || position.pool.token0
   const token1Shown = feeValue1?.currency || position.pool.token1
   const addTransactionWithType = useTransactionAdder()
-  const positionManager = useProAmmNFTPositionManagerContract()
+  const positionManager = useProAmmNFTPositionManagerReadingContract()
   const deadline = useTransactionDeadline() // custom from users settings
   const { mixpanelHandler } = useMixpanel()
 
@@ -105,7 +109,7 @@ export default function ProAmmFee({
     setTxnHash(response.hash)
   }
 
-  const farmContract = useProMMFarmContract(farmAddress || '')
+  const farmContract = useProMMFarmSigningContract(farmAddress || '')
   const poolAddress = useProAmmPoolInfo(position.pool.token0, position.pool.token1, position.pool.fee as FeeAmount)
   const { userInfo } = useElasticFarmsV2()
   const info = userInfo?.find(item => item.nftId.toString() === tokenId.toString())
@@ -115,8 +119,8 @@ export default function ProAmmFee({
     ?.map(item => item.toLowerCase())
     .includes(address?.toLowerCase())
 
-  const farmV2Contract = useContract(address, FarmV2ABI)
-  const farmV21Contract = useContract(address, FarmV21ABI)
+  const farmV2Contract = useSigningContract(address, FarmV2ABI)
+  const farmV21Contract = useSigningContract(address, FarmV21ABI)
 
   const collectFeeFromFarmContract = async () => {
     const isInFarmV2 = !!info
@@ -178,7 +182,7 @@ export default function ProAmmFee({
     }
   }
 
-  const collect = () => {
+  const collect = async () => {
     setShowPendingModal(true)
     setAttemptingTxn(true)
 
@@ -214,27 +218,28 @@ export default function ProAmmFee({
       value,
     }
 
-    library
-      .getSigner()
-      .estimateGas(txn)
-      .then((estimate: BigNumber) => {
-        const newTxn = {
-          ...txn,
-          gasLimit: calculateGasMargin(estimate),
-        }
-        return library
-          .getSigner()
-          .sendTransaction(newTxn)
-          .then((response: TransactionResponse) => {
-            handleBroadcastClaimSuccess(response)
-          })
-      })
-      .catch((error: any) => {
-        setShowPendingModal(true)
-        setAttemptingTxn(false)
-        setCollectFeeError(error?.message || JSON.stringify(error))
-        console.error(error)
-      })
+    try {
+      await library
+        .getSigner()
+        .estimateGas(txn)
+        .then((estimate: BigNumber) => {
+          const newTxn = {
+            ...txn,
+            gasLimit: calculateGasMargin(estimate),
+          }
+          return library
+            .getSigner()
+            .sendTransaction(newTxn)
+            .then((response: TransactionResponse) => {
+              handleBroadcastClaimSuccess(response)
+            })
+        })
+    } catch (error: any) {
+      setShowPendingModal(true)
+      setAttemptingTxn(false)
+      setCollectFeeError(error?.message || JSON.stringify(error))
+      console.error(error)
+    }
   }
   const hasNoFeeToCollect = !(feeValue0?.greaterThan(0) || feeValue1?.greaterThan(0))
 

src/components/WalletPopup/SendToken/useSendToken.tsx

@@ -7,7 +7,7 @@ import { ethers } from 'ethers'
 import { useCallback, useEffect, useState } from 'react'
 
 import { useActiveWeb3React, useWeb3React, useWeb3Solana } from 'hooks'
-import { useTokenContract } from 'hooks/useContract'
+import { useTokenSigningContract } from 'hooks/useContract'
 import { tryParseAmount } from 'state/swap/hooks'
 import { useTransactionAdder } from 'state/transactions/hooks'
 import { TRANSACTION_TYPE } from 'state/transactions/type'
@@ -16,7 +16,7 @@ export default function useSendToken(currency: Currency | undefined, recipient:
   const { account, isEVM, walletSolana, isSolana } = useActiveWeb3React()
   const { library } = useWeb3React()
   const [estimateGas, setGasFee] = useState<number | null>(null)
-  const tokenContract = useTokenContract(isSolana ? undefined : currency?.wrapped.address)
+  const tokenContract = useTokenSigningContract(isSolana ? undefined : currency?.wrapped.address)
   const addTransactionWithType = useTransactionAdder()
   const [isSending, setIsSending] = useState(false)
   const { publicKey } = useWallet()

src/components/YieldPools/ElasticFarmGroup/Row.tsx

@@ -21,7 +21,7 @@ import { PartnerFarmTag } from 'components/YieldPools/PartnerFarmTag'
 import { APP_PATHS, ELASTIC_BASE_FEE_UNIT } from 'constants/index'
 import { TOBE_EXTENDED_FARMING_POOLS } from 'constants/v2'
 import { useActiveWeb3React } from 'hooks'
-import { useProMMFarmContract } from 'hooks/useContract'
+import { useProMMFarmReadingContract } from 'hooks/useContract'
 import { useProAmmPositions } from 'hooks/useProAmmPositions'
 import useTheme from 'hooks/useTheme'
 import { useShareFarmAddress } from 'state/farms/classic/hooks'
@@ -96,7 +96,7 @@ const Row = ({
     0,
   )
 
-  const contract = useProMMFarmContract(fairlaunchAddress)
+  const contract = useProMMFarmReadingContract(fairlaunchAddress)
   const [targetPercent, setTargetPercent] = useState('')
   const [targetPercentByNFT, setTargetPercentByNFT] = useState<{ [key: string]: string }>({})
   const [rowOpen, setRowOpen] = useState(false)

src/components/YieldPools/ElasticFarmGroup/index.tsx

@@ -18,7 +18,7 @@ import { MouseoverTooltip, MouseoverTooltipDesktopOnly, TextDashed } from 'compo
 import { FARM_TAB, SORT_DIRECTION, ZERO_ADDRESS } from 'constants/index'
 import { NETWORKS_INFO, isEVM } from 'constants/networks'
 import { useActiveWeb3React } from 'hooks'
-import { useProAmmNFTPositionManagerContract } from 'hooks/useContract'
+import { useProAmmNFTPositionManagerReadingContract } from 'hooks/useContract'
 import useTheme from 'hooks/useTheme'
 import { Dots } from 'pages/MyPool/styleds'
 import { useWalletModalToggle } from 'state/application/hooks'
@@ -228,7 +228,7 @@ const ElasticFarmGroup: React.FC<Props> = ({ address, onOpenModal, pools, onShow
     })
 
   const toggleWalletModal = useWalletModalToggle()
-  const posManager = useProAmmNFTPositionManagerContract()
+  const posManager = useProAmmNFTPositionManagerReadingContract()
 
   const res = useSingleCallResult(posManager, 'isApprovedForAll', [account || ZERO_ADDRESS, address])
   const isApprovedForAll = res?.result?.[0]
@@ -241,7 +241,7 @@ const ElasticFarmGroup: React.FC<Props> = ({ address, onOpenModal, pools, onShow
   const handleApprove = async () => {
     if (!isApprovedForAll) {
       const tx = await approve()
-      setApprovalTx(tx)
+      tx && setApprovalTx(tx)
     }
   }
 

src/components/YieldPools/ElasticFarmModals/StakeModal.tsx

@@ -369,7 +369,7 @@ function StakeModal({
       stakedLiquidity: e.staked.liquidity.toString(),
     }))
     if (type === 'stake') {
-      let txhash = ''
+      let txhash: string | undefined = undefined
       if (tab === 'deposit') txhash = await depositAndJoin(BigNumber.from(poolId), params)
       else txhash = await stake(BigNumber.from(poolId), params)
 

src/components/swapv2/LimitOrder/ListOrder/useRequestCancelOrder.tsx

@@ -14,11 +14,12 @@ import useSignOrder from 'components/swapv2/LimitOrder/useSignOrder'
 import LIMIT_ORDER_ABI from 'constants/abis/limit_order.json'
 import { TRANSACTION_STATE_DEFAULT } from 'constants/index'
 import { useActiveWeb3React, useWeb3React } from 'hooks'
+import { useKyberSwapConfig } from 'state/application/hooks'
 import { useLimitActionHandlers, useLimitState } from 'state/limit/hooks'
 import { useTransactionAdder } from 'state/transactions/hooks'
 import { TRANSACTION_TYPE } from 'state/transactions/type'
 import { TransactionFlowState } from 'types/TransactionFlowState'
-import { getContract } from 'utils/getContract'
+import { getReadingContract } from 'utils/getContract'
 import { sendEVMTransaction } from 'utils/sendTransaction'
 import { ErrorName } from 'utils/sentry'
 import { formatSignature } from 'utils/transaction'
@@ -30,15 +31,16 @@ import { CancelOrderFunction, CancelOrderResponse, CancelOrderType, LimitOrder }
 const useGetEncodeLimitOrder = () => {
   const { account } = useActiveWeb3React()
   const [getEncodeData] = useGetEncodeDataMutation()
-  const { library } = useWeb3React()
+  const { readProvider } = useKyberSwapConfig()
+
   return useCallback(
     async ({ orders, isCancelAll }: { orders: LimitOrder[]; isCancelAll: boolean | undefined }) => {
-      if (!library) throw new Error()
+      if (!readProvider) throw new Error()
       if (isCancelAll) {
         const contracts = [...new Set(orders.map(e => e.contractAddress))]
         const result = []
         for (const address of contracts) {
-          const limitOrderContract = getContract(address, LIMIT_ORDER_ABI, library, account)
+          const limitOrderContract = getReadingContract(address, LIMIT_ORDER_ABI, readProvider)
           const [{ encodedData }, nonce] = await Promise.all([
             getEncodeData({ orderIds: [], isCancelAll }).unwrap(),
             limitOrderContract?.nonce?.(account),
@@ -53,7 +55,7 @@ const useGetEncodeLimitOrder = () => {
       }).unwrap()
       return [{ encodedData, contractAddress: orders[0]?.contractAddress, nonce: '' }]
     },
-    [account, getEncodeData, library],
+    [account, getEncodeData, readProvider],
   )
 }
 

src/constants/env.ts

@@ -17,6 +17,7 @@ export const AGGREGATOR_API = required('AGGREGATOR_API')
 export const SENTRY_DNS = required('SENTRY_DNS')
 export const REWARD_SERVICE_API = required('REWARD_SERVICE_API')
 export const KS_SETTING_API = required('KS_SETTING_API')
+export const BLACKJACK_API = required('BLACKJACK_API')
 export const BLOCK_SERVICE_API = required('BLOCK_SERVICE_API')
 export const PRICE_CHART_API = required('PRICE_CHART_API')
 export const AGGREGATOR_STATS_API = required('AGGREGATOR_STATS_API')

src/constants/networks/görli.ts

@@ -70,7 +70,7 @@ const görliInfo: EVMNetworkInfo = {
     staking: '0x9bc1214E28005e9c3f5E99Ff01C23D42796702CF',
     dao: '0x583c0A1a49CdC99f4709337fa5500844316366dc',
     rewardsDistributor: '0x62D82BC6aa44a4340F29E629b43859b7e0C1E915',
-    daoStatsApi: 'https://kyberswap-dao-stats.dev.kyberengineering.io',
+    daoStatsApi: 'https://kyberswap-dao-stats-testnet.dev.kyberengineering.io',
     KNCAddress: '0xd19e5119Efc73FeA1e70f9fbbc105DaB89D914e4',
     KNCLAddress: '0x03010458f00F1B9fEb6Ad5d67A065971126fBBc1',
   },

src/data/Allowances.ts

@@ -2,12 +2,12 @@ import { Token, TokenAmount } from '@kyberswap/ks-sdk-core'
 import { useMemo } from 'react'
 
 import { useActiveWeb3React } from 'hooks'
-import { useTokenContractForReading } from 'hooks/useContract'
+import { useTokenReadingContract } from 'hooks/useContract'
 import { useSingleCallResult } from 'state/multicall/hooks'
 
 export function useTokenAllowance(token?: Token, owner?: string, spender?: string): TokenAmount | undefined {
   const { isEVM } = useActiveWeb3React()
-  const contractForReading = useTokenContractForReading(isEVM ? token?.address : undefined)
+  const contractForReading = useTokenReadingContract(isEVM ? token?.address : undefined)
 
   const inputs = useMemo(() => [owner, spender], [owner, spender])
   const allowance = useSingleCallResult(contractForReading, 'allowance', inputs).result

src/data/TotalSupply.ts

@@ -1,13 +1,13 @@
 import { BigNumber } from '@ethersproject/bignumber'
 import { Token, TokenAmount } from '@kyberswap/ks-sdk-core'
 
-import { useTokenContract } from 'hooks/useContract'
+import { useTokenReadingContract } from 'hooks/useContract'
 import { useSingleCallResult } from 'state/multicall/hooks'
 
 // returns undefined if input token is undefined, or fails to get token contract,
 // or contract total supply cannot be fetched
 export function useTotalSupply(token?: Token): TokenAmount | undefined {
-  const contract = useTokenContract(token?.address, false)
+  const contract = useTokenReadingContract(token?.address)
   const totalSupply: BigNumber = useSingleCallResult(contract, 'totalSupply')?.result?.[0]
 
   return token && totalSupply ? TokenAmount.fromRawAmount(token, totalSupply.toString()) : undefined

src/hooks/Tokens.ts

@@ -12,7 +12,7 @@ import { KS_SETTING_API } from 'constants/env'
 import { ETHER_ADDRESS, ZERO_ADDRESS } from 'constants/index'
 import { NativeCurrencies } from 'constants/tokens'
 import { useActiveWeb3React } from 'hooks/index'
-import { useBytes32TokenContract, useMulticallContract, useTokenContract } from 'hooks/useContract'
+import { useBytes32TokenContract, useMulticallContract, useTokenReadingContract } from 'hooks/useContract'
 import { AppState } from 'state'
 import { TokenAddressMap } from 'state/lists/reducer'
 import { TokenInfo, WrappedTokenInfo } from 'state/lists/wrappedTokenInfo'
@@ -180,10 +180,10 @@ export function useToken(tokenAddress?: string): Token | NativeCurrency | undefi
 
   const address = isAddress(chainId, tokenAddress)
 
-  const tokenContract = useTokenContract(address && tokenAddress !== ZERO_ADDRESS ? address : undefined, false)
-  const tokenContractBytes32 = useBytes32TokenContract(address ? address : undefined, false)
+  const tokenContract = useTokenReadingContract(address && tokenAddress !== ZERO_ADDRESS ? address : undefined)
+  const tokenContractBytes32 = useBytes32TokenContract(address ? address : undefined)
   const token =
-    tokenAddress === ZERO_ADDRESS || tokenAddress?.toLowerCase() === ETHER_ADDRESS.toLowerCase()
+    tokenAddress?.toLowerCase() === ZERO_ADDRESS || tokenAddress?.toLowerCase() === ETHER_ADDRESS.toLowerCase()
       ? NativeCurrencies[chainId]
       : address
       ? tokens[address]