Merge pull request #3277 from ethereum-optimism/rename-op-chain-ops

op-chain-ops: rename from state-surgery

.circleci/config.yml

@@ -18,7 +18,7 @@ jobs:
           name: Check if we should run
           command: |
             shopt -s inherit_errexit
-            CHANGED=$(check-changed "(op-bindings|packages/)")
+            CHANGED=$(check-changed "(op-bindings|op-chain-ops|packages/)")
             if [[ "$CHANGED" = "FALSE" ]]; then
               circleci step halt
             fi
@@ -419,7 +419,7 @@ jobs:
                 command: make <<parameters.binary_name>>
                 working_directory: <<parameters.working_directory>>
 
-  state-surgery-tests:
+  op-chain-ops-tests:
     docker:
       - image: ethereumoptimism/ci-builder:latest
     steps:
@@ -430,15 +430,15 @@ jobs:
       - run:
           name: Check if we should run
           command: |
-            CHANGED=$(bash ./ops/docker/ci-builder/check-changed.sh "state-surgery")
+            CHANGED=$(bash ./ops/docker/ci-builder/check-changed.sh "op-chain-ops")
             if [[ "$CHANGED" = "FALSE" ]]; then
               circleci step halt
             fi
       - run:
           name: Test
           command: |
-            gotestsum --junitfile /test-results/state-surgery.xml -- -coverpkg=github.com/ethereum-optimism/optimism/... -coverprofile=coverage.out -covermode=atomic ./...
-          working_directory: state-surgery
+            gotestsum --junitfile /test-results/op-chain-ops.xml -- -coverpkg=github.com/ethereum-optimism/optimism/... -coverprofile=coverage.out -covermode=atomic ./...
+          working_directory: op-chain-ops
 
   geth-tests:
     docker:
@@ -749,8 +749,8 @@ workflows:
           binary_name: bss-core
           working_directory: bss-core
           build: false
-      - state-surgery-tests:
-          name: state-surgery-tests
+      - op-chain-ops-tests:
+          name: op-chain-ops-tests
           requires:
             - yarn-monorepo
       - geth-tests

go.work

@@ -15,7 +15,7 @@ use (
 	./op-proposer
 	./op-service
 	./proxyd
-	./state-surgery
+	./op-chain-ops
 	./teleportr
 )
 

state-surgery/README.md → op-chain-ops/README.md

-# state-surgery
+# op-chain-ops
 
 This package performs state surgery. It takes the following input:
 

state-surgery/cmd/main.go → op-chain-ops/cmd/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	surgery "github.com/ethereum-optimism/optimism/state-surgery"
+	ops "github.com/ethereum-optimism/optimism/op-chain-ops"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/mattn/go-isatty"
 	"github.com/urfave/cli/v2"
