Merge branch 'main' into env/mainnet

axelarnetwork · Oct 9, 2024 · 5f5b2c0 · 5f5b2c0
2 parents c5c255c + 372e279
commit 5f5b2c0
Show file tree

Hide file tree

Showing 11 changed files with 10,892 additions and 14,293 deletions.
diff --git a/apps/axelarscan-amplifier-apis/CHANGELOG.md b/apps/axelarscan-amplifier-apis/CHANGELOG.md
@@ -1,5 +1,11 @@
 # axelarscan-amplifier-apis
 
+## 0.0.4
+
+### Patch Changes
+
+- [#451](https://github.com/axelarnetwork/axelarjs/pull/451) [`89680a5b273e46465e3387346415beaad8e67c8c`](https://github.com/axelarnetwork/axelarjs/commit/89680a5b273e46465e3387346415beaad8e67c8c) Thanks [@SGiaccobasso](https://github.com/SGiaccobasso)! - add hedera to fees and prices file testnet and stagenet
+
 ## 0.0.3
 
 ### Patch Changes

diff --git a/apps/axelarscan-amplifier-apis/package.json b/apps/axelarscan-amplifier-apis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "axelarscan-amplifier-apis",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",

diff --git a/apps/axelarscan-amplifier-apis/src/configs/feesAndPrices.ts b/apps/axelarscan-amplifier-apis/src/configs/feesAndPrices.ts
@@ -24,6 +24,14 @@ const feesAndPrices = {
       approvalCost: 250000,
       updated: "2024-09-05",
     },
+    {
+      name: "hedera",
+      amplifierChainId: "hedera",
+      description: null,
+      gasPriceGwei: 1730,
+      approvalCost: 250000,
+      updated: "2024-09-18",
+    },
   ],
   stagenet: [
     {
@@ -50,74 +58,48 @@ const feesAndPrices = {
       approvalCost: 250000,
       updated: "2024-09-05",
     },
-  ],
-  "devnet-verifiers": [
-    {
-      name: "Avalanche",
-      amplifierChainId: "avalanche",
-      description: null,
-      gasPriceGwei: 25,
-      approvalCost: 425000,
-      updated: "2024-08-05",
-    },
-    {
-      name: "fantom",
-      amplifierChainId: "fantom",
-      description: null,
-      gasPriceGwei: 1.03,
-      approvalCost: 1300000,
-      updated: "2024-08-05",
-    },
     {
-      name: "ethereum-sepolia",
-      amplifierChainId: "ethereum-sepolia",
+      name: "hedera",
+      amplifierChainId: "hedera",
       description: null,
-      gasPriceGwei: 11.5,
-      approvalCost: 200000,
-      updated: "2024-08-05",
-    },
-    {
-      name: "op-sepolia",
-      amplifierChainId: "op-sepolia",
-      description: null,
-      gasPriceGwei: 0.001,
-      approvalCost: 300000,
-      updated: "2024-08-05",
+      gasPriceGwei: 1730,
+      approvalCost: 250000,
+      updated: "2024-09-18",
     },
   ],
   "devnet-amplifier": [
     {
       name: "Avalanche",
-      amplifierChainId: "avalanche",
+      amplifierChainId: "avalanche-fuji",
       description: null,
       gasPriceGwei: 25,
-      approvalCost: 425000,
-      updated: "2024-08-05",
-    },
-    {
-      name: "fantom",
-      amplifierChainId: "fantom",
-      description: null,
-      gasPriceGwei: 1.03,
-      approvalCost: 1300000,
+      approvalCost: 200000,
       updated: "2024-08-05",
     },
     {
-      name: "ethereum-sepolia",
-      amplifierChainId: "ethereum-sepolia",
+      name: "eth-sepolia",
+      amplifierChainId: "eth-sepolia",
       description: null,
       gasPriceGwei: 6.4,
       approvalCost: 200000,
       updated: "2024-08-05",
     },
     {
-      name: "op-sepolia",
-      amplifierChainId: "op-sepolia",
+      name: "optimism-sepolia",
+      amplifierChainId: "optimism-sepolia",
       description: null,
       gasPriceGwei: 0.001,
       approvalCost: 300000,
       updated: "2024-08-05",
     },
+    {
+      name: "flow",
+      amplifierChainId: "flow",
+      description: null,
+      gasPriceGwei: 0.1,
+      approvalCost: 250000,
+      updated: "2024-09-05",
+    },
   ],
   mainnet: [],
 };

diff --git a/apps/maestro/CHANGELOG.md b/apps/maestro/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @axelarjs/maestro
 
