Fix issues with smart contract bounty example (#188)

* Add the whole Solidity repos * Fix adder bounty targets in Makefile * Fix import paths of adder example
crypto-bug-hunters · Nov 6, 2024 · 98c25da · 98c25da
1 parent e0ffaa6
commit 98c25da
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -158,15 +158,15 @@ COPY --from=riscv64-build-stage /opt/build/bwrapbox/seccomp-filter.bpf /usr/lib/
 
 # install forge-std
 ARG FORGE_STD_VERSION=1.9.3
-ADD https://github.com/foundry-rs/forge-std.git#v${FORGE_STD_VERSION}:src /usr/share/forge-lib/forge-std/src
+ADD https://github.com/foundry-rs/forge-std.git#v${FORGE_STD_VERSION} /usr/share/forge-lib/forge-std
 
 # install openzeppelin-contracts
 ARG OPENZEPPELIN_VERSION=5.1.0
-ADD https://github.com/OpenZeppelin/openzeppelin-contracts.git#v${OPENZEPPELIN_VERSION}:contracts /usr/share/forge-lib/openzeppelin-contracts/contracts
+ADD https://github.com/OpenZeppelin/openzeppelin-contracts.git#v${OPENZEPPELIN_VERSION} /usr/share/forge-lib/openzeppelin-contracts
 
 # install forge-deploy-lib
 ARG FORGE_DEPLOY_LIB_VERSION=0.0.0
-ADD https://github.com/crypto-bug-hunters/forge-deploy-lib.git#v${FORGE_DEPLOY_LIB_VERSION}:src /usr/share/forge-lib/forge-deploy-lib/src
+ADD https://github.com/crypto-bug-hunters/forge-deploy-lib.git#v${FORGE_DEPLOY_LIB_VERSION} /usr/share/forge-lib/forge-deploy-lib
 
 RUN useradd --home-dir /bounty bounty
 RUN mkdir -p /bounties /bounty

diff --git a/tests/bounties/Makefile b/tests/bounties/Makefile
@@ -85,15 +85,14 @@ ADDER_VERSIONS= safe unsafe
 all: $(patsubst %,dist/adder-%-bounty.tar.xz,$(ADDER_VERSIONS))
 
 dist/adder-%-bounty.tar.xz: \
-		build/adder-%-bounty/script/Deploy.s.sol \
+		build/adder-%-bounty/script/Setup.s.sol \
 		src/adder/start.sh \
 		src/adder/foundry.toml \
 		src/adder/src/IAdder.sol \
 		src/adder/src/%/Adder.sol \
-		src/adder/script/LibDeployments.sol \
-		src/adder/script/Test.s.sol
+		src/adder/script/Assertion.s.sol
 	tar $(TAR_OPTS) $@ $^
 
-build/adder-%-bounty/script/Deploy.s.sol: src/adder/script/%/Deploy.s.sol
+build/adder-%-bounty/script/Setup.s.sol: src/adder/script/%/Setup.s.sol
 	mkdir -p $(@D)
 	cp $< $@
diff --git a/tests/bounties/src/adder/script/Assertion.s.sol b/tests/bounties/src/adder/script/Assertion.s.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.27;
 
-import {DeploymentReaderScript} from "forge-deploy-lib/DeploymentScript.sol";
+import {DeploymentReaderScript} from "forge-deploy-lib/src/DeploymentScript.sol";
 
 import {IAdder} from "src/IAdder.sol";
 

diff --git a/tests/bounties/src/adder/script/safe/Setup.s.sol b/tests/bounties/src/adder/script/safe/Setup.s.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.27;
 
-import {DeploymentWriterScript} from "forge-deploy-lib/DeploymentScript.sol";
+import {DeploymentWriterScript} from "forge-deploy-lib/src/DeploymentScript.sol";
 
 import {SafeAdder} from "src/safe/Adder.sol";
 

diff --git a/tests/bounties/src/adder/script/unsafe/Exploit.s.sol b/tests/bounties/src/adder/script/unsafe/Exploit.s.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.27;
 
-import {DeploymentReaderScript} from "forge-deploy-lib/DeploymentScript.sol";
+import {DeploymentReaderScript} from "forge-deploy-lib/src/DeploymentScript.sol";
 
 import {IAdder} from "src/IAdder.sol";
 

diff --git a/tests/bounties/src/adder/script/unsafe/Setup.s.sol b/tests/bounties/src/adder/script/unsafe/Setup.s.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.27;
 
-import {DeploymentWriterScript} from "forge-deploy-lib/DeploymentScript.sol";
+import {DeploymentWriterScript} from "forge-deploy-lib/src/DeploymentScript.sol";
 
 import {UnsafeAdder} from "src/unsafe/Adder.sol";