Skip to content

chore(deps-dev): bump ethereum-waffle from 3.4.4 to 4.0.10 #891

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

Merged
gabririgo merged 5 commits into from
Jun 11, 2026
Merged

chore(deps-dev): bump ethereum-waffle from 3.4.4 to 4.0.10 #891

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
784bb3f
chore(deps-dev): bump ethereum-waffle from 3.4.4 to 4.0.10
dependabot[bot] Apr 30, 2026
dd55e84
fix failing tests after waffle upgrade
gabririgo Jun 10, 2026
652a444
latest fixes
gabririgo Jun 10, 2026
7329015
Merge branch 'origin/development' into dependabot/npm_and_yarn/ethere…
gabririgo Jun 10, 2026
2ad507e
Regenerate yarn.lock after merge
gabririgo Jun 10, 2026
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
4 changes: 3 additions & 1 deletion contracts/test/RogueStaking.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ contract RogueStaking {
bytes memory encodedCall = abi.encodeWithSelector(selector);
(bool success, bytes memory data) = inflation.call(encodedCall);
if (!success) {
revert(string(data));
assembly {
revert(add(data, 32), mload(data))
}
}
return uint256(bytes32(data));
}
Expand Down
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
"build:foundry:ir": "forge compile --via-ir",
"build:ts": "yarn rimraf dist && tsc",
"test": "hardhat test --deploy-fixture",
"test:foundry": "forge test --no-match-path 'test/{extensions/{Polygon,A0xRouterUnichain}Fork,debug/*}.t.sol'",
"test:foundry:gas": "forge test --no-match-path 'test/{extensions/{Polygon,A0xRouterUnichain}Fork,debug/*}.t.sol' --gas-report 2>&1 | awk '/^╭/{found=1} found' | tee coverage/gas-report.txt",
"test:foundry": "forge test --no-match-path 'test/{extensions/{Polygon,A0xRouterUnichain}Fork,debug/*}.t.sol' --no-match-contract 'DelegationLibFuzz|ECrosschainFuzzTest'",
"test:foundry:gas": "forge test --no-match-path 'test/{extensions/{Polygon,A0xRouterUnichain}Fork,debug/*}.t.sol' --no-match-contract 'DelegationLibFuzz|ECrosschainFuzzTest' --gas-report 2>&1 | awk '/^╭/{found=1} found' | tee coverage/gas-report.txt",
"test:polygon": "forge test --match-path test/extensions/PolygonFork.t.sol --fork-url polygon",
"test:unichain": "forge test --match-path test/extensions/A0xRouterUnichainFork.t.sol --fork-url unichain",
"test:bsc": "forge test --match-path test/debug/BscPoolUpgradeDebug.t.sol -vvv",
"test:fuzz": "forge test --match-contract 'DelegationLibFuzz|ECrosschainFuzzTest' -vvv",
"coverage": "yarn coverage:all",
"coverage:setup": "mkdir -p coverage",
"coverage:hardhat": "hardhat coverage && mv -f coverage.json coverage/coverage.json 2>/dev/null || true",
Expand Down Expand Up @@ -82,7 +83,7 @@
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-no-only-tests": "^3.0.0",
"eslint-plugin-prettier": "^4.2.1",
"ethereum-waffle": "^3.3.0",
"ethereum-waffle": "^4.0.10",
"ethers": "^5.1.4",
"hardhat": "^2.13.1",
"hardhat-deploy": "1.0.4",
Expand Down
5 changes: 3 additions & 2 deletions scripts/foundry-coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ rm -f lcov.info
forge coverage \
--no-match-coverage "mocks/|examples/|test/|tokens/|utils/" \
--match-path "test/libraries/*.t.sol" \
--no-match-contract "Fork" \
--no-match-contract "Fork|DelegationLibFuzz" \
--report lcov

mv lcov.info /tmp/foundry_library_lcov.info
Expand All @@ -46,7 +46,7 @@ echo "⚡ Step 1/4: Running non-fork test coverage..."
rm -f lcov.info
forge coverage \
--no-match-coverage "mocks/|examples/|test/|tokens/|utils/" \
--no-match-contract 'A0xRouterForkTest|ENavViewForkTest|AIntentsRealForkTest|EscrowWorkingTest|VSOnlyModelTest|AIntentsPerformanceAttributionAnalysisTest|PolygonForkTest|PoolDonateTest|AGmxV2ForkTest|A0xRouterUnichainForkTest|AUniswapForkTest|BscPoolUpgradeDebugTest' \
--no-match-contract 'A0xRouterForkTest|ENavViewForkTest|AIntentsRealForkTest|EscrowWorkingTest|VSOnlyModelTest|AIntentsPerformanceAttributionAnalysisTest|PolygonForkTest|PoolDonateTest|AGmxV2ForkTest|A0xRouterUnichainForkTest|AUniswapForkTest|BscPoolUpgradeDebugTest|DelegationLibFuzz|ECrosschainFuzzTest' \
--report lcov

