Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test partial fill #114

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

test partial fill #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b87dcae
test partial fill
snreynolds Oct 27, 2022
abf95e9
test passing
snreynolds Oct 27, 2022
ee02b8d
updated test
snreynolds Oct 28, 2022
5aa7d68
updated tests
snreynolds Oct 28, 2022
48f8ea8
some fixes
snreynolds Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 101 additions & 2 deletions test/integration-tests/Router.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
getAdvancedOrderParams,
AdvancedOrder,
Order,
defaultAvailableAdvancedOrders,
} from './shared/protocolHelpers/seaport'
import { resetFork, WETH, DAI } from './shared/mainnetForkHelpers'
import { CommandType, RoutePlanner } from './shared/planner'
Expand Down Expand Up @@ -197,14 +198,112 @@ describe('Router', () => {
[DAI.address, WETH.address],
router.address,
])
planner.addCommand(CommandType.UNWRAP_WETH, [alice.address, value])
snreynolds marked this conversation as resolved.
Show resolved Hide resolved
planner.addCommand(CommandType.UNWRAP_WETH, [router.address, value])
planner.addCommand(CommandType.SEAPORT, [value.toString(), calldata])
const { commands, inputs } = planner
const covenBalanceBefore = await covenContract.balanceOf(alice.address)
await router['execute(bytes,bytes[],uint256)'](commands, inputs, DEADLINE, { value })
await router['execute(bytes,bytes[],uint256)'](commands, inputs, DEADLINE)
const covenBalanceAfter = await covenContract.balanceOf(alice.address)
expect(covenBalanceAfter.sub(covenBalanceBefore)).to.eq(1)
})

it('completes a trade for ERC20 --> ETH --> NFTs, invalid Seaport order', async () => {
snreynolds marked this conversation as resolved.
Show resolved Hide resolved
const maxAmountIn = expandTo18DecimalsBN(100_000)
// in this case there is leftover dai in the router, and the unspent eth gets sent to alice
await daiContract.transfer(router.address, maxAmountIn)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should now use permit2 to transfer in the tokens 👯

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can just add a

dai.approve(permit2)
permit2.approve(router, amount)

so that then during v2 it can pull in the tokens from the user :)


let invalidSeaportOrder = JSON.parse(JSON.stringify(seaportOrders[0]))
const { order: seaportOrder, value: seaportValue } = getOrderParams(invalidSeaportOrder)
let nftxValue: BigNumber = expandTo18DecimalsBN(4)
let totalValue = seaportValue.add(nftxValue)

// invalidate Seaport order
invalidSeaportOrder.protocol_data.signature = '0xdeadbeef'
const calldataOpensea = seaportInterface.encodeFunctionData('fulfillOrder', [seaportOrder, OPENSEA_CONDUIT_KEY])

// valid NFTX order
let numCovensNFTX = 2
const calldataNFTX = nftxZapInterface.encodeFunctionData('buyAndRedeem', [
NFTX_COVEN_VAULT_ID,
numCovensNFTX,
[],
[WETH.address, NFTX_COVEN_VAULT],
alice.address,
])

planner.addCommand(CommandType.V2_SWAP_EXACT_OUT, [
totalValue,
maxAmountIn,
[DAI.address, WETH.address],
router.address,
])
planner.addCommand(CommandType.UNWRAP_WETH, [router.address, totalValue])
planner.addCommand(CommandType.SEAPORT, [seaportValue.toString(), calldataOpensea], true)

planner.addCommand(CommandType.NFTX, [nftxValue, calldataNFTX])

const { commands, inputs } = planner

const routerEthBalanceBefore = await ethers.provider.getBalance(router.address)
const covenBalanceBefore = await covenContract.balanceOf(alice.address)

await router['execute(bytes,bytes[],uint256)'](commands, inputs, DEADLINE)

const covenBalanceAfter = await covenContract.balanceOf(alice.address)
const routerEthBalanceAfter = await ethers.provider.getBalance(router.address)

expect(covenBalanceAfter.sub(covenBalanceBefore)).to.eq(numCovensNFTX)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to make sure that the user gets their money back for the NFT's they did not receive

expect(routerEthBalanceAfter).to.eq(routerEthBalanceBefore)
})

