Merge pull request #226 from sablier-labs/feat/remove-targets

Remove proxy targets

.github/workflows/create-merkle-streamer-ll.yml

@@ -11,7 +11,7 @@ env:
     API_KEY_SNOWTRACE: ${{ secrets.API_KEY_SNOWTRACE }}
     FOUNDRY_PROFILE: "optimized"
     MNEMONIC: ${{ secrets.MNEMONIC }}
-    RPC_URL_GOERLI: ${{ secrets.RPC_URL_GOERLI }}
+    RPC_URL_SEPOLIA: ${{ secrets.RPC_URL_SEPOLIA }}
     RPC_URL_MAINNET: ${{ secrets.RPC_URL_MAINNET }}
 
 on:
@@ -21,7 +21,7 @@ on:
         description: "Parameters needed for the script, as comma-separated tupples."
         required: true
       chain:
-        default: "goerli"
+        default: "sepolia"
         description: "Chain name as defined in the Foundry config."
         required: false
 

.github/workflows/deploy-batch.yml

@@ -11,14 +11,14 @@ env:
   API_KEY_SNOWTRACE: ${{ secrets.API_KEY_SNOWTRACE }}
   FOUNDRY_PROFILE: "optimized"
   MNEMONIC: ${{ secrets.MNEMONIC }}
-  RPC_URL_GOERLI: ${{ secrets.RPC_URL_GOERLI }}
   RPC_URL_MAINNET: ${{ secrets.RPC_URL_MAINNET }}
+  RPC_URL_SEPOLIA: ${{ secrets.RPC_URL_SEPOLIA }}
 
 on:
   workflow_dispatch:
     inputs:
       chain:
-        default: "goerli"
+        default: "sepolia"
         description: "Chain name as defined in the Foundry config."
         required: false
 

.github/workflows/deploy-merkle-streamer-factory.yml

@@ -11,14 +11,14 @@ env:
   API_KEY_SNOWTRACE: ${{ secrets.API_KEY_SNOWTRACE }}
   FOUNDRY_PROFILE: "optimized"
   MNEMONIC: ${{ secrets.MNEMONIC }}
-  RPC_URL_GOERLI: ${{ secrets.RPC_URL_GOERLI }}
   RPC_URL_MAINNET: ${{ secrets.RPC_URL_MAINNET }}
+  RPC_URL_SEPOLIA: ${{ secrets.RPC_URL_SEPOLIA }}
 
 on:
   workflow_dispatch:
     inputs:
       chain:
-        default: "goerli"
+        default: "sepolia"
         description: "Chain name as defined in the Foundry config."
         required: false
 

.github/workflows/deploy-periphery.yml

@@ -11,20 +11,16 @@ env:
   API_KEY_SNOWTRACE: ${{ secrets.API_KEY_SNOWTRACE }}
   FOUNDRY_PROFILE: "optimized"
   MNEMONIC: ${{ secrets.MNEMONIC }}
-  RPC_URL_GOERLI: ${{ secrets.RPC_URL_GOERLI }}
   RPC_URL_MAINNET: ${{ secrets.RPC_URL_MAINNET }}
+  RPC_URL_SEPOLIA: ${{ secrets.RPC_URL_SEPOLIA }}
 
 on:
   workflow_dispatch:
     inputs:
       chain:
-        default: "goerli"
+        default: "sepolia"
         description: "Chain name as defined in the Foundry config."
         required: false
-      permit2:
-        default: "0x000000000022D473030F116dDEE9F6B43aC78BA3"
-        description: "The address of the Permit2 contract."
-        required: false
 
 
 jobs:
@@ -44,10 +40,9 @@ jobs:
           forge script script/DeployPeriphery.s.sol
           --broadcast
           --rpc-url "${{ inputs.chain }}"
-          --sig "run(address)"
+          --sig "run()"
           --verify
           -vvvv
-          "${{ inputs.permit2 }}"
 
       - name: "Add workflow summary"
         run: |

.github/workflows/deploy-protocol.yml

@@ -12,8 +12,8 @@ env:
   FOUNDRY_OPTIMIZER_RUNS: "1000" # needed to compile V2 Core
   FOUNDRY_PROFILE: "optimized"
   MNEMONIC: ${{ secrets.MNEMONIC }}
-  RPC_URL_GOERLI: ${{ secrets.RPC_URL_GOERLI }}
   RPC_URL_MAINNET: ${{ secrets.RPC_URL_MAINNET }}
