diff --git a/.gitmodules b/.gitmodules index 3c70208f..22bc8896 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,19 +1,13 @@ -[submodule "lib/solidity-utils"] - path = lib/solidity-utils - url = https://github.com/bgd-labs/solidity-utils -[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 branch = release-v4.9 -[submodule "lib/aave-address-book"] - path = lib/aave-address-book - url = https://github.com/bgd-labs/aave-address-book [submodule "lib/nitro-contracts"] path = lib/nitro-contracts url = https://github.com/OffchainLabs/nitro-contracts [submodule "lib/fx-portal"] path = lib/fx-portal url = https://github.com/0xPolygon/fx-portal +[submodule "lib/aave-helpers"] + path = lib/aave-helpers + url = https://github.com/bgd-labs/aave-helpers diff --git a/lib/aave-address-book b/lib/aave-address-book deleted file mode 160000 index fa8d35fb..00000000 --- a/lib/aave-address-book +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fa8d35fbfbe5c6d574a9b3130498b34d1f2ffcd0 diff --git a/lib/aave-helpers b/lib/aave-helpers new file mode 160000 index 00000000..1daafea0 --- /dev/null +++ b/lib/aave-helpers @@ -0,0 +1 @@ +Subproject commit 1daafea0e7f7baafa82d2b386e284e3850abf048 diff --git a/lib/forge-std b/lib/forge-std deleted file mode 160000 index 1d9650e9..00000000 --- a/lib/forge-std +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1d9650e951204a0ddce9ff89c32f1997984cef4d diff --git a/lib/solidity-utils b/lib/solidity-utils deleted file mode 160000 index 56720adb..00000000 --- a/lib/solidity-utils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 56720adb8b751c3742a5f9b8c5bcb8a9446ba941 diff --git a/remappings.txt b/remappings.txt index e642ac5f..21772e84 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,12 +1,8 @@ -solidity-utils/=lib/solidity-utils/src/ -@openzeppelin/=lib/openzeppelin-contracts/ -@aave/core-v3/=lib/aave-address-book/lib/aave-v3-core/ -@aave/periphery-v3/=lib/aave-address-book/lib/aave-v3-periphery/ -aave-address-book/=lib/aave-address-book/src/ -aave-v3-core/=lib/aave-address-book/lib/aave-v3-core/ -aave-v3-periphery/=lib/aave-address-book/lib/aave-v3-periphery/ -ds-test/=lib/forge-std/lib/ds-test/src/ -forge-std/=lib/forge-std/src/ +solidity-utils/=lib/aave-helpers/lib/solidity-utils/src/ +ds-test/=lib/aave-helpers/lib/forge-std/lib/ds-test/src/ +forge-std/=lib/aave-helpers/lib/forge-std/src/ fx-portal/=lib/fx-portal/contracts/ nitro-contracts/=lib/nitro-contracts/src/ openzeppelin-contracts/=lib/openzeppelin-contracts/ +aave-helpers/=lib/aave-helpers/src/ +aave-address-book/=lib/aave-helpers/lib/aave-address-book/src/