finish bedrock codebase

.changeset/chilly-carrots-impress.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/core-utils': patch
+---
+
+Delete legacy core-utils

.changeset/fair-poems-give.md

@@ -0,0 +1,6 @@
+---
+'@eth-optimism/fault-detector': major
+'@eth-optimism/sdk': major
+---
+
+Make optimism/sdk default to bedrock mode

.changeset/few-shoes-deny.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/fault-detector': patch
+---
+
+Fix false error to warning

.changeset/moody-foxes-enjoy.md

@@ -0,0 +1,6 @@
+---
+'@eth-optimism/chain-mon': minor
+'@eth-optimism/core-utils': patch
+---
+
+Added a new service wallet-mon to identify unexpected transfers from key accounts

.changeset/rotten-cheetahs-guess.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/fault-detector': patch
+---
+
+Add better source maps and developer support

.changeset/smooth-bulldogs-hear.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/chain-mon': patch
+---
+
+Fixed an issue with logging the wrong timestamp.

.changeset/tasty-seahorses-add.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-bedrock': minor
+---
+
+Fix issue with deposits running out of gas

.circleci/config.yml

@@ -495,4 +495,4 @@ workflows:
           docker_tags: mantlenetworkio/batch-submitter:nightly
           docker_context: .
           context:
-            - mantle
+            - mantle

.dockerignore

@@ -19,4 +19,4 @@ go/batch-submitter/batch-submitter
 ops/Makefile.local
 ops/docker-compose.local.yml
 ops/docker-compose.yml
-ops/data/**
+ops/data/**

.editorconfig

@@ -14,4 +14,4 @@ indent_size = 4
 
 [*.go]
 indent_size = 4
-indent_style = tab
+indent_style = tab

.github/CODEOWNERS

@@ -1,2 +1,44 @@
+<<<<<<< HEAD
 /.github          @wukongcheng @shidaxi
 /*                @wukongcheng
+=======
+# Legacy codebases
+/packages/common-ts             @ethereum-optimism/typescript-reviewers
+/packages/contracts             @ethereum-optimism/contract-reviewers
+/packages/contracts-bedrock     @ethereum-optimism/contract-reviewers
+/packages/contracts-periphery   @ethereum-optimism/contract-reviewers
+/packages/core-utils            @ethereum-optimism/legacy-reviewers
+/packages/chain-mon             @smartcontracts
+/packages/fault-detector        @ethereum-optimism/devxpod
+/packages/hardhat-deploy-config @ethereum-optimism/legacy-reviewers
+/packages/replica-healthcheck   @ethereum-optimism/legacy-reviewers
+/packages/sdk                   @ethereum-optimism/devxpod
+/packages/atst                  @ethereum-optimism/devxpod
+
+# Bedrock codebases
+/bedrock-devnet @ethereum-optimism/go-reviewers
+/op-batcher     @ethereum-optimism/go-reviewers
+/op-chain-ops   @ethereum-optimism/go-reviewers
+/op-e2e         @ethereum-optimism/go-reviewers
+/op-node        @ethereum-optimism/go-reviewers
+/op-node/rollup @protolambda @trianglesphere
+/op-proposer    @ethereum-optimism/go-reviewers
+/op-bootnode    @ethereum-optimism/go-reviewers
+/op-program     @ethereum-optimism/go-reviewers
+/op-service     @ethereum-optimism/go-reviewers
+/ops-bedrock    @ethereum-optimism/go-reviewers
+
+
+# Ops
+/.circleci    @ethereum-optimism/infra-reviewers
+/.github      @ethereum-optimism/infra-reviewers
+/ops          @ethereum-optimism/infra-reviewers
+/op-signer    @ethereum-optimism/infra-reviewers
+
+# Misc
+/proxyd           @ethereum-optimism/infra-reviewers
+/indexer          @ethereum-optimism/devxpod
+/infra            @ethereum-optimism/infra-reviewers
+/specs            @ethereum-optimism/contract-reviewers @ethereum-optimism/go-reviewers
+/endpoint-monitor @ethereum-optimism/infra-reviewers
+>>>>>>> op-node/v1.1.1

.github/labeler.yml

@@ -1,4 +1,5 @@
 ---
+<<<<<<< HEAD
 2-reviewers:
   - '.github/**/*'
   - 'l2geth/**/*'
