@paraswap/dex-lib 2.49.2-dackieswapv3-base.0 → 2.49.2

package/build/dex-helper/RedisBatcher.d.ts

@@ -0,0 +1,20 @@
+import { ChainableCommander } from 'ioredis';
+export declare type BatchedCmd = {
+    makeCmd: (chain: ChainableCommander) => void;
+    cb: (result: string | null) => boolean;
+};
+declare class DexlibRedisBatcher {
+    private intervalTimeMs;
+    private interval?;
+    private _lastLoggedAt;
+    private isAlreadyRunning;
+    private cmds;
+    private tmpCmds;
+    constructor(intervalTimeMs: number);
+    enable(): void;
+    disable(): void;
+    addCmd(cmd: BatchedCmd): void;
+    execute(): Promise<void>;
+}
+export declare const redisBatcher: DexlibRedisBatcher;
+export {};

package/build/dex-helper/RedisBatcher.js

@@ -0,0 +1,75 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redisBatcher = void 0;
+const RedisWrapper_1 = __importDefault(require("./RedisWrapper"));
+const REDIS_BATCHER_INTERVAL_MS = 100;
+const LOG_PERIOD_MS = 10 * 1000;
+const logger = console;
+class DexlibRedisBatcher {
+    constructor(intervalTimeMs) {
+        this.intervalTimeMs = intervalTimeMs;
+        this._lastLoggedAt = 0;
+        this.isAlreadyRunning = false;
+        this.cmds = [];
+        this.tmpCmds = [];
+    }
+    enable() {
+        this.interval = setInterval(this.execute.bind(this), this.intervalTimeMs);
+    }
+    disable() {
+        if (this.interval) {
+            clearInterval(this.interval);
+            this.interval = undefined;
+        }
+    }
+    addCmd(cmd) {
+        this.tmpCmds.push(cmd);
+    }
+    async execute() {
+        if (this.isAlreadyRunning) {
+            return;
+        }
+        try {
+            this.isAlreadyRunning = true;
+            const cmdsCount = this.tmpCmds.length + this.cmds.length;
+            if (cmdsCount === 0) {
+                return;
+            }
+            logger.trace(`execute ${cmdsCount} cmds`);
+            this.tmpCmds.forEach(cmd => this.cmds.push(cmd));
+            this.tmpCmds.length = 0;
+            const results = await RedisWrapper_1.default.batchReadOnlyCmds(this.cmds);
+            this.cmds = this.cmds.filter((cmd, index) => {
+                if (!results) {
+                    logger.error('no results');
+                    return true;
+                }
+                const res = results[index];
+                if (!res) {
+                    logger.error('error in execute empty result');
+                    return true;
+                }
+                if (res[0]) {
+                    logger.error('error in execute, res[0] =', res[0]);
+                    return true;
+                }
+                return !cmd.cb(res[1]);
+            });
+            if (this.cmds.length && Date.now() - this._lastLoggedAt > LOG_PERIOD_MS) {
+                logger.info(`still some cmds to run ${this.cmds.length}`);
+                this._lastLoggedAt = Date.now();
+            }
+        }
+        catch (e) {
+            logger.error('error in execute:', e);
+        }
+        finally {
+            this.isAlreadyRunning = false;
+        }
+    }
+}
+exports.redisBatcher = new DexlibRedisBatcher(REDIS_BATCHER_INTERVAL_MS);
+//# sourceMappingURL=RedisBatcher.js.map

package/build/dex-helper/RedisBatcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisBatcher.js","sourceRoot":"","sources":["../../src/dex-helper/RedisBatcher.ts"],"names":[],"mappings":"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"}

package/build/dex-helper/RedisWrapper.d.ts

