@shapeshiftoss/contracts 1.1.0 → 2.0.0

package/dist/esm/constants.js

@@ -1,12 +1,4 @@
-import { erc20Abi } from 'viem';
-import { EVERGREEN_FARMING_ABI } from './abis/evergreenFarming.js';
-import { FARMING_ABI } from './abis/farming.js';
-import { I_UNISWAP_V2_PAIR_ABI } from './abis/iUniswapV2Pair.js';
-import { THORCHAIN_ROUTER_ABI } from './abis/thorchainRouter.js';
-import { UNISWAP_V2_ROUTER_02_ABI } from './abis/uniswapV2Router02.js';
-import { ContractType } from './types.js';
 export const WETH_TOKEN_CONTRACT = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
-export const FOX_TOKEN_CONTRACT = '0xc770EEfAd204B5180dF6a14Ee197D99d808ee52d';
 // Staking contract addresses as string literals
 export const ETH_FOX_STAKING_V1_CONTRACT = '0xdd80e21669a664bce83e3ad9a0d74f8dad5d9e72';
 export const ETH_FOX_STAKING_V2_CONTRACT = '0xc54b9f82c1c54e9d4d274d633c7523f2299c42a0';
@@ -46,28 +38,6 @@ export const RFOX_ARB_UNI_V2_ETH_FOX_PROXY_CONTRACT = '0x83B51B7605d2E277E03A7D6
 export const RFOX_ETH_PROXY_CONTRACT = '0x7AC9c77263473A9e1DC9621F97b886c1e90Ddd33';
 export const RFOX_REWARD_RATE = 1n * 10n ** 27n;
 export const RFOX_WAD = 1n * 10n ** 18n;
-export const CONTRACT_ADDRESS_TO_ABI = {
-    [ETH_FOX_POOL_CONTRACT]: I_UNISWAP_V2_PAIR_ABI,
-    [ETH_FOX_STAKING_V1_CONTRACT]: FARMING_ABI,
-    [ETH_FOX_STAKING_V2_CONTRACT]: FARMING_ABI,
-    [ETH_FOX_STAKING_V3_CONTRACT]: FARMING_ABI,
-    [ETH_FOX_STAKING_V4_CONTRACT]: FARMING_ABI,
-    [ETH_FOX_STAKING_V5_CONTRACT]: FARMING_ABI,
-    [ETH_FOX_STAKING_V6_CONTRACT]: FARMING_ABI,
-    [ETH_FOX_STAKING_V7_CONTRACT]: FARMING_ABI,
-    [ETH_FOX_STAKING_V8_CONTRACT]: FARMING_ABI,
-    [ETH_FOX_STAKING_V9_CONTRACT]: FARMING_ABI,
-    [ETH_FOX_STAKING_EVERGREEN_CONTRACT]: EVERGREEN_FARMING_ABI,
-    [FOX_TOKEN_CONTRACT]: erc20Abi,
-    [UNISWAP_V2_ROUTER_02_CONTRACT_MAINNET]: UNISWAP_V2_ROUTER_02_ABI,
-    // THOR Router Mainnet
-    [THOR_ROUTER_CONTRACT_MAINNET]: THORCHAIN_ROUTER_ABI,
-};
-export const CONTRACT_TYPE_TO_ABI = {
-    [ContractType.UniV2Pair]: I_UNISWAP_V2_PAIR_ABI,
-    [ContractType.ERC20]: erc20Abi,
-    [ContractType.ThorRouter]: THORCHAIN_ROUTER_ABI,
-};
 // 0x proxy contracts - all EVM chains except Optimism have the same address
 export const ZRX_ETHEREUM_PROXY_CONTRACT = '0xDef1C0ded9bec7F1a1670819833240f027b25EfF';
 export const ZRX_OPTIMISM_PROXY_CONTRACT = '0xDEF1ABE32c034e558Cdd535791643C58a13aCC10';

package/dist/esm/contractManager.d.ts

