Merge pull request #6 from Axis-Fi/develop

Develop -> Master: Staging Branch

.github/workflows/test.yml

@@ -1,10 +1,10 @@
 name: test
 
 on:
-    push:
-        branches:
-            - master
-    pull_request:
+  push:
+    branches:
+      - master
+  pull_request:
 
 env:
   FOUNDRY_PROFILE: ci
@@ -27,7 +27,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-            version: 9
+          version: 9
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

.gitignore

@@ -3,6 +3,10 @@ cache/
 out/
 crates/**/target/
 
+# Invariant testing
+echidna/
+crytic-export/
+
 # Ignores development broadcast logs
 broadcast/
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/baseline-v2"]
+	path = lib/baseline-v2
+	url = [email protected]:0xBaseline/baseline-v2.git

.prettierignore

@@ -0,0 +1,16 @@
+# Don't rewrite pnpm lockfile
+pnpm-lock.yaml
+
+# Ignore artifacts:
+build
+coverage
+
+# also includes what is in .gitignore
+
+lib/**/*
+dependencies/**/*
+
+test/lib/uniswap-v2/**/*
+test/lib/uniswap-v3/**/*
+
+src/callbacks/liquidity/BaselineV2/lib/**/*

.prettierrc

@@ -0,0 +1 @@
+{}

.solhint.json

@@ -1,10 +1,7 @@
 {
   "extends": "solhint:recommended",
   "rules": {
-    "compiler-version": [
-      "error",
-      ">=0.7.0"
-    ],
+    "compiler-version": ["error", ">=0.7.0"],
     "avoid-low-level-calls": "off",
     "const-name-snakecase": "warn",
     "var-name-mixedcase": "warn",
@@ -30,4 +27,4 @@
     "reentrancy": "error",
     "state-visibility": "warn"
   }
-}
+}

.solhintignore

@@ -1,7 +1,7 @@
-lib/**
-dependencies/**
+lib/**/*
+dependencies/**/*
 
-test/lib/uniswap-v2/**
-test/lib/uniswap-v3/**
+test/lib/uniswap-v2/**/*
+test/lib/uniswap-v3/**/*
 
-src/callbacks/liquidity/BaselineV2/lib/**
+src/callbacks/liquidity/BaselineV2/lib/**/*

.vscode/extensions.json

@@ -6,4 +6,4 @@
     "nomicfoundation.hardhat-solidity",
     "tamasfe.even-better-toml"
   ]
-}
+}

.vscode/settings.json

@@ -1,20 +1,14 @@
 {
-  "cSpell.words": [
-    "ECIES",
-    "IPFS",
-    "keypairs"
-  ],
+  "cSpell.words": ["ECIES", "IPFS", "keypairs"],
   "[json]": {
     "editor.tabSize": 2
   },
   "json.schemas": [
     {
-      "fileMatch": [
-        "/script/deploy/sequences/*.json"
-      ],
+      "fileMatch": ["/script/deploy/sequences/*.json"],
       "url": "/script/deploy/sequence_schema.json"
     }
   ],
   "solidity.packageDefaultDependenciesContractsDirectory": "src",
   "solidity.packageDefaultDependenciesDirectory": "lib"
-}
+}

CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 
-## 1.???.0
+## 1.0.0
 
-- Introduces a direct-to-liquidity callbacks contract to deploy auction proceeds into a Baseline pool (Axis-Fi/axis-core#156)
+- Introduces direct-to-liquidity callbacks. Multi-use, permissionless versions are available for UniswapV2 and UniswapV3 pools. Permissioned launches are available for Baseline pools on Blast.
+- Deployed to blast, base, arbitrum-one, mantle, and mode mainnets and testnets.
 
 ## 0.9.0
 

README.md

@@ -72,8 +72,8 @@ When updating the version of a dependency provided through soldeer, the followin
 1. Update the version of the dependency in `foundry.toml` or through `forge soldeer`
 2. Re-run the [installation script](#first-run)
 3. If the version number has changed:
-    - Change the existing entry in [remappings.txt](remappings.txt) to point to the new dependency version
-    - Update imports to use the new remapping
+   - Change the existing entry in [remappings.txt](remappings.txt) to point to the new dependency version
+   - Update imports to use the new remapping
 
 #### Updating axis-core
 

deployments/.arbitrum-one-v0.9.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x9826F771e56Fc6623C8D47D63416F809Aa454D56",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98A30139c73B3DF755082b8790D3253674cC9DC2",
+  "deployments.callbacks.BatchTokenAllowlist": "0x980Ce05E482aB873C1E38725a5dE22F206afF862",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98836F2727E3Fe3c0067568d51ae60297525015f",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE6558832167221bcC80576BeA1dED4B5969185Ff",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE6E58B6D836725B9Df30054F2FC6EE84c6DE6886"
+}

deployments/.arbitrum-one-v1.0.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x986ADD36BEF1B7a5aF9C659776a601fdECF27ccC",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98c5c24eB3FFEFeCd1a666423978f7A030319A78",
+  "deployments.callbacks.BatchTokenAllowlist": "0x98a5d4827A57056d30df93C7Bd4Bc294cC6dC0b9",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98F28A689275dFC6376dFe54280dfac85fB7bA69",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE67cB70883fBBf4BDAe501e73E9dC5E881E53452",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE6C7C76D480075658789f6a0ed87771a7179E0b3"
+}