@@ -0,0 +1,37 @@
+import { Redis } from 'ioredis';
+interface Pool<T> extends Array<T> {
+    next: () => T;
+}
+export declare class DexlibRedisWrapper {
+    static MAX_SCORE_VALUE: number;
+    private redisMasterUrl;
+    private redisSlavesUrl;
+    masterPool: Pool<Redis>;
+    slavesPool: Pool<Redis>;
+    connect(redisMasterUrl?: string, redisSlavesUrl?: string, connectionPerPool?: number): Promise<void>;
+    private _checkConnected;
+    checkConnected(): void;
+    close(): Promise<void>;
+    get(key: string): Promise<string | null>;
+    set(key: string, value: string): Promise<"OK">;
+    setex(key: string, seconds: number, value: string): Promise<"OK">;
+    incrWithTTLSec(key: string, ttlSec: number): Promise<number>;
+    sismember(set: string, key: string): Promise<number>;
+    publish(channel: string, value: string): Promise<number>;
+    subscribe(channel: string, cb: (channel: string, message: string) => void): Promise<unknown>;
+    del(key: string): Promise<number>;
+    zremrangebyscore(key: string, min: number, max: number): Promise<number>;
+    zadd(key: string, bulkItemsToAdd: (number | string)[], option?: 'NX'): Promise<number>;
+    zrem(key: string, membersKeys: string[]): Promise<number>;
+    zscore(key: string, member: string): Promise<string | null>;
+    hset(mapKey: string, mappings: Record<string, string>): Promise<number | undefined>;
+    hdel(mapKey: string, keys: string[]): Promise<number>;
+    hget(keyMap: string, key: string): Promise<string | null>;
+    hmget(keyMap: string, keys: string[]): Promise<(string | null)[]>;
+    hgetAll(keyMap: string): Promise<Record<string, string>>;
+    zrangebyscore(key: string, min: number, max: number, isWithScores?: boolean): Promise<string[]>;
+    zcount(key: string, min: number, max: number): Promise<number>;
+    sadd(set: string, keys: string[], ttl?: number): Promise<number | [error: Error | null, result: unknown][] | null>;
+}
+declare const _default: DexlibRedisWrapper;
+export default _default;

package/build/dex-helper/RedisWrapper.js

