feat(tests): fix Integration tests (#13772)

.github/workflows/_tests.yml

@@ -54,8 +54,8 @@ jobs:
       BUILDKIT_PROGRESS: plain
     steps:
       - uses: actions/checkout@v4
-      # - name: Run Integration Tests
-      #   run: scripts/integration-tests.sh
+      - name: Run Integration Tests
+        run: scripts/integration-tests.sh
       - name: Archive production artifacts
         uses: actions/upload-artifact@v4
         with:

packages/hardhat-plugin/test/index.test.ts

@@ -45,7 +45,6 @@ describe('Unlock Hardhat plugin', function () {
       assert.equal(this.hre.unlock.networks['1'].unlockAddress, 'newAddress')
     })
     it('should store additional networks info', function () {
-      console.log(this.hre.unlock.networks['12345'])
       assert.isTrue(Object.keys(this.hre.unlock.networks).includes('12345'))
       assert.isTrue(Object.keys(this.hre.unlock.networks).includes('31337'))
       assert.equal(

tests/package.json

@@ -17,8 +17,6 @@
     "@nomicfoundation/hardhat-network-helpers": "1.0.10",
     "@nomicfoundation/hardhat-toolbox": "4.0.0",
     "@nomicfoundation/hardhat-verify": "2.0.4",
-    "@nomiclabs/hardhat-ethers": "2.2.3",
-    "@nomiclabs/hardhat-etherscan": "3.1.8",
     "@typechain/ethers-v5": "10.1.0",
     "@typechain/ethers-v6": "0.5.1",
     "@typechain/hardhat": "6.1.2",
@@ -31,7 +29,7 @@
     "apollo-link-http": "1.5.17",
     "chai": "4.2.0",
     "eslint": "8.46.0",
-    "ethers": "5.7.2",
+    "ethers": "6.10.0",
     "graphql": "16.6.0",
     "hardhat": "2.20.1",
     "hardhat-gas-reporter": "1.0.8",

tests/test/helpers/fixtures.ts

@@ -1,10 +1,9 @@
 import { ethers } from 'hardhat'
-const { constants, utils } = ethers
 import { DEFAULT_KEY_PRICE } from './keys'
 
 export const lockParams = {
   expirationDuration: 60 * 60 * 24 * 30, // 30 days
-  currencyContractAddress: constants.AddressZero, // address 0 is ETH but could be any ERC20 token
+  currencyContractAddress: ethers.ZeroAddress, // address 0 is ETH but could be any ERC20 token
   keyPrice: DEFAULT_KEY_PRICE, // in wei
   maxNumberOfKeys: 100,
   name: 'Unlock-Protocol Sample Lock',

tests/test/helpers/keys.ts

@@ -1,71 +1,70 @@
 const { ethers, unlock } = require('hardhat')
-const { AddressZero } = ethers.constants
-import type { BigNumber } from 'ethers'
+const { ZeroAddress } = ethers
 
-export const DEFAULT_KEY_PRICE = ethers.utils.parseEther('0.01')
+export const DEFAULT_KEY_PRICE = ethers.parseEther('0.01')
 
-export const genKeyId = (lockAddress: string, tokenId: BigNumber) =>
+export const genKeyId = (lockAddress: string, tokenId: bigint) =>
   `${lockAddress}-${tokenId.toString()}`
 
 export const purchaseKey = async (
   lockAddress: string,
   keyOwnerAddress: string,
-  price = null,
-  isErc20 = false
+  price = null
 ) => {
   // make sure we got ethers lock
   const lock = await unlock.getLockContract(lockAddress)
+  const isErc20 = (await lock.tokenAddress()) !== ZeroAddress
 
   const purchasePrice = price || (await lock.keyPrice())
 
   const tx = await lock.purchase(
-    [purchasePrice],
+    isErc20 ? [purchasePrice] : [],
     [keyOwnerAddress],
-    [AddressZero],
-    [AddressZero],
-    [[]],
+    [ZeroAddress],
+    [ZeroAddress],
+    ['0x'],
     {
       value: isErc20 ? 0 : purchasePrice,
     }
   )
   // get token ids
-  const { events, blockNumber, transactionHash } = await tx.wait()
-  const { args } = events.find(
-    (v: any) =>
-      v.event === 'Transfer' &&
-      v.address.toLowerCase() === lockAddress.toLowerCase()
+  const { logs, blockNumber, hash } = await tx.wait()
+  const { args } = logs.find(
+    ({ fragment }: any) => fragment && fragment.name === 'Transfer'
   )
+
   const { tokenId, from, to } = args
 
-  return { tokenId, blockNumber, from, to, transactionHash }
+  return { tokenId, blockNumber, from, to, transactionHash: hash }
 }
 
 export const purchaseKeys = async (
   lockAddress: string,
   nbOfKeys = 1,
-  price = DEFAULT_KEY_PRICE,
-  isErc20 = false
+  price = DEFAULT_KEY_PRICE
 ) => {
   // make sure we got ethers lock
   const lock = await unlock.getLockContract(lockAddress)
+  const isErc20 = (await lock.tokenAddress()) !== ZeroAddress
 
   // signer 0 is the lockOwner so keyOwners starts at index 1
   const signers = await ethers.getSigners()
   const keyOwners = signers.slice(1, nbOfKeys + 1)
+
   const tx = await lock.purchase(
     isErc20 ? keyOwners.map(() => price) : [],
-    keyOwners.map((k: any) => k.address),
-    keyOwners.map(() => AddressZero),
-    keyOwners.map(() => AddressZero),
-    keyOwners.map(() => []),
+    keyOwners.map(({ address }: { address: string }) => address),
+    keyOwners.map(() => ZeroAddress),
+    keyOwners.map(() => ZeroAddress),
+    keyOwners.map(() => '0x'),
     {
-      value: isErc20 ? 0 : price.mul(nbOfKeys),
+      value: isErc20 ? 0 : price * BigInt(nbOfKeys),
     }
   )
   // get token ids
-  const { events } = await tx.wait()
-  const tokenIds = events
-    .filter((v: any) => v.event === 'Transfer')
+  const { logs } = await tx.wait()
+  const tokenIds = logs
+    .filter(({ fragment }: any) => fragment && fragment.name === 'Transfer')
     .map(({ args }: any) => args.tokenId)
 
   return {

tests/test/helpers/subgraph.ts

@@ -7,7 +7,6 @@ import {
 } from '@apollo/client'
 import { HttpLink } from 'apollo-link-http'
 import { genKeyId } from './keys'
-import type { BigNumber } from 'ethers'
 
 import { localhost } from '@unlock-protocol/networks'
 
@@ -62,7 +61,7 @@ export const getLock = async (lockAddress: string) => {
   } = await subgraph.query({
     query: getLockQuery,
     variables: {
-      id: lockAddress,
+      id: lockAddress.toLowerCase(),
     },
   })
   return lock
@@ -82,8 +81,8 @@ const getKeyQuery = gql`
     }
   }
 `
-export const getKey = async (lockAddress: string, tokenId: BigNumber) => {
-  const keyId = genKeyId(lockAddress, tokenId)
+export const getKey = async (lockAddress: string, tokenId: bigint) => {
+  const keyId = genKeyId(lockAddress.toLowerCase(), tokenId)
   const {
     data: { key },
   } = await subgraph.query({
@@ -115,21 +114,22 @@ export const getReceipt = async (txHash: string) => {
   } = await subgraph.query({
     query: getReceiptQuery,
     variables: {
-      id: txHash,
+      id: txHash.toLowerCase(),
     },
   })
   return receipt
 }
 
-const getLocksQuery = gql`
-  query Locks($first: Int = 1) {
-    locks(first: $first) {
+export const getLocks = async (first = 100, isErc20 = false) => {
+  const getLocksQuery = gql`query Locks($first: Int = 1) {
+    locks(first: $first, where: {${
+      isErc20 ? `tokenAddress_not_contains` : `tokenAddress_contains`
+    }: "0000000000000000000000000000000000000000" }) {
       tokenAddress
       address
     }
   }
 `
-export const getLocks = async (first = 100) => {
   const { data } = await subgraph.query({
     query: getLocksQuery,
     variables: {