From 343be224431e5f1dc2ca8b8a87c8e33e38f1e2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Mon, 11 May 2026 14:15:07 +0200 Subject: [PATCH 1/6] Mention the new process --- CONTRIBUTING.md | 14 ++++++++++++++ .../stylus-compiler-runner/testdata/memory.wasm | Bin 0 -> 219 bytes 2 files changed, 14 insertions(+) create mode 100644 crates/sp1/stylus-compiler-runner/testdata/memory.wasm diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a0cd5900fe1..05047ebdccc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,6 +17,17 @@ You can explore our [Open Issues](https://github.com/offchainlabs/nitro/issues) > * Refactors that don't improve usability +## How contributions are merged + +Our development model has changed. The private repository (`nitro-private`) is now the source of truth for day-to-day development; the public `nitro` repository is a published mirror of private. + +External pull requests are still welcome and should be opened against the public `nitro` repository as described in the steps below. When a contribution is accepted, a core developer will: + +1. Port your changes into the private repository, preserving you as the commit author. +2. Push the same commits to the public repository when the private repository is synced. + +As a result, the feedback loop is somewhat slower than a direct merge, and there will be a delay between acceptance and the change appearing in the public repository. We appreciate your patience and will work to keep communication clear throughout the process. + ## Contribution Steps **1. Build Nitro locally following our instructions in our [docs](https://docs.arbitrum.io/run-arbitrum-node/nitro/build-nitro-locally).** @@ -100,6 +111,9 @@ $ git push mynitrorepo feature-in-progress-branch Navigate your browser to https://github.com/offchainlabs/nitro and click on the new pull request button. In the “base” box on the left, leave the default selection “base master”, the branch that you want your changes to be applied to. In the “compare” box on the right, select feature-in-progress-branch, the branch containing the changes you want to apply. +> [!NOTE] +> As described in [How contributions are merged](#how-contributions-are-merged) above, accepted pull requests are ported into our private development repository rather than merged directly. Your change will appear in the public repository once the private repository is synced. + **15. Respond to comments by Core Contributors.** Core Contributors may ask questions and request that you make edits. If you set notifications at the top of the page to “not watching,” you will still be notified by email whenever someone comments on the page of a pull request you have created. If you are asked to modify your pull request, repeat steps 8 through 15, then leave a comment to notify the Core Contributors that the pull request is ready for further review. diff --git a/crates/sp1/stylus-compiler-runner/testdata/memory.wasm b/crates/sp1/stylus-compiler-runner/testdata/memory.wasm new file mode 100644 index 0000000000000000000000000000000000000000..6815d2475a9f21a872a3af78459089d4f4fd4b49 GIT binary patch literal 219 zcmYj}&1wQM7)9^>qWy6y3f+}1;sdyKJCltl(r1VRrqdli|*Rs zHKfy53mT#H`y{`4|0<(X3hKk5)$SN~hZg4U?^-Zea8Ah%V>(QM2_1hSrm|Av({k0T bEKBSsQdp_*Qo?dMMBz|kCU9^Zi$ie*Xg4yJ literal 0 HcmV?d00001 From 819b0368047f7a7155152963cf7c72d1863bf11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Mon, 11 May 2026 14:16:58 +0200 Subject: [PATCH 2/6] Update careeers link --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 05047ebdccc..f583cfa00e2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -162,4 +162,4 @@ We love working with people that are autonomous, bring new experience to the tea Join our dynamic team of innovators and explore exciting career opportunities below to make a meaningful impact in a collaborative environment. Browse open positions and take the next step in your career today! -[Offchain Labs Careers](https://www.offchainlabs.com/careers) +[Offchain Labs Careers](https://www.offchain.io/careers) From e668c804a26106aea2249227837b9a26ea953884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Mon, 11 May 2026 14:17:33 +0200 Subject: [PATCH 3/6] Simplify encouragement --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f583cfa00e2..e4de4bab989 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -160,6 +160,6 @@ $ git push mynitrorepo feature-in-progress-branch We love working with people that are autonomous, bring new experience to the team, and are excited for their work. -Join our dynamic team of innovators and explore exciting career opportunities below to make a meaningful impact in a collaborative environment. Browse open positions and take the next step in your career today! +Interested in working on Nitro full time? See open roles at Offchain. [Offchain Labs Careers](https://www.offchain.io/careers) From 0979f831d40b3a4a10f1334426072ddc17a28bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Mon, 11 May 2026 14:18:04 +0200 Subject: [PATCH 4/6] AI-generated code -> Non-impactful/not-useful AI generated code --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e4de4bab989..60139f976bd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ You can explore our [Open Issues](https://github.com/offchainlabs/nitro/issues) > If you are unsure, please open an issue first to discuss the change. > Here are some examples of trivial PRs that will most-likely be rejected: > * Fixing typos -> * AI-generated code +> * Non-impactful/not-useful AI generated code > * Refactors that don't improve usability From 144b2ae241183f03f90ad1588a14e63be94e0e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Mon, 11 May 2026 14:18:58 +0200 Subject: [PATCH 5/6] Add changelog --- changelog/pmikolajczyk-nit-4864.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelog/pmikolajczyk-nit-4864.md diff --git a/changelog/pmikolajczyk-nit-4864.md b/changelog/pmikolajczyk-nit-4864.md new file mode 100644 index 00000000000..36fe433545b --- /dev/null +++ b/changelog/pmikolajczyk-nit-4864.md @@ -0,0 +1,2 @@ +### Changed +- Update CONTRIBUTING.md with the new development process \ No newline at end of file From 66e83a4c3c58241657464feee14c841facd2f884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Mon, 11 May 2026 14:21:12 +0200 Subject: [PATCH 6/6] Remove local testing artifact --- .../stylus-compiler-runner/testdata/memory.wasm | Bin 219 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 crates/sp1/stylus-compiler-runner/testdata/memory.wasm diff --git a/crates/sp1/stylus-compiler-runner/testdata/memory.wasm b/crates/sp1/stylus-compiler-runner/testdata/memory.wasm deleted file mode 100644 index 6815d2475a9f21a872a3af78459089d4f4fd4b49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmYj}&1wQM7)9^>qWy6y3f+}1;sdyKJCltl(r1VRrqdli|*Rs zHKfy53mT#H`y{`4|0<(X3hKk5)$SN~hZg4U?^-Zea8Ah%V>(QM2_1hSrm|Av({k0T bEKBSsQdp_*Qo?dMMBz|kCU9^Zi$ie*Xg4yJ