fixup! chore: added gas estimation api to planner

Author: frazarshad

packages/portfolio-contract/tools/portfolio-actors.ts

@@ -348,7 +348,7 @@ export const planTransfer = (
   dest: PoolKey,
   amount: NatAmount,
   feeBrand: Brand<'nat'>,
-  gmpFees: { acct: bigint; wallet: bigint; return: bigint},
+  gmpFees: { acct: bigint; wallet: bigint; return: bigint },
 ): MovementDesc[] => {
   const { protocol: p, chainName: evm } = PoolPlaces[dest];
   const steps: MovementDesc[] = [];
@@ -368,7 +368,7 @@ export const planTransfer = (
         dest: `@${evm}`,
         amount,
         fee: make(feeBrand, gmpFees.acct),
-        detail: {evmFee: gmpFees.return}
+        detail: { evmGas: gmpFees.return },
       });
       steps.push({
         src: `@${evm}`,

services/ymax-planner/package.json

@@ -26,7 +26,6 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/keccak": "^3",
     "@types/node": "^22.10.2",
     "@types/ws": "^8",
     "ava": "^6.3.0",
@@ -42,7 +41,6 @@
     "@agoric/ertp": "workspace:*",
     "@agoric/internal": "workspace:*",
     "@agoric/orchestration": "workspace:*",
-    "@axelar-network/axelarjs-sdk": "^0.17.7",
     "@cosmjs/crypto": "^0.36.0",
     "@cosmjs/encoding": "^0.36.0",
     "@cosmjs/proto-signing": "^0.36.0",
@@ -55,12 +53,10 @@
     "@endo/patterns": "^1.7.0",
     "@endo/promise-kit": "^1.1.13",
     "@google-cloud/secret-manager": "^6.1.0",
-    "@metamask/abi-utils": "^3.0.0",
     "chain-registry": "^2.0.44",
     "dotenv": "^17.2.1",
     "ethers": "^6.13.0",
     "json-rpc-2.0": "^1.7.1",
-    "keccak": "^3.0.4",
     "ky": "^1.4.0",
     "ts-blank-space": "^0.6.1",
     "ws": "^8.18.3"

services/ymax-planner/src/gas-estimation.ts

@@ -1,85 +1,49 @@
-import { AxelarQueryAPI, Environment } from '@axelar-network/axelarjs-sdk';
+import { buildGMPPayload } from '@agoric/orchestration/src/utils/gmp.js';
 import { ethers } from 'ethers';
-import { fromHex } from '@cosmjs/encoding';
-import { encodeAbiParameters } from 'viem';
-import createKeccakHash from 'keccak';
-import { encode } from '@metamask/abi-utils';
 
 const GAS_ESTIMATOR_CONTRACT = '0x0010F196F5CD0314f68FF665b8c8eD93531112Fe';
+const COMMAND_ID =
+  '0xddea323337dfb73c82df7393d76b2f38835d5c2bda0123c47d1a2fc06527d19f';
 
-const hexToBytes = (hex: string) => fromHex(hex.slice(2));
+const bytesToHex = (bytes: number[]): string =>
+  '0x' + bytes.map(n => n.toString(16).padStart(2, '0')).join('');
 
-const uint8ArrayToHex = (uint8Array: Uint8Array): string => {
-  return `0x${Array.from(uint8Array)
-    .map(byte => byte.toString(16).padStart(2, '0'))
-    .join('')}`;
+const vars = {
+  mainnet: {
+    AXELAR_GAS_API: 'https://api.axelarscan.io/gmp/estimateGasFee',
+    RPC: {
+      Avalanche: 'https://api.avax.network/ext/bc/C/rpc',
+    },
+  },
+  testnet: {
+    AXELAR_GAS_API: 'https://testnet.api.axelarscan.io/gmp/estimateGasFee',
+    RPC: {
+      Avalanche: 'https://api.avax-test.network/ext/bc/C/rpc',
+    },
+  },
 };
 
-const pack = (
-  functionSignature: string,
-  paramTypes: Array<string>,
-  params: Array<string>,
-): `0x${string}` => {
-  const functionHash = createKeccakHash('keccak256')
-    .update(functionSignature)
-    .digest();
-  return uint8ArrayToHex(
-    Uint8Array.from([
-      ...Uint8Array.from(functionHash.subarray(0, 4)),
-      ...encode(paramTypes, params),
-    ]),
-  ) as `0x${string}`;
-};
+const params = vars['testnet'];
 
-const generatePayload = (
-  id: string,
-  contractAddress: string,
-  payment: string,
-) => {
-  const abiEncodedContractCalls = [
+const generatePayload = (contractAddress: string, payment: string) => {
+  const contractCalls = [
     {
       target: '0x5425890298aed601595a70AB815c96711a31Bc65' as `0x${string}`,
-      data: pack(
-        'approve(address,uint256)',
-        ['address', 'uint256'],
-        ['0x8B9b2AF4afB389b4a70A474dfD4AdCD4a302bb40', payment],
-      ),
+      functionSignature: 'approve(address,uint256)',
+      args: ['0x8B9b2AF4afB389b4a70A474dfD4AdCD4a302bb40', payment],
     },
     {
       target: '0x8B9b2AF4afB389b4a70A474dfD4AdCD4a302bb40' as `0x${string}`,
-      data: pack(
-        'supply(address,uint256,address,uint16)',
-        ['address', 'uint256', 'address', 'uint16'],
-        [
-          '0x5425890298aed601595a70AB815c96711a31Bc65',
-          payment,
-          contractAddress,
-          '0',
-        ],
-      ),
+      functionSignature: 'supply(address,uint256,address,uint16)',
+      args: [
+        '0x5425890298aed601595a70AB815c96711a31Bc65',
+        payment,
+        contractAddress,
+        '0',
+      ],
     },
   ];
-  const payload = encodeAbiParameters(
-    [
-      {
-        type: 'tuple',
-        name: 'callMessage',
-        components: [
-          { name: 'id', type: 'string' },
-          {
-            name: 'calls',
-            type: 'tuple[]',
-            components: [
-              { name: 'target', type: 'address' },
-              { name: 'data', type: 'bytes' },
-            ],
-          },
-        ],
-      },
-    ],
-    [{ id, calls: abiEncodedContractCalls }],
-  );
-  return payload;
+  return bytesToHex(buildGMPPayload(contractCalls));
 };
 
 const queryAxelarGasAPI = async (
@@ -88,18 +52,26 @@ const queryAxelarGasAPI = async (
   gasLimit: bigint,
   gasToken?: string,
 ) => {
-  const api = new AxelarQueryAPI({ environment: Environment.TESTNET });
-
-  const GAS_MULTIPLIER = 1;
-
-  const feeQuote = await api.estimateGasFee(
-    sourceChain,
-    destinationChain, // mayber lowercase?
-    gasLimit,
-    GAS_MULTIPLIER,
-    gasToken,
-  );
-  return feeQuote;
+  const response = await fetch(params.AXELAR_GAS_API, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      sourceChain,
+      destinationChain,
+      gasLimit: gasLimit.toString(),
+      sourceTokenSymbol: gasToken,
+      gasMultiplier: '1',
+    }),
+  });
+
+  if (!response.ok) {
+    throw new Error(`HTTP error! status: ${response.status}`);
+  }
+
+  const data = await response.json();
+  return data;
 };
 
 export const getReturnFeeEstimate = async (chainName: string) => {
@@ -151,22 +123,15 @@ const createGasEstimator = (rpcUrl: string, contractAddress: string) => {
 };
 
 const estimateContracts = {
-  Avalanche: createGasEstimator(
-    'https://api.avax-test.network/ext/bc/C/rpc',
-    GAS_ESTIMATOR_CONTRACT,
-  ),
+  Avalanche: createGasEstimator(params.RPC.Avalanche, GAS_ESTIMATOR_CONTRACT),
 };
 
 export const getWalletEstimate = async (chainName: string) => {
   const estimateContract = estimateContracts[chainName];
-  const txId = 'tx0';
-  const payloadString = generatePayload(txId, GAS_ESTIMATOR_CONTRACT, '5');
-  const payload = Array.from(hexToBytes(payloadString));
-  const commandId =
-    '0xddea323337dfb73c82df7393d76b2f38835d5c2bda0123c47d1a2fc06527d19f';
+  const payload = generatePayload(GAS_ESTIMATOR_CONTRACT, '5');
 
-  const gasLimit = await estimateContract('executeFactory', [
-    commandId,
+  const gasLimit = await estimateContract('executeWallet', [
+    COMMAND_ID,
     'agoric',
     'agoric1owner',
     payload,
@@ -180,15 +145,14 @@ export const getWalletEstimate = async (chainName: string) => {
   )) as string;
   return BigInt(estimate);
 };
+
 export const getFactoryContractEstimate = async (chainName: string) => {
   const estimateContract = estimateContracts[chainName];
 
   const payload = ethers.AbiCoder.defaultAbiCoder().encode(['uint256'], [0]);
-  const commandId =
-    '0xddea323337dfb73c82df7393d76b2f38835d5c2bda0123c47d1a2fc06527d19f';
 
   const gasLimit = await estimateContract('executeFactory', [
-    commandId,
+    COMMAND_ID,
     'agoric',
     'agoric1owner',
     payload,

services/ymax-planner/src/plan-deposit.ts

@@ -119,5 +119,6 @@ export const handleDeposit = async (
       }),
     ),
   ];
-  return steps;
+  console.log(steps);
+  // return steps;
 };