Merge branch 'master' into finalize-arbos-30 · OffchainLabs/nitro@fdd2c62

Commit

Merge branch 'master' into finalize-arbos-30

Browse files

PlasmaPower authored May 6, 2024

2 parents c8d8df7 + ce3cc19 commit fdd2c62

+7 −1		foundry.toml
+3 −2		package.json
+0 −5		remappings.txt
+2 −1		scripts/config.ts.example
+11 −1		scripts/createERC20Rollup.ts
+10 −1		scripts/createEthRollup.ts
+6 −1		scripts/deployment.ts
+108 −51		scripts/deploymentUtils.ts
+117 −0		scripts/local-deployment/deployCreatorAndCreateRollup.ts
+221 −48		scripts/rollupCreation.ts
+0 −52		src/challenge/ChallengeLib.sol
+24 −9		src/challenge/ChallengeManager.sol
+13 −0		src/challenge/IChallengeManager.sol
+10 −0		src/osp/IOneStepProofEntry.sol
+54 −0		src/osp/OneStepProofEntry.sol
+107 −10		test/foundry/ChallengeManager.t.sol
+3 −1		test/signatures/ChallengeManager
+9 −0		test/signatures/OneStepProofEntry
+1 −1		test/signatures/test-sigs.bash
+1 −0		test/storage/ChallengeManager
+1 −1		yarn.lock