Merge pull request #213 from sablier-labs/feat/remove-plugin-and-archive

Remove "ProxyPlugin" and "Archive"

.github/workflows/deploy-periphery.yml

@@ -17,10 +17,6 @@ env:
 on:
   workflow_dispatch:
     inputs:
-      admin:
-        default: "0xF3663da48030b6c88535413Fd643aB0B5F3496ff"
-        description: "Initial protocol admin."
-        required: false
       chain:
         default: "goerli"
         description: "Chain name as defined in the Foundry config."
@@ -48,10 +44,9 @@ jobs:
           forge script script/DeployPeriphery.s.sol
           --broadcast
           --rpc-url "${{ inputs.chain }}"
-          --sig "run(address,address)"
+          --sig "run(address)"
           --verify
           -vvvv
-          "${{ inputs.admin }}"
           "${{ inputs.permit2 }}"
 
       - name: "Add workflow summary"

CHANGELOG.md

@@ -34,6 +34,8 @@ The format is based on [Common Changelog](https://common-changelog.org).
 
 ### Removed
 
+- **Breaking**: Remove `ProxyPlugin` and `Archive` contracts
+  ([#213](https://github.com/sablier-labs/v2-periphery/pull/213))
 - Remove `@openzeppelin/contracts` from Node.js peer dependencies
   ([#194](https://github.com/sablier-labs/v2-periphery/pull/194))
 

SECURITY.md

@@ -45,9 +45,6 @@ Vulnerabilities contingent upon the occurrence of any of the following also are
 Sablier V2 Periphery has been developed with a number of technical assumptions in mind. For a disclosure to qualify as a
 vulnerability, it must adhere to these assumptions as well:
 
-- Every user creating streams via `SablierV2ProxyTarget` has a `SablierV2ProxyPlugin` contract installed for the
-  `onStreamCanceled` method.
-- All relevant Sablier contracts are listed in the `SablierV2Archive` contract.
 - [All assumptions](https://github.com/sablier-labs/v2-core/blob/main/SECURITY.md) in Sablier V2 Core apply to Sablier
   V2 Periphery as well.
 

foundry.toml

@@ -5,10 +5,8 @@
   evm_version = "paris"
   fs_permissions = [{ access = "read", path = "out-optimized" }]
   gas_reports = [
-    "SablierV2Archive",
     "SablierV2MerkleStreamerFactory",
     "SablierV2MerkleStreamerLL",
-    "SablierV2ProxyPlugin",
     "SablierV2ProxyTarget",
   ]
   libs = ["lib"]

script/DeployDeterministicPeriphery.s.sol

@@ -4,31 +4,25 @@ pragma solidity >=0.8.19 <0.9.0;
 import { BaseScript } from "@sablier/v2-core-script/Base.s.sol";
 import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol";
 
-import { SablierV2Archive } from "../src/SablierV2Archive.sol";
 import { SablierV2Batch } from "../src/SablierV2Batch.sol";
 import { SablierV2MerkleStreamerFactory } from "../src/SablierV2MerkleStreamerFactory.sol";
-import { SablierV2ProxyPlugin } from "../src/SablierV2ProxyPlugin.sol";
 import { SablierV2ProxyTargetApprove } from "../src/SablierV2ProxyTargetApprove.sol";
 import { SablierV2ProxyTargetPermit2 } from "../src/SablierV2ProxyTargetPermit2.sol";
 import { SablierV2ProxyTargetPush } from "../src/SablierV2ProxyTargetPush.sol";
 
 /// @notice Deploys all V2 Periphery contracts at deterministic addresses across chains, in the following order:
 ///
-/// 1. {SablierV2Archive}
-/// 2. {SablierV2Batch}
-/// 3. {SablierV2MerkleStreamerFactory}
-/// 4. {SablierV2ProxyPlugin}
-/// 5. {SablierV2ProxyTargetApprove}
-/// 6. {SablierV2ProxyTargetPermit2}
-/// 7. {SablierV2ProxyTargetPush}
+/// 1. {SablierV2Batch}
+/// 2. {SablierV2MerkleStreamerFactory}
+/// 3. {SablierV2ProxyTargetApprove}
+/// 4. {SablierV2ProxyTargetPermit2}
+/// 5. {SablierV2ProxyTargetPush}
 ///
 /// @dev Reverts if any contract has already been deployed.
 contract DeployDeterministicPeriphery is BaseScript {
     struct DeployedContracts {
-        SablierV2Archive archive;
         SablierV2Batch batch;
         SablierV2MerkleStreamerFactory merkleStreamerFactory;
-        SablierV2ProxyPlugin plugin;
         SablierV2ProxyTargetApprove targetApprove;
         SablierV2ProxyTargetPermit2 targetPermit2;
         SablierV2ProxyTargetPush targetPush;
@@ -38,20 +32,16 @@ contract DeployDeterministicPeriphery is BaseScript {
     /// https://github.com/Arachnid/deterministic-deployment-proxy
     function run(
         string memory create2Salt,
-        address initialAdmin,
         IAllowanceTransfer permit2
     )
         public
         virtual
         broadcast
         returns (DeployedContracts memory deployedContracts)
     {
-        deployedContracts.archive = new SablierV2Archive{ salt: bytes32(abi.encodePacked(create2Salt)) }(initialAdmin);
         deployedContracts.batch = new SablierV2Batch{ salt: bytes32(abi.encodePacked(create2Salt)) }();
         deployedContracts.merkleStreamerFactory =
             new SablierV2MerkleStreamerFactory{ salt: bytes32(abi.encodePacked(create2Salt)) }();
-        deployedContracts.plugin =
-            new SablierV2ProxyPlugin{ salt: bytes32(abi.encodePacked(create2Salt)) }(deployedContracts.archive);
         deployedContracts.targetApprove =
             new SablierV2ProxyTargetApprove{ salt: bytes32(abi.encodePacked(create2Salt)) }();
         deployedContracts.targetPermit2 =

script/DeployPeriphery.s.sol

@@ -5,43 +5,32 @@ import { BaseScript } from "@sablier/v2-core-script/Base.s.sol";
 import { IAllowanceTransfer } from "@uniswap/permit2/interfaces/IAllowanceTransfer.sol";
 
 import { SablierV2MerkleStreamerFactory } from "../src/SablierV2MerkleStreamerFactory.sol";
-import { SablierV2Archive } from "../src/SablierV2Archive.sol";
 import { SablierV2Batch } from "../src/SablierV2Batch.sol";
-import { SablierV2ProxyPlugin } from "../src/SablierV2ProxyPlugin.sol";
 import { SablierV2ProxyTargetApprove } from "../src/SablierV2ProxyTargetApprove.sol";
 import { SablierV2ProxyTargetPermit2 } from "../src/SablierV2ProxyTargetPermit2.sol";
 import { SablierV2ProxyTargetPush } from "../src/SablierV2ProxyTargetPush.sol";
 
 /// @notice Deploys all V2 Periphery contract in the following order:
 ///
-/// 1. {SablierV2Archive}
-/// 2. {SablierV2Batch}
-/// 3. {SablierV2MerkleStreamerFactory}
-/// 4. {SablierV2ProxyPlugin}
-/// 5. {SablierV2ProxyTargetApprove}
-/// 6. {SablierV2ProxyTargetPermit2}
-/// 7. {SablierV2ProxyTargetPush}
+/// 1. {SablierV2Batch}
+/// 2. {SablierV2MerkleStreamerFactory}
+/// 3. {SablierV2ProxyTargetApprove}
+/// 4. {SablierV2ProxyTargetPermit2}
+/// 5. {SablierV2ProxyTargetPush}
 contract DeployPeriphery is BaseScript {
-    function run(
-        address initialAdmin,
-        IAllowanceTransfer permit2
-    )
+    function run(IAllowanceTransfer permit2)
         public
         broadcast
         returns (
-            SablierV2Archive archive,
             SablierV2Batch batch,
             SablierV2MerkleStreamerFactory merkleStreamerFactory,
-            SablierV2ProxyPlugin plugin,
             SablierV2ProxyTargetApprove targetApprove,
             SablierV2ProxyTargetPermit2 targetPermit2,
             SablierV2ProxyTargetPush targetPush
         )
     {
-        archive = new SablierV2Archive(initialAdmin);
         batch = new SablierV2Batch();
         merkleStreamerFactory = new SablierV2MerkleStreamerFactory();
-        plugin = new SablierV2ProxyPlugin(archive);
         targetApprove = new SablierV2ProxyTargetApprove();
         targetPermit2 = new SablierV2ProxyTargetPermit2(permit2);
         targetPush = new SablierV2ProxyTargetPush();