feat: Update Foundry project to use sphinx-contracts dependency

argumentcomputer · Jun 19, 2024 · 0822881 · 0822881
1 parent 4b4a00f
commit 0822881
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 129 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,3 +3,6 @@
 	url = https://github.com/foundry-rs/forge-std
 	# https://stackoverflow.com/questions/5126765/how-to-get-rid-of-git-submodules-untracked-status
 	ignore = dirty
+[submodule "aptos/solidity/contracts/lib/sphinx-contracts"]
+	path = aptos/solidity/contracts/lib/sphinx-contracts
+	url = https://github.com/lurk-lab/sphinx-contracts
diff --git a/aptos/solidity/contracts-generator/Cargo.toml b/aptos/solidity/contracts-generator/Cargo.toml
diff --git a/aptos/solidity/contracts-generator/rust-toolchain b/aptos/solidity/contracts-generator/rust-toolchain
diff --git a/aptos/solidity/contracts-generator/src/bin/main.rs b/aptos/solidity/contracts-generator/src/bin/main.rs
diff --git a/aptos/solidity/contracts/lib/forge-std b/aptos/solidity/contracts/lib/forge-std
diff --git a/aptos/solidity/contracts/lib/sphinx-contracts b/aptos/solidity/contracts/lib/sphinx-contracts
diff --git a/aptos/solidity/contracts/remappings.txt b/aptos/solidity/contracts/remappings.txt
@@ -0,0 +1,2 @@
+forge-std/=lib/forge-std/src/
+sphinx-contracts/=lib/sphinx-contracts/contracts/src/
diff --git a/aptos/solidity/contracts/src/EpochChange.sol b/aptos/solidity/contracts/src/EpochChange.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.25;
 
-import {SP1Verifier as SP1PlonkVerifier} from "../src/plonk/SP1Verifier.sol";
+import {SP1Verifier as SP1PlonkVerifier} from "sphinx-contracts/SP1Verifier.sol";
 
 contract EpochChange is SP1PlonkVerifier {
     bytes32 public epochChangeProgramVkey;

diff --git a/aptos/solidity/contracts/src/Inclusion.sol b/aptos/solidity/contracts/src/Inclusion.sol
@@ -1,6 +1,7 @@
 pragma solidity ^0.8.25;
 
-import {SP1Verifier as SP1PlonkVerifier} from "../src/plonk/SP1Verifier.sol";
+import {SP1Verifier as SP1PlonkVerifier} from "sphinx-contracts/SP1Verifier.sol";
+
 
 contract Inclusion is SP1PlonkVerifier {
     bytes32 public inclusionProgramVkey;
+6 −0		src/StdChains.sol
+9 −0		src/StdInvariant.sol
+3 −0		src/Vm.sol
+1 −5		src/mocks/MockERC721.sol
+4 −0		test/StdChains.t.sol
+1 −1		test/Vm.t.sol
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		forge-std/=lib/forge-std/src/
		sphinx-contracts/=lib/sphinx-contracts/contracts/src/