mv lcov.info /tmp/foundry_nofork_lcov.info
Expand All @@ -59,6 +59,7 @@ rm -f lcov.info
forge coverage \
--no-match-coverage "mocks/|examples/|test/|tokens/|utils/" \
--match-contract 'A0xRouterForkTest|ENavViewForkTest|AIntentsRealForkTest|EscrowWorkingTest|VSOnlyModelTest|AIntentsPerformanceAttributionAnalysisTest|PoolDonateTest|AGmxV2ForkTest|AUniswapForkTest' \
--no-match-contract 'DelegationLibFuzz|ECrosschainFuzzTest' \
--report lcov

mv lcov.info /tmp/foundry_fork_lcov.info
Expand Down
62 changes: 31 additions & 31 deletions test/core/RigoblockPool.Basetoken.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ describe("BaseTokenProxy", async () => {
// on mint (or any op that requires nav calculation), the base token price feed existance is asserted
await expect(
pool.mint(user1.address, TEN_ETHER, 0)
).to.be.revertedWith('BaseTokenPriceFeedError()')
).to.be.revertedWith('BaseTokenPriceFeedError')
const poolKey = { currency0: AddressZero, currency1: grgToken.address, fee: 0, tickSpacing: MAX_TICK_SPACING, hooks: oracle.address }
await oracle.initializeObservations(poolKey)
await pool.mint(user1.address, TEN_ETHER, 0)
Expand All @@ -138,7 +138,7 @@ describe("BaseTokenProxy", async () => {
// spread is applied on mint regardless of number of holders, total supply is net of spread to offset price impact
poolData = await pool.getPoolTokens()
expect(poolData.totalSupply).to.be.eq(TEN_ETHER.sub(markup))
await expect(pool.mint(user2.address, TEN_ETHER, 0)).to.be.revertedWith('InvalidOperator()')
await expect(pool.mint(user2.address, TEN_ETHER, 0)).to.be.revertedWith('InvalidOperator')
await pool.connect(user2).setOperator(user1.address, true)
await pool.mint(user2.address, TEN_ETHER, 0)
poolData = await pool.getPoolTokens()
Expand Down Expand Up @@ -221,12 +221,12 @@ describe("BaseTokenProxy", async () => {
expect(await pool.decimals()).to.be.eq(18)
await expect(
pool.mint(user1.address, tokenAmountIn, 0)
).to.be.revertedWith('BaseTokenPriceFeedError()')
).to.be.revertedWith('BaseTokenPriceFeedError')
const poolKey = { currency0: AddressZero, currency1: grgToken.address, fee: 0, tickSpacing: MAX_TICK_SPACING, hooks: oracle.address }
await oracle.initializeObservations(poolKey)
await expect(
pool.mint(user1.address, tokenAmountIn, tokenAmountIn)
).to.not.be.revertedWith('BaseTokenPriceFeedError()')
).to.not.be.revertedWith('BaseTokenPriceFeedError')
})

it('should create new tokens with input tokens', async () => {
Expand All @@ -240,23 +240,23 @@ describe("BaseTokenProxy", async () => {
expect(await pool.decimals()).to.be.eq(18)
await expect(
pool.mint(user1.address, dustAmount, 0)
).to.be.revertedWith('PoolAmountSmallerThanMinimum(1000)')
).to.be.revertedWith('PoolAmountSmallerThanMinimum').withArgs(1000)
const tokenAmountIn = parseEther("1")
await expect(
pool.mint(user1.address, tokenAmountIn, 0)
).to.be.revertedWith('TokenTransferFromFailed()')
).to.be.revertedWith('TokenTransferFromFailed')
await grgToken.approve(pool.address, tokenAmountIn)
expect(
await grgToken.allowance(user1.address, pool.address)
).to.be.eq(tokenAmountIn)
await expect(
pool.mint(user1.address, tokenAmountIn, tokenAmountIn.sub(1))
).to.be.revertedWith('PoolMintOutputAmount()')
).to.be.revertedWith('PoolMintOutputAmount')
const { spread } = await pool.getPoolParams()
const markup = tokenAmountIn.mul(spread).div(10000)
await expect(
pool.mint(user1.address, tokenAmountIn, tokenAmountIn.sub(markup))
).to.not.be.revertedWith('PoolMintOutputAmount()')
).to.not.be.revertedWith('PoolMintOutputAmount')
// prev mint did not revert, so we need to approve again
await grgToken.approve(pool.address, tokenAmountIn)
// first mint uses initial value, which is 1, so user tokens are equal to grg transferred to pool
Expand Down Expand Up @@ -297,32 +297,32 @@ describe("BaseTokenProxy", async () => {
expect(await pool.balanceOf(user1.address)).to.be.eq(userTokens)
await expect(
pool.burn(0, 0)
).to.be.revertedWith('PoolBurnNullAmount()')
).to.be.revertedWith('PoolBurnNullAmount')
let userPoolBalance = await pool.balanceOf(user1.address)
// initial price is 1, so user balance is same as tokenAmountIn as long as no spread is applied
const { spread } = await pool.getPoolParams()
let markup = tokenAmountIn.mul(spread).div(10000)
expect(userPoolBalance).to.be.eq(tokenAmountIn.sub(markup))
await expect(
pool.burn(BigNumber.from(userPoolBalance).add(1), 0)
).to.be.revertedWith('PoolBurnNotEnough()')
).to.be.revertedWith('PoolBurnNotEnough')
await expect(
pool.burn(userPoolBalance, 0)
).to.be.revertedWith('PoolMinimumPeriodNotEnough()')
).to.be.revertedWith('PoolMinimumPeriodNotEnough')
// previous assertions result in 1 second time travel per assertion
await timeTravel({ seconds: 2592000 - 4, mine: false })
await expect(
pool.burn(userPoolBalance, BigNumber.from(tokenAmountIn).add(1))
).to.be.revertedWith('PoolMinimumPeriodNotEnough()')
).to.be.revertedWith('PoolMinimumPeriodNotEnough')
await timeTravel({ seconds: 1, mine: false })
await expect(
pool.burn(userPoolBalance, userPoolBalance.add(1))
).to.be.revertedWith('PoolBurnOutputAmount()')
).to.be.revertedWith('PoolBurnOutputAmount')