it('completes a trade for ERC20 --> ETH --> NFTs with Seaport, fulfillAvailableAdvancedOrders fill', async () => {
const maxAmountIn = expandTo18DecimalsBN(100_000)
// in this case there is leftover dai in the router and all eth gets spent on the nfts
await daiContract.transfer(router.address, maxAmountIn)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aaand again
basically these dai transfers used to be our way to make tests before we could integrate with permit2 :)


const { advancedOrder: advancedOrder0, value: value1 } = getAdvancedOrderParams(seaportOrders[0])
const { advancedOrder: advancedOrder1, value: value2 } = getAdvancedOrderParams(seaportOrders[1])
const params0 = advancedOrder0.parameters
const params1 = advancedOrder1.parameters
const totalValue = value1.add(value2)

const calldata = defaultAvailableAdvancedOrders(alice.address, advancedOrder0, advancedOrder1)

planner.addCommand(CommandType.V2_SWAP_EXACT_OUT, [
totalValue,
maxAmountIn,
[DAI.address, WETH.address],
router.address,
])
planner.addCommand(CommandType.UNWRAP_WETH, [router.address, totalValue])

planner.addCommand(CommandType.SEAPORT, [totalValue, calldata])
const { commands, inputs } = planner

const nftId0 = params0.offer[0].identifierOrCriteria
const nftId1 = params1.offer[0].identifierOrCriteria

const owner0Before = await covenContract.ownerOf(nftId0)
const owner1Before = await covenContract.ownerOf(nftId1)
const ethBefore = await ethers.provider.getBalance(alice.address)
const routerEthBalanceBefore = await ethers.provider.getBalance(router.address)

const receipt = await (await router['execute(bytes,bytes[],uint256)'](commands, inputs, DEADLINE)).wait()

const owner0After = await covenContract.ownerOf(nftId0)
const owner1After = await covenContract.ownerOf(nftId1)
const ethAfter = await ethers.provider.getBalance(alice.address)
const routerEthBalanceAfter = await ethers.provider.getBalance(router.address)
const gasSpent = receipt.gasUsed.mul(receipt.effectiveGasPrice)
const ethDelta = ethBefore.sub(ethAfter)

expect(owner0Before.toLowerCase()).to.eq(params0.offerer)
expect(owner1Before.toLowerCase()).to.eq(params1.offerer)
expect(owner0After).to.eq(alice.address)
expect(owner1After).to.eq(alice.address)
expect(ethDelta).to.eq(gasSpent) // eth spent only on gas bc trade came from DAI
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this was a partial fill, does some ether get stuck in the router?? might be good to check that router balance is 0 and that Alice got refunded for her partial fill....I may have forgetten to do this in my other partial fill tests. 😬

expect(routerEthBalanceBefore).to.eq(routerEthBalanceAfter) // ensure no eth is left in the router
})
})
})

Expand Down
42 changes: 15 additions & 27 deletions test/integration-tests/SeaportRouter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import { expect } from './shared/expect'
import { BigNumber } from 'ethers'
import { Router } from '../../typechain'
import { abi as ERC721_ABI } from '../../artifacts/solmate/src/tokens/ERC721.sol/ERC721.json'
import { seaportOrders, seaportInterface, getAdvancedOrderParams } from './shared/protocolHelpers/seaport'
import {
seaportOrders,
seaportInterface,
getAdvancedOrderParams,
defaultAvailableAdvancedOrders,
} from './shared/protocolHelpers/seaport'
import deployRouter from './shared/deployRouter'
import { resetFork } from './shared/mainnetForkHelpers'
import { ALICE_ADDRESS, COVEN_ADDRESS, DEADLINE, OPENSEA_CONDUIT_KEY } from './shared/constants'
Expand Down Expand Up @@ -62,40 +67,23 @@ describe('Seaport', () => {
const params0 = advancedOrder0.parameters
const params1 = advancedOrder1.parameters
const value = value1.add(value2)
const considerationFulfillment = [
[[0, 0]],
[
[0, 1],
[1, 1],
],
[
[0, 2],
[1, 2],
],
[[1, 0]],
]

const calldata = seaportInterface.encodeFunctionData('fulfillAvailableAdvancedOrders', [
[advancedOrder0, advancedOrder1],
[],
[[[0, 0]], [[1, 0]]],
considerationFulfillment,
OPENSEA_CONDUIT_KEY,
alice.address,
100,
])

const calldata = defaultAvailableAdvancedOrders(alice.address, advancedOrder0, advancedOrder1)

planner.addCommand(CommandType.SEAPORT, [value.toString(), calldata])
const { commands, inputs } = planner

const owner0Before = await covenContract.ownerOf(params0.offer[0].identifierOrCriteria)
const owner1Before = await covenContract.ownerOf(params1.offer[0].identifierOrCriteria)
const nftId0 = params0.offer[0].identifierOrCriteria
const nftId1 = params1.offer[0].identifierOrCriteria

const owner0Before = await covenContract.ownerOf(nftId0)
const owner1Before = await covenContract.ownerOf(nftId1)
const ethBefore = await ethers.provider.getBalance(alice.address)

const receipt = await (await router['execute(bytes,bytes[],uint256)'](commands, inputs, DEADLINE, { value })).wait()

const owner0After = await covenContract.ownerOf(params0.offer[0].identifierOrCriteria)
const owner1After = await covenContract.ownerOf(params1.offer[0].identifierOrCriteria)
const owner0After = await covenContract.ownerOf(nftId0)
const owner1After = await covenContract.ownerOf(nftId1)
const ethAfter = await ethers.provider.getBalance(alice.address)
const gasSpent = receipt.gasUsed.mul(receipt.effectiveGasPrice)
const ethDelta = ethBefore.sub(ethAfter)
Expand Down
32 changes: 32 additions & 0 deletions test/integration-tests/shared/protocolHelpers/seaport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { BigNumber } from 'ethers'
import { expandTo18DecimalsBN } from '../helpers'
import fs from 'fs'
import hre from 'hardhat'
import { OPENSEA_CONDUIT_KEY } from '../constants'
const { ethers } = hre

export const seaportOrders = JSON.parse(
Expand Down Expand Up @@ -75,3 +76,34 @@ export function calculateValue(considerations: ConsiderationItem[]): BigNumber {
expandTo18DecimalsBN(0)
)
}

export function defaultAvailableAdvancedOrders(
address: string,
advancedOrder0: AdvancedOrder,
advancedOrder1: AdvancedOrder
): string {
const considerationFulfillment = [
[[0, 0]],
[
[0, 1],
[1, 1],
],
[
[0, 2],
[1, 2],
],
[[1, 0]],
]

const calldata = seaportInterface.encodeFunctionData('fulfillAvailableAdvancedOrders', [
[advancedOrder0, advancedOrder1],
[],
[[[0, 0]], [[1, 0]]],
considerationFulfillment,
OPENSEA_CONDUIT_KEY,
address,
100,
])

return calldata
}