@@ -41,3 +42,7 @@ C-Protocol-Critical:
   - 'packages/data-transport-layer/**/*.ts'
   - 'packages/contracts/**/*.sol'
   - 'l2geth/**/*.go'
+=======
+C-Protocol-Critical:
+  - 'packages/contracts-bedrock/**/*.sol'
+>>>>>>> op-node/v1.1.1

.github/mergify.yml

@@ -7,10 +7,19 @@ pull_request_rules:
     conditions:
       - and:
         - "#review-threads-unresolved=0"
+<<<<<<< HEAD
         - "#approved-reviews-by>=2"
         - "#changes-requested-reviews-by=0"
         - "label!=do-not-merge"
         - "label!=mergify-ignore"
+=======
+        - "#approved-reviews-by>=1"
+        - "#changes-requested-reviews-by=0"
+        - "label!=do-not-merge"
+        - "label!=multiple-reviewers"
+        - "label!=mergify-ignore"
+        - "base=develop"
+>>>>>>> op-node/v1.1.1
         - or:
           - and:
             - "label!=SR-Risk"
@@ -26,7 +35,12 @@ pull_request_rules:
     actions:
       queue:
         name: default
+<<<<<<< HEAD
         method: squash
+=======
+        method: merge
+        merge_bot_account: OptimismBot
+>>>>>>> op-node/v1.1.1
   - name: Add merge train label
     conditions:
       - "queue-position >= 0"
@@ -89,6 +103,7 @@ pull_request_rules:
       comment:
         message: |
           This PR is next in line to be merged, and will be merged as soon as checks pass.
+<<<<<<< HEAD
   - name: Notify author when merge queue failed
     conditions:
       - "check-failure=Queue: Embarked in merge train"
@@ -105,3 +120,48 @@ pull_request_rules:
       comment:
         message: |
           This PR changes implementation code, but doesn't include a changeset. Did you forget to add one?
+=======
+  - name: Notify author on queue failure
+    conditions:
+      - 'check-failure=Queue: Embarked in merge train'
+    actions:
+      comment:
+        message: >
+          Hey @{{ author }}, this pull request failed to merge and has been
+          dequeued from the merge train.  If you believe your PR failed in
+          the merge train because of a flaky test, requeue it by commenting
+          with `@mergifyio requeue`.
+
+          More details can be found on the `Queue: Embarked in merge train`
+          check-run.
+  - name: Add indexer tag and ecopod reviewers
+    conditions:
+      - 'files~=^indexer/'
+    actions:
+      label:
+        add:
+          - indexer
+      request_reviews:
+        users:
+          - roninjin10
+  - name: Add sdk tag and ecopod reviewers
+    conditions:
+      - 'files~=^packages/sdk/'
+    actions:
+      label:
+        add:
+          - sdk
+      request_reviews:
+        users:
+          - roninjin10
+  - name: Add common-ts tag and ecopod reviewers
+    conditions:
+      - 'files~=^packages/common-ts/'
+    actions:
+      label:
+        add:
+          - common-ts
+      request_reviews:
+        users:
+          - roninjin10
+>>>>>>> op-node/v1.1.1

.github/workflows/close-stale.yml

@@ -12,6 +12,11 @@ jobs:
           stale-pr-message: 'This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
           exempt-pr-labels: exempt-stale
           days-before-issue-stale: 999
+<<<<<<< HEAD
           days-before-pr-stale: 15
           days-before-close: 15
+=======
+          days-before-pr-stale: 14
+          days-before-close: 5
+>>>>>>> op-node/v1.1.1
           repo-token: ${{ secrets.GITHUB_TOKEN }}