Merge branch 'main' of https://github.com/polymorpher/omni-meme-food-…

…factory
polymorpher · Oct 20, 2024 · c172bc1 · c172bc1
2 parents dcd513d + 8a35918
commit c172bc1
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 # Compiler files
 cache/
-out/
+contracts-out/
 
 # Ignores development broadcast logs
 !/broadcast
@@ -12,3 +12,6 @@ docs/
 
 # Dotenv file
 .env
+
+node_modules
+
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/layerzero-v2"]
+	path = lib/layerzero-v2
+	url = https://github.com/LayerZero-Labs/layerzero-v2
diff --git a/src/Counter.sol → contracts/Counter.sol b/src/Counter.sol → contracts/Counter.sol
diff --git a/foundry.toml b/foundry.toml
@@ -1,6 +1,12 @@
 [profile.default]
-src = "src"
-out = "out"
-libs = ["lib"]
+src = "contracts"
+out = "contracts-out"
+libs = [
+    "lib"
+]
 
-# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
+remappings = [
+    '@layerzerolabs/oft-evm/=lib/devtools/packages/oft-evm/',
+    '@layerzerolabs/oapp-evm/=lib/devtools/packages/oapp-evm/',
+    '@layerzerolabs/lz-evm-protocol-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/protocol',
+]
diff --git a/lib/layerzero-v2 b/lib/layerzero-v2
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/remappings.txt b/remappings.txt
@@ -0,0 +1,10 @@
+@layerzerolabs/oft-evm/=lib/devtools/packages/oft-evm/
+@layerzerolabs/oapp-evm/=lib/devtools/packages/oapp-evm/
+@layerzerolabs/lz-evm-protocol-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/protocol/
+@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
+ds-test/=lib/layerzero-v2/lib/forge-std/lib/ds-test/src/
+erc4626-tests/=lib/openzeppelin-contracts/lib/erc4626-tests/
+forge-std/=lib/forge-std/src/
+halmos-cheatcodes/=lib/openzeppelin-contracts/lib/halmos-cheatcodes/src/
+layerzero-v2/=lib/layerzero-v2/
+openzeppelin-contracts/=lib/openzeppelin-contracts/
diff --git a/script/Counter.s.sol b/script/Counter.s.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.13;
 
 import {Script, console} from "forge-std/Script.sol";
-import {Counter} from "../src/Counter.sol";
+import {Counter} from "contracts/Counter.sol";
 
 contract CounterScript is Script {
     Counter public counter;

diff --git a/test/Counter.t.sol b/test/Counter.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.13;
 
 import {Test, console} from "forge-std/Test.sol";
-import {Counter} from "../src/Counter.sol";
+import {Counter} from "contracts/Counter.sol";
 
 contract CounterTest is Test {
     Counter public counter;