Use develop branch

OffchainLabs · Oct 13, 2023 · e7f1155 · e7f1155
1 parent 226bd1c
commit e7f1155
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,7 +13,7 @@
 [submodule "contracts"]
 	path = contracts
 	url = https://github.com/OffchainLabs/nitro-contracts.git
-	branch = feature-orbit-bridge
+	branch = develop
 [submodule "arbitrator/wasm-testsuite/testsuite"]
 	path = arbitrator/wasm-testsuite/testsuite
 	url = https://github.com/WebAssembly/testsuite.git

diff --git a/contracts b/contracts
diff --git a/nitro-testnode b/nitro-testnode
+1 −1		.github/workflows/contract-tests.yml
+1 −1		.prettierignore
+1 −1		deploy/SequencerInbox.js
+1 −1		deploy/SequencerInboxStubCreator.js
+16 −0		hardhat.config.ts
+8 −8		package.json
+4 −0		scripts/config.ts.example
+44 −102		scripts/deployment.ts
+3 −1		scripts/rollupCreation.ts
+9 −6		src/bridge/AbsInbox.sol
+20 −5		src/bridge/ERC20Bridge.sol
+2 −0		src/bridge/ERC20Inbox.sol
+255 −0		src/bridge/GasRefunder.sol
+5 −3		src/bridge/IERC20Bridge.sol
+2 −0		src/bridge/IInboxBase.sol
+2 −0		src/bridge/IOutbox.sol
+2 −0		src/bridge/ISequencerInbox.sol
+2 −1		src/bridge/Inbox.sol
+8 −4		src/bridge/SequencerInbox.sol
+0 −3		src/libraries/Constants.sol
+3 −0		src/libraries/Error.sol
+5 −0		src/mocks/InboxStub.sol
+3 −2		src/mocks/SequencerInboxStub.sol
+2 −1		src/mocks/Simple.sol
+16 −0		src/node-interface/NodeInterface.sol
+6 −0		src/precompiles/ArbOwner.sol
+3 −0		src/precompiles/ArbOwnerPublic.sol
+51 −159		src/rollup/BridgeCreator.sol
+0 −64		src/rollup/IBridgeCreator.sol
+20 −18		src/rollup/RollupCreator.sol
+72 −1		test/contract/arbRollup.spec.ts
+2 −2		test/contract/sequencerInboxForceInclude.spec.ts
+18 −34		test/foundry/AbsInbox.t.sol
+118 −77		test/foundry/BridgeCreator.t.sol
+57 −21		test/foundry/ERC20Bridge.t.sol
+5 −6		test/foundry/ERC20Inbox.t.sol
+1 −1		test/foundry/Inbox.t.sol
+91 −35		test/foundry/RollupCreator.t.sol
+747 −822		yarn.lock
+47 −8		README.md
+1 −1		docker-compose.yaml
+10 −9		scripts/ethcommands.ts
+22 −23		test-node.bash