SYS-Labs · bstr156 · Apr 17, 2023 · Apr 17, 2023 · Apr 18, 2023 · Apr 18, 2023
diff --git a/.devnet/done b/.devnet/done
diff --git a/.devnet/genesis-l2.json b/.devnet/genesis-l2.json
diff --git a/.devnet/rollup.json b/.devnet/rollup.json
@@ -0,0 +1,30 @@
+{
+  "genesis": {
+    "l1": {
+      "hash": "0xbaaa9a7834d9b5e928eeb36942b96eb64167701e16b9da02a7a5f3aa9c0a216c",
+      "number": 247425
+    },
+    "l2": {
+      "hash": "0x045514aee1f089c5acd01ee15995e39a406e92586495bfa4429aa93b9f6f1067",
+      "number": 0
+    },
+    "l2_time": 1678830392,
+    "system_config": {
+      "batcherAddr": "0x00d97b2a26cb85252998fe7b4bd4ec2118bf6b6e",
+      "overhead": "0x0000000000000000000000000000000000000000000000000000000000000834",
+      "scalar": "0x00000000000000000000000000000000000000000000000000000000000f4240",
+      "gasLimit": 25000000
+    }
+  },
+  "block_time": 2,
+  "max_sequencer_drift": 1500,
+  "seq_window_size": 288,
+  "channel_timeout": 24,
+  "l1_chain_id": 5700,
+  "l2_chain_id": 57000,
+  "regolith_time": 0,
+  "batch_inbox_address": "0x678255ae6b5c4ba0e6206a8e70b59b874f20bc9c",
+  "output_oracle_address": "0x63d297aa3fecbf6eede0acd15b0308b9c8379afb",
+  "deposit_contract_address": "0x61200b9fcbb421afd0bb5a732fe48ec98482e39c",
+  "l1_system_config_address": "0xd8daedc48ca71e20feb81cc3e51c9e3a89a3c84b"
+}
diff --git a/.github/workflows/sync-fork.yml b/.github/workflows/sync-fork.yml
@@ -0,0 +1,31 @@
+name: Sync Fork
+
+on:
+  schedule:
+    - cron: '*/30 * * * *'
+  workflow_dispatch: # on button click
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Configure Git
+        run: |
+          git config --global user.name "GitHub Actions Bot"
+          git config --global user.email "[email protected]"
+
+      - name: Merge upstream
+        run: |
+          git remote add upstream https://github.com/ethereum-optimism/optimism.git
+          git fetch upstream develop
+          git checkout develop
+          git merge upstream/develop
+          git push origin develop
+
+
diff --git a/.gitignore b/.gitignore
@@ -36,7 +36,6 @@ packages/contracts-bedrock/deployments/anvil
 !.env.example
 *.log
 
-.devnet
 
 # Ignore local fuzzing results
 **/testdata/fuzz/
@@ -52,3 +51,5 @@ __pycache__
 
 # Ignore echidna artifacts
 crytic-export
