merge main/add snaps

Uniswap · Apr 8, 2024 · 08e3181 · 08e3181
2 parents 06bb849 + 126ec86
commit 08e3181
Show file tree

Hide file tree

Showing 72 changed files with 1,150 additions and 418 deletions.
diff --git a/.forge-snapshots/DynamicFees.swap_updateDynamicFeeInBeforeSwap.snap b/.forge-snapshots/DynamicFees.swap_updateDynamicFeeInBeforeSwap.snap
@@ -1 +1 @@
-141181
+139992
diff --git a/.forge-snapshots/DynamicFees.swap_withDynamicFee.snap b/.forge-snapshots/DynamicFees.swap_withDynamicFee.snap
@@ -1 +1 @@
-90176
+89366
diff --git a/.forge-snapshots/PoolManager.addLiquidity.snap b/.forge-snapshots/PoolManager.addLiquidity.snap
@@ -1 +1 @@
-145959
+144743
diff --git a/.forge-snapshots/PoolManager.addLiquidity_withEmptyHook.snap b/.forge-snapshots/PoolManager.addLiquidity_withEmptyHook.snap
@@ -1 +1 @@
-265799
+264566
diff --git a/.forge-snapshots/PoolManager.addLiquidity_withNative.snap b/.forge-snapshots/PoolManager.addLiquidity_withNative.snap
@@ -1 +1 @@
-140642
+139426
diff --git a/.forge-snapshots/PoolManager.bytecodeSize.snap b/.forge-snapshots/PoolManager.bytecodeSize.snap
@@ -1 +1 @@
-23026
+22598
diff --git a/.forge-snapshots/PoolManager.collectProtocolFees_erc20.snap b/.forge-snapshots/PoolManager.collectProtocolFees_erc20.snap
@@ -1 +1 @@
-24938
+24961
diff --git a/.forge-snapshots/PoolManager.collectProtocolFees_native.snap b/.forge-snapshots/PoolManager.collectProtocolFees_native.snap
@@ -1 +1 @@
-36611
+36634
diff --git a/.forge-snapshots/PoolManager.donate_gasWith1Token.snap b/.forge-snapshots/PoolManager.donate_gasWith1Token.snap
@@ -1 +1 @@
-101654
+101137
diff --git a/.forge-snapshots/PoolManager.donate_gasWith2Tokens.snap b/.forge-snapshots/PoolManager.donate_gasWith2Tokens.snap
@@ -1 +1 @@
-128667
+132127
diff --git a/.forge-snapshots/PoolManager.initialize.snap b/.forge-snapshots/PoolManager.initialize.snap
@@ -1 +1 @@
-51819
+51266
diff --git a/.forge-snapshots/PoolManager.removeLiquidity.snap b/.forge-snapshots/PoolManager.removeLiquidity.snap
@@ -1 +1 @@
-150224
+148876
diff --git a/.forge-snapshots/PoolManager.removeLiquidity_withEmptyHook.snap b/.forge-snapshots/PoolManager.removeLiquidity_withEmptyHook.snap
@@ -1 +1 @@
-56574
+55226
diff --git a/.forge-snapshots/PoolManager.removeLiquidity_withNative.snap b/.forge-snapshots/PoolManager.removeLiquidity_withNative.snap
@@ -1 +1 @@
-148760
+147412
diff --git a/.forge-snapshots/PoolManager.swap_againstLiquidity.snap b/.forge-snapshots/PoolManager.swap_againstLiquidity.snap
@@ -1 +1 @@
-60874
+60138
diff --git a/.forge-snapshots/PoolManager.swap_againstLiquidityWithNativeToken.snap b/.forge-snapshots/PoolManager.swap_againstLiquidityWithNativeToken.snap
@@ -1 +1 @@
-72868
+72132
diff --git a/.forge-snapshots/PoolManager.swap_burn6909ForInput.snap b/.forge-snapshots/PoolManager.swap_burn6909ForInput.snap
@@ -1 +1 @@
-80988
+80315
diff --git a/.forge-snapshots/PoolManager.swap_burnNative6909ForInput.snap b/.forge-snapshots/PoolManager.swap_burnNative6909ForInput.snap
@@ -1 +1 @@
-76943
+76165
diff --git a/.forge-snapshots/PoolManager.swap_mintNativeOutputAs6909.snap b/.forge-snapshots/PoolManager.swap_mintNativeOutputAs6909.snap
@@ -1 +1 @@
-139268
+138660
diff --git a/.forge-snapshots/PoolManager.swap_mintOutputAs6909.snap b/.forge-snapshots/PoolManager.swap_mintOutputAs6909.snap
@@ -1 +1 @@
-156077
+155291
diff --git a/.forge-snapshots/PoolManager.swap_simple.snap b/.forge-snapshots/PoolManager.swap_simple.snap
@@ -1 +1 @@
-147285
+146476
diff --git a/.forge-snapshots/PoolManager.swap_simpleWithNative.snap b/.forge-snapshots/PoolManager.swap_simpleWithNative.snap
@@ -1 +1 @@
-133409
+132600
diff --git a/.forge-snapshots/PoolManager.swap_withHooks.snap b/.forge-snapshots/PoolManager.swap_withHooks.snap
@@ -1 +1 @@
-60849
+60113
diff --git a/.forge-snapshots/SkipCallsTestsHook.swap_skipsHookCallifHookIsCaller.snap b/.forge-snapshots/SkipCallsTestsHook.swap_skipsHookCallifHookIsCaller.snap
@@ -0,0 +1 @@
+155723
diff --git a/.forge-snapshots/flipTick_gasCostOfFlippingATickThatResultsInDeletingAWord.snap b/.forge-snapshots/flipTick_gasCostOfFlippingATickThatResultsInDeletingAWord.snap
@@ -1 +1 @@
-5409
+5407
diff --git a/.forge-snapshots/flipTick_gasCostOfFlippingFirstTickInWordToInitialized.snap b/.forge-snapshots/flipTick_gasCostOfFlippingFirstTickInWordToInitialized.snap
@@ -1 +1 @@
-22506
+22504
diff --git a/.forge-snapshots/flipTick_gasCostOfFlippingSecondTickInWordToInitialized.snap b/.forge-snapshots/flipTick_gasCostOfFlippingSecondTickInWordToInitialized.snap
@@ -1 +1 @@
-5515
+5513
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_gasCostForEntireWord.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_gasCostForEntireWord.snap
@@ -1 +1 @@
-2592
+2578
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_gasCostJustBelowBoundary.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_gasCostJustBelowBoundary.snap
@@ -1 +1 @@
-2592
+2578
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_gasCostOnBoundary.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteFalse_gasCostOnBoundary.snap
@@ -1 +1 @@
-2592
+2578
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_gasCostForEntireWord.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_gasCostForEntireWord.snap
@@ -1 +1 @@
-2591
+2556
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_gasCostJustBelowBoundary.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_gasCostJustBelowBoundary.snap
@@ -1 +1 @@
-2900
+2865
diff --git a/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_gasCostOnBoundary.snap b/.forge-snapshots/nextInitializedTickWithinOneWord_lteTrue_gasCostOnBoundary.snap
@@ -1 +1 @@
-2591
+2556
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
@@ -0,0 +1 @@
+60135
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
@@ -0,0 +1 @@
+80312
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
@@ -0,0 +1 @@
+76162
diff --git a/.forge-snapshots/swap skips hook call if hook is caller.snap b/.forge-snapshots/swap skips hook call if hook is caller.snap
@@ -0,0 +1 @@
+155723
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -0,0 +1,89 @@
+name: code coverage
+
+on: 
+ pull_request:
+ branches:
+ - main
+
+jobs:
+ comment-forge-coverage:
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ pull-requests: write
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Install foundry
+ uses: foundry-rs/foundry-toolchain@v1
+ with:
+ version: nightly
+ - name: Run Forge build
+ run: |
+ forge --version
+ forge build --sizes
+ id: build
+ - name: Run forge coverage
+ id: coverage
+ run: |
+ {
+ echo 'COVERAGE<<EOF'
+ forge coverage | grep -v 'test/' | tail -n +6
+ echo EOF
+ } >> "$GITHUB_OUTPUT"
+ env:
+ FOUNDRY_RPC_URL: '${{ secrets.RPC_URL }}'
+
+ - name: Check coverage is updated
+ uses: actions/github-script@v5
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ script: |
+ const fs = require('fs');
+ const file = "coverage.txt"
+ if(!fs.existsSync(file)) {
+ console.log("Nothing to check");
+ return
+ }
+ const currentCoverage = fs.readFileSync(file, "utf8").trim();
+ const newCoverage = (`${{ steps.coverage.outputs.COVERAGE }}`).trim();
+ if (newCoverage != currentCoverage) {
+ core.setFailed(`Code coverage not updated. Run : forge coverage | grep -v 'test/' | tail -n +6 > coverage.txt`);
+ }
+
+ - name: Comment on PR
+ id: comment
+ uses: actions/github-script@v5
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ script: |
+ const {data: comments} = await github.rest.issues.listComments({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ issue_number: context.issue.number, 
+ })
+
+ const botComment = comments.find(comment => comment.user.id === 41898282)
+
+ const output = `${{ steps.coverage.outputs.COVERAGE }}`;
+ const commentBody = `Forge code coverage:\n${output}\n`;
+
+ if (botComment) {
+ github.rest.issues.updateComment({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ comment_id: botComment.id,
+ body: commentBody
+ })
+ } else {
+ github.rest.issues.createComment({
+ issue_number: context.issue.number,
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ body: commentBody
+ });
+ }
diff --git a/src/Owned.sol b/src/Owned.sol