feat(smart-contarcts): add support for swap and purchase when a discount hook is activated

packages/contracts/src/index.ts

@@ -77,9 +77,4 @@ export { UnlockDiscountTokenV2 }
 export { UnlockDiscountTokenV3 }
 export { GovernorUnlockProtocol }
 export { GovernorUnlockProtocolTimelock }
-export {
-  LockSerializer,
-  UnlockSwapPurchaser,
-  UnlockSwapBurner,
-  UniswapOracleV3,
-}
+export { LockSerializer,UnlockSwapPurchaser,UnlockSwapBurner,UniswapOracleV3 }

packages/hardhat-helpers/package.json

@@ -20,14 +20,14 @@
     "@nomiclabs/hardhat-ethers": "2.2.3",
     "@nomiclabs/hardhat-waffle": "2.0.6",
     "@uniswap/permit2-sdk": "1.2.0",
-    "@uniswap/sdk-core": "4.0.9",
-    "@uniswap/smart-order-router": "3.19.2",
-    "@uniswap/v3-sdk": "3.10.2",
+    "@uniswap/sdk-core": "4.2.0",
+    "@uniswap/smart-order-router": "3.25.0",
     "@unlock-protocol/contracts": "workspace:^",
     "@unlock-protocol/networks": "workspace:^",
     "@unlock-protocol/tsconfig": "workspace:^",
     "@unlock-protocol/types": "workspace:^",
     "ethers": "6.10.0",
+    "ethersv5": "npm:ethers@^5.7.2",
     "hardhat": "2.20.1",
     "typescript": "5.3.3",
     "zksync-ethers": "6.1.0"

packages/hardhat-helpers/src/fork.js

@@ -27,7 +27,7 @@ async function getWhales(chainId = 1) {
     case 1:
       return {
         [tokens.DAI]: '0x075e72a5eDf65F0A5f44699c7654C1a76941Ddc8', // PulseX
-        [tokens.USDC]: '0x8EB8a3b98659Cce290402893d0123abb75E3ab28',
+        [tokens.USDC]: '0xD6153F5af5679a75cC85D8974463545181f48772',
         [tokens.WBTC]: '0x845cbCb8230197F733b59cFE1795F282786f212C',
         [tokens.UDT]: '0xF5C28ce24Acf47849988f147d5C75787c0103534', // unlock-protocol.eth
       }
@@ -61,11 +61,11 @@ const parseForkUrl = (networks) => {
     name: `${name} (forked locally)`,
     accounts: process.env.DEPLOYER_PRIVATE_KEY
       ? [
-          {
-            privateKey: process.env.DEPLOYER_PRIVATE_KEY,
-            balance: '10000000000000000000000', // 1000 ETH yah
-          },
-        ]
+        {
+          privateKey: process.env.DEPLOYER_PRIVATE_KEY,
+          balance: '10000000000000000000000', // 1000 ETH yah
+        },
+      ]
       : undefined,
   }
 
@@ -94,10 +94,7 @@ const resetNodeState = async () => {
   })
 }
 
-const addSomeETH = async (
-  address,
-  amount = ethers.utils.parseEther('1000')
-) => {
+const addSomeETH = async (address, amount = ethers.parseEther('1000')) => {
   const { network } = require('hardhat')
   const balance = `0x${BigInt(amount.toString()).toString(16)}`
   await network.provider.send('hardhat_setBalance', [address, balance])
@@ -160,13 +157,20 @@ const addERC20 = async function (
   }
 
   // otherwise use transfer from whales
+  const erc20Contract = await ethers.getContractAt(ERC20_ABI, tokenAddress)
   const whales = await getWhales()
   if (!whales[tokenAddress])
     throw Error(`No whale for this address: ${tokenAddress}`)
+
+  const whaleBalance = await erc20Contract.balanceOf(whales[tokenAddress])
+  if (whaleBalance.lt(amount)) {
+    throw Error(
+      `Whale at address: ${whales[tokenAddress]} does not have enough ${tokenAddress} to transfer ${amount} to ${address} (only has ${whaleBalance})`
+    )
+  }
   const whale = await ethers.getSigner(whales[tokenAddress])
   await impersonate(whale.address)
 
-  const erc20Contract = await ethers.getContractAt(ERC20_ABI, tokenAddress)
   await erc20Contract.connect(whale).transfer(address, amount)
   return erc20Contract
 }

packages/hardhat-helpers/src/uniswap.js

@@ -1,4 +1,5 @@
 const { ethers } = require('ethers')
+const { ethers: ethersv5 } = require('ethersv5')
 
 const { AllowanceTransfer } = require('@uniswap/permit2-sdk')
 const {
@@ -26,11 +27,11 @@ const PERMIT2_ADDRESS = '0x000000000022D473030F116dDEE9F6B43aC78BA3'
 // convert swap jsbi to ethers BigNumber
 const currencyAmountToBigNumber = (amount) => {
   const { decimals } = amount.currency
-  const fixed = ethers.FixedNumber.from(amount.toExact())
-  const tokenScale = ethers.FixedNumber.from(
-    ethers.BigNumber.from(10).pow(decimals)
+  const fixed = ethersv5.FixedNumber.from(amount.toExact())
+  const tokenScale = ethersv5.FixedNumber.from(
+    ethersv5.BigNumber.from(10).pow(decimals)
   )
-  return ethers.BigNumber.from(
+  return ethersv5.BigNumber.from(
     // have to remove trailing .0 "manually" :/
     fixed.mulUnsafe(tokenScale).floor().toString().split('.')[0]
   )
@@ -47,18 +48,22 @@ async function getUniswapRoute({
   slippageTolerance = new Percent(10, 100),
   deadline = Math.floor(new Date().getTime() / 1000 + 100000),
   permitOptions: { usePermit2Sig = false, inputTokenPermit } = {},
-  chainId,
+  chainId = 1,
 }) {
   // init router
+
+  const provider = new ethersv5.providers.JsonRpcProvider(
+    `https://rpc.unlock-protocol.com/${chainId}`
+  )
   const router = new AlphaRouter({
     chainId,
-    provider: ethers.provider,
+    provider,
   })
 
   // parse router args
   const outputAmount = CurrencyAmount.fromRawAmount(
     tokenOut,
-    JSBI.BigInt(amoutOut)
+    amoutOut //JSBI.BigInt(amoutOut)
   )
   const routeArgs = [
     outputAmount,

packages/networks/src/networks/sepolia.ts

@@ -84,6 +84,7 @@ export const sepolia: NetworkConfig = {
     networkName: 'sepolia',
     studioName: 'unlock-protocol-sepolia',
   },
+  swapPurchaser: '0x580A4a5a9612371e3832c4559026B9Ee3b23Cc11',
   tokens: [
     {
       address: '0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9',