@@ -1,11 +1,8 @@
-import type { AssetId, ChainId } from '@shapeshiftoss/caip';
-import type { Address } from 'viem';
-import type { KnownContractAddress, KnownContractByAddress, KnownContractByType } from './types.js';
-import { ContractType } from './types.js';
-export declare const getOrCreateContractByAddress: <A extends KnownContractAddress>(address: A) => KnownContractByAddress<A>;
-export declare const getOrCreateContractByType: <A extends KnownContractAddress, T extends ContractType>({ address, type, chainId, }: {
-    address: string | Address;
-    type: T;
-    chainId: ChainId;
-}) => KnownContractByType<A, T>;
-export declare const fetchUniV2PairData: ((pairAssetId: AssetId) => Promise<import("@uniswap/sdk").Pair>) & import("lodash").MemoizedFunction;
+import type { AssetId } from '@shapeshiftoss/caip';
+import { Pair } from '@uniswap/sdk';
+import type { Address, GetContractReturnType, PublicClient } from 'viem';
+import { I_UNISWAP_V2_PAIR_ABI } from './abis/index.js';
+import type { FoxEthStakingContractAbi, FoxEthStakingContractAddress } from './types.js';
+export declare const getFoxEthStakingContract: (address: FoxEthStakingContractAddress) => GetContractReturnType<FoxEthStakingContractAbi, PublicClient, Address>;
+export declare const getEthFoxPoolContract: () => GetContractReturnType<typeof I_UNISWAP_V2_PAIR_ABI, PublicClient, Address>;
+export declare const fetchUniV2PairData: (pairAssetId: AssetId) => Promise<Pair>;

package/dist/esm/contractManager.js

@@ -1,69 +1,43 @@
-import { fromAssetId, toAssetId } from '@shapeshiftoss/caip';
-import { KnownChainIds } from '@shapeshiftoss/types';
-import { Fetcher } from '@uniswap/sdk';
-import assert from 'assert';
+import { fromAssetId, fromChainId } from '@shapeshiftoss/caip';
+import { Pair, Token, TokenAmount } from '@uniswap/sdk';
 import memoize from 'lodash/memoize';
