Cleanup forge remappings (#11301)

packages/protocol/foundry.toml

@@ -3,23 +3,6 @@ src = 'contracts-0.8'
 out = 'out'
 test = 'test-sol'
 libs = ['lib', 'node_modules']
-remappings = [
-    '@celo-contracts/=contracts/',
-    '@celo-contracts-8=contracts-0.8/',
-    '@mento-core/=lib/mento-core',
-    'openzeppelin-solidity/=lib/openzeppelin-contracts/',
-    '@openzeppelin/contracts8/=lib/openzeppelin-contracts8/contracts/',
-    'celo-foundry/=lib/celo-foundry/src/',
-    'celo-foundry-8/=lib/celo-foundry-8/src/',
-    '@test-sol/=test-sol/',
-    '@migrations-sol/=migrations_sol/',
-    'forge-std/=lib/celo-foundry/lib/forge-std/src/',
-    'forge-std-8/=lib/celo-foundry-8/lib/forge-std/src/',
-    '@summa-tx/memview.sol/=lib/memview.sol',
-    'solidity-bytes-utils/=lib/solidity-bytes-utils/',
-    'solidity-bytes-utils-8/=lib/solidity-bytes-utils-8/',
-    'ds-test/=lib/celo-foundry/lib/forge-std/lib/ds-test/src/',
-]
 
 no_match_test = "skip"
 

packages/protocol/remappings.txt

@@ -1,4 +1,19 @@
 @celo-contracts=contracts/
 @celo-contracts-8=contracts-0.8/
 @test-sol=test-sol
+@migrations-sol/=migrations_sol/
+
 @lib=lib
+
+celo-foundry/=lib/celo-foundry/src/
+celo-foundry-8/=lib/celo-foundry-8/src/
+ds-test/=lib/celo-foundry/lib/forge-std/lib/ds-test/src/
+forge-std/=lib/celo-foundry/lib/forge-std/src/
+forge-std-8/=lib/celo-foundry-8/lib/forge-std/src/
+
+@mento-core/=lib/mento-core
+openzeppelin-solidity/=lib/openzeppelin-contracts/
+@openzeppelin/contracts8/=lib/openzeppelin-contracts8/contracts/
+@summa-tx/memview.sol/=lib/memview.sol
+solidity-bytes-utils/=lib/solidity-bytes-utils/
+solidity-bytes-utils-8/=lib/solidity-bytes-utils-8/

packages/protocol/scripts/foundry/deploy_libraries.sh

@@ -33,8 +33,9 @@ for LIB_PATH in "${LIBRARY_DEPENDENCIES_PATH[@]}"; do
     cp $SOURCE_DIR/$LIB_PATH $DEST_DIR/$LIB_PATH
 done
 
-# Copy foundry config to the temporary directory
+# Copy foundry config and remappings to the temporary directory
 cp $SOURCE_DIR/foundry.toml $DEST_DIR/foundry.toml
+cp $SOURCE_DIR/remappings.txt $DEST_DIR/remappings.txt
 
 # Move into the temporary directory
 pushd $TEMP_DIR