+
+temp/*
diff --git a/.rollux/done b/.rollux/done
diff --git a/.rollux/genesis-l2.json b/.rollux/genesis-l2.json
diff --git a/.rollux/rollup.json b/.rollux/rollup.json
@@ -0,0 +1,30 @@
+{
+  "genesis": {
+    "l1": {
+      "hash": "0x47ac31005a8c86e4fc6bdbbf4b74ebe578bd8660b3ce44ea2e04f362a5918ca8",
+      "number": 319398
+    },
+    "l2": {
+      "hash": "0xc6b3cc4a21e79da5a3ff4981e73403be68ad93dce5c52401c7172cd8e33af6a0",
+      "number": 0
+    },
+    "l2_time": 1687365241,
+    "system_config": {
+      "batcherAddr": "0x00d97b2a26cb85252998fe7b4bd4ec2118bf6b6e",
+      "overhead": "0x00000000000000000000000000000000000000000000000000000000000000bc",
+      "scalar": "0x00000000000000000000000000000000000000000000000000000000000a6fe0",
+      "gasLimit": 30000000
+    }
+  },
+  "block_time": 2,
+  "max_sequencer_drift": 1500,
+  "seq_window_size": 288,
+  "channel_timeout": 24,
+  "l1_chain_id": 57,
+  "l2_chain_id": 570,
+  "regolith_time": 0,
+  "batch_inbox_address": "0x9a79018d3a5df42d32b790c0093702d4ba87984d",
+  "output_oracle_address": "0xb8ffe6015e1c00cfa620f884f25f21f001744c0e",
+  "deposit_contract_address": "0xfe43b2c8a481c412481bc5a36261380edc417266",
+  "l1_system_config_address": "0xcb691bd46540997e98051f3b3a7fb61034007d17"
+}
diff --git a/Makefile b/Makefile
@@ -85,13 +85,43 @@ devnet-down:
 	@(cd ./ops-bedrock && GENESIS_TIMESTAMP=$(shell date +%s) docker-compose stop)
 .PHONY: devnet-down
 
-devnet-clean:
-	rm -rf ./packages/contracts-bedrock/deployments/devnetL1
+tanenbaum-up:
+	@bash ./ops-bedrock/tanenbaum-up.sh
+.PHONY: tanenbaum-up
+
+p2p-tanenbaum-up:
+	@bash ./ops-bedrock/p2p-tanenbaum-up.sh
+.PHONY: p2p-tanenbaum-up
+
+tanenbaum-down:
+	@(cd ./ops-bedrock && GENESIS_TIMESTAMP=$(shell date +%s) docker-compose stop)
+.PHONY: tanenbaum-down
+
+tanenbaum-clean:
+	rm -rf ./.devnet
+	cd ./ops-bedrock && docker-compose down
+	docker image ls 'ops-bedrock*' --format='{{.Repository}}' | xargs -r docker rmi
+	docker volume ls --filter name=ops-bedrock --format='{{.Name}}' | xargs -r docker volume rm
+.PHONY: tanenbaum-clean
+
+rollux-up:
+	@bash ./ops-bedrock/rollux-up.sh
+.PHONY: rollux-up
+
+p2p-rollux-up:
+	@bash ./ops-bedrock/p2p-rollux-up.sh
+.PHONY: p2p-rollux-up
+
+rollux-down:
+	@(cd ./ops-bedrock && GENESIS_TIMESTAMP=$(shell date +%s) docker-compose stop)
+.PHONY: rollux-down
+
+rollux-clean:
 	rm -rf ./.devnet
 	cd ./ops-bedrock && docker-compose down
 	docker image ls 'ops-bedrock*' --format='{{.Repository}}' | xargs -r docker rmi
 	docker volume ls --filter name=ops-bedrock --format='{{.Name}}' | xargs -r docker volume rm
-.PHONY: devnet-clean
+.PHONY: rollux-clean
 
 devnet-logs:
 	@(cd ./ops-bedrock && docker-compose logs -f)

diff --git a/README.md b/README.md
@@ -2,62 +2,66 @@
 <div align="center">
   <br />
   <br />
-  <a href="https://optimism.io"><img alt="Optimism" src="https://raw.githubusercontent.com/ethereum-optimism/brand-kit/main/assets/svg/OPTIMISM-R.svg" width=600></a>
+  <a href="https://rollux.com"><img alt="Rollux" src="https://raw.githubusercontent.com/SYS-Labs/brand-kits/main/rollux/SVG/rollux_logo.svg" width=300></a>
   <br />
-  <h3><a href="https://optimism.io">Optimism</a> is Ethereum, scaled.</h3>
+  <h3><a href="https://rollux.com">Rollux.com</a></h3>
   <br />
 </div>
 
-## What is Optimism?
+## What is Rollux?
 
-[Optimism](https://www.optimism.io/) is a project dedicated to scaling Ethereum's technology and expanding its ability to coordinate people from across the world to build effective decentralized economies and governance systems. The [Optimism Collective](https://app.optimism.io/announcement) builds open-source software for running L2 blockchains and aims to address key governance and economic challenges in the wider cryptocurrency ecosystem. Optimism operates on the principle of **impact=profit**, the idea that individuals who positively impact the Collective should be proportionally rewarded with profit. **Change the incentives and you change the world.**
+[Rollux](https://rollux.com), built by [SYS Labs](https://syslabs.com), is a project dedicated to scaling blockchain technology and expanding its ability to coordinate people from across the world to build effective decentralized economies and governance systems. More specifically, Rollux is the EVM-equivalent Layer 2 optimistic rollup that introduces some key scaling technologies and security characteristics to Optimism's [OP Stack](https://stack.optimism.io). Built on [Syscoin's](https://syscoin.org) holistically modular Layer 1, Rollux inherits the security of Bitcoin’s mining network through merged-mining, combined with decentralized multi-quorum finality. Rollux fully factors Syscoin's efficient data availability (Proof of Data Availability - PoDA) and data fee market rather than relying on EVM calldata or danksharding. Rollux is secure, scalable, and offers very low fees. Additionally, Rollux provides native Layer 2 data availability which makes it ideal for supporting Layer 3 and fractal scaling.
 
-In this repository, you'll find numerous core components of the OP Stack, the decentralized software stack maintained by the Optimism Collective that powers Optimism and forms the backbone of blockchains like [OP Mainnet](https://explorer.optimism.io/) and [Base](https://base.org). Designed to be "aggressively open source," the OP Stack encourages you to explore, modify, extend, and test the code as needed. Although not all elements of the OP Stack are contained here, many of its essential components can be found within this repository. By collaborating on free, open software and shared standards, the Optimism Collective aims to prevent siloed software development and rapidly accelerate the development of the Ethereum ecosystem. Come contribute, build the future, and redefine power, together.
+In all, Rollux is a unique and powerful alternative to other rollup-based stacks and blockchain scaling technologies in general.
+
+In this repository, you'll find numerous core components of Rollux, the decentralized software stack maintained by SYS Labs, and much of the upstream [OP Stack](https://stack.optimism.io) which is maintained by the Optimism Collective. We encourage you to explore, modify, extend, and test the code as needed. By collaborating on free, open software and shared standards, SYS Labs, Syscoin Foundation and the Optimism Collective aim to prevent siloed software development and rapidly accelerate the development of blockchain ecosystems. Come contribute, build the future, and redefine power, together.
+
+**NOTE: It is important to understand that this repository became public relatively recently. As such, some READMEs might be incomplete. We appreciate your patience while we work quickly to expand technical information about Rollux and refactor existing content! Should you have questions about this repo, feel free to chat with the Rollux community at the links below!**
 
 ## Documentation
 
-- If you want to build on top of OP Mainnet, refer to the [Optimism Community Hub](https://community.optimism.io)
+- If you want to build on top of Rollux Mainnet, refer to the [Rollux Developers Docs](https://rollux.com/developers)
+- If you want to contribute to Rollux, check out the [Protocol Specs](./specs)
 - If you want to build your own OP Stack based blockchain, refer to the [OP Stack docs](https://stack.optimism.io)
-- If you want to contribute to the OP Stack, check out the [Protocol Specs](./specs)
 
 ## Community
 
-General discussion happens most frequently on the [Optimism discord](https://discord.gg/optimism).
-Governance discussion can also be found on the [Optimism Governance Forum](https://gov.optimism.io/).
+General dev discussion happens most frequently on the [Rollux discord](https://discord.gg/rollux) in the `#🔨│builder-general` channel.
+<!--- Governance discussion can also be found on the [Optimism Governance Forum](https://gov.optimism.io/). --->
 
 ## Contributing
 
 Read through [CONTRIBUTING.md](./CONTRIBUTING.md) for a general overview of the contributing process for this repository.
-Use the [Developer Quick Start](./CONTRIBUTING.md#development-quick-start) to get your development environment set up to start working on the Optimism Monorepo.
-Then check out the list of [Good First Issues](https://github.com/ethereum-optimism/optimism/contribute) to find something fun to work on!
+Use the [Developer Quick Start](./CONTRIBUTING.md#development-quick-start) to get your development environment set up to start working on the Rollux Monorepo.
+Then check out the list of [Good First Issues](https://github.com/sys-labs/rollux/contribute) to find something fun to work on!
 
 ## Security Policy and Vulnerability Reporting
 
-Please refer to the canonical [Security Policy](https://github.com/ethereum-optimism/.github/blob/master/SECURITY.md) document for detailed information about how to report vulnerabilities in this codebase.
+If you are reporting any vulnerabilites exclusive to the Rollux codebase, you should follow the common sense "How to" guidelines echoed in Optimism's canonical [Security Policy](https://github.com/ethereum-optimism/.github/blob/master/SECURITY.md).
 Bounty hunters are encouraged to check out [the Optimism Immunefi bug bounty program](https://immunefi.com/bounty/optimism/).
-The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vulnerabilities.
+While this does not apply to any Rollux-specific discoveries, the Optimism Immunefi program offers up to $2,000,042 for in-scope critical vulnerabilities in the Optimism codebase.
+For vulnerabilities in any Rollux or SYS Labs websites, email servers or other non-critical infrastructure, please email SYS Labs at [email protected]. We appreciate detailed instructions for confirming the vulnerability.
 
-## The Bedrock Upgrade
 
-OP Mainnet is currently preparing for [its next major upgrade, Bedrock](https://dev.optimism.io/introducing-optimism-bedrock/).
-You can find detailed specifications for the Bedrock upgrade within the [specs folder](./specs) in this repository.
 
-Please note that a significant number of packages and folders within this repository are part of the Bedrock upgrade and are NOT currently running in production.
-Refer to the Directory Structure section below to understand which packages are currently running in production and which are intended for use as part of the Bedrock upgrade.
+## Bedrock-based
+
+Rollux is based upon Optimism Bedrock!
+You can find detailed specifications for the Bedrock upgrade within the [specs folder](./specs) in this repository.
 
 ## Directory Structure
 
 <pre>
 ~~ Production ~~
 ├── <a href="./packages">packages</a>
 │   ├── <a href="./packages/common-ts">common-ts</a>: Common tools for building apps in TypeScript
-│   ├── <a href="./packages/contracts-bedrock">contracts-bedrock</a>: Bedrock smart contracts.
-│   ├── <a href="./packages/contracts-periphery">contracts-periphery</a>: Peripheral contracts for Optimism
+│   ├── <a href="./packages/contracts-bedrock">contracts-bedrock</a>: Rollux Bedrock smart contracts.
+│   ├── <a href="./packages/contracts-periphery">contracts-periphery</a>: Peripheral contracts for Rollux
 │   ├── <a href="./packages/core-utils">core-utils</a>: Low-level utilities that make building Optimism easier
 │   ├── <a href="./packages/chain-mon">chain-mon</a>: Chain monitoring services
 │   ├── <a href="./packages/fault-detector">fault-detector</a>: Service for detecting Sequencer faults
 │   ├── <a href="./packages/replica-healthcheck">replica-healthcheck</a>: Service for monitoring the health of a replica node
-│   └── <a href="./packages/sdk">sdk</a>: provides a set of tools for interacting with Optimism
+│   └── <a href="./packages/sdk">sdk</a>: provides a set of tools for interacting with Rollux
 ├── <a href="./op-bindings">op-bindings</a>: Go bindings for Bedrock smart contracts.
 ├── <a href="./op-batcher">op-batcher</a>: L2-Batch Submitter, submits bundles of batches to L1
 ├── <a href="./op-bootnode">op-bootnode</a>: Standalone op-node discovery bootnode
@@ -79,14 +83,14 @@ Refer to the Directory Structure section below to understand which packages are
 ~~ Pre-BEDROCK ~~
 ├── <a href="./packages">packages</a>
 │   ├── <a href="./packages/common-ts">common-ts</a>: Common tools for building apps in TypeScript
-│   ├── <a href="./packages/contracts-periphery">contracts-periphery</a>: Peripheral contracts for Optimism
-│   ├── <a href="./packages/core-utils">core-utils</a>: Low-level utilities that make building Optimism easier
+│   ├── <a href="./packages/contracts-periphery">contracts-periphery</a>: Peripheral contracts for Rollux
+│   ├── <a href="./packages/core-utils">core-utils</a>: Low-level utilities that make building Rollux easier
 │   ├── <a href="./packages/chain-mon">chain-mon</a>: Chain monitoring services
 │   ├── <a href="./packages/fault-detector">fault-detector</a>: Service for detecting Sequencer faults
 │   ├── <a href="./packages/replica-healthcheck">replica-healthcheck</a>: Service for monitoring the health of a replica node
 │   └── <a href="./packages/sdk">sdk</a>: provides a set of tools for interacting with Optimism
 ├── <a href="./indexer">indexer</a>: indexes and syncs transactions
-├── <a href="./op-exporter">op-exporter</a>: A prometheus exporter to collect/serve metrics from an Optimism node
+├── <a href="./op-exporter">op-exporter</a>: A prometheus exporter to collect/serve metrics from a Rollux node
 ├── <a href="./proxyd">proxyd</a>: Configurable RPC request router and proxy
 └── <a href="./technical-documents">technical-documents</a>: audits and post-mortem documents
 </pre>
@@ -97,8 +101,8 @@ Refer to the Directory Structure section below to understand which packages are
 
 | Branch          | Status                                                                           |
 | --------------- | -------------------------------------------------------------------------------- |
-| [master](https://github.com/ethereum-optimism/optimism/tree/master/)                   | Accepts PRs from `develop` when intending to deploy to production.                  |
-| [develop](https://github.com/ethereum-optimism/optimism/tree/develop/)                 | Accepts PRs that are compatible with `master` OR from `release/X.X.X` branches.                    |
+| [master](https://github.com/sys-labs/rollux/tree/master/)                   | Accepts PRs from `develop` when intending to deploy to production.                  |
+| [develop](https://github.com/sys-labs/rollux/tree/develop/)                 | Accepts PRs that are compatible with `master` OR from `release/X.X.X` branches.                    |
 | release/X.X.X                                                                          | Accepts PRs for all changes, particularly those not backwards compatible with `develop` and `master`. |
 
 ### Overview
@@ -114,8 +118,8 @@ Updates from `master` **always** come from the `develop` branch.
 
 ### Development branch
 
-The primary development branch is [`develop`](https://github.com/ethereum-optimism/optimism/tree/develop/).
-`develop` contains the most up-to-date software that remains backwards compatible with the latest experimental [network deployments](https://community.optimism.io/docs/useful-tools/networks/).
+The primary development branch is [`develop`](https://github.com/sys-labs/rollux/tree/develop/).
+`develop` contains the most up-to-date software that remains backwards compatible with the latest testnet [network deployments](https://rollux.com/developers/docs/useful-tools/networks/).
 If you're making a backwards compatible change, please direct your pull request towards `develop`.
 
 **Changes to contracts within `packages/contracts-bedrock/contracts` are usually NOT considered backwards compatible and SHOULD be made against a release candidate branch**.
@@ -159,4 +163,4 @@ It's strongly recommended to avoid merging PRs into develop during an active rel
 
 ## License
 
-All other files within this repository are licensed under the [MIT License](https://github.com/ethereum-optimism/optimism/blob/master/LICENSE) unless stated otherwise.
+All other files within this repository are licensed under the [MIT License](https://github.com/sys-labs/rollux/blob/master/LICENSE) unless stated otherwise.
diff --git a/endpoint-monitor/endpoint_monitor.go b/endpoint-monitor/endpoint_monitor.go
@@ -46,7 +46,7 @@ func Main(version string) func(cliCtx *cli.Context) error {
 
 		l.Info("starting metrics server", "addr", metricsCfg.ListenAddr, "port", metricsCfg.ListenPort)
 		if err := opmetrics.ListenAndServe(ctx, registry, metricsCfg.ListenAddr, metricsCfg.ListenPort); err != nil {
-			l.Error("error starting metrics server", err)
+			l.Error("error starting metrics server", "err", err)
 			return err
 		}
 

diff --git a/go.mod b/go.mod
@@ -30,6 +30,7 @@ require (
 	github.com/pkg/profile v1.7.0
 	github.com/prometheus/client_golang v1.14.0
 	github.com/stretchr/testify v1.8.1
+	github.com/urfave/cli v1.22.2
 	github.com/urfave/cli/v2 v2.25.7
 	golang.org/x/crypto v0.6.0
 	golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb

diff --git a/go.sum b/go.sum
@@ -680,6 +680,7 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
+github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
 github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=