Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing the issue for the lookup multi column case #170

Merged
merged 3 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/postman-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

jobs:
run-tests:
runs-on: [self-hosted, ubuntu-22.04, X64, medium]
runs-on: [self-hosted, Linux, X64, large]
name: Postman & SDK tests
steps:
- name: Checkout
Expand Down
49 changes: 24 additions & 25 deletions bridge-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,48 +20,47 @@
},
"dependencies": {
"@consensys/linea-sdk": "0.3.0",
"@headlessui/react": "2.1.2",
"@tanstack/react-query": "5.51.11",
"@wagmi/connectors": "5.1.0",
"@wagmi/core": "2.13.0",
"@web3modal/wagmi": "5.0.8",
"axios": "1.7.2",
"@headlessui/react": "2.1.9",
"@tanstack/react-query": "5.59.3",
"@wagmi/connectors": "5.1.15",
"@wagmi/core": "2.13.8",
"@web3modal/wagmi": "5.1.11",
"clsx": "^2.1.1",
"compare-versions": "6.1.1",
"date-fns": "3.6.0",
"framer-motion": "11.3.17",
"date-fns": "4.1.0",
"framer-motion": "11.11.4",
"joi": "17.13.3",
"loglevel": "1.9.1",
"next": "14.2.5",
"next-seo": "6.5.0",
"pino-pretty": "11.2.1",
"loglevel": "1.9.2",
"next": "14.2.15",
"next-seo": "6.6.0",
"pino-pretty": "11.2.2",
"react": "18.3.1",
"react-device-detect": "2.2.3",
"react-dom": "18.3.1",
"react-hook-form": "7.52.1",
"react-icons": "5.2.1",
"react-hook-form": "7.53.0",
"react-icons": "5.3.0",
"react-toastify": "10.0.5",
"sharp": "0.33.4",
"swiper": "11.1.7",
"tailwind-merge": "^2.5.2",
"viem": "2.18.0",
"wagmi": "2.12.0",
"sharp": "0.33.5",
"swiper": "11.1.14",
"tailwind-merge": "^2.5.3",
"viem": "2.21.19",
"wagmi": "2.12.17",
"zustand": "4.5.4"
},
"devDependencies": {
"@playwright/test": "1.45.3",
"@svgr/webpack": "^8.1.0",
"@synthetixio/synpress": "4.0.0-alpha.7",
"@types/fs-extra": "11.0.4",
"@types/react": "18.3.3",
"@types/react": "18.3.11",
"@types/react-dom": "18.3.0",
"autoprefixer": "10.4.19",
"daisyui": "4.12.10",
"autoprefixer": "10.4.20",
"daisyui": "4.12.12",
"dotenv": "16.4.5",
"eslint-config-next": "14.2.5",
"eslint-config-next": "14.2.15",
"eslint-plugin-tailwindcss": "3.17.4",
"postcss": "8.4.40",
"postcss": "8.4.47",
"tailwind-scrollbar": "3.1.0",
"tailwindcss": "3.4.7"
"tailwindcss": "3.4.13"
}
}
2 changes: 1 addition & 1 deletion bridge-ui/src/components/layouts/footer/FooterLinks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const FooterLinks = ({ toggleMenu }: FooterLinksProps) => (
<div className="space-y-2 py-4">
<Link
className="flex items-center hover:text-primary"
href="https://support.linea.build/"
href="https://support.linea.build/bridging/how-to-bridge-to-linea"
passHref
target="_blank"
rel="noopener noreferrer"
Expand Down
29 changes: 18 additions & 11 deletions bridge-ui/src/services/tokenService.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import axios, { AxiosResponse } from "axios";
import log from "loglevel";
import { Address } from "viem";
import { GetTokenReturnType, getToken } from "@wagmi/core";
Expand Down Expand Up @@ -32,27 +31,35 @@ export async function fetchERC20Image(name: string) {
throw new Error("Name is required");
}

const coinsResponse: AxiosResponse<CoinGeckoToken[]> = await axios.get(
"https://api.coingecko.com/api/v3/coins/list",
);
const coin = coinsResponse.data.find((coin: CoinGeckoToken) => coin.name === name);
const coinsResponse = await fetch("https://api.coingecko.com/api/v3/coins/list");

if (!coinsResponse.ok) {
throw new Error("Error in fetchERC20Image to get coins list");
}

const coinsData: CoinGeckoToken[] = await coinsResponse.json();
const coin = coinsData.find((coin: CoinGeckoToken) => coin.name === name);

if (!coin) {
throw new Error("Coin not found");
}

const coinId = coin.id;
const coinDataResponse: AxiosResponse<CoinGeckoTokenDetail> = await axios.get(
`https://api.coingecko.com/api/v3/coins/${coinId}`,
);
const coinDataResponse = await fetch(`https://api.coingecko.com/api/v3/coins/${coinId}`);

if (!coinDataResponse.ok) {
throw new Error("Error in fetchERC20Image to get coin data");
}

const coinData: CoinGeckoTokenDetail = await coinDataResponse.json();

if (!coinDataResponse.data.image.small) {
if (!coinData.image.small) {
throw new Error("Image not found");
}

const imageUrl = coinDataResponse.data.image.small.split("?")[0];
const imageUrl = coinData.image.small.split("?")[0];
// Test image URL
const response = await axios.get(imageUrl, { timeout: 5000 });
const response = await fetch(imageUrl);

if (response.status !== 200) {
return "/images/logo/noTokenLogo.svg";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ eth-api="http://traces-node-v2:8545"

[traces]
switch-to-linea-besu=true
expected-traces-api-version-v2="v0.8.0-rc1"
expected-traces-api-version-v2="v0.8.0-rc3"
[traces.counters-v2]
endpoints=["http://traces-node-v2:8545/"]
request-limit-per-endpoint=20
Expand Down
1 change: 1 addition & 0 deletions config/coordinator/coordinator-docker.config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ new-block-polling-interval="PT1S"

[traces]
switch-to-linea-besu=false
blob-compressor-version="V0_1_0"
raw-execution-traces-version="0.2.0"
expected-traces-api-version="0.2.0"
[traces.counters]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package net.consensys.zkevm.coordinator.app
import io.vertx.core.Vertx
import kotlinx.datetime.Clock
import net.consensys.linea.BlockNumberAndHash
import net.consensys.linea.blob.BlobCompressorVersion
import net.consensys.linea.blob.ShnarfCalculatorVersion
import net.consensys.linea.contract.LineaRollupAsyncFriendly
import net.consensys.linea.contract.Web3JL2MessageService
Expand Down Expand Up @@ -394,12 +393,7 @@ class L1DependentApp(
val logger = LogManager.getLogger(GlobalBlockConflationCalculator::class.java)

// To fail faster for JNA reasons
val compressorVersion =
if (configs.traces.switchToLineaBesu) {
BlobCompressorVersion.V1_0_1
} else {
BlobCompressorVersion.V0_1_0
}
val compressorVersion = configs.traces.blobCompressorVersion
val blobCompressor = GoBackedBlobCompressor.getInstance(
compressorVersion = compressorVersion,
dataLimit = configs.blobCompression.blobSizeLimit.toUInt()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import net.consensys.assertIs32Bytes
import net.consensys.decodeHex
import net.consensys.linea.BlockParameter
import net.consensys.linea.assertIsValidAddress
import net.consensys.linea.blob.BlobCompressorVersion
import net.consensys.linea.ethereum.gaspricing.dynamiccap.MAX_FEE_HISTORIES_STORAGE_PERIOD
import net.consensys.linea.ethereum.gaspricing.dynamiccap.MAX_FEE_HISTORY_BLOCK_COUNT
import net.consensys.linea.ethereum.gaspricing.dynamiccap.MAX_REWARD_PERCENTILES_SIZE
Expand Down Expand Up @@ -165,6 +166,7 @@ data class TracesConfig(
val conflation: FunctionalityEndpoint,
val fileManager: FileManager,
val switchToLineaBesu: Boolean = false,
val blobCompressorVersion: BlobCompressorVersion,
val expectedTracesApiVersionV2: String? = null,
val countersV2: FunctionalityEndpoint? = null,
val conflationV2: FunctionalityEndpoint? = null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.github.michaelbull.result.onFailure
import com.github.michaelbull.result.onSuccess
import com.sksamuel.hoplite.Masked
import net.consensys.linea.BlockParameter
import net.consensys.linea.blob.BlobCompressorVersion
import net.consensys.linea.ethereum.gaspricing.BoundableFeeCalculator
import net.consensys.linea.ethereum.gaspricing.staticcap.ExtraDataV1UpdaterImpl
import net.consensys.linea.ethereum.gaspricing.staticcap.FeeHistoryFetcherImpl
Expand Down Expand Up @@ -239,6 +240,7 @@ class CoordinatorConfigTest {

private val tracesConfig = TracesConfig(
switchToLineaBesu = false,
blobCompressorVersion = BlobCompressorVersion.V0_1_0,
rawExecutionTracesVersion = "0.2.0",
expectedTracesApiVersion = "0.2.0",
counters = TracesConfig.FunctionalityEndpoint(
Expand Down
2 changes: 1 addition & 1 deletion docker/compose-local-dev-traces-v2.overrides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ services:
traces-node-v2-plugin-downloader:
image: busybox:1.36.1
# profiles: ["l2", "l2-bc"] this works locally but breakes on CI, maybe Docker compose version issue
command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-tracer/releases/download/v0.8.0-rc1/linea-tracer-v0.8.0-rc1.jar", "/traces-node-v2" ]
command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/linea-tracer/releases/download/v0.8.0-rc3/linea-tracer-v0.8.0-rc3.jar", "/traces-node-v2" ]
volumes:
- ./scripts/file-downloader.sh:/file-downloader.sh:ro
- ../tmp/traces-node-v2/plugins:/traces-node-v2/
Expand Down
Loading
Loading