deployments/.arbitrum-sepolia-v1.0.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x9859AcCA8a9afEbb9b3986036d4E0efc0246cEeA",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98d64E00D9d6550913E73C940Ff476Cf1723d834",
+  "deployments.callbacks.BatchTokenAllowlist": "0x9801e45362a2bb7C9F22486CC3F5cA9224e9CC55",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98C8ffFf24bcfC3A5B0b463c43F10932Cedb7B8F",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE63Ea32d7D1BF1cfe10801E6B7Aa7f3E6d21f2Cd",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE603A98566BA6ca4C898a759Ef13c7E6A7A26f4A"
+}

deployments/.base-sepolia-v1.0.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x9859AcCA8a9afEbb9b3986036d4E0efc0246cEeA",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98d64E00D9d6550913E73C940Ff476Cf1723d834",
+  "deployments.callbacks.BatchTokenAllowlist": "0x9801e45362a2bb7C9F22486CC3F5cA9224e9CC55",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98C8ffFf24bcfC3A5B0b463c43F10932Cedb7B8F",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE6546c03B1b9DFC4238f0A2923FdefD5E4af7659",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE68b21C071534781BC4c40E6BF1bCFC23638fF4B"
+}

deployments/.base-v0.9.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x98B85ded86493cf5Fa058956447C5d19A1e1Fca8",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x980EE91db19Dff91f95FFA9CB0825f2A028DF34A",
+  "deployments.callbacks.BatchTokenAllowlist": "0x980bFd44358F06562521aFD68DeE7160eaE66a88",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98c4648021C12a5b44C8549f71A293532533c3b9",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE6731E192421CA4197EAFC682220D3189c64fde0",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE68D9DeCC2F3a273f31C5a68F3a5715785e5307F"
+}

deployments/.base-v1.0.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x986ADD36BEF1B7a5aF9C659776a601fdECF27ccC",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98c5c24eB3FFEFeCd1a666423978f7A030319A78",
+  "deployments.callbacks.BatchTokenAllowlist": "0x98a5d4827A57056d30df93C7Bd4Bc294cC6dC0b9",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98F28A689275dFC6376dFe54280dfac85fB7bA69",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE6F93df14cB554737A26acd2aB5fEf649921D7F2",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE64d6e058dD5F76CCc8566c07b994090a24CCB75"
+}

deployments/.blast-sepolia-v1.0.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x98Fa90B451171389a2132191a95a0d4109C16B36",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98bd3C7ddF2510553A858e3Fb636299BDD61992b",
+  "deployments.callbacks.BatchTokenAllowlist": "0x983df377a8c64F26f947312374e6859ebc00dA81",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98e37312E0Bdb9012Eb1F6b70fe5b1cB82AC07dc",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE6BFCC5C3f3e71b5A7a9F4c0C8952f084d649850",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE6531D363c29A453c2589D9CDEFcC02773f8ee95"
+}

deployments/.blast-v0.9.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x986B25Cd77B5A9175eD40f26D3acE0bf6C7547Fe",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x982FdCD97dcFb433977820814aa8D86Ef0dC320d",
+  "deployments.callbacks.BatchTokenAllowlist": "0x983155c5e8E08700D4aeda7b0A3417EA33a47918",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x984070D753B0b9e0544fC66b13EB9722d7310e97",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE6ad77d3637847C787369c53A37c3b41ee188cf5",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE6AA1A3001D65DbEDaA8Dc795866Edbe0613Db23"
+}

