Move Pasta and Poseidon contracts to blocks

argumentcomputer · Jul 20, 2023 · 52aee4b · 52aee4b
1 parent ab14b67
commit 52aee4b
Show file tree

Hide file tree

Showing 24 changed files with 39 additions and 91 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,8 +34,8 @@ jobs:
 
       - name: Regenerate Contracts
         run: |
-          python src/poseidon/poseidon-contract-gen.py neptune-constants-U24-pallas.json PoseidonU24Pallas > src/poseidon/PoseidonNeptuneU24pallas.sol
-          python src/poseidon/poseidon-contract-gen.py neptune-constants-U24-vesta.json PoseidonU24Vesta > src/poseidon/PoseidonNeptuneU24vesta.sol
+          python src/blocks/poseidon/poseidon-contract-gen.py neptune-constants-U24-pallas.json PoseidonU24Pallas > src/blocks/poseidon/PoseidonNeptuneU24pallas.sol
+          python src/blocks/poseidon/poseidon-contract-gen.py neptune-constants-U24-vesta.json PoseidonU24Vesta > src/blocks/poseidon/PoseidonNeptuneU24vesta.sol
 
       - name: Run forge fmt on re-generated contracts
         run: |

diff --git a/nifs-expected-loader.py b/nifs-expected-loader.py
diff --git a/src/NovaVerifierAbstractions.sol b/src/NovaVerifierAbstractions.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "src/pasta/Vesta.sol";
-import "src/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
 import "src/Utilities.sol";
 
 library Abstractions {

diff --git a/src/blocks/EqPolynomial.sol b/src/blocks/EqPolynomial.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.16;
 
-import "src/pasta/Vesta.sol";
-import "src/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
 
 library EqPolinomialLib {
     function evaluate(

diff --git a/src/blocks/KeccakTranscript.sol b/src/blocks/KeccakTranscript.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.16;
 
-import "src/pasta/Vesta.sol";
-import "src/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
 
 library ScalarFromUniformLib {
     uint256 private constant SCALAR_UNIFORM_BYTE_SIZE = 64;

diff --git a/src/blocks/PolyEvalInstance.sol b/src/blocks/PolyEvalInstance.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "src/pasta/Vesta.sol";
-import "src/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
 
 library PolyEvalInstanceUtilities {
     function powers(uint256 s, uint256 len, uint256 modulus) internal pure returns (uint256[] memory) {

diff --git a/src/blocks/SparsePolynomial.sol b/src/blocks/SparsePolynomial.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.16;
 
-import "src/pasta/Vesta.sol";
-import "src/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
 
 // Port of Nova' SparsePolynomial (https://github.com/microsoft/Nova/blob/main/src/spartan/polynomial.rs#L121)
 library SparsePolynomialLib {

diff --git a/src/blocks/Sumcheck.sol b/src/blocks/Sumcheck.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
-import "src/pasta/Pallas.sol";
-import "src/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
 import "src/blocks/KeccakTranscript.sol";
 import "src/blocks/EqPolynomial.sol";
 

diff --git a/src/pasta/Pallas.sol → src/blocks/pasta/Pallas.sol b/src/pasta/Pallas.sol → src/blocks/pasta/Pallas.sol
diff --git a/src/pasta/Vesta.sol → src/blocks/pasta/Vesta.sol b/src/pasta/Vesta.sol → src/blocks/pasta/Vesta.sol
diff --git a/src/poseidon/PoseidonNeptuneU24pallas.sol → ...cks/poseidon/PoseidonNeptuneU24pallas.sol b/src/poseidon/PoseidonNeptuneU24pallas.sol → ...cks/poseidon/PoseidonNeptuneU24pallas.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Do not change manually. This contract has been auto-generated by src/poseidon/poseidon-contract-gen.py
+// Do not change manually. This contract has been auto-generated by src/blocks/poseidon/poseidon-contract-gen.py
 pragma solidity ^0.8.16;
 
 library PoseidonU24Pallas {

diff --git a/src/poseidon/PoseidonNeptuneU24vesta.sol → ...ocks/poseidon/PoseidonNeptuneU24vesta.sol b/src/poseidon/PoseidonNeptuneU24vesta.sol → ...ocks/poseidon/PoseidonNeptuneU24vesta.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Do not change manually. This contract has been auto-generated by src/poseidon/poseidon-contract-gen.py
+// Do not change manually. This contract has been auto-generated by src/blocks/poseidon/poseidon-contract-gen.py
 pragma solidity ^0.8.16;
 
 library PoseidonU24Vesta {

diff --git a/src/poseidon/Sponge.sol → src/blocks/poseidon/Sponge.sol b/src/poseidon/Sponge.sol → src/blocks/poseidon/Sponge.sol
@@ -2,9 +2,8 @@
 pragma solidity ^0.8.16;
 
 import "@std/Test.sol";
-import "src/pasta/Pallas.sol";
-import "src/poseidon/PoseidonNeptuneU24pallas.sol";
-import "src/poseidon/PoseidonNeptuneU24vesta.sol";
+import "src/blocks/poseidon/PoseidonNeptuneU24pallas.sol";
+import "src/blocks/poseidon/PoseidonNeptuneU24vesta.sol";
 
 library SpongeOpLib {
     enum SpongeOpType {

diff --git a/src/poseidon/poseidon-contract-gen.py → src/blocks/poseidon/poseidon-contract-gen.py b/src/poseidon/poseidon-contract-gen.py → src/blocks/poseidon/poseidon-contract-gen.py
diff --git a/src/verifier/Step2.sol b/src/verifier/Step2.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
 import "src/NovaVerifierAbstractions.sol";
-import "src/poseidon/Sponge.sol";
-import "src/pasta/Pallas.sol";
-import "src/pasta/Vesta.sol";
+import "src/blocks/poseidon/Sponge.sol";
+import "src/blocks/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
 
 library Step2Lib {
     uint256 private constant NUM_FE_WITHOUT_IO_FOR_CRHF = 17;

diff --git a/src/verifier/Step3.sol b/src/verifier/Step3.sol
@@ -2,9 +2,9 @@
 pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
-import "src/pasta/Pallas.sol";
-import "src/pasta/Vesta.sol";
-import "src/poseidon/Sponge.sol";
+import "src/blocks/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
+import "src/blocks/poseidon/Sponge.sol";
 import "src/blocks/KeccakTranscript.sol";
 import "src/blocks/Sumcheck.sol";
 import "src/NovaVerifierAbstractions.sol";

diff --git a/test/eq-evaluation-tests.t.sol b/test/eq-evaluation-tests.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
 import "src/blocks/EqPolynomial.sol";
-import "src/pasta/Vesta.sol";
-import "src/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
 
 contract EqEvaluationTest is Test {
     function testEqEvaluationPrimary1() public {

diff --git a/test/field-tests.t.sol b/test/field-tests.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
 import "src/Utilities.sol";
-import "src/pasta/Pallas.sol";
-import "src/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
 
 contract FieldLibraryTest is Test {
     function testPallasInvertFr() public {

diff --git a/test/pasta-curves-tests.t.sol b/test/pasta-curves-tests.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
 import "src/Utilities.sol";
-import "src/pasta/Pallas.sol";
-import "src/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
 
 contract PastaCurvesContractTests is Test {
     function testPallasMSM() public {

diff --git a/test/poly-eval-instance-tests.t.sol b/test/poly-eval-instance-tests.t.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
-import "src/pasta/Pallas.sol";
-import "src/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
 import "src/blocks/PolyEvalInstance.sol";
 
 contract PolyEvalInstanceTest is Test {

diff --git a/test/poseidon-tests.t.sol b/test/poseidon-tests.t.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
-import "src/poseidon/PoseidonNeptuneU24pallas.sol";
-import "src/poseidon/PoseidonNeptuneU24vesta.sol";
+import "src/blocks/poseidon/PoseidonNeptuneU24pallas.sol";
+import "src/blocks/poseidon/PoseidonNeptuneU24vesta.sol";
 
 contract PoseidonContractTest is Test {
     function testPoseidonNeptuneU24PallasCompatibility() public {

diff --git a/test/pp-spartan.t.sol b/test/pp-spartan.t.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
-import "src/pasta/Pallas.sol";
-import "src/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
 import "src/blocks/EqPolynomial.sol";
 import "src/blocks/KeccakTranscript.sol";
 import "src/blocks/PolyEvalInstance.sol";

diff --git a/test/sparse-poly-evaluation-tests.t.sol b/test/sparse-poly-evaluation-tests.t.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
 import "src/blocks/SparsePolynomial.sol";
-import "src/pasta/Vesta.sol";
-import "src/pasta/Pallas.sol";
+import "src/blocks/pasta/Vesta.sol";
+import "src/blocks/pasta/Pallas.sol";
 
 contract SparseEvaluationTest is Test {
     function testSparseEvaluationPrimary() public {

diff --git a/test/sponge-tests.t.sol b/test/sponge-tests.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import "@std/Test.sol";
-import "src/poseidon/Sponge.sol";
+import "src/blocks/poseidon/Sponge.sol";
 
 // TODO: add other sponge (in simplex mode) tests from neptune: https://github.com/lurk-lab/neptune/blob/master/src/sponge/vanilla.rs#L501
 contract SpongeContractTest is Test {