@@ -0,0 +1,165 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DexlibRedisWrapper = void 0;
+const ioredis_1 = __importDefault(require("ioredis"));
+const logger = console;
+const IOREDIS_OPTION = {
+    enableAutoPipelining: true,
+    lazyConnect: true,
+    stringNumbers: true,
+};
+function makePool(url, connectionPerPool) {
+    const pool = Array.apply(null, new Array(connectionPerPool)).map(() => new ioredis_1.default(url, IOREDIS_OPTION));
+    const lastIdx = pool.length - 1;
+    pool.idx = 0;
+    pool.next = () => {
+        const n = pool[pool.idx];
+        pool.idx = pool.idx === lastIdx ? 0 : pool.idx + 1;
+        return n;
+    };
+    return pool;
+}
+class DexlibRedisWrapper {
+    constructor() {
+        this.redisMasterUrl = '';
+        this.redisSlavesUrl = '';
+    }
+    async connect(redisMasterUrl = 'redis://localhost:32768', redisSlavesUrl = 'redis://localhost:32768', connectionPerPool = 5) {
+        this.redisMasterUrl = redisMasterUrl;
+        this.redisSlavesUrl = redisSlavesUrl;
+        this.masterPool = makePool(redisMasterUrl, connectionPerPool);
+        this.slavesPool = makePool(redisSlavesUrl, connectionPerPool);
+        try {
+            logger.info(`Connecting to REDIS... ${this.redisMasterUrl}`);
+            await Promise.all([...this.masterPool, ...this.slavesPool].map(redis => redis.connect()));
+            logger.info('Connected to REDIS');
+        }
+        catch (e) {
+            logger.error(`Connecting to REDIS ${e}`);
+            throw e;
+        }
+    }
+    _checkConnected(redis) {
+        if (redis.status !== 'ready') {
+            throw new Error('Redis connection down!');
+        }
+    }
+    checkConnected() {
+        this.masterPool.forEach(this._checkConnected);
+        this.slavesPool.forEach(this._checkConnected);
+    }
+    async close() {
+        try {
+            logger.info('Closing REDIS...');
+            await Promise.all([...this.masterPool, ...this.slavesPool].map(redis => redis.quit()));
+            logger.info('Closed REDIS');
+        }
+        catch (e) {
+            logger.error(`Closing REDIS ${e}`);
+            throw e;
+        }
+    }
+    async get(key) {
+        return this.slavesPool.next().get(key);
+    }
+    set(key, value) {
+        return this.masterPool.next().set(key, value);
+    }
+    setex(key, seconds, value) {
+        return this.masterPool.next().setex(key, seconds, value);
+    }
+    async incrWithTTLSec(key, ttlSec) {
+        const results = await this.masterPool
+            .next()
+            .multi()
+            .incr(key)
+            .expire(key, ttlSec)
+            .exec();
+        if (!results || results[0] === null) {
+            throw new Error(`incrWithTTLSec failed`);
+        }
+        return parseInt(results[0][1], 10);
+    }
+    async sismember(set, key) {
+        const res = await this.masterPool.next().sismember(set, key);
+        return typeof res === 'number' ? res : parseInt(res, 10);
+    }
+    publish(channel, value) {
+        return this.masterPool.next().publish(channel, value);
+    }
+    subscribe(channel, cb) {
+        const redis = new ioredis_1.default(this.redisSlavesUrl, IOREDIS_OPTION);
+        redis.on('error', (error) => {
+            logger.error(`redis_subscribe_error(${channel}): ${error}`);
+        });
+        redis.on('connect', () => logger.info(`Redis_subscriber_connected(${channel})`));
+        redis.on('message', cb);
+        return redis.subscribe(channel);
+    }
+    async del(key) {
+        return this.masterPool.next().del(key);
+    }
+    async zremrangebyscore(key, min, max) {
+        return this.masterPool.next().zremrangebyscore(key, min, max);
+    }
+    async zadd(key, bulkItemsToAdd, option) {
+        return option === undefined
+            ? this.masterPool.next().zadd(key, ...bulkItemsToAdd)
+            : this.masterPool.next().zadd(key, option, ...bulkItemsToAdd);
+    }
+    async zrem(key, membersKeys) {
+        return this.masterPool.next().zrem(key, membersKeys);
+    }
+    async zscore(key, member) {
+        return this.slavesPool.next().zscore(key, member);
+    }
+    async hset(mapKey, mappings) {
+        if (!Object.keys(mappings).length) {
+            return;
+        }
+        return this.masterPool.next().hset(mapKey, mappings);
+    }
+    async hdel(mapKey, keys) {
+        if (keys.length === 0) {
+            return 0;
+        }
+        return this.masterPool.next().hdel(mapKey, ...keys);
+    }
+    async hget(keyMap, key) {
+        return this.slavesPool.next().hget(keyMap, key);
+    }
+    async hmget(keyMap, keys) {
+        return this.slavesPool.next().hmget(keyMap, ...keys);
+    }
+    async hgetAll(keyMap) {
+        return this.slavesPool.next().hgetall(keyMap);
+    }
+    async zrangebyscore(key, min, max, isWithScores = false) {
+        return isWithScores
+            ? this.slavesPool.next().zrangebyscore(key, min, max, 'WITHSCORES')
+            : this.slavesPool.next().zrangebyscore(key, min, max);
+    }
+    async zcount(key, min, max) {
+        return this.slavesPool.next().zcount(key, min, max);
+    }
+    async sadd(set, keys, ttl) {
+        if (ttl) {
+            return this.masterPool
+                .next()
+                .multi()
+                .sadd(set, keys)
+                .expire(set, ttl)
+                .exec();
+        }
+        else {
+            return this.masterPool.next().sadd(set, keys);
+        }
+    }
+}
+exports.DexlibRedisWrapper = DexlibRedisWrapper;
+DexlibRedisWrapper.MAX_SCORE_VALUE = 9007199254740991;
+exports.default = new DexlibRedisWrapper();
+//# sourceMappingURL=RedisWrapper.js.map

package/build/dex-helper/RedisWrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisWrapper.js","sourceRoot":"","sources":["../../src/dex-helper/RedisWrapper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.49.2-dackieswapv3-base.0",
+  "version": "2.49.2",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

package/src/dex/index.ts

@@ -85,6 +85,7 @@ import { Dexalot } from './dexalot/dexalot';
 import { Smardex } from './smardex/smardex';
 import { Wombat } from './wombat/wombat';
 import { Swell } from './swell/swell';
