Skip to content

Commit

Permalink
Merge branch 'main' into env/testnet
Browse files Browse the repository at this point in the history
  • Loading branch information
alanrsoares committed Jan 22, 2024
2 parents 3cf306a + b1fae01 commit 7114385
Show file tree
Hide file tree
Showing 19 changed files with 634 additions and 821 deletions.
30 changes: 15 additions & 15 deletions apps/maestro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,28 @@
"drizzle:studio": "pnpm drizzle-kit studio"
},
"dependencies": {
"@axelar-network/axelarjs-sdk": "^0.13.8",
"@axelar-network/axelarjs-sdk": "^0.13.9",
"@axelarjs/api": "workspace:*",
"@axelarjs/core": "workspace:*",
"@axelarjs/evm": "workspace:*",
"@axelarjs/ui": "workspace:*",
"@axelarjs/utils": "workspace:*",
"@hookform/resolvers": "^3.3.3",
"@sentry/nextjs": "^7.91.0",
"@hookform/resolvers": "^3.3.4",
"@sentry/nextjs": "^7.94.1",
"@tanstack/react-query": "^4.36.1",
"@trpc/client": "^10.45.0",
"@trpc/next": "^10.45.0",
"@trpc/react-query": "^10.45.0",
"@trpc/server": "^10.45.0",
"@vercel/kv": "^1.0.1",
"@vercel/postgres": "^0.5.1",
"@web3modal/wagmi": "^3.5.6",
"@web3modal/wagmi": "^3.5.7",
"drizzle-orm": "^0.29.3",
"lucide-react": "^0.265.0",
"next": "^14.0.4",
"next": "^14.1.0",
"nextjs-cors": "^2.2.0",
"nprogress": "^0.2.0",
"openai": "^4.24.7",
"openai": "^4.25.0",
"pg": "^8.11.3",
"rambda": "^8.6.0",
"react": "^18.2.0",
Expand All @@ -74,14 +74,14 @@
},
"devDependencies": {
"@babel/core": "^7.23.7",
"@next/bundle-analyzer": "^14.0.4",
"@playwright/test": "^1.40.1",
"@sentry/cli": "^2.25.0",
"@next/bundle-analyzer": "^14.1.0",
"@playwright/test": "^1.41.1",
"@sentry/cli": "^2.26.0",
"@tanstack/react-query-devtools": "^4.36.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.2",
"@types/node": "^20.11.2",
"@types/node": "^20.11.5",
"@types/nprogress": "^0.2.3",
"@types/react": "18.2.21",
"@types/react-dom": "^18.2.18",
Expand All @@ -92,19 +92,19 @@
"@vitejs/plugin-react": "^4.2.1",
"@vitest/coverage-v8": "^0.34.6",
"@wagmi/cli": "^1.5.2",
"autoprefixer": "^10.4.16",
"autoprefixer": "^10.4.17",
"concurrently": "^8.2.2",
"date-fns": "^2.30.0",
"dotenv": "^16.3.1",
"dotenv": "^16.3.2",
"dotenv-cli": "^7.3.0",
"drizzle-kit": "^0.20.9",
"drizzle-kit": "^0.20.13",
"drizzle-zod": "^0.5.1",
"eslint": "^8.56.0",
"eslint-config-next": "^14.0.4",
"eslint-config-next": "^14.1.0",
"happy-dom": "^9.20.3",
"matchers": "link:@testing-library/jest-dom/matchers",
"next-auth": "^4.24.5",
"postcss": "^8.4.32",
"postcss": "^8.4.33",
"tailwindcss": "^3.4.1",
"tsx": "^4.7.0",
"typescript": "^5.3.3",
Expand Down
7 changes: 7 additions & 0 deletions apps/maestro/src/config/evm-chains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
goerli,
kava,
kavaTestnet,
linea,
lineaTestnet,
mainnet,
mantle,
Expand Down Expand Up @@ -241,6 +242,12 @@ export const ALL_CHAINS: ExtendedWagmiChainConfig[] = [
axelarChainName: "linea",
environment: ENVIRONMENTS.testnet,
},
{
...linea,
axelarChainId: "linea",
axelarChainName: "linea",
environment: ENVIRONMENTS.mainnet,
},
{
...mantle,
axelarChainId: "mantle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import ABI from "./InterchainTokenFactory.abi";
export const interchainTokenFactoryABI = ABI.abi;

export const interchainTokenFactoryAddress =
"0x83a93500d23Fbc3e82B410aD07A6a9F7A0670D66" as const;
"0xe93462bc7Ef7692D763C4d4DbCE7B870c0958c59" as const;

export const interchainTokenFactoryConfig = {
address: interchainTokenFactoryAddress,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import ABI from "./InterchainTokenService.abi";
export const interchainTokenServiceABI = ABI.abi;

export const interchainTokenServiceAddress =
"0xB5FB4BE02232B1bBA4dC8f81dc24C26980dE9e3C" as const;
"0xa4A9965149388c86E62CDDDd6C95EFe9c294005a" as const;

export const interchainTokenServiceConfig = {
address: interchainTokenServiceAddress,
Expand Down
4 changes: 2 additions & 2 deletions apps/maestro/src/lib/contracts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ export const contracts = [
{
name: INTERCHAIN_TOKEN_FACTORY_ABI.contractName,
abi: INTERCHAIN_TOKEN_FACTORY_ABI.abi,
address: "0x83a93500d23Fbc3e82B410aD07A6a9F7A0670D66" as `0x${string}`, // read from .env.local (NEXT_PUBLIC_INTERCHAIN_TOKEN_FACTORY_ADDRESS)
address: "0xe93462bc7Ef7692D763C4d4DbCE7B870c0958c59" as `0x${string}`, // read from .env.local (NEXT_PUBLIC_INTERCHAIN_TOKEN_FACTORY_ADDRESS)
},
{
name: INTERCHAIN_TOKEN_SERVICE_ABI.contractName,
abi: INTERCHAIN_TOKEN_SERVICE_ABI.abi,
address: "0xB5FB4BE02232B1bBA4dC8f81dc24C26980dE9e3C" as `0x${string}`, // read from .env.local (NEXT_PUBLIC_INTERCHAIN_TOKEN_SERVICE_ADDRESS)
address: "0xa4A9965149388c86E62CDDDd6C95EFe9c294005a" as `0x${string}`, // read from .env.local (NEXT_PUBLIC_INTERCHAIN_TOKEN_SERVICE_ADDRESS)
},
{
name: TOKEN_MANAGER_ABI.contractName,
Expand Down
2 changes: 2 additions & 0 deletions apps/maestro/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { defineConfig } from "vitest/config";

// https://vitejs.dev/config/
export default defineConfig({
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error react plugin doesn't have the latest types
plugins: [react()],
test: {
environment: "happy-dom",
Expand Down
8 changes: 4 additions & 4 deletions apps/registry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
"dependencies": {
"@axelarjs/ui": "workspace:*",
"@axelarjs/utils": "workspace:*",
"next": "^14.0.4",
"next": "^14.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"tailwind-styled-components": "^2.2.0"
},
"devDependencies": {
"@types/node": "^20.11.2",
"@types/node": "^20.11.5",
"@types/react": "18.2.21",
"@types/react-dom": "^18.2.18",
"autoprefixer": "^10.4.16",
"autoprefixer": "^10.4.17",
"eslint": "^8.56.0",
"eslint-config-next": "^14.0.4",
"eslint-config-next": "^14.1.0",
"postcss": "8.4.27",
"tailwindcss": "^3.4.1",
"typescript": "^5.3.3"
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
"@commitlint/config-conventional": "^17.8.1",
"@ianvs/prettier-plugin-sort-imports": "^4.1.1",
"@tsconfig/strictest": "^2.0.2",
"@types/node": "^20.11.2",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"@types/node": "^20.11.5",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^6.19.1",
"eslint": "^8.56.0",
"husky": "^8.0.3",
"lint-staged": "^14.0.1",
"package-json": "^8.1.1",
"prettier": "^2.8.8",
"pretty-quick": "^3.1.3",
"pretty-quick": "^3.3.1",
"rimraf": "^5.0.5",
"turbo": "^1.11.3",
"typescript": "^5.3.3"
Expand Down
6 changes: 3 additions & 3 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@
"devDependencies": {
"@axelarjs/config": "workspace:*",
"@axelarjs/utils": "workspace:*",
"@types/node": "^20.11.2",
"dotenv": "^16.3.1",
"@types/node": "^20.11.5",
"dotenv": "^16.3.2",
"fast-check": "^3.15.0",
"happy-dom": "^9.20.3",
"matchers": "link:@testing-library/jest-dom/matchers",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rimraf": "^5.0.5",
"typescript": "^5.3.3",
"vite": "^5.0.11",
"vite": "^5.0.12",
"vitest": "^1.2.1"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cosmos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"devDependencies": {
"@tsconfig/strictest": "^2.0.2",
"cosmjs-types": "^0.8.0",
"dotenv": "^16.3.1",
"dotenv": "^16.3.2",
"rambda": "^8.6.0",
"rimraf": "^5.0.5",
"typescript": "^5.3.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/deposit-address/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"license": "LicenseRef-LICENSE",
"devDependencies": {
"@axelarjs/config": "workspace:*",
"dotenv": "^16.3.1",
"dotenv": "^16.3.2",
"rimraf": "^5.0.5",
"typescript": "^5.3.3",
"vitest": "1.2.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/evm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"devDependencies": {
"@axelar-network/interchain-token-service": "^1.2.1",
"@axelarjs/config": "workspace:*",
"@types/node": "^20.11.2",
"@types/node": "^20.11.5",
"@types/prettier": "^2.7.3",
"commander": "^11.1.0",
"prettier": "^2.8.8",
Expand Down
6 changes: 3 additions & 3 deletions packages/proto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
"license": "LicenseRef-LICENSE",
"dependencies": {
"long": "^5.2.3",
"protobufjs": "^7.2.5"
"protobufjs": "^7.2.6"
},
"devDependencies": {
"@axelarjs/config": "workspace:*",
"@types/node": "^20.11.2",
"@types/node": "^20.11.5",
"degit": "^2.8.4",
"prettier": "^2.8.8",
"rimraf": "^5.0.5",
"ts-proto": "^1.166.2",
"ts-proto": "^1.166.4",
"typescript": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion packages/transaction-recovery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"license": "LicenseRef-LICENSE",
"devDependencies": {
"@axelarjs/config": "workspace:*",
"dotenv": "^16.3.1",
"dotenv": "^16.3.2",
"rimraf": "^5.0.5",
"typescript": "^5.3.3",
"vitest": "^1.2.1"
Expand Down
12 changes: 8 additions & 4 deletions packages/transaction-recovery/src/add-gas/isomorphic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,14 @@ export async function addGas(
{ autocalculateGasOptions, sendOptions, ...params }: AddGasParams,
dependencies: AddGasDependencies
): Promise<AddGasResponse> {
const chainConfig = await dependencies.configClient
.getChainConfigs(sendOptions.environment)
.then((res) => res.chains[params.chain] as AxelarCosmosChainConfig)
.catch(() => undefined);
const { chains } = await dependencies.configClient.getChainConfigs(
sendOptions.environment
);

const chainConfig =
params.chain in chains && chains[params.chain]?.module === "axelarnet"
? (chains[params.chain] as AxelarCosmosChainConfig)
: undefined;

if (!chainConfig) {
throw new Error(`chain ID ${params.chain} not found`);
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.2",
"@tsconfig/strictest": "^2.0.2",
"@types/node": "^20.11.2",
"@types/node": "^20.11.5",
"@types/react": "18.2.21",
"@types/react-dom": "18.2.7",
"@types/testing-library__jest-dom": "^5.14.9",
"@vitejs/plugin-react": "^4.2.1",
"autoprefixer": "^10.4.16",
"autoprefixer": "^10.4.17",
"commander": "^10.0.1",
"csstype": "^3.1.3",
"daisyui": "^4.6.0",
Expand All @@ -120,7 +120,7 @@
"postcss": "^8.4.33",
"prettier": "^2.8.8",
"prettier-plugin-tailwindcss": "^0.3.0",
"pretty-quick": "^3.1.3",
"pretty-quick": "^3.3.1",
"prop-types": "^15.8.1",
"storybook": "^7.6.10",
"tailwindcss": "^3.4.1",
Expand All @@ -129,7 +129,7 @@
"tsup": "^8.0.1",
"tsx": "^4.7.0",
"typescript": "^5.3.3",
"vite": "^5.0.11",
"vite": "^5.0.12",
"vitest": "^1.2.1",
"zx": "^7.2.3"
},
Expand Down
16 changes: 9 additions & 7 deletions packages/ui/src/components/icons/icons.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@ import type { Meta, StoryFn } from "@storybook/react";

import type { IconType } from ".";
import { Tooltip } from "../Tooltip";
import * as icons from "./svgr";
import * as lucideIcons from "./lucide";
import * as svgrIcons from "./svgr";

const iconset = Object.entries({ ...svgrIcons, ...lucideIcons });

export default {
title: "components/Icons",
component: icons.AxelarIcon,
} as Meta<typeof icons.AxelarIcon>;
component: svgrIcons.AxelarIcon,
} as Meta<typeof svgrIcons.AxelarIcon>;

const Template: StoryFn<IconType> = () => {
const iconComponents = Object.keys(icons).map(
(key) => icons[key as keyof typeof icons]
);
const iconComponents = iconset.map(([, value]) => value);

return (
<ul className="flex flex-wrap gap-2">
<ul className="flex max-w-4xl flex-wrap gap-2">
{iconComponents.map((Icon) => (
<>
<Tooltip tip={Icon.name}>
Expand Down
6 changes: 3 additions & 3 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
"@tsconfig/strictest": "^2.0.2",
"@types/lodash.debounce": "^4.0.9",
"@types/lodash.throttle": "^4.1.9",
"@types/node": "^20.11.2",
"@types/ramda": "^0.29.9",
"@types/node": "^20.11.5",
"@types/ramda": "^0.29.10",
"@types/react": "18.2.21",
"@types/react-dom": "18.2.7",
"@types/testing-library__jest-dom": "^5.14.9",
Expand All @@ -81,7 +81,7 @@
"react-dom": "^18.2.0",
"rimraf": "^5.0.5",
"typescript": "^5.3.3",
"vite": "^5.0.11",
"vite": "^5.0.12",
"vitest": "^1.2.1"
},
"dependencies": {
Expand Down
Loading

0 comments on commit 7114385

Please sign in to comment.