deployments/.blast-v1.0.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x980997561d92D30Cae5bae01CCdfc6923E0c54a6",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x9817F12e9461e9D68b0ecB7ff2e8E9da5cf0959C",
+  "deployments.callbacks.BatchTokenAllowlist": "0x989Dc1DAa66139ed26361cc3A24CdA372370a7dA",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x986827E5FC7ECE5704449aAA3B4A4b16b417b8e7",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE6512c5F23403585916C936a194D63880DAd7EDF",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE6B27B702DB07a3a7b6d5572f9fA5dc7F201a439"
+}

deployments/.mantle-sepolia-v1.0.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x98a0826b19B412a159cedb38Bd38899930382972",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98E56d6466fC7B2c88acb39e9e4C6E7671e28CBd",
+  "deployments.callbacks.BatchTokenAllowlist": "0x98a16dF00DB1ea2bC4Cb05E8e2c06d43F56f8e62",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98b7402E399ff864a3277bd4c3e01Df8ef0234e8",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE60a178a2f5e86BF77fB1D6814Ed47790B0993f0",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE6bF04764268B46ddE10e9e8a13c3E7fF0a181d6"
+}

deployments/.mantle-v1.0.0.json

@@ -0,0 +1,6 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x986ADD36BEF1B7a5aF9C659776a601fdECF27ccC",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98c5c24eB3FFEFeCd1a666423978f7A030319A78",
+  "deployments.callbacks.BatchTokenAllowlist": "0x98a5d4827A57056d30df93C7Bd4Bc294cC6dC0b9",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98F28A689275dFC6376dFe54280dfac85fB7bA69"
+}

deployments/.mode-sepolia-v1.0.0.json

@@ -0,0 +1,8 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x98a0826b19B412a159cedb38Bd38899930382972",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98E56d6466fC7B2c88acb39e9e4C6E7671e28CBd",
+  "deployments.callbacks.BatchTokenAllowlist": "0x98a16dF00DB1ea2bC4Cb05E8e2c06d43F56f8e62",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98b7402E399ff864a3277bd4c3e01Df8ef0234e8",
+  "deployments.callbacks.BatchUniswapV2DirectToLiquidity": "0xE60c0BFa8DE1250eFDF46d80F98AE5eAe947e5E2",
+  "deployments.callbacks.BatchUniswapV3DirectToLiquidity": "0xE68d298ef59B3ddFc82d12aFC9B8Db67ac068266"
+}

deployments/.mode-v1.0.0.json

@@ -0,0 +1,6 @@
+{
+  "deployments.callbacks.BatchCappedMerkleAllowlist": "0x986ADD36BEF1B7a5aF9C659776a601fdECF27ccC",
+  "deployments.callbacks.BatchMerkleAllowlist": "0x98c5c24eB3FFEFeCd1a666423978f7A030319A78",
+  "deployments.callbacks.BatchTokenAllowlist": "0x98a5d4827A57056d30df93C7Bd4Bc294cC6dC0b9",
+  "deployments.callbacks.BatchAllocatedMerkleAllowlist": "0x98F28A689275dFC6376dFe54280dfac85fB7bA69"
+}

foundry.toml

@@ -6,7 +6,7 @@ fs_permissions = [
   {access = "read-write", path = "./bytecode/"},
   {access = "read", path = "./script/"},
   {access = "read-write", path = "./deployments/"},
-  {access = "read", path = "./dependencies/axis-core-1.0.0/script/env.json"},
+  {access = "read", path = "./dependencies/axis-core-1.0.1/script/env.json"},
 ]
 ffi = true
 solc_version = "0.8.19"
@@ -26,21 +26,25 @@ quote_style = "double"
 number_underscore = "thousands"
 wrap_comments = false
 ignore = [
-  "lib/**",
-  "src/lib/**",
+  "lib/**/*",
+  "dependencies/**/*",
+  "src/lib/**/*",
+  "test/lib/uniswap-v2/**/*",
+  "test/lib/uniswap-v3/**/*",
 ]
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
 
 [dependencies]
 forge-std = { version = "1.9.1" }
-axis-core = { version = "1.0.0" }
+axis-core = { version = "1.0.1" }
 "@openzeppelin-contracts" = { version = "4.9.2" }
 "@openzeppelin-contracts-upgradeable" = { version = "4.9.2" }
 "@uniswap-v2-core" = { version = "1.0.1" }
 "@uniswap-v3-core" = { version = "1.0.1-solc-0.8-simulate" }
 g-uni-v1-core = { version = "0.9.9", git = "[email protected]:Axis-Fi/g-uni-v1-core.git", rev = "d6bcb6e811e86d36bc836c002eb2e9a2c73d29ca" }
 "@uniswap-v2-periphery" = { version = "1.0.1", git = "[email protected]:Axis-Fi/uniswap-v2-periphery.git", rev = "19be650786731dfe43cac3aac7a2d1f0731d18e2" }