+## 0.3.28
+
+### Patch Changes
+
+- [#467](https://github.com/axelarnetwork/axelarjs/pull/467) [`f5764a714a0c7ddf27f9972f8f16ffbe1e3282a1`](https://github.com/axelarnetwork/axelarjs/commit/f5764a714a0c7ddf27f9972f8f16ffbe1e3282a1) Thanks [@SGiaccobasso](https://github.com/SGiaccobasso)! - change ethereum rpc urls
+
+## 0.3.27
+
+### Patch Changes
+
+- [#460](https://github.com/axelarnetwork/axelarjs/pull/460) [`2212d30216b3af7b6d2c2bfce0318bb3de62678b`](https://github.com/axelarnetwork/axelarjs/commit/2212d30216b3af7b6d2c2bfce0318bb3de62678b) Thanks [@SGiaccobasso](https://github.com/SGiaccobasso)! - allow making transfers for tokens with 0 decimals
+
+## 0.3.26
+
+### Patch Changes
+
+- [#454](https://github.com/axelarnetwork/axelarjs/pull/454) [`649ec35ad543c44fd6eb73ee18a184952b9e7598`](https://github.com/axelarnetwork/axelarjs/commit/649ec35ad543c44fd6eb73ee18a184952b9e7598) Thanks [@SGiaccobasso](https://github.com/SGiaccobasso)! - fix search interchain tokens query issue where it was only looking at the results for the first chain searched
+
 ## 0.3.25
 
 ### Patch Changes

diff --git a/apps/maestro/package.json b/apps/maestro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axelarjs/maestro",
-  "version": "0.3.25",
+  "version": "0.3.28",
   "private": true,
   "publishConfig": {
     "access": "restricted"

diff --git a/apps/maestro/src/config/evm-chains.ts b/apps/maestro/src/config/evm-chains.ts
@@ -68,7 +68,10 @@ function createRpcUrlConfig(chain: Chain, additionalUrls: string[] = []) {
 export const ALL_CHAINS: ExtendedWagmiChainConfig[] = [
   {
     ...mainnet,
-    rpcUrls: createRpcUrlConfig(mainnet, ["https://eth.llamarpc.com"]),
+    rpcUrls: {
+      default: { http: ["https://eth.llamarpc.com", "https://eth.drpc.org"] }, // Temporarily using this url
+      public: { http: ["https://eth.llamarpc.com", "https://eth.drpc.org"] },
+    },
     axelarChainId: "ethereum",
     axelarChainName: "ethereum",
     environment: ENVIRONMENTS.mainnet,

diff --git a/...estro/src/features/SendInterchainToken/hooks/useInterchainTokenServiceTransferMutation.ts b/...estro/src/features/SendInterchainToken/hooks/useInterchainTokenServiceTransferMutation.ts
@@ -156,7 +156,8 @@ export function useInterchainTokenServiceTransferMutation(
 
   const mutation = useMutation<void, unknown, UseSendInterchainTokenInput>({
     mutationFn: async ({ amount }) => {
-      if (!(decimals && address && config.gas)) {
+      // allow token transfers with decimals === 0 but not undefined
+      if (!(decimals !== undefined && address && config.gas)) {
         return;
       }
 

diff --git a/apps/maestro/src/server/routers/interchainToken/searchInterchainToken.ts b/apps/maestro/src/server/routers/interchainToken/searchInterchainToken.ts
@@ -299,9 +299,8 @@ async function scanChains(
         return null;
       });
   });
-
   const results = await Promise.all(promises);
-  const validResult = results.find((result) => result !== null);
+  const validResult = results.find((result) => result);
 
   return validResult || null;
 }

diff --git a/apps/maestro/src/services/interchainToken/hooks.ts b/apps/maestro/src/services/interchainToken/hooks.ts
@@ -6,7 +6,7 @@ import { trpc } from "~/lib/trpc";
 
 export function useInterchainTokenDetailsQuery(input: {
   chainId?: number;
-  tokenAddress?: `0x${string}`;
+  tokenAddress?: `0x${string}` | null;
 }) {
   return trpc.interchainToken.getInterchainTokenDetails.useQuery(
     {

diff --git a/apps/maestro/src/ui/pages/InterchainTokenDetailsPage/index.tsx b/apps/maestro/src/ui/pages/InterchainTokenDetailsPage/index.tsx
@@ -31,8 +31,8 @@ const InterchainTokensPage: FC = () => {
   });
 
   const { data: interchainTokenDetails } = useInterchainTokenDetailsQuery({
-    chainId: routeChain?.id,
-    tokenAddress,
+    chainId: interchainToken?.chainId,
+    tokenAddress: interchainToken?.tokenAddress,
   });
 
   const { data: tokenDetails } = useERC20TokenDetailsQuery({