feat: misc solana fixes (#1049)

Author: dohaki

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [

src/coingecko/Coingecko.ts

@@ -70,13 +70,14 @@ export class Coingecko {
   private platformIdMap = new Map<number, string>(); // chainId => platform_id (137 => "polygon-pos")
   private tokenIdMap: Record<string, Record<string, string>> = {}; // coinGeckoId => { platform_id : "tokenAddress":}
 
-  public static get(logger: Logger, apiKey?: string) {
+  public static get(logger: Logger, apiKey?: string, customPlatformIdMap?: Record<number, string>) {
     if (!this.instance)
       this.instance = new Coingecko(
         "https://api.coingecko.com/api/v3",
         "https://pro-api.coingecko.com/api/v3",
         logger,
-        apiKey
+        apiKey,
+        customPlatformIdMap
       );
     return this.instance;
   }
@@ -98,7 +99,8 @@ export class Coingecko {
     private readonly host: string,
     private readonly proHost: string,
     private readonly logger: Logger,
-    private readonly apiKey?: string
+    private readonly apiKey?: string,
+    private readonly customPlatformIdMap?: Record<number, string>
   ) {
     this.prices = {};
   }
@@ -115,6 +117,13 @@ export class Coingecko {
       platforms.filter((chain) => Boolean(chain.chain_identifier)).map((chain) => [chain.chain_identifier, chain.id])
     );
 
+    // Extend the platformIdMap with any custom platform ids
+    if (this.customPlatformIdMap) {
+      Object.entries(this.customPlatformIdMap).forEach(([chainId, platformId]) => {
+        this.platformIdMap.set(Number(chainId), platformId);
+      });
+    }
+
     id = this.platformIdMap.get(chainId);
     if (!id) {
       this.logger.error({

src/gasPriceOracle/adapters/solana.ts

@@ -34,7 +34,9 @@ export async function messageFee(provider: SVMProvider, opts: GasPriceEstimateOp
 
   // Optionally impose a minimum priority fee, denoted in microLamports/computeUnit.
   const flooredPriorityFeePerGas = parseUnits(process.env[`MIN_PRIORITY_FEE_PER_GAS_${opts.chainId}`] || "0", 6);
-  let microLamportsPerComputeUnit = toBN(totalPrioritizationFees / BigInt(nonzeroPrioritizationFees.length));
+  let microLamportsPerComputeUnit = toBN(
+    totalPrioritizationFees / BigInt(Math.max(nonzeroPrioritizationFees.length, 1))
+  );
   if (microLamportsPerComputeUnit.lt(flooredPriorityFeePerGas)) {
     microLamportsPerComputeUnit = flooredPriorityFeePerGas;
   }

src/utils/TokenUtils.ts

@@ -4,9 +4,9 @@ import * as constants from "../constants";
 import { L1Token } from "../interfaces";
 import { ERC20__factory } from "../typechain";
 import { BigNumber } from "./BigNumberUtils";
-import { getNetworkName, chainIsL1, chainIsProd } from "./NetworkUtils";
+import { getNetworkName, chainIsL1, chainIsProd, chainIsSvm } from "./NetworkUtils";
 import { isDefined } from "./TypeGuards";
-import { compareAddressesSimple } from "./AddressUtils";
+import { compareAddressesSimple, toAddressType } from "./AddressUtils";
 const { TOKEN_SYMBOLS_MAP, CHAIN_IDs, TOKEN_EQUIVALENCE_REMAPPING } = constants;
 
 type SignerOrProvider = providers.Provider | Signer;
@@ -112,9 +112,12 @@ export function isStablecoin(tokenSymbol: string): boolean {
  * @returns
  */
 export function getTokenInfo(l2TokenAddress: string, chainId: number, tokenMapping = TOKEN_SYMBOLS_MAP): L1Token {
+  const parsedAddress = chainIsSvm(chainId)
+    ? toAddressType(l2TokenAddress).toBase58()
+    : toAddressType(l2TokenAddress).toEvmAddress();
   // @dev This might give false positives if tokens on different networks have the same address. I'm not sure how
   // to get around this...
-  let tokenObject = Object.values(tokenMapping).find(({ addresses }) => addresses[chainId] === l2TokenAddress);
+  let tokenObject = Object.values(tokenMapping).find(({ addresses }) => addresses[chainId] === parsedAddress);
   if (!tokenObject) {
     throw new Error(
       `TokenUtils#getTokenInfo: Unable to resolve token in TOKEN_SYMBOLS_MAP for ${l2TokenAddress} on chain ${chainId}`