+"@uniswap-v3-periphery" = { version = "1.4.2-solc-0.8", git = "[email protected]:Uniswap/v3-periphery.git", rev = "b325bb0905d922ae61fcc7df85ee802e8df5e96c" }
 solmate = { version = "6.7.0", git = "[email protected]:transmissions11/solmate.git", rev = "c892309933b25c03d32b1b0d674df7ae292ba925" }
 clones-with-immutable-args = { version = "1.1.1", git = "[email protected]:wighawag/clones-with-immutable-args.git", rev = "f5ca191afea933d50a36d101009b5644dc28bc99" }
 solady = { version = "0.0.124" }

package.json

@@ -10,24 +10,25 @@
   "scripts": {
     "build": "forge build",
     "deploy": "./script/deploy/deploy.sh",
-    "fmt:check": "forge fmt --check",
-    "fmt": "forge fmt",
-    "lint:all": "pnpm run fmt && pnpm run solhint:all",
+    "fmt:check": "forge fmt --check && prettier . --check",
+    "fmt": "forge fmt && prettier . --write",
     "lint:check": "pnpm run fmt:check && pnpm run solhint:check",
     "lint": "pnpm run fmt && pnpm run solhint",
     "postinstall": "./script/install.sh",
     "publish": "./script/publish.sh",
     "salts": "./script/salts/write_salt.sh",
     "size": "forge clean && forge build --sizes --skip test --skip '*/Mock*.sol'",
-    "solhint:all": "solhint --fix --config ./.solhint.json 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
-    "solhint:check": "solhint --config ./.solhint.json 'src/**/*.sol'",
-    "solhint": "solhint --fix --config ./.solhint.json 'src/**/*.sol'",
+    "solhint:check": "solhint --config ./.solhint.json 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
+    "solhint": "solhint --fix --config ./.solhint.json 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'",
     "test": "forge test --nmt largeNumberOf -vvv"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
   "dependencies": {
     "solhint-community": "^3.7.0"
+  },
+  "devDependencies": {
+    "prettier": "3.3.3"
   }
 }

remappings.txt

@@ -1,17 +1,19 @@
 @forge-std-1.9.1=dependencies/forge-std-1.9.1/src
-@axis-core-1.0.0=dependencies/axis-core-1.0.0/src
-@axis-core-1.0.0-script=dependencies/axis-core-1.0.0/script
-@axis-core-1.0.0-test=dependencies/axis-core-1.0.0/test
+@axis-core-1.0.1=dependencies/axis-core-1.0.1/src
+@axis-core-1.0.1-script=dependencies/axis-core-1.0.1/script
+@axis-core-1.0.1-test=dependencies/axis-core-1.0.1/test
 @solmate-6.7.0=dependencies/solmate-6.7.0/src
 @clones-with-immutable-args-1.1.1=dependencies/clones-with-immutable-args-1.1.1/src
 @openzeppelin-contracts-4.9.2=dependencies/@openzeppelin-contracts-4.9.2
 @openzeppelin-contracts-upgradeable-4.9.2=dependencies/@openzeppelin-contracts-upgradeable-4.9.2
 @uniswap-v2-core-1.0.1=dependencies/@uniswap-v2-core-1.0.1/contracts
 @uniswap-v2-periphery-1.0.1=dependencies/@uniswap-v2-periphery-1.0.1/contracts
 @uniswap-v3-core-1.0.1-solc-0.8-simulate=dependencies/@uniswap-v3-core-1.0.1-solc-0.8-simulate/contracts
+@uniswap-v3-periphery-1.4.2-solc-0.8=dependencies/@uniswap-v3-periphery-1.4.2-solc-0.8/contracts
 @g-uni-v1-core-0.9.9=dependencies/g-uni-v1-core-0.9.9/contracts
 @uniswap/v2-core/contracts=dependencies/@uniswap-v2-core-1.0.1/contracts
 @uniswap/v3-core/contracts=dependencies/@uniswap-v3-core-1.0.1-solc-0.8-simulate/contracts
 @openzeppelin/contracts=dependencies/@openzeppelin-contracts-4.9.2
 @openzeppelin/contracts-upgradeable=dependencies/@openzeppelin-contracts-upgradeable-4.9.2
-@solady-0.0.124=dependencies/solady-0.0.124/src
+@solady-0.0.124=dependencies/solady-0.0.124/src
+@baseline=lib/baseline-v2/src