Merge branch 'espresso-migration' of github.com:EspressoSystems/nitro…

…-testnode into espresso-migration
EspressoSystems · Aug 23, 2024 · f7d2e02 · f7d2e02
2 parents f75e6bc + 8e68bc8
commit f7d2e02
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/espresso-tests/migration-test.bash b/espresso-tests/migration-test.bash
@@ -48,8 +48,7 @@ cast send $UPGRADE_EXECUTOR "execute(address, bytes)" 0x773D62Ce1794b11788907b32
 docker stop nitro-testnode-sequencer-1
 
 #start nitro node in new docker container with espresso image (create a new script to do this from pieces of test-node.bash)
-cd ..
-./espresso-tests/create-espresso-integrated-nitro-node.bash 
+cd ..; ./espresso-tests/create-espresso-integrated-nitro-node.bash 
 
 #echo for debug
 echo "Deploying ArbOS action"

diff --git a/orbit-actions b/orbit-actions
+3 −0		.gitmodules
+18 −0		contracts/parent-chain/contract-upgrades/DeployAndExecuteEspressoMigrationActions.s.sol
+26 −0		contracts/parent-chain/contract-upgrades/DeployEspressoOsp.s.sol
+12 −0		foundry.toml
+1 −0		lib/nitro-contracts
+1 −0		lib/nitro-contracts.git
+0 −1		nitro-contracts