// when spread is applied, also requesting tokenAmountIn as minimum will revert
await expect(
pool.burn(userPoolBalance, userPoolBalance)
).to.be.revertedWith('PoolBurnOutputAmount()')
).to.be.revertedWith('PoolBurnOutputAmount')
const netRevenue = await pool.callStatic.burn(userPoolBalance, 0)
// the following is true with fee set as 0
await expect(
Expand Down Expand Up @@ -361,7 +361,7 @@ describe("BaseTokenProxy", async () => {
const poolKey = { currency0: AddressZero, currency1: grgToken.address, fee: 0, tickSpacing: MAX_TICK_SPACING, hooks: oracle.address }
await oracle.initializeObservations(poolKey)
await pool.mint(user1.address, parseEther("10"), 0)
await expect(pool.mint(user2.address, parseEther("5"), 0)).to.be.revertedWith('InvalidOperator()')
await expect(pool.mint(user2.address, parseEther("5"), 0)).to.be.revertedWith('InvalidOperator')
await pool.connect(user2).setOperator(user1.address, true)
await pool.mint(user2.address, parseEther("5"), 0)
const { unitaryValue } = await pool.getPoolTokens()
Expand Down Expand Up @@ -431,7 +431,7 @@ describe("BaseTokenProxy", async () => {
.and.to.not.emit(poolUsdc, "NewNav")
await expect(
poolUsdc.connect(user2).mint(user2.address, 999, 0)
).to.be.revertedWith('PoolAmountSmallerThanMinimum(1000)')
).to.be.revertedWith('PoolAmountSmallerThanMinimum').withArgs(1000)
// TODO: verify setting minimum period to 2 will set to 10?
await timeTravel({ seconds: 2592000, mine: true })
const burnAmount = 6000
Expand All @@ -450,7 +450,7 @@ describe("BaseTokenProxy", async () => {
let symbol = utils.formatBytes32String("TEST")
symbol = utils.hexDataSlice(symbol, 0, 8)
await expect(pool.initializePool())
.to.be.revertedWith('PoolAlreadyInitialized()')
.to.be.revertedWith('PoolAlreadyInitialized')
})
})

Expand All @@ -463,7 +463,7 @@ describe("BaseTokenProxy", async () => {
await pool.mint(user1.address, parseEther("10"), 0)
await expect(
pool.burnForToken(parseEther("10"), 0, AddressZero)
).to.be.revertedWith('PoolTokenNotActive()')
).to.be.revertedWith('PoolTokenNotActive')
})

it('should burn if token is active and base token balance small enough', async () => {
Expand All @@ -472,7 +472,7 @@ describe("BaseTokenProxy", async () => {
// nav calculations will sync uni v4 positions, but if (accidentally) a token does not have a price feed, the liquidity amount will be 0
await expect(
pool.mint(user1.address, parseEther("10"), 0)
).to.be.revertedWith(`BaseTokenPriceFeedError()`)
).to.be.revertedWith(`BaseTokenPriceFeedError`)

// re-deploy weth, as otherwise transaction won't revert (weth is converted 1-1 to ETH)
const Weth = await hre.ethers.getContractFactory("WETH9")
Expand All @@ -482,11 +482,11 @@ describe("BaseTokenProxy", async () => {
await oracle.initializeObservations(poolKey)
// as the new token (new weth) does not have a price feed, the token is not activated by minting
await pool.mint(user1.address, parseEther("10"), 0)
await expect(pool.burnForToken(0, 0, weth.address)).to.be.revertedWith('PoolTokenNotActive()')
await expect(pool.burnForToken(0, 0, weth.address)).to.be.revertedWith('PoolTokenNotActive')

// also a second mint, which performs nav calculations, will not activate the token
await pool.mint(user1.address, parseEther("10"), 0)
await expect(pool.burnForToken(0, 0, weth.address)).to.be.revertedWith('PoolTokenNotActive()')
await expect(pool.burnForToken(0, 0, weth.address)).to.be.revertedWith('PoolTokenNotActive')

// using a supported app is the only way to activate a token
const PAIR = DEFAULT_PAIR
Expand All @@ -509,8 +509,8 @@ describe("BaseTokenProxy", async () => {
await oracle.initializeObservations(poolKey)
// this call will activate the token
await user1.sendTransaction({ to: extPool.address, value: 0, data: encodedSwapData})
await expect(pool.burnForToken(0, 0, weth.address)).to.be.revertedWith('PoolBurnNullAmount()')
await expect(pool.burnForToken(parseEther("1"), 0, weth.address)).to.be.revertedWith('PoolMinimumPeriodNotEnough()')
await expect(pool.burnForToken(0, 0, weth.address)).to.be.revertedWith('PoolBurnNullAmount')
await expect(pool.burnForToken(parseEther("1"), 0, weth.address)).to.be.revertedWith('PoolMinimumPeriodNotEnough')
await timeTravel({ seconds: 2592000, mine: true })
// need to deposit a bigger amount, as otherwise won't be able to reproduce case where target token is transferred
await weth.deposit({ value: parseEther("100") })
Expand All @@ -525,7 +525,7 @@ describe("BaseTokenProxy", async () => {
expect(unitaryValue).to.be.eq(parseEther("6.005005005005005005"))
expect(updated[0].toString()).to.be.eq(unitaryValue.toString())
// Notice: sometimes, changing order of tx affects twaps, and the amount needed to revert this must be adjusted
await expect(pool.burnForToken(parseEther("16.7"), 0, weth.address)).to.be.revertedWith('TokenTransferFailed()')
await expect(pool.burnForToken(parseEther("16.7"), 0, weth.address)).to.be.revertedWith('TokenTransferFailed')
const wethBalanceBefore = await weth.balanceOf(user1.address)
const tx = await pool.burnForToken(parseEther("16.6"), 0, weth.address)
const wethBalanceAfter = await weth.balanceOf(user1.address)
Expand All @@ -544,7 +544,7 @@ describe("BaseTokenProxy", async () => {
const poolKey = { currency0: AddressZero, currency1: grgToken.address, fee: 0, tickSpacing: MAX_TICK_SPACING, hooks: oracle.address }
await oracle.initializeObservations(poolKey)
await pool.mint(user1.address, parseEther("10"), 0)
await expect(pool.burnForToken(0, 0, AddressZero)).to.be.revertedWith('PoolTokenNotActive()')
await expect(pool.burnForToken(0, 0, AddressZero)).to.be.revertedWith('PoolTokenNotActive')
const v4Planner: V4Planner = new V4Planner()
v4Planner.addAction(Actions.TAKE, [AddressZero, pool.address, parseEther("12")])
const planner: RoutePlanner = new RoutePlanner()
Expand All @@ -563,17 +563,17 @@ describe("BaseTokenProxy", async () => {
const activeTokens = (await pool.getActiveTokens()).activeTokens
expect(activeTokens[0]).to.be.eq(AddressZero)
expect(activeTokens.length).to.be.eq(1)
await expect(pool.burnForToken(0, 0, AddressZero)).to.be.revertedWith('PoolBurnNullAmount()')
await expect(pool.burnForToken(parseEther("1"), 0, AddressZero)).to.be.revertedWith('PoolMinimumPeriodNotEnough()')
await expect(pool.burnForToken(0, 0, AddressZero)).to.be.revertedWith('PoolBurnNullAmount')
await expect(pool.burnForToken(parseEther("1"), 0, AddressZero)).to.be.revertedWith('PoolMinimumPeriodNotEnough')
await timeTravel({ seconds: 2592000, mine: true })
await expect(pool.burnForToken(parseEther("1"), 0, AddressZero)).to.be.revertedWith('BaseTokenBalance()')
await expect(pool.burnForToken(parseEther("1"), 0, AddressZero)).to.be.revertedWith('BaseTokenBalance')
await user1.sendTransaction({ to: pool.address, value: parseEther("98")})
await pool.updateUnitaryValue()
const { unitaryValue } = await pool.getPoolTokens()
// TODO: what is affecting unitary value calculation here?
expect(unitaryValue).to.be.eq(parseEther("11.007971106066621173"))
await expect(pool.burnForToken(parseEther("0.08"), 0, AddressZero)).to.be.revertedWith('BaseTokenBalance()')
await expect(pool.burnForToken(parseEther("9.1"), 0, AddressZero)).to.be.revertedWith('NativeTransferFailed()')
await expect(pool.burnForToken(parseEther("0.08"), 0, AddressZero)).to.be.revertedWith('BaseTokenBalance')
await expect(pool.burnForToken(parseEther("9.1"), 0, AddressZero)).to.be.revertedWith('NativeTransferFailed')
await expect(
pool.burnForToken(parseEther("8"), 0, AddressZero)
)
Expand Down Expand Up @@ -611,7 +611,7 @@ describe("BaseTokenProxy", async () => {
// this call will activate the token
await user1.sendTransaction({ to: extPool.address, value: 0, data: encodedSwapData})
// minting again to activate token via nav calculations
await expect(pool.mint(user2.address, parseEther("10"), 0)).to.be.revertedWith('InvalidOperator()')
await expect(pool.mint(user2.address, parseEther("10"), 0)).to.be.revertedWith('InvalidOperator')
await pool.connect(user2).setOperator(user1.address, true)
await pool.mint(user2.address, parseEther("5"), 0)
// unitary value does not include spread to pool, but includes weth balance
Expand Down
6 changes: 3 additions & 3 deletions test/core/RigoblockPool.Delegation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe("Delegation", async () => {
pool.connect(user2).updateDelegation([
{ delegated: user2.address, selector: WRITE_SELECTOR, isDelegated: true }
])
).to.be.revertedWith("PoolCallerIsNotOwner()")
).to.be.revertedWith("PoolCallerIsNotOwner")
})

it("should grant delegation for a single (selector, address) pair", async () => {
Expand Down Expand Up @@ -163,7 +163,7 @@ describe("Delegation", async () => {
const { pool } = await setupTests()
await expect(
pool.connect(user2).revokeAllDelegations(user2.address)
).to.be.revertedWith("PoolCallerIsNotOwner()")
).to.be.revertedWith("PoolCallerIsNotOwner")
})

it("should revoke all selectors for a delegated address at once", async () => {
Expand Down Expand Up @@ -219,7 +219,7 @@ describe("Delegation", async () => {
const { pool } = await setupTests()
await expect(
pool.connect(user2).revokeAllDelegationsForSelector(WRITE_SELECTOR)
).to.be.revertedWith("PoolCallerIsNotOwner()")
).to.be.revertedWith("PoolCallerIsNotOwner")
})

it("should revoke all addresses delegated for a selector at once", async () => {
Expand Down
Loading