feat: update spectre proxy according to the latest spectre contract (#38

) * fix: update spectre proxy according to the latest contracts * Update spectre test contract
sprintertech · Mar 13, 2024 · 9721143 · 9721143
1 parent 9cafa97
commit 9721143
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 28 deletions.
diff --git a/src/contracts/TestContracts.sol b/src/contracts/TestContracts.sol
@@ -222,13 +222,6 @@ contract TestSpectre {
         uint64 participation;
         bytes32 finalizedHeaderRoot;
         bytes32 executionPayloadRoot;
-        uint256[12] accumulator;
-    }
-
-    struct RotateInput {
-        bytes32 syncCommitteeSSZ;
-        uint256 syncCommitteePoseidon;
-        uint256[12] accumulator;
     }
 
     mapping(uint256 => bytes32) public executionPayloadRoots;
@@ -238,7 +231,6 @@ contract TestSpectre {
     }
 
     function rotate(
-        RotateInput calldata rotateInput, 
         bytes calldata rotateProof, 
         SyncStepInput calldata stepInput, 
         bytes calldata stepProof

diff --git a/src/contracts/interfaces/ISpectre.sol b/src/contracts/interfaces/ISpectre.sol
@@ -14,12 +14,6 @@ interface ISpectre {
         uint64 participation;
         bytes32 finalizedHeaderRoot;
         bytes32 executionPayloadRoot;
-        uint256[12] accumulator;
-    }
-    struct RotateInput {
-        bytes32 syncCommitteeSSZ;
-        uint256 syncCommitteePoseidon;
-        uint256[12] accumulator;
     }
 
     /// @notice Verify that a sync committee has attested to a block that finalizes 
@@ -30,12 +24,10 @@ interface ISpectre {
 
 
     /// @notice Use the current sync committee to verify the transition to a new sync committee
-    /// @param rotateInput The input to the sync step.
     /// @param rotateProof The proof for the rotation
     /// @param stepInput The input to the sync step.
     /// @param stepProof The proof for the sync step
     function rotate(
-        RotateInput calldata rotateInput, 
         bytes calldata rotateProof, 
         SyncStepInput calldata stepInput, 
         bytes calldata stepProof

diff --git a/src/contracts/proxies/SpectreProxy.sol b/src/contracts/proxies/SpectreProxy.sol
@@ -60,14 +60,12 @@ contract SpectreProxy is AccessControl {
     /**
         @notice Proxy for the Spectre rotate function that supports multiple domains
         @param sourceDomainID DomainID of the network for which the proof is submitted
-        @param rotateInput The input to the sync step
         @param rotateProof The proof for the rotation
         @param stepInput The input to the sync step
         @param stepProof The proof for the sync step
     */
     function rotate(
         uint8 sourceDomainID, 
-        ISpectre.RotateInput calldata rotateInput, 
         bytes calldata rotateProof, 
         ISpectre.SyncStepInput calldata stepInput, 
         bytes calldata stepProof
@@ -76,7 +74,7 @@ contract SpectreProxy is AccessControl {
         require(spectreAddress != address(0), "no spectre address found");
 
         ISpectre spectre = ISpectre(spectreAddress);
-        spectre.rotate(rotateInput, rotateProof, stepInput, stepProof);
+        spectre.rotate(rotateProof, stepInput, stepProof);
 
         emit CommitteeRotated(sourceDomainID, stepInput.attestedSlot);
     }

diff --git a/test/proxies/spectre/spectreProxy.test.ts b/test/proxies/spectre/spectreProxy.test.ts
@@ -30,12 +30,6 @@ describe("Spectre Proxy", () => {
     "0x59dac95a8278295a3a05d809156f69b45007af3f3df94bcabe4bbbdd9cce5c5a",
   ];
 
-  const rotateInput: ISpectre.RotateInputStruct = {
-    syncCommitteePoseidon: "256",
-    syncCommitteeSSZ:
-      "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f",
-    accumulator: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-  };
   const stepInput: ISpectre.SyncStepInputStruct = {
     finalizedHeaderRoot:
       "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f",
@@ -44,7 +38,6 @@ describe("Spectre Proxy", () => {
     participation: 8,
     executionPayloadRoot:
       "0x9109d68183cb2c2b4d8d769a4263195c153ece0d2bc797f44b8f6cec4814439c",
-    accumulator: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
   };
 
   const constructorDomains = [2, 3];
@@ -105,7 +98,6 @@ describe("Spectre Proxy", () => {
     await expect(
       spectreProxyInstance.rotate(
         invalidOriginDomainID,
-        rotateInput,
         rotateProof,
         stepInput,
         stepProof,
@@ -116,7 +108,6 @@ describe("Spectre Proxy", () => {
   it("should emit event even if rotate successful", async () => {
     const rotateTx = await spectreProxyInstance.rotate(
       validDomainID,
-      rotateInput,
       rotateProof,
       stepInput,
       stepProof,