@@ -98,7 +98,7 @@ func main() {
 func dumpAddressesAction(cliCtx *cli.Context) error {
 	dataDir := cliCtx.String("data-dir")
 	outFile := cliCtx.String("out-file")
-	return surgery.DumpAddresses(dataDir, outFile)
+	return ops.DumpAddresses(dataDir, outFile)
 }
 
 func migrateAction(cliCtx *cli.Context) error {
@@ -111,10 +111,10 @@ func migrateAction(cliCtx *cli.Context) error {
 	levelDBCacheSize := cliCtx.Int("leveldb-cache-size-mb")
 	levelDBHandles := cliCtx.Int("leveldb-file-handles")
 
-	genesis, err := surgery.ReadGenesisFromFile(genesisPath)
+	genesis, err := ops.ReadGenesisFromFile(genesisPath)
 	if err != nil {
 		return err
 	}
 
-	return surgery.Migrate(dataDir, outDir, genesis, addressLists, allowanceLists, chainID, levelDBCacheSize, levelDBHandles)
+	return ops.Migrate(dataDir, outDir, genesis, addressLists, allowanceLists, chainID, levelDBCacheSize, levelDBHandles)
 }

state-surgery/genesis/config.go → op-chain-ops/genesis/config.go

@@ -11,8 +11,8 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
-	"github.com/ethereum-optimism/optimism/state-surgery/hardhat"
-	"github.com/ethereum-optimism/optimism/state-surgery/state"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/hardhat"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/state"
 )
 
 // DeployConfig represents the deployment configuration for Optimism

state-surgery/genesis/helpers.go → op-chain-ops/genesis/helpers.go

@@ -7,9 +7,9 @@ import (
 	"math/big"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
-	"github.com/ethereum-optimism/optimism/state-surgery/hardhat"
-	"github.com/ethereum-optimism/optimism/state-surgery/immutables"
-	"github.com/ethereum-optimism/optimism/state-surgery/state"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/hardhat"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/immutables"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/state"
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"

state-surgery/genesis/layer_one.go → op-chain-ops/genesis/layer_one.go

 package genesis
 
 import (
-	"github.com/ethereum-optimism/optimism/state-surgery/hardhat"
-	"github.com/ethereum-optimism/optimism/state-surgery/state"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/hardhat"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/state"
 	"github.com/ethereum/go-ethereum/core"
 )
 

state-surgery/genesis/layer_two.go → op-chain-ops/genesis/layer_two.go

 package genesis
 
 import (
-	"github.com/ethereum-optimism/optimism/state-surgery/hardhat"
-	"github.com/ethereum-optimism/optimism/state-surgery/state"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/hardhat"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/state"
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/core"

state-surgery/genesis/layer_two_test.go → op-chain-ops/genesis/layer_two_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
-	"github.com/ethereum-optimism/optimism/state-surgery/genesis"
-	"github.com/ethereum-optimism/optimism/state-surgery/hardhat"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/hardhat"
 	"github.com/stretchr/testify/require"
 )
 

op-chain-ops/go.mod

+module github.com/ethereum-optimism/optimism/op-chain-ops
+
+go 1.18
+
+require (
+	github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220820030939-de38b6f6f77e
+	github.com/ethereum-optimism/optimism/op-bindings v0.4.0
+	github.com/ethereum/go-ethereum v1.10.21
+	github.com/mattn/go-isatty v0.0.14
+	github.com/stretchr/testify v1.7.2
+	github.com/urfave/cli/v2 v2.10.2
+	golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70
+)
+
+require (
+	github.com/VictoriaMetrics/fastcache v1.9.0 // indirect
+	github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 // indirect
+	github.com/btcsuite/btcd v0.22.1 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/edsrzf/mmap-go v1.1.0 // indirect
+	github.com/elastic/gosigar v0.12.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
+	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
+	github.com/holiman/uint256 v1.2.0 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/tsdb v0.10.0 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/rjeczalik/notify v0.9.2 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 // indirect
+	github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.4.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
+	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

state-surgery/hardhat/hardhat.go → op-chain-ops/hardhat/hardhat.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum-optimism/optimism/state-surgery/solc"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
 )
 
 // `Hardhat` encapsulates all of the functionality required to interact

state-surgery/hardhat/hardhat_test.go → op-chain-ops/hardhat/hardhat_test.go

@@ -3,7 +3,7 @@ package hardhat_test
 import (
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/state-surgery/hardhat"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/hardhat"
 
 	"github.com/stretchr/testify/require"
 )

state-surgery/hardhat/types.go → op-chain-ops/hardhat/types.go

@@ -3,7 +3,7 @@ package hardhat
 import (
 	"encoding/json"
 
-	"github.com/ethereum-optimism/optimism/state-surgery/solc"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"

state-surgery/immutables/immutables.go → op-chain-ops/immutables/immutables.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum-optimism/optimism/l2geth/common/hexutil"
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/crypto"
 )

state-surgery/immutables/immutables_test.go → op-chain-ops/immutables/immutables_test.go

@@ -3,7 +3,7 @@ package immutables_test
 import (
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/state-surgery/immutables"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/immutables"
 	"github.com/stretchr/testify/require"
 )
 

state-surgery/solc/types.go → op-chain-ops/solc/types.go

@@ -3,7 +3,7 @@ package solc
 import (
 	"encoding/json"
 
-	"github.com/ethereum-optimism/optimism/l2geth/accounts/abi"
+	"github.com/ethereum/go-ethereum/accounts/abi"
 )
 
 type CompilerInput struct {

state-surgery/state/encoding.go → op-chain-ops/state/encoding.go

@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/ethereum-optimism/optimism/state-surgery/solc"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"

state-surgery/state/memory_db_test.go → op-chain-ops/state/memory_db_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/state-surgery/state"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/state"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"

state-surgery/state/state.go → op-chain-ops/state/state.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum-optimism/optimism/state-surgery/solc"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
 	"github.com/ethereum/go-ethereum/common"
 )
 

state-surgery/state/state_test.go → op-chain-ops/state/state_test.go

@@ -13,9 +13,9 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/crypto"
 
-	"github.com/ethereum-optimism/optimism/state-surgery/solc"
-	"github.com/ethereum-optimism/optimism/state-surgery/state"
-	"github.com/ethereum-optimism/optimism/state-surgery/state/testdata"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/state"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/state/testdata"
 
 	"github.com/stretchr/testify/require"
 )

state-surgery/go.mod

-module github.com/ethereum-optimism/optimism/state-surgery
-
-go 1.18
-
-require (
-	github.com/ethereum/go-ethereum v1.10.17
-	github.com/mattn/go-isatty v0.0.12
-	github.com/urfave/cli/v2 v2.3.0
-)
-
-require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
-)