all: rm abi from build

packages/explorer-backend/src/TransferStats.ts

@@ -28,7 +28,7 @@ import { getPreRegenesisBondEvent } from './preregenesis'
 import { getPriceHistory } from './price'
 import { getProxyAddress } from './utils/getProxyAddress'
 import { getTokenDecimals } from './utils/getTokenDecimals'
-import { l1BridgeAbi, l2BridgeAbi } from '@hop-protocol/sdk/abi'
+import { L1_Bridge__factory, L2_Bridge__factory } from '@hop-protocol/sdk/contracts'
 import { populateData } from './populateData'
 import { populateTransfer } from './utils/populateTransfer'
 
@@ -1326,7 +1326,7 @@ export class TransferStats {
         const logs = receipt.logs
         for (const log of logs) {
           if (log.topics[0] === '0xe35dddd4ea75d7e9b3fe93af4f4e40e778c3da4074c9d93e7c6536f1e803c1eb') { // TransferSent
-            const iface = new ethers.utils.Interface(l2BridgeAbi)
+            const iface = new ethers.utils.Interface(L2_Bridge__factory.abi)
             const decoded = iface.parseLog(log)
             if (decoded) {
               transferId = decoded?.args?.transferId
@@ -1348,7 +1348,7 @@ export class TransferStats {
               }
             }
           } else if (log.topics[0] === '0x0a0607688c86ec1775abcdbab7b33a3a35a6c9cde677c9be880150c231cc6b0b') { // TransferSentToL2
-            const iface = new ethers.utils.Interface(l1BridgeAbi)
+            const iface = new ethers.utils.Interface(L1_Bridge__factory.abi)
             const decoded = iface.parseLog(log)
             if (decoded) {
               destinationChainId = Number(decoded?.args.chainId.toString())

packages/frontend/src/pages/Faucet/FaucetContext.tsx

@@ -3,9 +3,9 @@ import React, { FC, ReactNode, createContext, useContext, useEffect, useState }
 import Token from 'src/models/Token'
 import Transaction from 'src/models/Transaction'
 import logger from 'src/logger'
-import { BigNumber, Contract } from 'ethers'
+import { BigNumber } from 'ethers'
 import { L1_NETWORK } from 'src/utils/constants'
-import { erc20Abi } from '@hop-protocol/sdk/abi'
+import { ERC20Mintable__factory } from '@hop-protocol/sdk/contracts'
 import { formatError } from 'src/utils/format'
 import { getTokenDecimals } from 'src/utils/tokens'
 import { l1Network } from 'src/config/networks'
@@ -97,7 +97,7 @@ const FaucetContextProvider: FC<{ children: ReactNode }> = ({ children }) => {
       const recipient = await signer.getAddress()
       const tokenDecimals = getTokenDecimals(tokenSymbol)
       const parsedAmount = parseUnits(mintAmount, tokenDecimals)
-      const contract = new Contract(address, erc20Abi, signer)
+      const contract = ERC20Mintable__factory.connect(address, signer)
 
       const txOptions: any = {}
       if (['USDT', 'DAI', 'UNI', 'HOP'].includes(tokenSymbol)) {

packages/frontend/src/pages/Pools/PoolsContext.tsx

@@ -15,13 +15,12 @@ import { Multicall, Token } from '@hop-protocol/sdk'
 import { SelectChangeEvent } from '@mui/material/Select'
 import { amountToBN, formatError } from 'src/utils/format'
 import { commafy, findMatchingBridge, getTokenDecimals, shiftBNDecimals, toPercentDisplay, toTokenDisplay } from 'src/utils'
-import { erc20Abi } from '@hop-protocol/sdk/abi'
+import { ERC20__factory, StakingRewards__factory } from '@hop-protocol/sdk/contracts'
 import { formatUnits, parseUnits } from 'ethers/lib/utils'
 import { getTokenImage } from 'src/utils/tokens'
 import { hopStakingRewardsContracts, reactAppNetwork, stakingRewardTokens, stakingRewardsContracts } from 'src/config'
 import { l2Networks } from 'src/config/networks'
 import { stableCoins } from 'src/utils/constants'
-import { stakingRewardsAbi } from '@hop-protocol/sdk/abi'
 import { useApp } from 'src/contexts/AppContext'
 import { useAssets, useAsyncMemo, useBalance, useQueryParams, useSelectedNetwork } from 'src/hooks'
 import { useCheckPoolDeprecated } from 'src/hooks/useCheckPoolDeprecated'
@@ -395,7 +394,7 @@ const PoolsProvider: FC<{ children: ReactNode }> = ({ children }) => {
 
         const balancesOpts: any = []
         balancesOpts.push({
-          abi: erc20Abi,
+          abi: ERC20__factory.abi,
           method: 'balanceOf',
           address: lpTokenAddress,
           tokenSymbol,
@@ -404,15 +403,15 @@ const PoolsProvider: FC<{ children: ReactNode }> = ({ children }) => {
         if (stakingContractAddress) {
           const stakingContractRewardToken = stakingRewardTokens?.[reactAppNetwork]?.[chainSlug]?.[stakingContractAddress?.toLowerCase()]
           balancesOpts.push({
-            abi: stakingRewardsAbi,
+            abi: StakingRewards__factory.abi,
             method: 'balanceOf',
             address: stakingContractAddress,
             tokenSymbol: stakingContractRewardToken
           })
         }
         if (hopStakingContractAddress) {
           balancesOpts.push({
-            abi: stakingRewardsAbi,
+            abi: StakingRewards__factory.abi,
             method: 'balanceOf',
             address: hopStakingContractAddress,
             tokenSymbol: 'HOP'

packages/frontend/src/pages/Pools/PoolsOverview/usePools.tsx

@@ -3,13 +3,12 @@ import { Multicall } from '@hop-protocol/sdk'
 import { addresses, hopStakingRewardsContracts, reactAppNetwork, stakingRewardTokens, stakingRewardsContracts } from 'src/config'
 import { checkIsPoolDeprecated } from 'src/hooks/useCheckPoolDeprecated'
 import { commafy, toPercentDisplay } from 'src/utils'
-import { erc20Abi } from '@hop-protocol/sdk/abi'
+import { ERC20__factory, StakingRewards__factory } from '@hop-protocol/sdk/contracts'
 import { findNetworkBySlug } from 'src/utils/networks'
 import { formatTokenDecimalString } from 'src/utils/format'
 import { formatUnits } from 'ethers/lib/utils'
 import { getTokenImage } from 'src/utils/tokens'
 import { stableCoins } from 'src/utils/constants'
-import { stakingRewardsAbi } from '@hop-protocol/sdk/abi'
 import { useApp } from 'src/contexts/AppContext'
 import { useEffect, useState } from 'react'
 import { usePoolStats } from 'src/pages/Pools/usePoolStats'
@@ -234,7 +233,7 @@ export function usePools () {
 
             const balancesOpts: any = []
             balancesOpts.push({
-              abi: erc20Abi,
+              abi: ERC20__factory.abi,
               method: 'balanceOf',
               address: lpTokenAddress,
               tokenSymbol,
@@ -243,27 +242,27 @@ export function usePools () {
             if (stakingContractAddress) {
               const stakingContractRewardToken = stakingRewardTokens?.[reactAppNetwork]?.[chainSlug]?.[stakingContractAddress?.toLowerCase()]
               balancesOpts.push({
-                abi: stakingRewardsAbi,
+                abi: StakingRewards__factory.abi,
                 method: 'balanceOf',
                 address: stakingContractAddress,
                 tokenSymbol: stakingContractRewardToken
               })
               balancesOpts.push({
-                abi: stakingRewardsAbi,
+                abi: StakingRewards__factory.abi,
                 method: 'earned',
                 address: stakingContractAddress,
                 tokenSymbol: stakingContractRewardToken
               })
             }
             if (hopStakingContractAddress) {
               balancesOpts.push({
-                abi: stakingRewardsAbi,
+                abi: StakingRewards__factory.abi,
                 method: 'balanceOf',
                 address: hopStakingContractAddress,
                 tokenSymbol: 'HOP'
               })
               balancesOpts.push({
-                abi: stakingRewardsAbi,
+                abi: StakingRewards__factory.abi,
                 method: 'earned',
                 address: hopStakingContractAddress,
                 tokenSymbol: 'HOP'

packages/frontend/src/pages/Rewards/useRewards.tsx

@@ -4,7 +4,7 @@ import useQueryParams from 'src/hooks/useQueryParams'
 import { BigNumber, Contract } from 'ethers'
 import { DateTime } from 'luxon'
 import { ShardedMerkleTree } from './merkle'
-import { erc20Abi } from '@hop-protocol/sdk/abi'
+import { ERC20__factory } from '@hop-protocol/sdk/contracts'
 import { findNetworkBySlug, networkIdToSlug } from 'src/utils/networks'
 import { formatError } from 'src/utils/format'
 import { getAddress } from 'ethers/lib/utils'
@@ -66,7 +66,7 @@ export const useRewards = (props: Props) => {
     try {
       if (contract) {
         const tokenAddress = await contract.rewardsToken()
-        return new Contract(tokenAddress, erc20Abi, contract.provider)
+        return ERC20__factory.connect(tokenAddress, contract.provider)
       }
     } catch (err: any) {
       if (!/noNetwork/.test(err.message)) {

packages/hop-node-core/src/chains/Chains/gnosis/GnosisMessageService.ts

@@ -1,10 +1,9 @@
 import assert from 'node:assert'
 import { AbstractMessageService, type IMessageService } from '../../Services/AbstractMessageService.js'
 import { Chain } from '#constants/index.js'
-import { Contract } from 'ethers'
 import { DefaultL1RelayGasLimit } from '../../Services/AbstractMessageService.js'
 import { GnosisAddresses, type GnosisCanonicalAddresses } from '../../Chains/gnosis/GnosisAddresses.js'
-import { l1xDaiAmbAbi, l2xDaiAmbAbi } from '@hop-protocol/sdk/abi'
+import { L1_xDaiAMB__factory, L2_xDaiAMB__factory } from '@hop-protocol/sdk/contracts'
 import { solidityKeccak256 } from 'ethers/lib/utils.js'
 import type { L1_xDaiAMB } from '@hop-protocol/sdk/contracts'
 import type { L2_xDaiAMB } from '@hop-protocol/sdk/contracts'
@@ -32,8 +31,8 @@ export class GnosisMessageService extends AbstractMessageService<Message, Messag
 
     const l1AmbAddress = gnosisAddresses.l1AmbAddress
     const l2AmbAddress = gnosisAddresses.l2AmbAddress
-    this.#l1Amb = new Contract(l1AmbAddress, l1xDaiAmbAbi, this.l1Wallet) as L1_xDaiAMB
-    this.#l2Amb = new Contract(l2AmbAddress, l2xDaiAmbAbi, this.l2Wallet) as L2_xDaiAMB
+    this.#l1Amb = L1_xDaiAMB__factory.connect(l1AmbAddress, this.l1Wallet) as L1_xDaiAMB
+    this.#l2Amb = L2_xDaiAMB__factory.connect(l2AmbAddress, this.l2Wallet) as L2_xDaiAMB
   }
 
   override async relayL1ToL2Message (l1TxHash: string): Promise<providers.TransactionResponse> {

packages/hop-node-core/src/swap/uniswap/uniswap.ts

@@ -6,7 +6,7 @@ import { CurrencyAmount, Ether, Percent, Token, TradeType } from '@uniswap/sdk-c
 import { Logger } from '#logger/index.js'
 import { Pool, Route, SwapRouter, TICK_SPACINGS, TickMath, Trade, nearestUsableTick } from '@uniswap/v3-sdk'
 import { chainSlugToId } from '#utils/chainSlugToId.js'
-import { erc20Abi } from '@hop-protocol/sdk/abi'
+import { ERC20__factory } from '@hop-protocol/sdk/contracts'
 import { formatUnits, parseUnits } from 'ethers/lib/utils.js'
 import { getCanonicalTokenSymbol } from '#utils/getCanonicalTokenSymbol.js'
 import type { SwapInput } from '../types.js'
@@ -116,11 +116,7 @@ async function getPool (poolContract: Contract) {
 }
 
 function getToken (address: string, provider: any) {
-  return new Contract(
-    address,
-    erc20Abi,
-    provider
-  )
+  return ERC20__factory.connect(address, provider)
 }
 
 const addresses: any = {

packages/hop-node/src/cli/unwithdrawnTransfers.ts

@@ -1,14 +1,14 @@
 import getTransferRootSet from '#theGraph/getTransferRootSet.js'
 import getTransfersCommitted from '#theGraph/getTransfersCommitted.js'
-import { BigNumber, Contract } from 'ethers'
+import { BigNumber } from 'ethers'
 import { Chain, OneHourSeconds } from '@hop-protocol/hop-node-core/constants'
 import { DateTime } from 'luxon'
 import {
   actionHandler,
   parseString,
   root
 } from './shared/index.js'
-import { bridgeAbi } from '@hop-protocol/sdk/abi'
+import { Bridge__factory } from '@hop-protocol/sdk/contracts'
 import { chainSlugToId } from '@hop-protocol/hop-node-core/utils'
 import { getRpcProvider } from '@hop-protocol/hop-node-core/utils'
 import { config as globalConfig } from '#config/index.js'
@@ -63,7 +63,7 @@ export async function main (source: any) {
   )
 
   const provider = getRpcProvider(destinationChain)!
-  const contract = new Contract(bridgeAddress, bridgeAbi, provider)
+  const contract = Bridge__factory.connect(bridgeAddress, provider)
   let amountUnwithdrawnTotal: BigNumber = BigNumber.from('0')
   for (const transferRootToChain of transferRootsToChain) {
     const rootHash = transferRootToChain.rootHash

packages/hop-node/src/watchers/IncompleteSettlementsWatcher.ts

@@ -13,7 +13,7 @@ import { formatUnits } from 'ethers/lib/utils.js'
 import { getEnabledTokens } from '#config/index.js'
 import { getRpcProvider } from '@hop-protocol/hop-node-core/utils'
 import { getTokenDecimals } from '@hop-protocol/hop-node-core/utils'
-import { l1BridgeAbi, l2BridgeAbi } from '@hop-protocol/sdk/abi'
+import { L1_Bridge__factory, L2_Bridge__factory } from '@hop-protocol/sdk/contracts'
 import { promiseQueue } from '@hop-protocol/hop-node-core/utils'
 import { wait } from '@hop-protocol/hop-node-core/utils'
 import type { AssetSymbol, ChainSlug } from '@hop-protocol/sdk/config'
@@ -265,7 +265,7 @@ class IncompleteSettlementsWatcher {
     if (!config) {
       throw new Error(`Could not find bridge config for ${token} on ${chain}`)
     }
-    const contract = new Contract(config.l1Bridge || config.l2Bridge, config.l1Bridge ? l1BridgeAbi : l2BridgeAbi, provider)
+    const contract = new Contract(config.l1Bridge || config.l2Bridge, config.l1Bridge ? L1_Bridge__factory.abi : L2_Bridge__factory.abi, provider)
     return contract
   }
 

packages/hop-node/src/watchers/classes/L1Bridge.ts

@@ -1,12 +1,12 @@
 import Bridge, { type CanonicalTokenConvertOptions, type EventCb, type EventsBatchOptions } from './Bridge.js'
 import Token from './Token.js'
 import wallets from '@hop-protocol/hop-node-core/wallets'
-import { BigNumber, Contract, constants } from 'ethers'
+import { BigNumber, constants } from 'ethers'
 import { Chain, Network, Token as TokenEnum } from '@hop-protocol/hop-node-core/constants'
 import { GasCostTransactionType, RelayableChains } from '#constants/index.js'
 import { Hop } from '@hop-protocol/sdk'
 import { chainIdToSlug } from '@hop-protocol/hop-node-core/utils'
-import { erc20Abi, l1Erc20BridgeAbi } from '@hop-protocol/sdk/abi'
+import { ERC20__factory,  L1_ERC20_Bridge__factory } from '@hop-protocol/sdk/contracts'
 import { config as globalConfig } from '#config/index.js'
 import type { ERC20 } from '@hop-protocol/sdk/contracts'
 import type {
@@ -32,13 +32,12 @@ export default class L1Bridge extends Bridge {
   }
 
   static fromAddress (address: string): L1Bridge {
-    const contract = new Contract(
+    const contract = L1_ERC20_Bridge__factory.connect(
       address,
-      l1Erc20BridgeAbi,
       wallets.get(Chain.Ethereum)
     )
 
-    return new L1Bridge(contract as L1BridgeContract)
+    return new L1Bridge(contract as unknown as L1BridgeContract)
   }
 
   getTransferBond = async (transferRootId: string) => {
@@ -166,9 +165,8 @@ export default class L1Bridge extends Bridge {
 
   async l1CanonicalToken (): Promise<Token> {
     const tokenAddress = await (this.l1BridgeContract as L1ERC20BridgeContract).l1CanonicalToken()
-    const tokenContract = new Contract(
+    const tokenContract = ERC20__factory.connect(
       tokenAddress,
-      erc20Abi,
       this.l1BridgeContract.signer
     ) as ERC20
     return new Token(tokenContract)

packages/hop-node/src/watchers/classes/L2Bridge.ts

@@ -4,13 +4,12 @@ import L2Amm from './L2Amm.js'
 import L2AmmWrapper from './L2AmmWrapper.js'
 import Token from './Token.js'
 import { Chain } from '@hop-protocol/hop-node-core/constants'
-import { Contract } from 'ethers'
 import { Hop } from '@hop-protocol/sdk'
 import {
-  erc20Abi,
-  l2AmmWrapperAbi,
-  swapAbi as saddleSwapAbi
-} from '@hop-protocol/sdk/abi'
+  ERC20__factory,
+  L2_AmmWrapper__factory,
+  Swap__factory
+} from '@hop-protocol/sdk/contracts'
 import { config as globalConfig } from '#config/index.js'
 import type { BigNumber, providers } from 'ethers'
 import type { ERC20 } from '@hop-protocol/sdk/contracts'
@@ -34,18 +33,16 @@ export default class L2Bridge extends Bridge {
 
     const addresses = globalConfig.addresses[this.tokenSymbol]?.[this.chainSlug]
     if (addresses?.l2AmmWrapper) {
-      const ammWrapperContract = new Contract(
+      const ammWrapperContract = L2_AmmWrapper__factory.connect(
         addresses.l2AmmWrapper,
-        l2AmmWrapperAbi,
         this.bridgeContract.signer
       )
       this.ammWrapper = new L2AmmWrapper(ammWrapperContract)
     }
 
     if (addresses?.l2SaddleSwap) {
-      const ammContract = new Contract(
+      const ammContract = Swap__factory.connect(
         addresses.l2SaddleSwap,
-        saddleSwapAbi,
         this.bridgeContract.signer
       )
       this.amm = new L2Amm(ammContract)
@@ -62,19 +59,17 @@ export default class L2Bridge extends Bridge {
 
   canonicalToken = async (): Promise<Token> => {
     const tokenAddress = await this.ammWrapper.contract.l2CanonicalToken()
-    const tokenContract = new Contract(
+    const tokenContract = ERC20__factory.connect(
       tokenAddress,
-      erc20Abi,
       this.bridgeContract.signer
     ) as ERC20
     return new Token(tokenContract)
   }
 
   hToken = async (): Promise<Token> => {
     const tokenAddress = await this.l2BridgeContract.hToken()
-    const tokenContract = new Contract(
+    const tokenContract = ERC20__factory.connect(
       tokenAddress,
-      erc20Abi,
       this.bridgeContract.signer
     ) as ERC20
     return new Token(tokenContract)

packages/sdk-core/.gitignore

@@ -16,7 +16,6 @@ docs-ui
 test/_*
 
 /core
-/abi
 /addresses
 /metadata
 /networks

packages/sdk-core/package.json

@@ -40,10 +40,6 @@
       "import": "./dist/esm/utils/index.js",
       "require": "./dist/cjs/utils/index.js"
     },
-    "./abi": {
-      "import": "./dist/esm/abi/index.js",
-      "require": "./dist/cjs/abi/index.js"
-    },
     "./addresses": {
       "import": "./dist/esm/addresses/index.js",
       "require": "./dist/cjs/addresses/index.js"

packages/sdk-core/src/index.ts

@@ -45,7 +45,6 @@ export {
 } from './utils/index.js'
 
 
-export * as abi from './abi/index.js'
 export * as addresses from './addresses/index.js'
 export * as config from './config/index.js'
 export * as contracts from './contracts/index.js'