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

feat: integrate estimate gas fee api #480

Merged
merged 6 commits into from
Dec 23, 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 apps/maestro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"dependencies": {
"@axelar-network/axelar-cgp-sui": "0.0.0-snapshot.424bc13",
"@axelar-network/axelarjs-sdk": "0.17.1-alpha.5",
"@axelar-network/axelarjs-sdk": "0.17.1-alpha.10",
"@axelarjs/api": "workspace:*",
"@axelarjs/core": "workspace:*",
"@axelarjs/evm": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Maybe } from "@axelarjs/utils";
import { useEffect, useState } from "react";

import { formatEther } from "viem";
Expand All @@ -6,7 +7,8 @@ import {
NEXT_PUBLIC_INTERCHAIN_DEPLOYMENT_EXECUTE_DATA,
NEXT_PUBLIC_INTERCHAIN_DEPLOYMENT_GAS_LIMIT,
} from "~/config/env";
import { useChainId } from "~/lib/hooks";
import { useBalance, useChainId } from "~/lib/hooks";
import { toNumericString } from "~/lib/utils/bigint";
import { useEstimateGasFeeMultipleChainsQuery } from "~/services/axelarjsSDK/hooks";
import { useEVMChainConfigsQuery } from "~/services/axelarscan/hooks";
import { useCanonicalTokenDeploymentStateContainer } from "../../CanonicalTokenDeployment.state";
Expand All @@ -18,6 +20,7 @@ export type UseStep3ChainSelectionStateProps = {
export function useStep3ChainSelectionState() {
const { data: evmChains } = useEVMChainConfigsQuery();
const chainId = useChainId();
const userBalance = useBalance();
const [isDeploying, setIsDeploying] = useState(false);
const [totalGasFee, $setTotalGasFee] = useState(formatEther(0n));
const [sourceChainId, setSourceChainId] = useState(
Expand All @@ -38,23 +41,17 @@ export function useStep3ChainSelectionState() {
gasMultiplier: "auto",
});

useEffect(
() =>
remoteDeploymentGasFees &&
setTotalGasFee(remoteDeploymentGasFees.totalGasFee),
[remoteDeploymentGasFees]
);
useEffect(() => {
Maybe.of(remoteDeploymentGasFees?.totalGasFee)
.map((value) => toNumericString(value, userBalance?.decimals || 18))
.map($setTotalGasFee);
}, [remoteDeploymentGasFees, $setTotalGasFee, userBalance?.decimals]);

const resetState = () => {
setIsDeploying(false);
$setTotalGasFee(formatEther(0n));
};

const setTotalGasFee = (total: bigint) => {
const num = Number(formatEther(total));
$setTotalGasFee(num.toFixed(4));
};

useEffect(() => {
const candidateChain = evmChains?.find(
(evmChain) => evmChain.chain_id === chainId
Expand All @@ -77,7 +74,7 @@ export function useStep3ChainSelectionState() {
actions: {
resetState,
setIsDeploying,
setTotalGasFee,
$setTotalGasFee,
setSourceChainId,
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
NEXT_PUBLIC_INTERCHAIN_DEPLOYMENT_EXECUTE_DATA,
NEXT_PUBLIC_INTERCHAIN_DEPLOYMENT_GAS_LIMIT,
} from "~/config/env";
import { useChainId } from "~/lib/hooks";
import { useBalance, useChainId } from "~/lib/hooks";
import { toNumericString } from "~/lib/utils/bigint";
import { useEstimateGasFeeMultipleChainsQuery } from "~/services/axelarjsSDK/hooks";
import { useEVMChainConfigsQuery } from "~/services/axelarscan/hooks";
Expand All @@ -20,6 +20,7 @@ export type UseStep2ChainSelectionStateProps = {
export function useStep2ChainSelectionState() {
const { data: evmChains } = useEVMChainConfigsQuery();
const chainId = useChainId();
const userBalance = useBalance();
const [isDeploying, setIsDeploying] = useState(false);
const [totalGasFee, setTotalGasFee] = useState(formatEther(0n));
const [sourceChainId, setSourceChainId] = useState(
Expand All @@ -42,9 +43,9 @@ export function useStep2ChainSelectionState() {

useEffect(() => {
Maybe.of(remoteDeploymentGasFees?.totalGasFee)
.map(toNumericString)
.map((value) => toNumericString(value, userBalance?.decimals || 18))
.map(setTotalGasFee);
}, [remoteDeploymentGasFees, setTotalGasFee]);
}, [remoteDeploymentGasFees, setTotalGasFee, userBalance?.decimals]);

const resetState = () => {
setIsDeploying(false);
Expand Down
6 changes: 3 additions & 3 deletions apps/maestro/src/lib/utils/bigint.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { formatEther } from "viem";
import { formatUnits } from "viem";

export const toNumericString = (num: bigint) =>
Number(formatEther(num)).toLocaleString("en", {
export const toNumericString = (num: bigint, decimals = 18) =>
Number(formatUnits(num, decimals)).toLocaleString("en", {
minimumFractionDigits: 2,
maximumFractionDigits: 4,
});
3 changes: 2 additions & 1 deletion apps/maestro/src/server/routers/sui/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ export const suiRouter = router({
const response = await fetch(
`${suiServiceBaseUrl}/chain/devnet-amplifier`
);
const chainConfig = await response.json();
const _chainConfig = await response.json();
const chainConfig = _chainConfig.chains.sui;
const {
sender,
symbol,
Expand Down
47 changes: 18 additions & 29 deletions apps/maestro/src/services/axelarjsSDK/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,24 @@ export const client = new AxelarQueryAPI({
});

async function estimateGasFee(params: EstimateGasFeeInput): Promise<bigint> {
let response;
console.log("params estimateGasFee", params);
// TODO: remove when sdk support for sui is ready
if (
params.sourceChainId.includes("sui") ||
params.destinationChainId.includes("sui")
) {
response = "20000000000000000";
} else
response = await client.estimateGasFee(
params.sourceChainId,
params.destinationChainId,
params.gasLimit,
params.gasMultiplier,
params.sourceChainTokenSymbol,
params.minGasPrice,
params.executeData as `0x${string}` | undefined
);

const rawFee =
typeof response === "string"
? response
: response.baseFee +
response.l1ExecutionFeeWithMultiplier +
response.executionFeeWithMultiplier;

console.log("rawFee", rawFee);

return BigInt(rawFee);
const hopParams = [
{
...params,
sourceChain: params.sourceChainId,
destinationChain: "axelar",
gasLimit: params.gasLimit.toString(),
},
{
...params,
sourceChain: "axelar",
destinationChain: params.destinationChainId,
gasLimit: params.gasLimit.toString(),
},
];

const fee = await client.estimateMultihopFee(hopParams);

return BigInt(fee as string);
}

async function estimateGasFeeMultipleChains(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ const ConnectedInterchainTokensPage: FC<ConnectedInterchainTokensPageProps> = (
<div className="flex items-center justify-end gap-1 text-sm md:ml-2">
≈{" "}
<BigNumberText
decimals={18}
decimals={userGasBalance?.decimals || 18}
localeOptions={{
style: "decimal",
maximumFractionDigits: 4,
Expand Down
Loading
Loading