+import { PharaohV1 } from './solidly/forks-override/pharaohV1';
 import { EtherFi } from './etherfi';
 
 const LegacyDexes = [
@@ -168,6 +169,7 @@ const Dexes = [
   Smardex,
   Wombat,
   Swell,
+  PharaohV1,
 ];
 
 export type LegacyDexConstructor = new (dexHelper: IDexHelper) => IDexTxBuilder<

package/src/dex/pancakeswap-v3/config.ts

@@ -69,22 +69,6 @@ export const PancakeswapV3Config: DexConfigMap<DexParams> = {
         'https://api.studio.thegraph.com/query/45376/exchange-v3-base/version/latest',
     },
   },
-  DackieSwapV3: {
-    [Network.BASE]: {
-      factory: '0x3D237AC6D2f425D2E890Cc99198818cc1FA48870',
-      quoter: '0x4fDBD73aD4B1DDde594BF05497C15f76308eFfb9',
-      deployer: '0x4f205D69834f9B101b9289F7AFFAc9B77B3fF9b7',
-      router: '0x4030ebafeb76e5fc848891076dfe315993800ba5',
-      supportedFees: [10000n, 2500n, 500n, 100n],
-      stateMulticall: '0xeBF40A40CA3D4310Bf53048F48e860656e1D7C81',
-      uniswapMulticall: '0x091e99cb1C49331a94dD62755D168E941AbD0693',
-      chunksCount: 10,
-      initRetryFrequency: 10,
-      initHash: `0x6ce8eb472fa82df5469c6ab6d485f17c3ad13c8cd7af59b3d4a8026c5ce0f7e2`,
-      subgraphURL:
-        'https://api.studio.thegraph.com/query/50473/exchange-clmm/version/latest',
-    },
-  },
 };
 
 export const Adapters: Record<number, AdapterMappings> = {

package/src/dex/pancakeswap-v3/pancakeswap-v3.ts

@@ -87,9 +87,7 @@ export class PancakeswapV3
   intervalTask?: NodeJS.Timeout;
 
   public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
-    getDexKeysWithNetwork(
-      _.pick(PancakeswapV3Config, ['PancakeswapV3', 'DackieSwapV3']),
-    );
+    getDexKeysWithNetwork(_.pick(PancakeswapV3Config, ['PancakeswapV3']));
 
   logger: Logger;
 

package/src/dex/solidly/config.ts

@@ -159,6 +159,20 @@ export const SolidlyConfig: DexConfigMap<DexParams> = {
       feeCode: 0,
     },
   },
+  PharaohV1: {
+    [Network.AVALANCHE]: {
+      subgraphURL:
+        'https://api.studio.thegraph.com/query/66247/pharaoh-legacy/version/latest',
+      factoryAddress: '0xAAA16c016BF556fcD620328f0759252E29b1AB57',
+      router: '0x609AcD8Fc955Dd7E744c7DFFc9930a7A6654DE43',
+      initCode:
+        '0xbf2404274de2b11f05e5aebd49e508de933034cb5fa2d0ac3de8cbd4bcef47dc',
+      poolGasCost: 180 * 1000,
+      stableFee: 5,
+      volatileFee: 25,
+      feeCode: 0,
+    },
+  },
   Equalizer: {
     [Network.FANTOM]: {
       factoryAddress: '0xc6366EFD0AF1d09171fe0EBF32c7943BB310832a',

package/src/dex/solidly/forks-override/pharaohV1.ts

@@ -0,0 +1,10 @@
+import { Network } from '../../../constants';
+import { getDexKeysWithNetwork } from '../../../utils';
+import { SolidlyConfig } from '../config';
+import _ from 'lodash';
+import { Ramses } from './ramses';
+
+export class PharaohV1 extends Ramses {
+  public static dexKeysWithNetwork: { key: string; networks: Network[] }[] =
+    getDexKeysWithNetwork(_.pick(SolidlyConfig, ['PharaohV1']));
+}

package/src/dex/solidly/solidly-e2e.test.ts

@@ -1245,6 +1245,27 @@ describe('Solidly E2E', () => {
         });
       });
     });
