Skip to content

Commit

Permalink
fix: update with new endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
tiendn committed Feb 20, 2023
1 parent d574289 commit 79d05e5
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 80 deletions.
24 changes: 12 additions & 12 deletions api/api_list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const API_LIST = {
TRANSACTION_OF_BLOCK: '/api/v1/blocks/:id/transactions',
LATEST_BLOCK: '/api/v1/eth-block-number',

ALL_TOKENS: '/api/v1/accounts/get-list-tokens?blockscout=true', // &page=1&offset=20
ALL_TOKENS: '/api/v1/contract/get-list-tokens?blockscout=true', // &page=1&offset=20
ALL_HOLDERS: '/api/v1/accounts/get-top-addresses-balance?blockscout=true', // &page=1&offset=20
ALL_TRANSACTIONS: '/api/v1/transactions',

Expand Down Expand Up @@ -36,21 +36,21 @@ const API_LIST = {
ADDRESS_COIN_BALANCE_HISTORY_CHART: 'api/v1/accounts', // address, page, offset=?
ADDRESS_TRANSACTION: '/api/v1/accounts',
ADDRESS_INTERNAL_TRANSACTION: 'evm_/api/v1?module=account&action=txlistinternal', // address, page, offset
ADDRESS_TOKEN_TRANSFER: 'evm_/api/v1?module=account&action=getlisttokentransfers', // address=?
CONTRACT_TRANSACTION: 'evm_/api/v1?module=account&action=txlist', // address = ?
ADDRESS_TOKEN_TRANSFER: '/api/v1/accounts/token-transfers/', // address=?
CONTRACT_TRANSACTION: '/api/v1/contract/txs/', // address = ?

TOKEN_DETAIL: '/api/v1?module=token&action=gettoken&contractaddress=', // SSR
TOKEN_TRANSACTIONS: 'evm_/api/v1?module=token&action=getlisttokentransfers',
TOKEN_HOLDERS: 'evm_/api/v1?module=token&action=getTokenHolders', // contractaddress=0x60baCCdfdCa114f97F32121f6b2879fB555Df4d0&page=1&offset=20
TOKEN_INVENTORY: 'evm_/api/v1?module=token&action=getinventory', // contractaddress=0x60baCCdfdCa114f97F32121f6b2879fB555Df4d0
TOKEN_METADATA: '/api/v1?module=token&action=getmetadata&contractaddress=',
TOKEN_TRANSER_BY_TOKEN_ID: 'evm_/api/v1?module=token&action=tokentransfersbytokenid', // contractaddress=0x8CB41dA24793D4515E6b96D1adA50b721878C0Ca&tokenid=10
TOKEN_DETAIL: '/api/v1/contract/token-detail/', // SSR
TOKEN_TRANSACTIONS: '/api/v1/contract/token-transfers/',
TOKEN_HOLDERS: '/api/v1/contract/token-holders/', // contractaddress=0x60baCCdfdCa114f97F32121f6b2879fB555Df4d0&page=1&offset=20
TOKEN_INVENTORY: '/api/v1/contract/token-inventory/', // contractaddress=0x60baCCdfdCa114f97F32121f6b2879fB555Df4d0
TOKEN_METADATA: '/api/v1/contract/token-metadata/',
TOKEN_TRANSER_BY_TOKEN_ID: '/api/v1/contract/token-transfers-by-tokenid/', // contractaddress=0x8CB41dA24793D4515E6b96D1adA50b721878C0Ca&tokenid=10

CONTRACT_CODE: 'evm_/api/v1?module=contract&action=getsourcecode',
CONTRACT_CODE: '/api/v1/contract/source-code/',
VERIFY_CONTRACT: `evm_/verify_smart_contract/contract_verifications`,
CHECK_VERIFY_STATUS: 'evm_/api/v1?module=contract&action=checkverifystatus',
GET_EVM_VERSION: 'evm_/api/v1/evm-versions',
GET_SOLIDITY_COMPILER: 'evm_/api/v1/compiler-versions?compiler=solc',
GET_EVM_VERSION: '/api/v1/evm-versions',
GET_SOLIDITY_COMPILER: '/api/v1/compiler-versions/',

// charts && stats
GET_TRANSACTION_HISTORY: '/api/v1/transactions-history?daily=true',
Expand Down
4 changes: 2 additions & 2 deletions components/VerifyContract/hook/useSolidityCompiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import API_LIST from 'api/api_list'
import { useEffect, useState } from 'react'
import useSWRImmutable from 'swr/immutable'

const useSolidityCompiler = (): string[] => {
const useSolidityCompiler = (type: string = 'solc'): string[] => {
const [evmVersions, setEvmVersions] = useState([])
const _fetchCondition = () => {
return [API_LIST.GET_SOLIDITY_COMPILER]
return [`${API_LIST.GET_SOLIDITY_COMPILER}${type}`]
}
const { data } = useSWRImmutable<any>(_fetchCondition())

Expand Down
4 changes: 2 additions & 2 deletions pages/token/[token].tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Breadcumbs, useMobileLayout } from '@astraprotocol/astra-ui'
import * as Sentry from '@sentry/nextjs'
import { evmApi } from 'api'
import { cosmosApi } from 'api'
import API_LIST from 'api/api_list'
import { AxiosError } from 'axios'
import Container from 'components/Container'
Expand Down Expand Up @@ -62,7 +62,7 @@ export async function getServerSideProps({ params }) {
const { token } = params
if (Web3.utils.isAddress(token, 11115)) {
try {
const tokenData = await evmApi.get<TokenDetailResponse>(`${API_LIST.TOKEN_DETAIL}${token}`)
const tokenData = await cosmosApi.get<TokenDetailResponse>(`${API_LIST.TOKEN_DETAIL}${token}`)
if (tokenData.data.result) {
return {
props: {
Expand Down
7 changes: 3 additions & 4 deletions pages/token/[token]/instance/[index].tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Breadcumbs, useMobileLayout } from '@astraprotocol/astra-ui'
import * as Sentry from '@sentry/nextjs'
import { evmApi } from 'api'
import { cosmosApi } from 'api'
import API_LIST from 'api/api_list'
import { AxiosError } from 'axios'
import Container from 'components/Container'
Expand Down Expand Up @@ -57,10 +57,9 @@ export async function getServerSideProps({ params }) {

if (Web3.utils.isAddress(token, parseInt(process.env.NEXT_PUBLIC_CHAIN_ID) || 11115)) {
try {
const tokenData = await evmApi.get<TokenInstanceResponse>(
`${API_LIST.TOKEN_METADATA}${token}&tokenid=${index}`
const tokenData = await cosmosApi.get<TokenInstanceResponse>(
`${API_LIST.TOKEN_METADATA}contractaddress=${token}/tokenid=${index}`
)

if (tokenData.data.result) {
return {
props: {
Expand Down
10 changes: 6 additions & 4 deletions types/address.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,12 @@ interface AddressBalanceResponse {
}

interface AddressTokenTransferResponse {
hasNextPage: boolean
result: TokenTransfer[]
nextPagePath: string
pagination: Pagination
result: {
hasNextPage: boolean
result: TokenTransfer[]
nextPagePath: string
pagination: Pagination
}
}

interface AddressTokenResponse {
Expand Down
24 changes: 15 additions & 9 deletions types/token.d.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
interface TokenTransactionResponse {
hasNextPage: boolean
nextPagePath: any
result: TokenTransaction[]
result: {
hasNextPage: boolean
nextPagePath: any
result: TokenTransaction[]
}
}

interface NftTransferResponse {
hasNextPage: boolean
nextPagePath: any
result: NftTransfer[]
result: {
hasNextPage: boolean
nextPagePath: any
result: NftTransfer[]
}
}

interface TokenHolderResponse {
Expand All @@ -16,9 +20,11 @@ interface TokenHolderResponse {
}

interface TokenInventoryResponse {
hasNextPage: boolean
nextPagePath: string
result: []
result: {
hasNextPage: boolean
nextPagePath: string
result: []
}
}

interface TopAstraHolderResponse {
Expand Down
10 changes: 5 additions & 5 deletions views/accounts/hook/useAddressTokenTransfer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ export default function useAddressTokenTransfers(
const _fetchCondition = () => {
if (params) {
return [
`${API_LIST.ADDRESS_TOKEN_TRANSFER}${params}`,
`${API_LIST.ADDRESS_TOKEN_TRANSFER}${address}${params}`,
{
address
blockscout: true
}
]
}

return [
API_LIST.ADDRESS_TOKEN_TRANSFER,
`${API_LIST.ADDRESS_TOKEN_TRANSFER}${address}`,
{
address,
blockscout: true,
page: 1,
offset: getEnvNumber('NEXT_PUBLIC_PAGE_OFFSET')
}
Expand All @@ -44,7 +44,7 @@ export default function useAddressTokenTransfers(

useEffect(() => {
if (data?.result) {
setState(data)
setState(data.result)
}
}, [data])

Expand Down
7 changes: 1 addition & 6 deletions views/accounts/hook/useContractCode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ export default function useContractCode(address: string): UseContractCodeData {
const [hookData, setState] = useState<ContractCodeData>(undefined)

const _fetchCondition = () => {
return [
API_LIST.CONTRACT_CODE,
{
address
}
]
return [`${API_LIST.CONTRACT_CODE}${address}`]
}
const { data, mutate, isValidating } = useSWRImmutable<ContractCodeResponse>(_fetchCondition())

Expand Down
14 changes: 7 additions & 7 deletions views/accounts/hook/useContractTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ export default function useContractTransaction(address: string, params: string):
const _fetchCondition = () => {
if (params) {
return [
`${API_LIST.CONTRACT_TRANSACTION}${params}`,
`${API_LIST.CONTRACT_TRANSACTION}${address}${params}`,
{
address
blockscout: true
}
]
}

return [
API_LIST.CONTRACT_TRANSACTION,
`${API_LIST.CONTRACT_TRANSACTION}${address}`,
{
address,
blockscout: true,
page: 1,
offset: getEnvNumber('NEXT_PUBLIC_PAGE_OFFSET')
}
Expand All @@ -42,9 +42,9 @@ export default function useContractTransaction(address: string, params: string):
useEffect(() => {
if (data?.result) {
setState({
hasNextPage: data.hasNextPage,
nextPagePath: data.nextPagePath,
result: data.result.map(d => ({ ...d, timeStamp: parseInt(d.timeStamp) * 1000 }))
hasNextPage: data.result.hasNextPage,
nextPagePath: data.result.nextPagePath,
result: data.result.result.map(d => ({ ...d, timeStamp: parseInt(d.timeStamp) * 1000 }))
})
}
}, [data])
Expand Down
20 changes: 9 additions & 11 deletions views/tokens/[instance]/hook/useNftTransfers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,26 @@ export default function useNftTransfer(token: string, tokenId: string, params: s
const _fetchCondition = () => {
if (params) {
return [
`${API_LIST.TOKEN_TRANSER_BY_TOKEN_ID}${params}`,
`${API_LIST.TOKEN_TRANSER_BY_TOKEN_ID}contractaddress=${token}/tokenid=${tokenId}${params}`,
{
contractaddress: token,
tokenid: tokenId
blockscout: true
}
]
}

return [
API_LIST.TOKEN_TRANSER_BY_TOKEN_ID,
`${API_LIST.TOKEN_TRANSER_BY_TOKEN_ID}contractaddress=${token}/tokenid=${tokenId}`,
{
contractaddress: token,
tokenid: tokenId,
blockscout: true,
page: 1,
offset: getEnvNumber('NEXT_PUBLIC_PAGE_OFFSET')
}
]
}
const { data } = useSWR<NftTransferResponse>(_fetchCondition())

const convertData = (_data: NftTransferResponse): NftTransfer[] => {
return data.result.map((d: NftTransfer) => {
const convertData = (_data: NftTransfer[]): NftTransfer[] => {
return _data.map((d: NftTransfer) => {
const isMint = d.fromAddress === ZERO_ADDRESS
const isBurn = d.toAddress === ZERO_ADDRESS

Expand All @@ -55,9 +53,9 @@ export default function useNftTransfer(token: string, tokenId: string, params: s
useEffect(() => {
if (data?.result) {
setState({
result: convertData(data),
hasNextPage: data.hasNextPage,
nextPagePath: data.nextPagePath
result: convertData(data.result?.result),
hasNextPage: data.result.hasNextPage,
nextPagePath: data.result.nextPagePath
})
}
}, [data])
Expand Down
8 changes: 4 additions & 4 deletions views/tokens/hook/useTokenHolders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ export default function useTokenHolders(token: string, page: number) {

const _fetchCondition = () => {
return [
API_LIST.TOKEN_HOLDERS,
`${API_LIST.TOKEN_HOLDERS}${token}`,
{
contractaddress: token,
blockscout: true,
page,
offset: getEnvNumber('NEXT_PUBLIC_PAGE_OFFSET')
}
Expand All @@ -22,8 +22,8 @@ export default function useTokenHolders(token: string, page: number) {
const { isWaiting } = useDelayUntilDone(() => !isEmpty(data) || error)
useEffect(() => {
if (data?.result) {
const tokens: any = data.result.map(d => ({ address: d.address, balance: d.value }))
setState({ result: tokens, hasNextPage: data.hasNextPage })
const tokens: any = data.result.result.map(d => ({ address: d.address, balance: d.value }))
setState({ result: tokens, hasNextPage: data.result.hasNextPage })
}
}, [data])
return {
Expand Down
14 changes: 9 additions & 5 deletions views/tokens/hook/useTokenInventory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,28 @@ export default function useTokenInventory(token: string, params: string) {
const _fetchCondition = () => {
if (params) {
return [
`${API_LIST.TOKEN_INVENTORY}${params}`,
`${API_LIST.TOKEN_INVENTORY}${token}${params}`,
{
contractaddress: token
blockscout: true
}
]
}
return [
API_LIST.TOKEN_INVENTORY,
`${API_LIST.TOKEN_INVENTORY}${token}`,
{
contractaddress: token
blockscout: true
}
]
}
const { data } = useSWR<TokenInventoryResponse>(_fetchCondition())

useEffect(() => {
if (data?.result) {
setState({ result: data.result, hasNextPage: data.hasNextPage, nextPagePath: data.nextPagePath })
setState({
result: data.result.result,
hasNextPage: data.result.hasNextPage,
nextPagePath: data.result.nextPagePath
})
}
}, [data])
return {
Expand Down
18 changes: 9 additions & 9 deletions views/tokens/hook/useTokenTransactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ export default function useTokenTransactions(token: string, params: string | und
const _fetchCondition = () => {
if (params) {
return [
`${API_LIST.TOKEN_TRANSACTIONS}${params}`,
`${API_LIST.TOKEN_TRANSACTIONS}${token}${params}`,
{
contractaddress: token
blockscout: true
}
]
}

return [
API_LIST.TOKEN_TRANSACTIONS,
`${API_LIST.TOKEN_TRANSACTIONS}${token}`,
{
contractaddress: token,
blockscout: true,
page: 1,
offset: getEnvNumber('NEXT_PUBLIC_PAGE_OFFSET')
}
Expand All @@ -36,8 +36,8 @@ export default function useTokenTransactions(token: string, params: string | und

const { isWaiting } = useDelayUntilDone(() => !isEmpty(data) || error)

const convertData = (_data: TokenTransactionResponse): TokenTransaction[] => {
return data.result.map((d: TokenTransaction) => {
const convertData = (_data: TokenTransaction[]): TokenTransaction[] => {
return _data.map((d: TokenTransaction) => {
const isMint = d.fromAddress === ZERO_ADDRESS
const isBurn = d.toAddress === ZERO_ADDRESS

Expand All @@ -51,9 +51,9 @@ export default function useTokenTransactions(token: string, params: string | und
useEffect(() => {
if (data?.result) {
setState({
result: convertData(data),
hasNextPage: data.hasNextPage,
nextPagePath: data.nextPagePath
result: convertData(data?.result?.result),
hasNextPage: data.result.hasNextPage,
nextPagePath: data.result.nextPagePath
})
}
}, [data])
Expand Down

0 comments on commit 79d05e5

Please sign in to comment.