+  RPC_URL_SEPOLIA: ${{ secrets.RPC_URL_SEPOLIA }}
 
 on:
   workflow_dispatch:
@@ -23,17 +23,13 @@ on:
         description: "Initial protocol admin."
         required: false
       chain:
-        default: "goerli"
+        default: "sepolia"
         description: "Chain name as defined in the Foundry config."
         required: false
       max-segment-count:
         default: "300"
         description: "Maximum number of segments allowed in a stream."
         required: false
-      permit2:
-        default: "0x000000000022D473030F116dDEE9F6B43aC78BA3"
-        description: "The permit2 address."
-        required: false
 
 jobs:
   deploy-protocol:
@@ -52,12 +48,11 @@ jobs:
           forge script script/DeployProtocol.s.sol
           --broadcast
           --rpc-url "${{ inputs.chain }}"
-          --sig "run(address,uint256,address)"
+          --sig "run(address,uint256)"
           --verify
           -vvvv
           "${{ inputs.admin }}"
           "${{ inputs.max-segment-count }}"
-          "${{ inputs.permit2 }}"
 
       - name: "Add workflow summary"
         run: |

.gitmodules

@@ -6,14 +6,6 @@
   branch = "release-v4.9"
   path = "lib/openzeppelin-contracts"
   url = "https://github.com/OpenZeppelin/openzeppelin-contracts"
-[submodule "lib/permit2"]
-  branch = "main"
-  path = "lib/permit2"
-  url = "https://github.com/uniswap/permit2"
-[submodule "lib/prb-proxy"]
-  branch = "release-v4"
-  path = "lib/prb-proxy"
-  url = "https://github.com/PaulRBerg/prb-proxy"
 [submodule "lib/prb-test"]
   branch = "release-v0"
   path = "lib/prb-test"

foundry.toml

@@ -1,14 +1,10 @@
 [profile.default]
   auto_detect_solc = false
-  block_timestamp = 1_682_899_200 # May 1, 2023 at 00:00 GMT
+  block_timestamp = 1_682_899_200                                               # May 1, 2023 at 00:00 GMT
   bytecode_hash = "none"
   evm_version = "paris"
   fs_permissions = [{ access = "read", path = "out-optimized" }]
-  gas_reports = [
-    "SablierV2MerkleStreamerFactory",
-    "SablierV2MerkleStreamerLL",
-    "SablierV2ProxyTarget",
-  ]
+  gas_reports = ["SablierV2MerkleStreamerFactory", "SablierV2MerkleStreamerLL"]
   libs = ["lib"]
   optimizer = true
   optimizer_runs = 10_000
@@ -73,4 +69,4 @@
   mainnet = "${RPC_URL_MAINNET}"
   optimism = "https://optimism-mainnet.infura.io/v3/${API_KEY_INFURA}"
   polygon = "https://polygon-mainnet.infura.io/v3/${API_KEY_INFURA}"
-  sepolia = "https://sepolia.infura.io/v3/${API_KEY_INFURA}"
+  sepolia = "${RPC_URL_SEPOLIA}"

package.json

@@ -11,9 +11,7 @@
   },
   "dependencies": {
     "@openzeppelin/contracts": "4.9.2",
-    "@prb/proxy": "4.0.1",
-    "@sablier/v2-core": "1.0.2",
-    "@uniswap/permit2": "github:Uniswap/permit2#cc56ad0f3439c502c246fc5cfcc3db92bb8b7219"
+    "@sablier/v2-core": "1.0.2"
   },
   "devDependencies": {
     "prettier": "^2.8.8",
@@ -46,7 +44,6 @@
     "web3"
   ],
   "peerDependencies": {
-    "@prb/proxy": "4.0.1",
     "@sablier/v2-core": "1.0.2"
   },
   "publishConfig": {

remappings.txt

@@ -1,11 +1,7 @@
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
-@prb/proxy/=lib/prb-proxy/
-@prb/proxy-test/=lib/prb-proxy/test/
 @prb/test/=lib/prb-test/src/
 @sablier/v2-core/=lib/v2-core/
 @sablier/v2-core-script/=lib/v2-core/script/
 @sablier/v2-core-test/=lib/v2-core/test/
-@uniswap/permit2/=lib/permit2/src/
-@uniswap/permit2-test/=lib/permit2/test/
 forge-std/=lib/forge-std/src/
 solady/=lib/solady/src/