-import { getAddress, getContract } from 'viem';
-import { CONTRACT_ADDRESS_TO_ABI, CONTRACT_TYPE_TO_ABI } from './constants.js';
-import { getEthersV5Provider } from './ethersProviderSingleton.js';
-import { ContractType } from './types.js';
-import { viemClientByChainId, viemEthMainnetClient } from './viemClient.js';
-const definedContracts = {};
-export const getOrCreateContractByAddress = (address) => {
-    const checksumAddress = getAddress(address);
-    const definedContract = definedContracts[checksumAddress];
-    if (definedContract !== undefined) {
-        return definedContract;
-    }
-    const contractAbi = CONTRACT_ADDRESS_TO_ABI[address];
-    const contract = getContract({
-        abi: contractAbi,
-        address: checksumAddress,
-        client: viemEthMainnetClient,
-    });
-    definedContracts[checksumAddress] = contract;
-    return contract;
-};
-export const getOrCreateContractByType = ({ address, type, chainId, }) => {
-    const checksumAddress = getAddress(address);
-    const definedContract = definedContracts[checksumAddress];
-    if (definedContract !== undefined) {
-        return definedContract;
-    }
-    const publicClient = viemClientByChainId[chainId];
-    assert(publicClient !== undefined, `no public client found for chainId '${chainId}'`);
-    const contract = getContract({
-        abi: CONTRACT_TYPE_TO_ABI[type],
-        address: checksumAddress,
-        client: publicClient,
-    });
-    definedContracts[checksumAddress] = contract;
-    return contract;
-};
-export const fetchUniV2PairData = memoize(async (pairAssetId) => {
+import { erc20Abi, getAddress, getContract } from 'viem';
+import { EVERGREEN_FARMING_ABI, FARMING_ABI, I_UNISWAP_V2_PAIR_ABI } from './abis/index.js';
+import { ETH_FOX_POOL_CONTRACT, ETH_FOX_STAKING_EVERGREEN_CONTRACT } from './constants.js';
+import { assertGetViemClient, viemEthMainnetClient } from './viemClient.js';
+export const getFoxEthStakingContract = (address) => getContract({
+    abi: address === ETH_FOX_STAKING_EVERGREEN_CONTRACT ? EVERGREEN_FARMING_ABI : FARMING_ABI,
+    address: getAddress(address),
+    client: viemEthMainnetClient,
+});
+export const getEthFoxPoolContract = () => getContract({
+    abi: I_UNISWAP_V2_PAIR_ABI,
+    address: ETH_FOX_POOL_CONTRACT,
+    client: viemEthMainnetClient,
+});
+const getUniV2PairTokens = memoize(async (pairAssetId) => {
     const { assetReference, chainId } = fromAssetId(pairAssetId);
-    const checksumAddress = getAddress(assetReference);
-    const pair = getOrCreateContractByType({
-        address: checksumAddress,
-        type: ContractType.UniV2Pair,
-        chainId: KnownChainIds.EthereumMainnet,
-    });
-    const ethersV5Provider = getEthersV5Provider();
-    const token0Address = await pair.read.token0();
-    const token1Address = await pair.read.token1();
-    const token0AssetId = toAssetId({
-        chainId,
-        assetNamespace: 'erc20',
-        assetReference: token0Address,
-    });
-    const token1AssetId = toAssetId({
-        chainId,
-        assetNamespace: 'erc20',
-        assetReference: token1Address,
+    const client = assertGetViemClient(chainId);
+    const pair = getContract({
+        abi: I_UNISWAP_V2_PAIR_ABI,
+        address: getAddress(assetReference),
+        client,
     });
-    const { chainReference: asset0EvmChainId, assetReference: asset0Address } = fromAssetId(token0AssetId);
-    const { chainReference: asset1EvmChainId, assetReference: asset1Address } = fromAssetId(token1AssetId);
-    const token0 = await Fetcher.fetchTokenData(Number(asset0EvmChainId), asset0Address, ethersV5Provider);
-    const token1 = await Fetcher.fetchTokenData(Number(asset1EvmChainId), asset1Address, ethersV5Provider);
-    return Fetcher.fetchPairData(token0, token1, ethersV5Provider);
+    const [token0Address, token1Address] = await Promise.all([pair.read.token0(), pair.read.token1()]);
+    const [decimals0, decimals1] = await Promise.all([token0Address, token1Address].map(address => client.readContract({ address, abi: erc20Abi, functionName: 'decimals' })));
+    const evmChainId = Number(fromChainId(chainId).chainReference);
+    return {
+        pair,
+        token0: new Token(evmChainId, token0Address, decimals0),
+        token1: new Token(evmChainId, token1Address, decimals1),
+    };
 });
+export const fetchUniV2PairData = async (pairAssetId) => {
+    const { pair, token0, token1 } = await getUniV2PairTokens(pairAssetId).catch(err => {
+        getUniV2PairTokens.cache.delete(pairAssetId);
+        throw err;
+    });
+    const [reserve0, reserve1] = await pair.read.getReserves();
+    // a uniswap v2 pair's token0 always sorts before token1, so reserves are already in token order
+    return new Pair(new TokenAmount(token0, reserve0.toString()), new TokenAmount(token1, reserve1.toString()));
+};

package/dist/esm/ethersProviderSingleton.d.ts

@@ -1,6 +1,3 @@
 import type { EvmChainId } from '@shapeshiftoss/types';
-import { JsonRpcProvider } from 'ethers';
 import { ethers as ethersV5 } from 'ethers5';
-export declare const rpcUrlByChainId: (chainId: EvmChainId) => string;
-export declare const getEthersProvider: (chainId: EvmChainId) => JsonRpcProvider;
 export declare const getEthersV5Provider: (chainId?: EvmChainId) => ethersV5.providers.JsonRpcProvider;

package/dist/esm/ethersProviderSingleton.js

@@ -1,9 +1,8 @@
 import { KnownChainIds } from '@shapeshiftoss/types';
 import { assertUnreachable } from '@shapeshiftoss/utils';
-import { JsonRpcProvider } from 'ethers';
 import { ethers as ethersV5 } from 'ethers5';
 import { PUBLIC_RPC_URLS } from './publicRpcUrls.js';
-export const rpcUrlByChainId = (chainId) => {
+const rpcUrlByChainId = (chainId) => {
     const url = (() => {
         switch (chainId) {
             // First-class chains: env-driven with public fallback
@@ -89,25 +88,7 @@ export const rpcUrlByChainId = (chainId) => {
     }
     return url;
 };
-const ethersProviders = new Map();
 const ethersV5Providers = new Map();
-export const getEthersProvider = (chainId) => {
-    if (!ethersProviders.has(chainId)) {
-        const provider = new JsonRpcProvider(rpcUrlByChainId(chainId), undefined, {
-            staticNetwork: true,
-        });
-        ethersProviders.set(chainId, provider);
-        return provider;
-    }
-    else {
-        // This really should be defined but I guess enough safety never hurts mang...
-        const provider = ethersProviders.get(chainId);
-        if (!provider) {
-            throw new Error(`No provider found for chainId ${chainId}`);
-        }
-        return provider;
-    }
-};
 // For backwards-compatibility for libraries still stuck in v5
 export const getEthersV5Provider = (chainId = KnownChainIds.EthereumMainnet) => {
     if (!ethersV5Providers.has(chainId)) {

package/dist/esm/types.d.ts

@@ -1,21 +1,4 @@
-import type { Address, GetContractReturnType, PublicClient } from 'viem';
 import type { EVERGREEN_FARMING_ABI, FARMING_ABI } from './abis/index.js';
-import type { CONTRACT_ADDRESS_TO_ABI, CONTRACT_TYPE_TO_ABI, ETH_FOX_POOL_CONTRACT, FOX_TOKEN_CONTRACT, foxEthStakingContractAddresses, THOR_ROUTER_CONTRACT_MAINNET, UNISWAP_V2_ROUTER_02_CONTRACT_MAINNET } from './constants.js';
-export declare enum ContractType {
-    UniV2Pair = "UniV2Pair",
-    ERC20 = "ERC20",
-    ThorRouter = "ThorRouter"
-}
-export type KnownContractAbiByAddress<T extends KnownContractAddress> = (typeof CONTRACT_ADDRESS_TO_ABI)[T];
-export type KnownContractAbiByType<T extends ContractType> = (typeof CONTRACT_TYPE_TO_ABI)[T];
-export type KnownContractByAddress<T extends KnownContractAddress> = GetContractReturnType<KnownContractAbiByAddress<T>, PublicClient, T>;
-export type KnownContract = KnownContractByAddress<KnownContractAddress>;
-export type KnownContractByType<A extends KnownContractAddress, T extends ContractType> = GetContractReturnType<KnownContractAbiByType<T>, PublicClient, A>;
-export type KnownContractAddress = typeof ETH_FOX_POOL_CONTRACT | FoxEthStakingContractAddress | typeof FOX_TOKEN_CONTRACT | typeof UNISWAP_V2_ROUTER_02_CONTRACT_MAINNET | typeof THOR_ROUTER_CONTRACT_MAINNET;
-export type DefinedContract = {
-    contract: KnownContractByAddress<KnownContractAddress>;
-    address: KnownContractAddress;
-};
+import type { foxEthStakingContractAddresses } from './constants.js';
 export type FoxEthStakingContractAddress = (typeof foxEthStakingContractAddresses)[number];
 export type FoxEthStakingContractAbi = typeof FARMING_ABI | typeof EVERGREEN_FARMING_ABI;
-export type FoxEthStakingContract<T extends FoxEthStakingContractAbi> = T extends typeof FARMING_ABI ? GetContractReturnType<typeof FARMING_ABI, PublicClient, Address> : GetContractReturnType<typeof EVERGREEN_FARMING_ABI, PublicClient, Address>;

package/dist/esm/types.js

@@ -1,6 +1 @@
-export var ContractType;
-(function (ContractType) {
-    ContractType["UniV2Pair"] = "UniV2Pair";
-    ContractType["ERC20"] = "ERC20";
-    ContractType["ThorRouter"] = "ThorRouter";
-})(ContractType || (ContractType = {}));
+export {};