+
+    describe('PharaohV1', () => {
+      const dexKey = 'PharaohV1';
+
+      const tokenASymbol: string = 'USDC';
+      const tokenBSymbol: string = 'WAVAX';
+
+      const tokenAAmount: string = '100000';
+      const tokenBAmount: string = '100000000000000000';
+      const nativeTokenAmount = '100000000000000000';
+
+      testForNetwork(
+        network,
+        dexKey,
+        tokenASymbol,
+        tokenBSymbol,
+        tokenAAmount,
+        tokenBAmount,
+        nativeTokenAmount,
+      );
+    });
   });
 
   describe('Arbitrum', () => {

package/src/dex/solidly/solidly-integration.test.ts

@@ -19,6 +19,7 @@ import { VelodromeV2 } from './forks-override/velodromeV2';
 import { Equalizer } from './forks-override/equalizer';
 import { Velocimeter } from './forks-override/velocimeter';
 import { Usdfi } from './forks-override/usdfi';
+import { PharaohV1 } from './forks-override/pharaohV1';
 
 const amounts18 = [0n, BI_POWS[18], 2000000000000000000n];
 const amounts6 = [0n, BI_POWS[6], 2000000n];
@@ -1443,6 +1444,148 @@ describe('Solidly integration tests', () => {
     });
   });
 
+  describe('Avalanche', () => {
+    const network = Network.AVALANCHE;
+    const dexHelper = new DummyDexHelper(network);
+    const checkOnChainPricing = constructCheckOnChainPricing(dexHelper);
+
+    describe('PharaohV1', function () {
+      const dexKey = 'PharaohV1';
+      const pharaohV1 = new PharaohV1(network, dexKey, dexHelper);
+
+      describe('UniswapV2 like pool', function () {
+        const TokenASymbol = 'USDC';
+        const tokenA = Tokens[network][TokenASymbol];
+        const TokenBSymbol = 'WAVAX';
+        const tokenB = Tokens[network][TokenBSymbol];
+
+        const amounts = amounts18;
+
+        it('getPoolIdentifiers and getPricesVolume', async function () {
+          const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
+          const pools = await pharaohV1.getPoolIdentifiers(
+            tokenA,
+            tokenB,
+            SwapSide.SELL,
+            blocknumber,
+          );
+          console.log(
+            `${TokenASymbol} <> ${TokenBSymbol} Pool Identifiers: `,
+            pools,
+          );
+
+          expect(pools.length).toBeGreaterThan(0);
+
+          console.log('AMOUNTS: ', amounts);
+
+          const poolPrices = await pharaohV1.getPricesVolume(
+            tokenA,
+            tokenB,
+            amounts,
+            SwapSide.SELL,
+            blocknumber,
+            pools,
+          );
+          console.log(
+            `${TokenASymbol} <> ${TokenBSymbol} Pool Prices: `,
+            util.inspect(poolPrices, false, null, true),
+          );
+
+          expect(poolPrices).not.toBeNull();
+          checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
+
+          // Check if onchain pricing equals to calculated ones
+
+          for (const poolPrice of poolPrices || []) {
+            await checkOnChainPricing(
+              pharaohV1,
+              'getAmountOut',
+              blocknumber,
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
+              tokenA.address,
+              amounts,
+            );
+          }
+        });
+
+        it('getTopPoolsForToken', async function () {
+          const poolLiquidity = await pharaohV1.getTopPoolsForToken(
+            tokenA.address,
+            10,
+          );
+          console.log(`${TokenASymbol} Top Pools:`, poolLiquidity);
+
+          checkPoolsLiquidity(poolLiquidity, tokenA.address, dexKey);
+        });
+      });
+
+      describe('Curve like stable pool', function () {
+        const TokenASymbol = 'USDT';
+        const tokenA = Tokens[network][TokenASymbol];
+        const TokenBSymbol = 'USDC';
+        const tokenB = Tokens[network][TokenBSymbol];
+
+        const amounts = amounts6;
+
+        it('getPoolIdentifiers and getPricesVolume', async function () {
+          const blocknumber = await dexHelper.web3Provider.eth.getBlockNumber();
+          const pools = await pharaohV1.getPoolIdentifiers(
+            tokenA,
+            tokenB,
+            SwapSide.SELL,
+            blocknumber,
+          );
+          console.log(
+            `${TokenASymbol} <> ${TokenBSymbol} Pool Identifiers: `,
+            pools,
+          );
+
+          expect(pools.length).toBeGreaterThan(0);
+
+          const poolPrices = await pharaohV1.getPricesVolume(
+            tokenA,
+            tokenB,
+            amounts,
+            SwapSide.SELL,
+            blocknumber,
+            pools,
+          );
+          console.log(
+            `${TokenASymbol} <> ${TokenBSymbol} Pool Prices: `,
+            poolPrices,
+          );
+
+          expect(poolPrices).not.toBeNull();
+          checkPoolPrices(poolPrices!, amounts, SwapSide.SELL, dexKey);
+
+          // Check if onchain pricing equals to calculated ones
+          for (const poolPrice of poolPrices || []) {
+            await checkOnChainPricing(
+              pharaohV1,
+              'getAmountOut',
+              blocknumber,
+              poolPrice.prices,
+              poolPrice.poolAddresses![0],
+              tokenA.address,
+              amounts,
+            );
+          }
+        });
+
+        it('getTopPoolsForToken', async function () {
+          const poolLiquidity = await pharaohV1.getTopPoolsForToken(
+            tokenA.address,
+            10,
+          );
+          console.log(`${TokenASymbol} Top Pools:`, poolLiquidity);
+
+          checkPoolsLiquidity(poolLiquidity, tokenA.address, dexKey);
+        });
+      });
+    });
+  });
+
   describe('Optimism', () => {
     const network = Network.OPTIMISM;
     const dexHelper = new DummyDexHelper(network);

package/src/dex/solidly/solidly.ts

@@ -78,6 +78,7 @@ export class Solidly extends UniswapV2 {
         'Equalizer',
         'Velocimeter',
         'Usdfi',
+        'PharaohV1',
       ]),
     );
 

package/src/dex/uniswap-v3/config.ts

@@ -261,7 +261,7 @@ export const UniswapV3Config: DexConfigMap<DexParams> = {
         'https://api.thegraph.com/subgraphs/name/ramsesexchange/concentrated-liquidity-graph',
     },
   },
-  Pharaoh: {
+  PharaohV2: {
     [Network.AVALANCHE]: {
       factory: '0xAAA32926fcE6bE95ea2c51cB4Fcb60836D320C42',
       deployer: '0x95120704f4E2D545Aea8b6B3c16d9Da1fa32E30F',

package/src/dex/uniswap-v3/uniswap-v3-e2e.test.ts

@@ -696,8 +696,8 @@ describe('UniswapV3 E2E', () => {
     });
   });
 
-  describe('Pharaoh', () => {
-    const dexKey = 'Pharaoh';
+  describe('PharaohV2', () => {
+    const dexKey = 'PharaohV2';
 
     describe('Avalanche', () => {
       const network = Network.AVALANCHE;

package/src/dex/uniswap-v3/uniswap-v3-integration.test.ts

@@ -613,8 +613,8 @@ describe('RamsesV2', () => {
   });
 });
 
-describe('Pharaoh', () => {
-  const dexKey = 'Pharaoh';
+describe('PharaohV2', () => {
+  const dexKey = 'PharaohV2';
   let blockNumber: number;
   let uniswapV3: UniswapV3;
   let uniswapV3Mainnet: UniswapV3;

package/src/dex/uniswap-v3/uniswap-v3.ts

@@ -104,7 +104,7 @@ export class UniswapV3
         'ChronosV3',
         'Retro',
         'BaseswapV3',
-        'Pharaoh',
+        'PharaohV2',
         'AlienBaseV3',
       ]),
     );

package/tests/constants-e2e.ts

@@ -669,6 +669,10 @@ export const Tokens: {
     },
   },
   [Network.AVALANCHE]: {
+    PHAR: {
+      address: '0xAAAB9D12A30504559b0C5a9A5977fEE4A6081c6b',
+      decimals: 18,
+    },
     USDCe: {
       address: '0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664',
       decimals: 6,
@@ -1236,6 +1240,7 @@ export const Holders: {
     YUSD: '0x6c1a5ef2acde1fd2fc68def440d2c1eb35bae24a',
     BTCb: '0x84c06d3c27821d0136f66306f5028d43ceac268d',
     AMPL: '0xfcaA5ea7F8eb0631BcA72C345025C0A5a6D93f0E',
+    PHAR: '0x654296D56532f62B7d91d335791d3c364a9385b5',
   },
   [Network.ARBITRUM]: {
     SEN: '0xcb19b6b4971bd4206bab176c75b1efe3e28ee5a8',