From 92af8bc351b0fd73647a1fede9ad1716554fa577 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Fri, 20 Jul 2018 16:31:26 -0500 Subject: [PATCH] Rename Entire Project to Repo, Change Import Paths and Readmes (#298) Former-commit-id: b7b8bbd10777012ae6f7d30eb6b05c3b1c3ec5d3 [formerly 06e1112fa0e1092a7137186d3a386972daa2effe] Former-commit-id: ff2bc760c9dafb6250f056606eb2cbf96b6afa5b --- .travis.yml | 2 +- BUILD.bazel | 4 +-- README.md | 26 +++++++------- beacon-chain/BUILD.bazel | 2 +- beacon-chain/README.md | 2 +- beacon-chain/blockchain/BUILD.bazel | 2 +- beacon-chain/blockchain/core.go | 2 +- beacon-chain/blockchain/core_test.go | 8 ++--- beacon-chain/blockchain/service.go | 2 +- beacon-chain/blockchain/service_test.go | 2 +- beacon-chain/database/BUILD.bazel | 2 +- beacon-chain/database/database.go | 2 +- beacon-chain/database/database_test.go | 2 +- beacon-chain/main.go | 8 ++--- beacon-chain/node/BUILD.bazel | 2 +- beacon-chain/node/node.go | 14 ++++---- beacon-chain/params/BUILD.bazel | 2 +- beacon-chain/powchain/BUILD.bazel | 2 +- beacon-chain/types/BUILD.bazel | 2 +- beacon-chain/utils/BUILD.bazel | 2 +- {sharding => client}/BUILD.bazel | 12 +++---- {sharding => client}/CONTRIBUTING.md | 20 +++++------ {sharding => client}/READINGS.md | 0 {sharding => client}/README.md | 8 ++--- {sharding => client}/contracts/BUILD.bazel | 6 ++-- {sharding => client}/contracts/contracts.go | 0 .../contracts/sharding_manager.go | 0 .../contracts/sharding_manager.sol | 0 .../contracts/sharding_manager_test.go | 2 +- {sharding => client}/contracts/types.go | 0 {sharding => client}/database/BUILD.bazel | 6 ++-- {sharding => client}/database/database.go | 2 +- .../database/database_test.go | 2 +- {sharding => client}/internal/BUILD.bazel | 8 ++--- {sharding => client}/internal/README.md | 0 .../internal/client_helper.go | 4 +-- {sharding => client}/main.go | 8 ++--- {sharding => client}/mainchain/BUILD.bazel | 10 +++--- {sharding => client}/mainchain/interfaces.go | 2 +- {sharding => client}/mainchain/smc_client.go | 2 +- .../mainchain/smc_client_test.go | 2 +- {sharding => client}/mainchain/utils.go | 4 +-- client/node/BUILD.bazel | 34 +++++++++++++++++++ {sharding => client}/node/backend.go | 28 +++++++-------- {sharding => client}/node/backend_test.go | 0 {sharding => client}/notary/BUILD.bazel | 20 +++++------ {sharding => client}/notary/notary.go | 6 ++-- {sharding => client}/notary/service.go | 8 ++--- {sharding => client}/notary/service_test.go | 6 ++-- client/observer/BUILD.bazel | 31 +++++++++++++++++ {sharding => client}/observer/service.go | 10 +++--- {sharding => client}/observer/service_test.go | 12 +++---- {sharding => client}/p2p/BUILD.bazel | 6 ++-- {sharding => client}/p2p/discovery.go | 2 +- {sharding => client}/p2p/discovery_test.go | 0 {sharding => client}/p2p/feed.go | 0 {sharding => client}/p2p/feed_example_test.go | 0 {sharding => client}/p2p/feed_test.go | 0 {sharding => client}/p2p/message.go | 0 {sharding => client}/p2p/options.go | 0 {sharding => client}/p2p/options_test.go | 0 {sharding => client}/p2p/peer.go | 2 +- {sharding => client}/p2p/service.go | 6 ++-- {sharding => client}/p2p/service_test.go | 4 +-- {sharding => client}/p2p/topics.go | 2 +- {sharding => client}/p2p/topics_test.go | 2 +- {sharding => client}/params/BUILD.bazel | 4 +-- {sharding => client}/params/config.go | 0 {sharding => client}/params/config_test.go | 0 {sharding => client}/proposer/BUILD.bazel | 22 ++++++------ {sharding => client}/proposer/proposer.go | 4 +-- {sharding => client}/proposer/service.go | 18 +++++----- {sharding => client}/proposer/service_test.go | 4 +-- {sharding => client}/simulator/BUILD.bazel | 20 +++++------ {sharding => client}/simulator/service.go | 10 +++--- .../simulator/service_test.go | 8 ++--- {sharding => client}/syncer/BUILD.bazel | 26 +++++++------- {sharding => client}/syncer/handlers.go | 8 ++--- {sharding => client}/syncer/handlers_test.go | 10 +++--- {sharding => client}/syncer/service.go | 12 +++---- {sharding => client}/syncer/service_test.go | 12 +++---- {sharding => client}/txpool/BUILD.bazel | 8 ++--- {sharding => client}/txpool/service.go | 2 +- {sharding => client}/txpool/service_test.go | 2 +- {sharding => client}/types/BUILD.bazel | 4 +-- {sharding => client}/types/collation.go | 2 +- {sharding => client}/types/collation_test.go | 2 +- {sharding => client}/types/interfaces.go | 0 {sharding => client}/types/shard.go | 0 {sharding => client}/types/shard_test.go | 2 +- {sharding => client}/utils/BUILD.bazel | 6 ++-- {sharding => client}/utils/flags.go | 2 +- contracts/BUILD.bazel | 2 +- contracts/deployVRC/BUILD.bazel | 2 +- contracts/deployVRC/deployVRC.go | 2 +- proto/sharding/v1/BUILD.bazel | 4 +-- sharding/node/BUILD.bazel | 34 ------------------- sharding/observer/BUILD.bazel | 31 ----------------- shared/BUILD.bazel | 2 +- shared/cmd/BUILD.bazel | 2 +- shared/database/BUILD.bazel | 2 +- shared/debug/BUILD.bazel | 2 +- shared/legacyutil/BUILD.bazel | 2 +- shared/legacyutil/convert_transaction.go | 2 +- 104 files changed, 319 insertions(+), 323 deletions(-) rename {sharding => client}/BUILD.bazel (59%) rename {sharding => client}/CONTRIBUTING.md (70%) rename {sharding => client}/READINGS.md (100%) rename {sharding => client}/README.md (97%) rename {sharding => client}/contracts/BUILD.bazel (87%) rename {sharding => client}/contracts/contracts.go (100%) rename {sharding => client}/contracts/sharding_manager.go (100%) rename {sharding => client}/contracts/sharding_manager.sol (100%) rename {sharding => client}/contracts/sharding_manager_test.go (99%) rename {sharding => client}/contracts/types.go (100%) rename {sharding => client}/database/BUILD.bazel (78%) rename {sharding => client}/database/database.go (96%) rename {sharding => client}/database/database_test.go (98%) rename {sharding => client}/internal/BUILD.bazel (76%) rename {sharding => client}/internal/README.md (100%) rename {sharding => client}/internal/client_helper.go (95%) rename {sharding => client}/main.go (86%) rename {sharding => client}/mainchain/BUILD.bazel (85%) rename {sharding => client}/mainchain/interfaces.go (97%) rename {sharding => client}/mainchain/smc_client.go (99%) rename {sharding => client}/mainchain/smc_client_test.go (99%) rename {sharding => client}/mainchain/utils.go (93%) create mode 100644 client/node/BUILD.bazel rename {sharding => client}/node/backend.go (90%) rename {sharding => client}/node/backend_test.go (100%) rename {sharding => client}/notary/BUILD.bazel (60%) rename {sharding => client}/notary/notary.go (96%) rename {sharding => client}/notary/service.go (87%) rename {sharding => client}/notary/service_test.go (92%) create mode 100644 client/observer/BUILD.bazel rename {sharding => client}/observer/service.go (84%) rename {sharding => client}/observer/service_test.go (82%) rename {sharding => client}/p2p/BUILD.bazel (92%) rename {sharding => client}/p2p/discovery.go (96%) rename {sharding => client}/p2p/discovery_test.go (100%) rename {sharding => client}/p2p/feed.go (100%) rename {sharding => client}/p2p/feed_example_test.go (100%) rename {sharding => client}/p2p/feed_test.go (100%) rename {sharding => client}/p2p/message.go (100%) rename {sharding => client}/p2p/options.go (100%) rename {sharding => client}/p2p/options_test.go (100%) rename {sharding => client}/p2p/peer.go (74%) rename {sharding => client}/p2p/service.go (95%) rename {sharding => client}/p2p/service_test.go (96%) rename {sharding => client}/p2p/topics.go (94%) rename {sharding => client}/p2p/topics_test.go (94%) rename {sharding => client}/params/BUILD.bazel (73%) rename {sharding => client}/params/config.go (100%) rename {sharding => client}/params/config_test.go (100%) rename {sharding => client}/proposer/BUILD.bazel (64%) rename {sharding => client}/proposer/proposer.go (97%) rename {sharding => client}/proposer/service.go (87%) rename {sharding => client}/proposer/service_test.go (97%) rename {sharding => client}/simulator/BUILD.bazel (64%) rename {sharding => client}/simulator/service.go (93%) rename {sharding => client}/simulator/service_test.go (96%) rename {sharding => client}/syncer/BUILD.bazel (68%) rename {sharding => client}/syncer/handlers.go (92%) rename {sharding => client}/syncer/handlers_test.go (96%) rename {sharding => client}/syncer/service.go (89%) rename {sharding => client}/syncer/service_test.go (91%) rename {sharding => client}/txpool/BUILD.bazel (64%) rename {sharding => client}/txpool/service.go (93%) rename {sharding => client}/txpool/service_test.go (63%) rename {sharding => client}/types/BUILD.bazel (91%) rename {sharding => client}/types/collation.go (99%) rename {sharding => client}/types/collation_test.go (99%) rename {sharding => client}/types/interfaces.go (100%) rename {sharding => client}/types/shard.go (100%) rename {sharding => client}/types/shard_test.go (99%) rename {sharding => client}/utils/BUILD.bazel (54%) rename {sharding => client}/utils/flags.go (93%) delete mode 100644 sharding/node/BUILD.bazel delete mode 100644 sharding/observer/BUILD.bazel diff --git a/.travis.yml b/.travis.yml index 3566c6557..2df9c314a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/prysmaticlabs/geth-sharding +go_import_path: github.com/prysmaticlabs/prysm sudo: false matrix: include: diff --git a/BUILD.bazel b/BUILD.bazel index a0347a76e..c2ce5c842 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,7 +1,7 @@ load("@bazel_gazelle//:def.bzl", "gazelle") -# gazelle:prefix github.com/prysmaticlabs/geth-sharding +# gazelle:prefix github.com/prysmaticlabs/prysm gazelle( name = "gazelle", - prefix = "github.com/prysmaticlabs/geth-sharding", + prefix = "github.com/prysmaticlabs/prysm", ) diff --git a/README.md b/README.md index 0c414d745..688644520 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# Prysmatic Labs Sharding Implementation +# Prysmatic Labs Ethereum 2.0 Implementation -![Travis Build](https://travis-ci.org/prysmaticlabs/geth-sharding.svg?branch=master) +![Travis Build](https://travis-ci.org/prysmaticlabs/prysm.svg?branch=master) This is the main repository for the beacon chain and sharding implementation for Ethereum 2.0 [Prysmatic Labs](https://prysmaticlabs.com). Before you begin, check out our [Contribution Guidelines](#contribution-guidelines) and join our active chat room on Gitter below: -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/prysmaticlabs/geth-sharding?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/prysmaticlabs/prysm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -Also, read our [Sharding Reference Implementation Doc](https://github.com/prysmaticlabs/geth-sharding/blob/master/sharding/README.md). This doc provides a background on the sharding implementation we follow at Prysmatic Labs. +Also, read our [Sharding Reference Implementation Doc](https://github.com/prysmaticlabs/prysm/blob/master/client/README.md). This doc provides a background on the sharding implementation we follow at Prysmatic Labs. # Table of Contents @@ -33,7 +33,7 @@ Note: it is not necessary to clone to the gopath if you're only building with Ba Clone our repository: ``` -git clone https://github.com/prysmaticlabs/geth-sharding +git clone https://github.com/prysmaticlabs/prysm ``` Download the Bazel build tool by Google [here](https://docs.bazel.build/versions/master/install.html) and ensure it works by typing @@ -42,7 +42,7 @@ Download the Bazel build tool by Google [here](https://docs.bazel.build/versions bazel version ``` -Bazel manages all of the dependencies for you (including go and necessary compilers) so you are all set to build geth-sharding. +Bazel manages all of the dependencies for you (including go and necessary compilers) so you are all set to build prysm. # Sharding Instructions @@ -93,7 +93,7 @@ Now, save the passphrase you used in the geth node into a text file called passw Build our system first ``` -$ bazel build //sharding/... +$ bazel build //client/... ``` ## Becoming a Notary @@ -102,7 +102,7 @@ $ bazel build //sharding/... Make sure a geth node is running as a separate process. Then, to deposit ETH and join as a notary in the Sharding Manager Contract, run the following command: ``` -bazel run //sharding -- \ +bazel run //client -- \ --actor "notary" \ --deposit \ --datadir /path/to/your/datadir \ @@ -117,7 +117,7 @@ Concurrently, you will need to run another service that is tasked with processin ## Running a Collation Proposal Node ``` -bazel run //sharding -- \ +bazel run //client -- \ --actor "proposer" \ --datadir /path/to/your/datadir \ --password /path/to/your/password.txt \ @@ -130,7 +130,7 @@ This node is tasked with processing pending transactions into blobs within colla ## Running an Observer Node ``` -bazel run //sharding -- \ +bazel run //client -- \ --datadir /path/to/your/datadir \ --password /path/to/your/password.txt \ --shardid 0 \ @@ -145,9 +145,9 @@ Omitting the `--actor` flag will launch a simple observer service attached to th The Sharding Manager Contract is built in Solidity and deployed to a running geth node upon launch of the sharding node if it does not exist in the network at a specified address. If there are any changes to the SMC's code, the Golang bindigs must be rebuilt with the following command. - go generate github.com/prysmaticlabs/geth-sharding/sharding/contracts + go generate github.com/prysmaticlabs/prysm/client/contracts # OR - cd sharding/contracts && go generate + cd client/contracts && go generate # Testing @@ -165,7 +165,7 @@ $ gometalinter ./... # Contributing -We have put all of our contribution guidelines into [CONTRIBUTING.md](https://github.com/prysmaticlabs/geth-sharding/blob/master/sharding/CONTRIBUTING.md)! Check it out to get started. +We have put all of our contribution guidelines into [CONTRIBUTING.md](https://github.com/prysmaticlabs/prysm/blob/master/client/CONTRIBUTING.md)! Check it out to get started. ![nyancat](https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRBSus2ozk_HuGdHMHKWjb1W5CmwwoxmYIjIBmERE1u-WeONpJJXg) diff --git a/beacon-chain/BUILD.bazel b/beacon-chain/BUILD.bazel index 661b55309..022f8638b 100644 --- a/beacon-chain/BUILD.bazel +++ b/beacon-chain/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/beacon-chain", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/node:go_default_library", diff --git a/beacon-chain/README.md b/beacon-chain/README.md index 391ef9a60..d88a955d4 100644 --- a/beacon-chain/README.md +++ b/beacon-chain/README.md @@ -2,7 +2,7 @@ This is the main project folder for the beacon chain implementation of Ethereum 2.0 in Golang by [Prysmatic Labs](https://prysmaticlabs.com). Before you begin, check out our [Contribution Guidelines](#contribution-guidelines) and join our active chat room on Gitter below: -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/prysmaticlabs/geth-sharding?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/prysmaticlabs/prysm=badge&utm_medium=badge&utm_campaign=pr-badge) Also, read the latest sharding + casper [design spec](https://ethresear.ch/t/convenience-link-to-full-casper-chain-v2-spec/2332), this design spec serves as a source of truth for the beacon chain implementation we follow at prysmatic labs. Refer this page on [why](http://email.mg2.substack.com/c/eJwlj9GOhCAMRb9G3jRQQPGBh5mM8xsbhKrsDGIAM9m_X9xN2qZtbpt7rCm4xvSjj5gLOTOmL-809CMbKXFaOKakIl4DZYr2AGyQIGjHOnWH22OiYnoIxmDijaBhhS6fcy7GvjobA9m0mSXOcnZq5GBqLkilXBZhBsus5ZK89VbKkRt-a-BZI6DzZ7iur1lQ953KJ9bemnxgahuQU9XJu6pFPdu8meT8vragzEjpMCwMGLlgLo6h5z1JumQTu4IJd4v15xqMf_8ZLP_Y1bSLdbnrD-LL71i2Kj7DLxaWWF4) diff --git a/beacon-chain/blockchain/BUILD.bazel b/beacon-chain/blockchain/BUILD.bazel index ce5d0869e..6a405d14e 100644 --- a/beacon-chain/blockchain/BUILD.bazel +++ b/beacon-chain/blockchain/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "core.go", "service.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/beacon-chain/blockchain", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/blockchain", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/database:go_default_library", diff --git a/beacon-chain/blockchain/core.go b/beacon-chain/blockchain/core.go index 6c5b52eba..ac6f31f2d 100644 --- a/beacon-chain/blockchain/core.go +++ b/beacon-chain/blockchain/core.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/rlp" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/types" + "github.com/prysmaticlabs/prysm/beacon-chain/types" log "github.com/sirupsen/logrus" leveldberrors "github.com/syndtr/goleveldb/leveldb/errors" ) diff --git a/beacon-chain/blockchain/core_test.go b/beacon-chain/blockchain/core_test.go index 0bb8b4fce..761e887fc 100644 --- a/beacon-chain/blockchain/core_test.go +++ b/beacon-chain/blockchain/core_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/database" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/types" + "github.com/prysmaticlabs/prysm/beacon-chain/database" + "github.com/prysmaticlabs/prysm/beacon-chain/types" logTest "github.com/sirupsen/logrus/hooks/test" ) @@ -70,7 +70,7 @@ func TestMutateActiveState(t *testing.T) { // Initializing a new beacon chain should deserialize persisted state from disk. newBeaconChain, err := NewBeaconChain(db.DB()) if err != nil { - t.Fatalf("unable to setup beacon chain: %v", err) + t.Fatalf("unable to setup second beacon chain: %v", err) } // The active state should still be the one we mutated and persited earlier. if active.AttestationCount != newBeaconChain.state.ActiveState.AttestationCount { @@ -109,7 +109,7 @@ func TestMutateCrystallizedState(t *testing.T) { // Initializing a new beacon chain should deserialize persisted state from disk. newBeaconChain, err := NewBeaconChain(db.DB()) if err != nil { - t.Fatalf("unable to setup beacon chain: %v", err) + t.Fatalf("unable to setup second beacon chain: %v", err) } // The crystallized state should still be the one we mutated and persited earlier. if crystallized.Dynasty != newBeaconChain.state.CrystallizedState.Dynasty { diff --git a/beacon-chain/blockchain/service.go b/beacon-chain/blockchain/service.go index 72ee1ce1d..2ddea68e4 100644 --- a/beacon-chain/blockchain/service.go +++ b/beacon-chain/blockchain/service.go @@ -3,7 +3,7 @@ package blockchain import ( "context" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/database" + "github.com/prysmaticlabs/prysm/beacon-chain/database" log "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/blockchain/service_test.go b/beacon-chain/blockchain/service_test.go index 2862babca..84c09fac3 100644 --- a/beacon-chain/blockchain/service_test.go +++ b/beacon-chain/blockchain/service_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/database" + "github.com/prysmaticlabs/prysm/beacon-chain/database" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/beacon-chain/database/BUILD.bazel b/beacon-chain/database/BUILD.bazel index acfbfb588..8d5f3a8eb 100644 --- a/beacon-chain/database/BUILD.bazel +++ b/beacon-chain/database/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["database.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/beacon-chain/database", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/database", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//shared/database:go_default_library", diff --git a/beacon-chain/database/database.go b/beacon-chain/database/database.go index e46706a91..afd41fc3d 100644 --- a/beacon-chain/database/database.go +++ b/beacon-chain/database/database.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/ethereum/go-ethereum/ethdb" - sharedDB "github.com/prysmaticlabs/geth-sharding/shared/database" + sharedDB "github.com/prysmaticlabs/prysm/shared/database" log "github.com/sirupsen/logrus" ) diff --git a/beacon-chain/database/database_test.go b/beacon-chain/database/database_test.go index 051b0bb58..01c2c7dcc 100644 --- a/beacon-chain/database/database_test.go +++ b/beacon-chain/database/database_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/prysmaticlabs/geth-sharding/shared" + "github.com/prysmaticlabs/prysm/shared" logTest "github.com/sirupsen/logrus/hooks/test" leveldberrors "github.com/syndtr/goleveldb/leveldb/errors" ) diff --git a/beacon-chain/main.go b/beacon-chain/main.go index 537a8d805..81ff51d8e 100644 --- a/beacon-chain/main.go +++ b/beacon-chain/main.go @@ -4,10 +4,10 @@ import ( "os" "runtime" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/node" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/utils" - "github.com/prysmaticlabs/geth-sharding/shared/cmd" - "github.com/prysmaticlabs/geth-sharding/shared/debug" + "github.com/prysmaticlabs/prysm/beacon-chain/node" + "github.com/prysmaticlabs/prysm/beacon-chain/utils" + "github.com/prysmaticlabs/prysm/shared/cmd" + "github.com/prysmaticlabs/prysm/shared/debug" log "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/beacon-chain/node/BUILD.bazel b/beacon-chain/node/BUILD.bazel index 3e9a46201..5dfeac491 100644 --- a/beacon-chain/node/BUILD.bazel +++ b/beacon-chain/node/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["node.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/beacon-chain/node", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/node", visibility = ["//beacon-chain:__subpackages__"], deps = [ "//beacon-chain/blockchain:go_default_library", diff --git a/beacon-chain/node/node.go b/beacon-chain/node/node.go index 8ed4fb6b8..d40ac8ec6 100644 --- a/beacon-chain/node/node.go +++ b/beacon-chain/node/node.go @@ -9,13 +9,13 @@ import ( "syscall" "github.com/ethereum/go-ethereum/common" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/blockchain" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/database" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/powchain" - "github.com/prysmaticlabs/geth-sharding/beacon-chain/utils" - "github.com/prysmaticlabs/geth-sharding/shared" - "github.com/prysmaticlabs/geth-sharding/shared/cmd" - "github.com/prysmaticlabs/geth-sharding/shared/debug" + "github.com/prysmaticlabs/prysm/beacon-chain/blockchain" + "github.com/prysmaticlabs/prysm/beacon-chain/database" + "github.com/prysmaticlabs/prysm/beacon-chain/powchain" + "github.com/prysmaticlabs/prysm/beacon-chain/utils" + "github.com/prysmaticlabs/prysm/shared" + "github.com/prysmaticlabs/prysm/shared/cmd" + "github.com/prysmaticlabs/prysm/shared/debug" log "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/beacon-chain/params/BUILD.bazel b/beacon-chain/params/BUILD.bazel index f0614d950..60f08de3e 100644 --- a/beacon-chain/params/BUILD.bazel +++ b/beacon-chain/params/BUILD.bazel @@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["config.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/beacon-chain/params", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/params", visibility = ["//beacon-chain:__subpackages__"], ) diff --git a/beacon-chain/powchain/BUILD.bazel b/beacon-chain/powchain/BUILD.bazel index a91dd37a9..cbb0771aa 100644 --- a/beacon-chain/powchain/BUILD.bazel +++ b/beacon-chain/powchain/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["service.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/beacon-chain/powchain", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/powchain", visibility = ["//beacon-chain:__subpackages__"], deps = [ "@com_github_ethereum_go_ethereum//:go_default_library", diff --git a/beacon-chain/types/BUILD.bazel b/beacon-chain/types/BUILD.bazel index 3c37f0006..5a5f397af 100644 --- a/beacon-chain/types/BUILD.bazel +++ b/beacon-chain/types/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "block.go", "state.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/beacon-chain/types", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/types", visibility = ["//beacon-chain:__subpackages__"], deps = ["@com_github_ethereum_go_ethereum//common:go_default_library"], ) diff --git a/beacon-chain/utils/BUILD.bazel b/beacon-chain/utils/BUILD.bazel index 283eb827a..9846b28ad 100644 --- a/beacon-chain/utils/BUILD.bazel +++ b/beacon-chain/utils/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["flags.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/beacon-chain/utils", + importpath = "github.com/prysmaticlabs/prysm/beacon-chain/utils", visibility = ["//beacon-chain:__subpackages__"], deps = ["@com_github_urfave_cli//:go_default_library"], ) diff --git a/sharding/BUILD.bazel b/client/BUILD.bazel similarity index 59% rename from sharding/BUILD.bazel rename to client/BUILD.bazel index 427a08af1..a1ae09a10 100644 --- a/sharding/BUILD.bazel +++ b/client/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client", + visibility = ["//client:__subpackages__"], deps = [ - "//sharding/node:go_default_library", - "//sharding/utils:go_default_library", + "//client/node:go_default_library", + "//client/utils:go_default_library", "//shared/cmd:go_default_library", "//shared/debug:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", @@ -16,7 +16,7 @@ go_library( ) go_binary( - name = "sharding", + name = "client", embed = [":go_default_library"], - visibility = ["//sharding:__subpackages__"], + visibility = ["//client:__subpackages__"], ) diff --git a/sharding/CONTRIBUTING.md b/client/CONTRIBUTING.md similarity index 70% rename from sharding/CONTRIBUTING.md rename to client/CONTRIBUTING.md index 25b8e5b22..87a69a724 100644 --- a/sharding/CONTRIBUTING.md +++ b/client/CONTRIBUTING.md @@ -1,27 +1,27 @@ # Contribution Guidelines -Excited by our work and want to get involved in building out our sharding releases? Or maybe you haven't learned as much about the Ethereum protocol but are a savvy developer? Our [READINGS.md](https://github.com/prysmaticlabs/geth-sharding/blob/master/sharding/READINGS.md) doc includes comprehensive information on Ethereum and sharding for both part-time and core contributors to the project. +Excited by our work and want to get involved in building out our sharding releases? Or maybe you haven't learned as much about the Ethereum protocol but are a savvy developer? Our [READINGS.md](https://github.com/prysmaticlabs/prysm/master/client/READINGS.md) doc includes comprehensive information on Ethereum and sharding for both part-time and core contributors to the project. -Additionally, our [Sharding Reference Implementation Doc](https://github.com/prysmaticlabs/geth-sharding/blob/master/sharding/README.md) serves source of truth for all things related to our implementation of sharding fo Ethereum. +Additionally, our [Sharding Reference Implementation Doc](https://github.com/prysmaticlabs/prysm/master/client/README.md) serves source of truth for all things related to our implementation of sharding fo Ethereum. -You can explore our [Current Projects](https://github.com/prysmaticlabs/geth-sharding/projects) in-the works for our different releases. Feel free to fork our repo and start creating PR’s after assigning yourself to an issue of interest. We are always chatting on [Gitter](https://gitter.im/prysmaticlabs/geth-sharding), so drop us a line there if you want to get more involved or have any questions on our implementation! +You can explore our [Current Projects](https://github.com/prysmaticlabs/prysm/projects) in-the works for our different releases. Feel free to fork our repo and start creating PR’s after assigning yourself to an issue of interest. We are always chatting on [Gitter](https://gitter.im/prysmaticlabs/prysm) drop us a line there if you want to get more involved or have any questions on our implementation! **Contribution Steps** -- Follow the setup instructions in our [README.md](https://github.com/prysmaticlabs/geth-sharding/blob/master/README.md) +- Follow the setup instructions in our [README.md](https://github.com/prysmaticlabs/prysm/master/README.md) - Create a folder in your `$GOPATH` and navigate to it `mkdir -p $GOPATH/src/github.com/prysmaticlabs && cd $GOPATH/src/github.com/prysmaticlabs` -- `git clone https://github.com/prysmaticlabs/geth-sharding` -- Fork the our repository on Github: +- `git clone https://github.com/prysmaticlabs/prysm` +- Fork the our repository on Github: - Add a remote to your fork - \`git remote add YOURNAME + \`git remote add YOURNAME -Now you should have a remote pointing to the `origin` repo (geth-sharding). To commit changes and start a Pull Request, our workflow is as follows: +Now you should have a remote pointing to the `origin` repo (prysm) commit changes and start a Pull Request, our workflow is as follows: - Create a new branch with a clear feature name such as `git checkout -b collations-pool` - Issue changes with clear commit messages - Run the linter and tester as follows `gometalinter && bazel test //...` - Push to your remote `git push YOURNAME collations-pool` -- Go to the [geth-sharding](https://github.com/prysmaticlabs/geth-sharding) repository on Github and start a PR comparing `geth-sharding:master` with `geth-sharding:collations-pool` (your fork on your profile). +- Go to the [prysm](https://github.com/prysmaticlabs/prysm) repository on Github and start a PR comparing `prysm:master` with `prysm:collations-pool` (your fork on your profile). - Add a clear PR title along with a description of what this PR encompasses, when it can be closed, and what you are currently working on. Github markdown checklists work great for this. Pull requests must be cleanly rebased ontop of master. If master advances while your PR is in review, please keep rebasing it. @@ -44,7 +44,7 @@ Anyone can become a part-time contributor and help out on implementing sharding. - Follow up on open PRs - Have an estimated timeframe to completion and let the core contributors know if a PR will take longer than expected -We do not expect all part-time contributors to be experts on all the latest sharding documentation, but all contributors should at least be familiarized with our sharding [README.md](https://github.com/prysmaticlabs/geth-sharding/blob/master/sharding/README.md) and have gone through the required Ethereum readings as posted on our [READINGS.md](https://github.com/prysmaticlabs/geth-sharding/blob/master/sharding/READINGS.md) document. +We do not expect all part-time contributors to be experts on all the latest sharding documentation, but all contributors should at least be familiarized with our sharding [README.md](https://github.com/prysmaticlabs/prysm/master/client/README.md) and have gone through the required Ethereum readings as posted on our [READINGS.md](https://github.com/prysmaticlabs/prysm/master/client/READINGS.md) document. ### Core Contributors diff --git a/sharding/READINGS.md b/client/READINGS.md similarity index 100% rename from sharding/READINGS.md rename to client/READINGS.md diff --git a/sharding/README.md b/client/README.md similarity index 97% rename from sharding/README.md rename to client/README.md index a650f3655..5a947fc18 100644 --- a/sharding/README.md +++ b/client/README.md @@ -115,11 +115,7 @@ A basic, end-to-end example of the system is as follows: ## System Start and User Entrypoint -Our Ruby Release requires users to start a local geth node running a localized, private blockchain to deploy the **Validator Registration Contract**. Then, the deployed address of this contract can be supplied to the beacon chain as an argument: - - beacon-chain --datadir /path/to/your/datadir --password /path/to/your/password.txt --networkid 12345 --vrc VALIDATOR_REGISTRATION_CONTRACT_ADDRESS - -This will kickstart the entire beacon chain sync process and listen for registrations of validators in the main chain VRC. The beacon node begins to work by its main loop, which involves the following steps: +Our Ruby Release requires users to start a local geth node running a localized, private blockchain to deploy the **Validator Registration Contract**. This will kickstart the entire beacon chain sync process and listen for registrations of validators in the main chain VRC. The beacon node begins to work by its main loop, which involves the following steps: 1. _**Sync to the latest block header on the beacon chain:**_ the node will begin a sync process for the beacon chain @@ -217,7 +213,7 @@ With a sharded network comes sharded state storage. State sync today is difficul # Acknowledgements -A special thanks for entire [Prysmatic Labs](https://gitter.im/prysmaticlabs/geth-sharding) team for helping put this together and to Ethereum Research (Hsiao-Wei Wang, Vitalik, Justin Drake) for the help and guidance in our approach. +A special thanks for entire [Prysmatic Labs](https://gitter.im/prysmaticlabs/prysm) team for helping put this together and to Ethereum Research (Hsiao-Wei Wang, Vitalik, Justin Drake) for the help and guidance in our approach. # References diff --git a/sharding/contracts/BUILD.bazel b/client/contracts/BUILD.bazel similarity index 87% rename from sharding/contracts/BUILD.bazel rename to client/contracts/BUILD.bazel index 91f73d584..3395f48c5 100644 --- a/sharding/contracts/BUILD.bazel +++ b/client/contracts/BUILD.bazel @@ -7,8 +7,8 @@ go_library( "sharding_manager.go", "types.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/contracts", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/contracts", + visibility = ["//client:__subpackages__"], deps = [ "@com_github_ethereum_go_ethereum//:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi:go_default_library", @@ -24,7 +24,7 @@ go_test( srcs = ["sharding_manager_test.go"], embed = [":go_default_library"], deps = [ - "//sharding/params:go_default_library", + "//client/params:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind/backends:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", diff --git a/sharding/contracts/contracts.go b/client/contracts/contracts.go similarity index 100% rename from sharding/contracts/contracts.go rename to client/contracts/contracts.go diff --git a/sharding/contracts/sharding_manager.go b/client/contracts/sharding_manager.go similarity index 100% rename from sharding/contracts/sharding_manager.go rename to client/contracts/sharding_manager.go diff --git a/sharding/contracts/sharding_manager.sol b/client/contracts/sharding_manager.sol similarity index 100% rename from sharding/contracts/sharding_manager.sol rename to client/contracts/sharding_manager.sol diff --git a/sharding/contracts/sharding_manager_test.go b/client/contracts/sharding_manager_test.go similarity index 99% rename from sharding/contracts/sharding_manager_test.go rename to client/contracts/sharding_manager_test.go index c7649d4f0..d16087543 100644 --- a/sharding/contracts/sharding_manager_test.go +++ b/client/contracts/sharding_manager_test.go @@ -13,7 +13,7 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/prysmaticlabs/geth-sharding/sharding/params" + "github.com/prysmaticlabs/prysm/client/params" ) type smcTestHelper struct { diff --git a/sharding/contracts/types.go b/client/contracts/types.go similarity index 100% rename from sharding/contracts/types.go rename to client/contracts/types.go diff --git a/sharding/database/BUILD.bazel b/client/database/BUILD.bazel similarity index 78% rename from sharding/database/BUILD.bazel rename to client/database/BUILD.bazel index c046d71cb..d19cb3722 100644 --- a/sharding/database/BUILD.bazel +++ b/client/database/BUILD.bazel @@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["database.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/database", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/database", + visibility = ["//client:__subpackages__"], deps = [ "//shared/database:go_default_library", "@com_github_ethereum_go_ethereum//ethdb:go_default_library", @@ -17,7 +17,7 @@ go_test( srcs = ["database_test.go"], embed = [":go_default_library"], deps = [ - "//sharding/types:go_default_library", + "//client/types:go_default_library", "@com_github_sirupsen_logrus//hooks/test:go_default_library", "@com_github_syndtr_goleveldb//leveldb/errors:go_default_library", ], diff --git a/sharding/database/database.go b/client/database/database.go similarity index 96% rename from sharding/database/database.go rename to client/database/database.go index b6a72f071..c0945a258 100644 --- a/sharding/database/database.go +++ b/client/database/database.go @@ -8,7 +8,7 @@ import ( "path/filepath" "github.com/ethereum/go-ethereum/ethdb" - sharedDB "github.com/prysmaticlabs/geth-sharding/shared/database" + sharedDB "github.com/prysmaticlabs/prysm/shared/database" log "github.com/sirupsen/logrus" ) diff --git a/sharding/database/database_test.go b/client/database/database_test.go similarity index 98% rename from sharding/database/database_test.go rename to client/database/database_test.go index f0cf88707..b0b43313c 100644 --- a/sharding/database/database_test.go +++ b/client/database/database_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/types" logTest "github.com/sirupsen/logrus/hooks/test" leveldberrors "github.com/syndtr/goleveldb/leveldb/errors" ) diff --git a/sharding/internal/BUILD.bazel b/client/internal/BUILD.bazel similarity index 76% rename from sharding/internal/BUILD.bazel rename to client/internal/BUILD.bazel index ba3ca0525..1e8a742d4 100644 --- a/sharding/internal/BUILD.bazel +++ b/client/internal/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["client_helper.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/internal", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/internal", + visibility = ["//client:__subpackages__"], deps = [ - "//sharding/contracts:go_default_library", - "//sharding/params:go_default_library", + "//client/contracts:go_default_library", + "//client/params:go_default_library", "@com_github_ethereum_go_ethereum//:go_default_library", "@com_github_ethereum_go_ethereum//accounts:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", diff --git a/sharding/internal/README.md b/client/internal/README.md similarity index 100% rename from sharding/internal/README.md rename to client/internal/README.md diff --git a/sharding/internal/client_helper.go b/client/internal/client_helper.go similarity index 95% rename from sharding/internal/client_helper.go rename to client/internal/client_helper.go index 959957cd8..f0243b004 100644 --- a/sharding/internal/client_helper.go +++ b/client/internal/client_helper.go @@ -14,8 +14,8 @@ import ( "github.com/ethereum/go-ethereum/core" gethTypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/prysmaticlabs/geth-sharding/sharding/contracts" - shardparams "github.com/prysmaticlabs/geth-sharding/sharding/params" + "github.com/prysmaticlabs/prysm/client/contracts" + shardparams "github.com/prysmaticlabs/prysm/client/params" ) var ( diff --git a/sharding/main.go b/client/main.go similarity index 86% rename from sharding/main.go rename to client/main.go index 5644787f9..810dec946 100644 --- a/sharding/main.go +++ b/client/main.go @@ -4,10 +4,10 @@ import ( "os" "runtime" - "github.com/prysmaticlabs/geth-sharding/sharding/node" - "github.com/prysmaticlabs/geth-sharding/sharding/utils" - "github.com/prysmaticlabs/geth-sharding/shared/cmd" - "github.com/prysmaticlabs/geth-sharding/shared/debug" + "github.com/prysmaticlabs/prysm/client/node" + "github.com/prysmaticlabs/prysm/client/utils" + "github.com/prysmaticlabs/prysm/shared/cmd" + "github.com/prysmaticlabs/prysm/shared/debug" log "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/sharding/mainchain/BUILD.bazel b/client/mainchain/BUILD.bazel similarity index 85% rename from sharding/mainchain/BUILD.bazel rename to client/mainchain/BUILD.bazel index abf49db75..50d94184b 100644 --- a/sharding/mainchain/BUILD.bazel +++ b/client/mainchain/BUILD.bazel @@ -7,11 +7,11 @@ go_library( "smc_client.go", "utils.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/mainchain", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/mainchain", + visibility = ["//client:__subpackages__"], deps = [ - "//sharding/contracts:go_default_library", - "//sharding/params:go_default_library", + "//client/contracts:go_default_library", + "//client/params:go_default_library", "@com_github_ethereum_go_ethereum//:go_default_library", "@com_github_ethereum_go_ethereum//accounts:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", @@ -30,7 +30,7 @@ go_test( srcs = ["smc_client_test.go"], embed = [":go_default_library"], deps = [ - "//sharding/types:go_default_library", + "//client/types:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind/backends:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//core:go_default_library", diff --git a/sharding/mainchain/interfaces.go b/client/mainchain/interfaces.go similarity index 97% rename from sharding/mainchain/interfaces.go rename to client/mainchain/interfaces.go index f6ae568d0..8a39a12e9 100644 --- a/sharding/mainchain/interfaces.go +++ b/client/mainchain/interfaces.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" gethTypes "github.com/ethereum/go-ethereum/core/types" - "github.com/prysmaticlabs/geth-sharding/sharding/contracts" + "github.com/prysmaticlabs/prysm/client/contracts" ) // Signer defines an interface that can read from the Ethereum mainchain as well call diff --git a/sharding/mainchain/smc_client.go b/client/mainchain/smc_client.go similarity index 99% rename from sharding/mainchain/smc_client.go rename to client/mainchain/smc_client.go index fa510d344..5ab7ad1b4 100644 --- a/sharding/mainchain/smc_client.go +++ b/client/mainchain/smc_client.go @@ -21,7 +21,7 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/rpc" - "github.com/prysmaticlabs/geth-sharding/sharding/contracts" + "github.com/prysmaticlabs/prysm/client/contracts" log "github.com/sirupsen/logrus" ) diff --git a/sharding/mainchain/smc_client_test.go b/client/mainchain/smc_client_test.go similarity index 99% rename from sharding/mainchain/smc_client_test.go rename to client/mainchain/smc_client_test.go index cf11124ae..019ff3e05 100644 --- a/sharding/mainchain/smc_client_test.go +++ b/client/mainchain/smc_client_test.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/types" ) var ( diff --git a/sharding/mainchain/utils.go b/client/mainchain/utils.go similarity index 93% rename from sharding/mainchain/utils.go rename to client/mainchain/utils.go index 8de8de371..2be38fe68 100644 --- a/sharding/mainchain/utils.go +++ b/client/mainchain/utils.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/rpc" - "github.com/prysmaticlabs/geth-sharding/sharding/contracts" - "github.com/prysmaticlabs/geth-sharding/sharding/params" + "github.com/prysmaticlabs/prysm/client/contracts" + "github.com/prysmaticlabs/prysm/client/params" log "github.com/sirupsen/logrus" ) diff --git a/client/node/BUILD.bazel b/client/node/BUILD.bazel new file mode 100644 index 000000000..99b4ca38e --- /dev/null +++ b/client/node/BUILD.bazel @@ -0,0 +1,34 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = ["backend.go"], + importpath = "github.com/prysmaticlabs/prysm/client/node", + visibility = ["//client:__subpackages__"], + deps = [ + "//client/database:go_default_library", + "//client/mainchain:go_default_library", + "//client/notary:go_default_library", + "//client/observer:go_default_library", + "//client/p2p:go_default_library", + "//client/params:go_default_library", + "//client/proposer:go_default_library", + "//client/simulator:go_default_library", + "//client/syncer:go_default_library", + "//client/txpool:go_default_library", + "//client/utils:go_default_library", + "//shared:go_default_library", + "//shared/cmd:go_default_library", + "//shared/debug:go_default_library", + "@com_github_ethereum_go_ethereum//node:go_default_library", + "@com_github_sirupsen_logrus//:go_default_library", + "@com_github_urfave_cli//:go_default_library", + ], +) + +go_test( + name = "go_default_test", + srcs = ["backend_test.go"], + embed = [":go_default_library"], + deps = ["@com_github_urfave_cli//:go_default_library"], +) diff --git a/sharding/node/backend.go b/client/node/backend.go similarity index 90% rename from sharding/node/backend.go rename to client/node/backend.go index 2c1c283df..0345cc841 100644 --- a/sharding/node/backend.go +++ b/client/node/backend.go @@ -13,20 +13,20 @@ import ( "time" "github.com/ethereum/go-ethereum/node" - "github.com/prysmaticlabs/geth-sharding/sharding/database" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/notary" - "github.com/prysmaticlabs/geth-sharding/sharding/observer" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/params" - "github.com/prysmaticlabs/geth-sharding/sharding/proposer" - "github.com/prysmaticlabs/geth-sharding/sharding/simulator" - "github.com/prysmaticlabs/geth-sharding/sharding/syncer" - "github.com/prysmaticlabs/geth-sharding/sharding/txpool" - "github.com/prysmaticlabs/geth-sharding/sharding/utils" - "github.com/prysmaticlabs/geth-sharding/shared" - "github.com/prysmaticlabs/geth-sharding/shared/cmd" - "github.com/prysmaticlabs/geth-sharding/shared/debug" + "github.com/prysmaticlabs/prysm/client/database" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/notary" + "github.com/prysmaticlabs/prysm/client/observer" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/params" + "github.com/prysmaticlabs/prysm/client/proposer" + "github.com/prysmaticlabs/prysm/client/simulator" + "github.com/prysmaticlabs/prysm/client/syncer" + "github.com/prysmaticlabs/prysm/client/txpool" + "github.com/prysmaticlabs/prysm/client/utils" + "github.com/prysmaticlabs/prysm/shared" + "github.com/prysmaticlabs/prysm/shared/cmd" + "github.com/prysmaticlabs/prysm/shared/debug" log "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/sharding/node/backend_test.go b/client/node/backend_test.go similarity index 100% rename from sharding/node/backend_test.go rename to client/node/backend_test.go diff --git a/sharding/notary/BUILD.bazel b/client/notary/BUILD.bazel similarity index 60% rename from sharding/notary/BUILD.bazel rename to client/notary/BUILD.bazel index 1c0ad7f61..a168f1d24 100644 --- a/sharding/notary/BUILD.bazel +++ b/client/notary/BUILD.bazel @@ -6,14 +6,14 @@ go_library( "notary.go", "service.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/notary", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/notary", + visibility = ["//client:__subpackages__"], deps = [ - "//sharding/contracts:go_default_library", - "//sharding/database:go_default_library", - "//sharding/mainchain:go_default_library", - "//sharding/p2p:go_default_library", - "//sharding/params:go_default_library", + "//client/contracts:go_default_library", + "//client/database:go_default_library", + "//client/mainchain:go_default_library", + "//client/p2p:go_default_library", + "//client/params:go_default_library", "@com_github_ethereum_go_ethereum//accounts:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//core/types:go_default_library", @@ -28,9 +28,9 @@ go_test( srcs = ["service_test.go"], embed = [":go_default_library"], deps = [ - "//sharding/internal:go_default_library", - "//sharding/params:go_default_library", - "//sharding/types:go_default_library", + "//client/internal:go_default_library", + "//client/params:go_default_library", + "//client/types:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", ], ) diff --git a/sharding/notary/notary.go b/client/notary/notary.go similarity index 96% rename from sharding/notary/notary.go rename to client/notary/notary.go index 2e3c605e6..4df9d220b 100644 --- a/sharding/notary/notary.go +++ b/client/notary/notary.go @@ -10,9 +10,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" gethTypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" - "github.com/prysmaticlabs/geth-sharding/sharding/contracts" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - shardparams "github.com/prysmaticlabs/geth-sharding/sharding/params" + "github.com/prysmaticlabs/prysm/client/contracts" + "github.com/prysmaticlabs/prysm/client/mainchain" + shardparams "github.com/prysmaticlabs/prysm/client/params" log "github.com/sirupsen/logrus" ) diff --git a/sharding/notary/service.go b/client/notary/service.go similarity index 87% rename from sharding/notary/service.go rename to client/notary/service.go index 99c6fd54a..5f86f6112 100644 --- a/sharding/notary/service.go +++ b/client/notary/service.go @@ -3,10 +3,10 @@ package notary import ( - "github.com/prysmaticlabs/geth-sharding/sharding/database" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/params" + "github.com/prysmaticlabs/prysm/client/database" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/params" log "github.com/sirupsen/logrus" ) diff --git a/sharding/notary/service_test.go b/client/notary/service_test.go similarity index 92% rename from sharding/notary/service_test.go rename to client/notary/service_test.go index 962c1e4d4..8fc24fcf6 100644 --- a/sharding/notary/service_test.go +++ b/client/notary/service_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/prysmaticlabs/geth-sharding/sharding/internal" - shardparams "github.com/prysmaticlabs/geth-sharding/sharding/params" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/internal" + shardparams "github.com/prysmaticlabs/prysm/client/params" + "github.com/prysmaticlabs/prysm/client/types" ) // Verifies that Notary implements the Actor interface. diff --git a/client/observer/BUILD.bazel b/client/observer/BUILD.bazel new file mode 100644 index 000000000..d8eac092f --- /dev/null +++ b/client/observer/BUILD.bazel @@ -0,0 +1,31 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = ["service.go"], + importpath = "github.com/prysmaticlabs/prysm/client/observer", + visibility = ["//client:__subpackages__"], + deps = [ + "//client/database:go_default_library", + "//client/mainchain:go_default_library", + "//client/p2p:go_default_library", + "//client/syncer:go_default_library", + "//client/types:go_default_library", + "@com_github_sirupsen_logrus//:go_default_library", + ], +) + +go_test( + name = "go_default_test", + srcs = ["service_test.go"], + embed = [":go_default_library"], + deps = [ + "//client/database:go_default_library", + "//client/mainchain:go_default_library", + "//client/p2p:go_default_library", + "//client/params:go_default_library", + "//client/syncer:go_default_library", + "//client/types:go_default_library", + "@com_github_sirupsen_logrus//hooks/test:go_default_library", + ], +) diff --git a/sharding/observer/service.go b/client/observer/service.go similarity index 84% rename from sharding/observer/service.go rename to client/observer/service.go index 8feffc48e..372138400 100644 --- a/sharding/observer/service.go +++ b/client/observer/service.go @@ -6,11 +6,11 @@ import ( "context" "math/big" - "github.com/prysmaticlabs/geth-sharding/sharding/database" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/syncer" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/database" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/syncer" + "github.com/prysmaticlabs/prysm/client/types" log "github.com/sirupsen/logrus" ) diff --git a/sharding/observer/service_test.go b/client/observer/service_test.go similarity index 82% rename from sharding/observer/service_test.go rename to client/observer/service_test.go index 833a58da2..0ad00273e 100644 --- a/sharding/observer/service_test.go +++ b/client/observer/service_test.go @@ -3,12 +3,12 @@ package observer import ( "testing" - "github.com/prysmaticlabs/geth-sharding/sharding/database" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/params" - "github.com/prysmaticlabs/geth-sharding/sharding/syncer" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/database" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/params" + "github.com/prysmaticlabs/prysm/client/syncer" + "github.com/prysmaticlabs/prysm/client/types" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/sharding/p2p/BUILD.bazel b/client/p2p/BUILD.bazel similarity index 92% rename from sharding/p2p/BUILD.bazel rename to client/p2p/BUILD.bazel index 0f4830f5b..4cf1759bc 100644 --- a/sharding/p2p/BUILD.bazel +++ b/client/p2p/BUILD.bazel @@ -11,8 +11,8 @@ go_library( "service.go", "topics.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/p2p", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/p2p", + visibility = ["//client:__subpackages__"], deps = [ "//proto/sharding/v1:go_default_library", "@com_github_ethereum_go_ethereum//event:go_default_library", @@ -41,8 +41,8 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//client/types:go_default_library", "//proto/sharding/v1:go_default_library", - "//sharding/types:go_default_library", "@com_github_ethereum_go_ethereum//event:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", "@com_github_libp2p_go_floodsub//:go_default_library", diff --git a/sharding/p2p/discovery.go b/client/p2p/discovery.go similarity index 96% rename from sharding/p2p/discovery.go rename to client/p2p/discovery.go index fd074f82f..b0e5e54fc 100644 --- a/sharding/p2p/discovery.go +++ b/client/p2p/discovery.go @@ -8,7 +8,7 @@ import ( peer "github.com/libp2p/go-libp2p-peer" ps "github.com/libp2p/go-libp2p-peerstore" mdns "github.com/libp2p/go-libp2p/p2p/discovery" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" log "github.com/sirupsen/logrus" ) diff --git a/sharding/p2p/discovery_test.go b/client/p2p/discovery_test.go similarity index 100% rename from sharding/p2p/discovery_test.go rename to client/p2p/discovery_test.go diff --git a/sharding/p2p/feed.go b/client/p2p/feed.go similarity index 100% rename from sharding/p2p/feed.go rename to client/p2p/feed.go diff --git a/sharding/p2p/feed_example_test.go b/client/p2p/feed_example_test.go similarity index 100% rename from sharding/p2p/feed_example_test.go rename to client/p2p/feed_example_test.go diff --git a/sharding/p2p/feed_test.go b/client/p2p/feed_test.go similarity index 100% rename from sharding/p2p/feed_test.go rename to client/p2p/feed_test.go diff --git a/sharding/p2p/message.go b/client/p2p/message.go similarity index 100% rename from sharding/p2p/message.go rename to client/p2p/message.go diff --git a/sharding/p2p/options.go b/client/p2p/options.go similarity index 100% rename from sharding/p2p/options.go rename to client/p2p/options.go diff --git a/sharding/p2p/options_test.go b/client/p2p/options_test.go similarity index 100% rename from sharding/p2p/options_test.go rename to client/p2p/options_test.go diff --git a/sharding/p2p/peer.go b/client/p2p/peer.go similarity index 74% rename from sharding/p2p/peer.go rename to client/p2p/peer.go index c089e82de..c80a1d5a1 100644 --- a/sharding/p2p/peer.go +++ b/client/p2p/peer.go @@ -3,5 +3,5 @@ package p2p // Peer // TODO - Design and implement. // See design doc: https://docs.google.com/document/d/1cthKuGPreOSQH96Ujt7sArcT-IRICk6b-QcdD0EnLsI/edit -// https://github.com/prysmaticlabs/geth-sharding/issues/175 +// https://github.com/prysmaticlabs/prysm/issues/175 type Peer struct{} diff --git a/sharding/p2p/service.go b/client/p2p/service.go similarity index 95% rename from sharding/p2p/service.go rename to client/p2p/service.go index 6e1349385..0362eb323 100644 --- a/sharding/p2p/service.go +++ b/client/p2p/service.go @@ -19,7 +19,7 @@ import ( floodsub "github.com/libp2p/go-floodsub" libp2p "github.com/libp2p/go-libp2p" host "github.com/libp2p/go-libp2p-host" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" log "github.com/sirupsen/logrus" ) @@ -89,7 +89,7 @@ func (s *Server) Stop() error { // Send a message to a specific peer. func (s *Server) Send(msg interface{}, peer Peer) { // TODO - // https://github.com/prysmaticlabs/geth-sharding/issues/175 + // https://github.com/prysmaticlabs/prysm/issues/175 // TODO: Support passing value and pointer type messages. @@ -101,7 +101,7 @@ func (s *Server) Send(msg interface{}, peer Peer) { // Broadcast a message to the world. func (s *Server) Broadcast(msg interface{}) { - // TODO https://github.com/prysmaticlabs/geth-sharding/issues/176 + // TODO https://github.com/prysmaticlabs/prysm/issues/176 topic := topic(msg) log.Debugf("Broadcasting msg on topic %s for message type %T", topic, msg) diff --git a/sharding/p2p/service_test.go b/client/p2p/service_test.go similarity index 96% rename from sharding/p2p/service_test.go rename to client/p2p/service_test.go index a7e6cb51e..e212d47dd 100644 --- a/sharding/p2p/service_test.go +++ b/client/p2p/service_test.go @@ -9,12 +9,12 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/golang/protobuf/proto" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/types" floodsub "github.com/libp2p/go-floodsub" swarmt "github.com/libp2p/go-libp2p-swarm/testing" bhost "github.com/libp2p/go-libp2p/p2p/host/basic" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" log "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/sharding/p2p/topics.go b/client/p2p/topics.go similarity index 94% rename from sharding/p2p/topics.go rename to client/p2p/topics.go index 3b9b95101..d4006ace6 100644 --- a/sharding/p2p/topics.go +++ b/client/p2p/topics.go @@ -3,7 +3,7 @@ package p2p import ( "reflect" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" ) // Mapping of message topic enums to protobuf types. diff --git a/sharding/p2p/topics_test.go b/client/p2p/topics_test.go similarity index 94% rename from sharding/p2p/topics_test.go rename to client/p2p/topics_test.go index 983d7b259..38e43ebe5 100644 --- a/sharding/p2p/topics_test.go +++ b/client/p2p/topics_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" ) type testStruct struct{} diff --git a/sharding/params/BUILD.bazel b/client/params/BUILD.bazel similarity index 73% rename from sharding/params/BUILD.bazel rename to client/params/BUILD.bazel index b71f77b46..729f08f9d 100644 --- a/sharding/params/BUILD.bazel +++ b/client/params/BUILD.bazel @@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["config.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/params", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/params", + visibility = ["//client:__subpackages__"], deps = ["@com_github_ethereum_go_ethereum//common:go_default_library"], ) diff --git a/sharding/params/config.go b/client/params/config.go similarity index 100% rename from sharding/params/config.go rename to client/params/config.go diff --git a/sharding/params/config_test.go b/client/params/config_test.go similarity index 100% rename from sharding/params/config_test.go rename to client/params/config_test.go diff --git a/sharding/proposer/BUILD.bazel b/client/proposer/BUILD.bazel similarity index 64% rename from sharding/proposer/BUILD.bazel rename to client/proposer/BUILD.bazel index 78b722aae..082f295e7 100644 --- a/sharding/proposer/BUILD.bazel +++ b/client/proposer/BUILD.bazel @@ -6,17 +6,17 @@ go_library( "proposer.go", "service.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/proposer", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/proposer", + visibility = ["//client:__subpackages__"], deps = [ + "//client/database:go_default_library", + "//client/mainchain:go_default_library", + "//client/p2p:go_default_library", + "//client/params:go_default_library", + "//client/syncer:go_default_library", + "//client/txpool:go_default_library", + "//client/types:go_default_library", "//proto/sharding/v1:go_default_library", - "//sharding/database:go_default_library", - "//sharding/mainchain:go_default_library", - "//sharding/p2p:go_default_library", - "//sharding/params:go_default_library", - "//sharding/syncer:go_default_library", - "//sharding/txpool:go_default_library", - "//sharding/types:go_default_library", "//shared/legacyutil:go_default_library", "@com_github_ethereum_go_ethereum//accounts:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", @@ -32,8 +32,8 @@ go_test( srcs = ["service_test.go"], embed = [":go_default_library"], deps = [ - "//sharding/internal:go_default_library", - "//sharding/params:go_default_library", + "//client/internal:go_default_library", + "//client/params:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//core/types:go_default_library", diff --git a/sharding/proposer/proposer.go b/client/proposer/proposer.go similarity index 97% rename from sharding/proposer/proposer.go rename to client/proposer/proposer.go index 6c822f714..25a333e20 100644 --- a/sharding/proposer/proposer.go +++ b/client/proposer/proposer.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts/abi/bind" gethTypes "github.com/ethereum/go-ethereum/core/types" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/types" log "github.com/sirupsen/logrus" ) diff --git a/sharding/proposer/service.go b/client/proposer/service.go similarity index 87% rename from sharding/proposer/service.go rename to client/proposer/service.go index 3d6c01755..ea7b301b5 100644 --- a/sharding/proposer/service.go +++ b/client/proposer/service.go @@ -8,15 +8,15 @@ import ( gethTypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" - "github.com/prysmaticlabs/geth-sharding/sharding/database" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/params" - "github.com/prysmaticlabs/geth-sharding/sharding/syncer" - "github.com/prysmaticlabs/geth-sharding/sharding/txpool" - "github.com/prysmaticlabs/geth-sharding/sharding/types" - "github.com/prysmaticlabs/geth-sharding/shared/legacyutil" + "github.com/prysmaticlabs/prysm/client/database" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/params" + "github.com/prysmaticlabs/prysm/client/syncer" + "github.com/prysmaticlabs/prysm/client/txpool" + "github.com/prysmaticlabs/prysm/client/types" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" + "github.com/prysmaticlabs/prysm/shared/legacyutil" log "github.com/sirupsen/logrus" ) diff --git a/sharding/proposer/service_test.go b/client/proposer/service_test.go similarity index 97% rename from sharding/proposer/service_test.go rename to client/proposer/service_test.go index 875ca7611..e685c51d4 100644 --- a/sharding/proposer/service_test.go +++ b/client/proposer/service_test.go @@ -8,8 +8,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" gethTypes "github.com/ethereum/go-ethereum/core/types" - "github.com/prysmaticlabs/geth-sharding/sharding/internal" - "github.com/prysmaticlabs/geth-sharding/sharding/params" + "github.com/prysmaticlabs/prysm/client/internal" + "github.com/prysmaticlabs/prysm/client/params" ) func TestCreateCollation(t *testing.T) { diff --git a/sharding/simulator/BUILD.bazel b/client/simulator/BUILD.bazel similarity index 64% rename from sharding/simulator/BUILD.bazel rename to client/simulator/BUILD.bazel index 57d1efba7..b1557695d 100644 --- a/sharding/simulator/BUILD.bazel +++ b/client/simulator/BUILD.bazel @@ -3,14 +3,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["service.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/simulator", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/simulator", + visibility = ["//client:__subpackages__"], deps = [ + "//client/mainchain:go_default_library", + "//client/p2p:go_default_library", + "//client/params:go_default_library", + "//client/syncer:go_default_library", "//proto/sharding/v1:go_default_library", - "//sharding/mainchain:go_default_library", - "//sharding/p2p:go_default_library", - "//sharding/params:go_default_library", - "//sharding/syncer:go_default_library", "@com_github_ethereum_go_ethereum//event:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", ], @@ -22,10 +22,10 @@ go_test( srcs = ["service_test.go"], embed = [":go_default_library"], deps = [ - "//sharding/mainchain:go_default_library", - "//sharding/p2p:go_default_library", - "//sharding/params:go_default_library", - "//sharding/types:go_default_library", + "//client/mainchain:go_default_library", + "//client/p2p:go_default_library", + "//client/params:go_default_library", + "//client/types:go_default_library", "@com_github_ethereum_go_ethereum//:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", diff --git a/sharding/simulator/service.go b/client/simulator/service.go similarity index 93% rename from sharding/simulator/service.go rename to client/simulator/service.go index d7c6d0fbb..4c03b3fca 100644 --- a/sharding/simulator/service.go +++ b/client/simulator/service.go @@ -8,12 +8,12 @@ import ( "time" "github.com/ethereum/go-ethereum/event" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/params" - "github.com/prysmaticlabs/geth-sharding/sharding/syncer" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/params" + "github.com/prysmaticlabs/prysm/client/syncer" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" log "github.com/sirupsen/logrus" ) diff --git a/sharding/simulator/service_test.go b/client/simulator/service_test.go similarity index 96% rename from sharding/simulator/service_test.go rename to client/simulator/service_test.go index e951cd25f..13e5e888b 100644 --- a/sharding/simulator/service_test.go +++ b/client/simulator/service_test.go @@ -14,10 +14,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" gethTypes "github.com/ethereum/go-ethereum/core/types" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/params" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/params" + "github.com/prysmaticlabs/prysm/client/types" log "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/sharding/syncer/BUILD.bazel b/client/syncer/BUILD.bazel similarity index 68% rename from sharding/syncer/BUILD.bazel rename to client/syncer/BUILD.bazel index 844723eab..2cc0d06d0 100644 --- a/sharding/syncer/BUILD.bazel +++ b/client/syncer/BUILD.bazel @@ -6,15 +6,15 @@ go_library( "handlers.go", "service.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/syncer", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/syncer", + visibility = ["//client:__subpackages__"], deps = [ + "//client/database:go_default_library", + "//client/mainchain:go_default_library", + "//client/p2p:go_default_library", + "//client/params:go_default_library", + "//client/types:go_default_library", "//proto/sharding/v1:go_default_library", - "//sharding/database:go_default_library", - "//sharding/mainchain:go_default_library", - "//sharding/p2p:go_default_library", - "//sharding/params:go_default_library", - "//sharding/types:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//event:go_default_library", @@ -31,13 +31,13 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//client/contracts:go_default_library", + "//client/database:go_default_library", + "//client/mainchain:go_default_library", + "//client/p2p:go_default_library", + "//client/params:go_default_library", + "//client/types:go_default_library", "//proto/sharding/v1:go_default_library", - "//sharding/contracts:go_default_library", - "//sharding/database:go_default_library", - "//sharding/mainchain:go_default_library", - "//sharding/p2p:go_default_library", - "//sharding/params:go_default_library", - "//sharding/types:go_default_library", "@com_github_ethereum_go_ethereum//accounts:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind/backends:go_default_library", diff --git a/sharding/syncer/handlers.go b/client/syncer/handlers.go similarity index 92% rename from sharding/syncer/handlers.go rename to client/syncer/handlers.go index 4c09d3dc9..5596fe048 100644 --- a/sharding/syncer/handlers.go +++ b/client/syncer/handlers.go @@ -6,10 +6,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/types" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" log "github.com/sirupsen/logrus" ) diff --git a/sharding/syncer/handlers_test.go b/client/syncer/handlers_test.go similarity index 96% rename from sharding/syncer/handlers_test.go rename to client/syncer/handlers_test.go index 53b01a019..e0d15efcb 100644 --- a/sharding/syncer/handlers_test.go +++ b/client/syncer/handlers_test.go @@ -15,11 +15,11 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" - "github.com/prysmaticlabs/geth-sharding/sharding/contracts" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - shardparams "github.com/prysmaticlabs/geth-sharding/sharding/params" - shardingTypes "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/contracts" + "github.com/prysmaticlabs/prysm/client/p2p" + shardparams "github.com/prysmaticlabs/prysm/client/params" + shardingTypes "github.com/prysmaticlabs/prysm/client/types" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" ) var ( diff --git a/sharding/syncer/service.go b/client/syncer/service.go similarity index 89% rename from sharding/syncer/service.go rename to client/syncer/service.go index 861d45741..43fc513aa 100644 --- a/sharding/syncer/service.go +++ b/client/syncer/service.go @@ -6,12 +6,12 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/event" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" - "github.com/prysmaticlabs/geth-sharding/sharding/database" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/params" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/database" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/params" + "github.com/prysmaticlabs/prysm/client/types" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" log "github.com/sirupsen/logrus" ) diff --git a/sharding/syncer/service_test.go b/client/syncer/service_test.go similarity index 91% rename from sharding/syncer/service_test.go rename to client/syncer/service_test.go index 59bb76215..a0d060eb2 100644 --- a/sharding/syncer/service_test.go +++ b/client/syncer/service_test.go @@ -8,12 +8,12 @@ import ( "github.com/ethereum/go-ethereum/common" gethTypes "github.com/ethereum/go-ethereum/core/types" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" - "github.com/prysmaticlabs/geth-sharding/sharding/database" - "github.com/prysmaticlabs/geth-sharding/sharding/mainchain" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" - "github.com/prysmaticlabs/geth-sharding/sharding/params" - "github.com/prysmaticlabs/geth-sharding/sharding/types" + "github.com/prysmaticlabs/prysm/client/database" + "github.com/prysmaticlabs/prysm/client/mainchain" + "github.com/prysmaticlabs/prysm/client/p2p" + "github.com/prysmaticlabs/prysm/client/params" + "github.com/prysmaticlabs/prysm/client/types" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" log "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" ) diff --git a/sharding/txpool/BUILD.bazel b/client/txpool/BUILD.bazel similarity index 64% rename from sharding/txpool/BUILD.bazel rename to client/txpool/BUILD.bazel index 5b3ab4fc2..10ad22fe4 100644 --- a/sharding/txpool/BUILD.bazel +++ b/client/txpool/BUILD.bazel @@ -3,10 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["service.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/txpool", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/txpool", + visibility = ["//client:__subpackages__"], deps = [ - "//sharding/p2p:go_default_library", + "//client/p2p:go_default_library", "@com_github_ethereum_go_ethereum//event:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", ], @@ -16,5 +16,5 @@ go_test( name = "go_default_test", srcs = ["service_test.go"], embed = [":go_default_library"], - deps = ["//sharding/types:go_default_library"], + deps = ["//client/types:go_default_library"], ) diff --git a/sharding/txpool/service.go b/client/txpool/service.go similarity index 93% rename from sharding/txpool/service.go rename to client/txpool/service.go index 965c1dc8f..039082011 100644 --- a/sharding/txpool/service.go +++ b/client/txpool/service.go @@ -3,7 +3,7 @@ package txpool import ( "github.com/ethereum/go-ethereum/event" - "github.com/prysmaticlabs/geth-sharding/sharding/p2p" + "github.com/prysmaticlabs/prysm/client/p2p" log "github.com/sirupsen/logrus" ) diff --git a/sharding/txpool/service_test.go b/client/txpool/service_test.go similarity index 63% rename from sharding/txpool/service_test.go rename to client/txpool/service_test.go index b8f29edc9..44818cbd2 100644 --- a/sharding/txpool/service_test.go +++ b/client/txpool/service_test.go @@ -1,6 +1,6 @@ package txpool -import "github.com/prysmaticlabs/geth-sharding/sharding/types" +import "github.com/prysmaticlabs/prysm/client/types" // Verifies that TXPool implements the Service interface. var _ = types.Service(&TXPool{}) diff --git a/sharding/types/BUILD.bazel b/client/types/BUILD.bazel similarity index 91% rename from sharding/types/BUILD.bazel rename to client/types/BUILD.bazel index 204c71a88..cfd7e17d7 100644 --- a/sharding/types/BUILD.bazel +++ b/client/types/BUILD.bazel @@ -7,8 +7,8 @@ go_library( "interfaces.go", "shard.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/types", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/types", + visibility = ["//client:__subpackages__"], deps = [ "//shared:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", diff --git a/sharding/types/collation.go b/client/types/collation.go similarity index 99% rename from sharding/types/collation.go rename to client/types/collation.go index edaa25202..e632da9db 100644 --- a/sharding/types/collation.go +++ b/client/types/collation.go @@ -9,7 +9,7 @@ import ( gethTypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/rlp" - "github.com/prysmaticlabs/geth-sharding/shared" + "github.com/prysmaticlabs/prysm/shared" ) // Collation defines a base struct that serves as a primitive equivalent of a "block" diff --git a/sharding/types/collation_test.go b/client/types/collation_test.go similarity index 99% rename from sharding/types/collation_test.go rename to client/types/collation_test.go index bb45aa88a..a42b27926 100644 --- a/sharding/types/collation_test.go +++ b/client/types/collation_test.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" gethTypes "github.com/ethereum/go-ethereum/core/types" - "github.com/prysmaticlabs/geth-sharding/shared" + "github.com/prysmaticlabs/prysm/shared" ) func TestCollation_Transactions(t *testing.T) { diff --git a/sharding/types/interfaces.go b/client/types/interfaces.go similarity index 100% rename from sharding/types/interfaces.go rename to client/types/interfaces.go diff --git a/sharding/types/shard.go b/client/types/shard.go similarity index 100% rename from sharding/types/shard.go rename to client/types/shard.go diff --git a/sharding/types/shard_test.go b/client/types/shard_test.go similarity index 99% rename from sharding/types/shard_test.go rename to client/types/shard_test.go index b76b06e52..cddf007fe 100644 --- a/sharding/types/shard_test.go +++ b/client/types/shard_test.go @@ -11,7 +11,7 @@ import ( "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/rlp" - sharedDB "github.com/prysmaticlabs/geth-sharding/shared/database" + sharedDB "github.com/prysmaticlabs/prysm/shared/database" ) type mockShardDB struct { diff --git a/sharding/utils/BUILD.bazel b/client/utils/BUILD.bazel similarity index 54% rename from sharding/utils/BUILD.bazel rename to client/utils/BUILD.bazel index a7045cab1..8c1a31dfb 100644 --- a/sharding/utils/BUILD.bazel +++ b/client/utils/BUILD.bazel @@ -3,10 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["flags.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/utils", - visibility = ["//sharding:__subpackages__"], + importpath = "github.com/prysmaticlabs/prysm/client/utils", + visibility = ["//client:__subpackages__"], deps = [ - "//sharding/params:go_default_library", + "//client/params:go_default_library", "@com_github_urfave_cli//:go_default_library", ], ) diff --git a/sharding/utils/flags.go b/client/utils/flags.go similarity index 93% rename from sharding/utils/flags.go rename to client/utils/flags.go index 2b46f8690..ac95433cf 100644 --- a/sharding/utils/flags.go +++ b/client/utils/flags.go @@ -3,7 +3,7 @@ package utils import ( "math/big" - shardparams "github.com/prysmaticlabs/geth-sharding/sharding/params" + shardparams "github.com/prysmaticlabs/prysm/client/params" "github.com/urfave/cli" ) diff --git a/contracts/BUILD.bazel b/contracts/BUILD.bazel index 09057778e..8c21de867 100644 --- a/contracts/BUILD.bazel +++ b/contracts/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["validator_registration.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/contracts", + importpath = "github.com/prysmaticlabs/prysm/contracts", visibility = ["//visibility:public"], deps = [ "@com_github_ethereum_go_ethereum//:go_default_library", diff --git a/contracts/deployVRC/BUILD.bazel b/contracts/deployVRC/BUILD.bazel index 1be809e9c..6dcada89f 100644 --- a/contracts/deployVRC/BUILD.bazel +++ b/contracts/deployVRC/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( name = "go_default_library", srcs = ["deployVRC.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/contracts/deployVRC", + importpath = "github.com/prysmaticlabs/prysm/contracts/deployVRC", visibility = ["//visibility:private"], deps = [ "//contracts:go_default_library", diff --git a/contracts/deployVRC/deployVRC.go b/contracts/deployVRC/deployVRC.go index e6c7ad352..5ed6ad1b0 100644 --- a/contracts/deployVRC/deployVRC.go +++ b/contracts/deployVRC/deployVRC.go @@ -13,7 +13,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" - "github.com/prysmaticlabs/geth-sharding/contracts" + "github.com/prysmaticlabs/prysm/contracts" log "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/proto/sharding/v1/BUILD.bazel b/proto/sharding/v1/BUILD.bazel index 74dd84b0c..ecd9fc8f2 100644 --- a/proto/sharding/v1/BUILD.bazel +++ b/proto/sharding/v1/BUILD.bazel @@ -9,7 +9,7 @@ proto_library( go_proto_library( name = "messages_go_proto", - importpath = "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1", + importpath = "github.com/prysmaticlabs/prysm/proto/sharding/v1", proto = ":ethereum_messages_v1_proto", visibility = ["//visibility:public"], ) @@ -17,7 +17,7 @@ go_proto_library( go_library( name = "go_default_library", embed = [":messages_go_proto"], - importpath = "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1", + importpath = "github.com/prysmaticlabs/prysm/proto/sharding/v1", visibility = ["//visibility:public"], ) diff --git a/sharding/node/BUILD.bazel b/sharding/node/BUILD.bazel deleted file mode 100644 index e16891ac5..000000000 --- a/sharding/node/BUILD.bazel +++ /dev/null @@ -1,34 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -go_library( - name = "go_default_library", - srcs = ["backend.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/node", - visibility = ["//sharding:__subpackages__"], - deps = [ - "//sharding/database:go_default_library", - "//sharding/mainchain:go_default_library", - "//sharding/notary:go_default_library", - "//sharding/observer:go_default_library", - "//sharding/p2p:go_default_library", - "//sharding/params:go_default_library", - "//sharding/proposer:go_default_library", - "//sharding/simulator:go_default_library", - "//sharding/syncer:go_default_library", - "//sharding/txpool:go_default_library", - "//sharding/utils:go_default_library", - "//shared:go_default_library", - "//shared/cmd:go_default_library", - "//shared/debug:go_default_library", - "@com_github_ethereum_go_ethereum//node:go_default_library", - "@com_github_sirupsen_logrus//:go_default_library", - "@com_github_urfave_cli//:go_default_library", - ], -) - -go_test( - name = "go_default_test", - srcs = ["backend_test.go"], - embed = [":go_default_library"], - deps = ["@com_github_urfave_cli//:go_default_library"], -) diff --git a/sharding/observer/BUILD.bazel b/sharding/observer/BUILD.bazel deleted file mode 100644 index cf19ed7de..000000000 --- a/sharding/observer/BUILD.bazel +++ /dev/null @@ -1,31 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -go_library( - name = "go_default_library", - srcs = ["service.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/sharding/observer", - visibility = ["//sharding:__subpackages__"], - deps = [ - "//sharding/database:go_default_library", - "//sharding/mainchain:go_default_library", - "//sharding/p2p:go_default_library", - "//sharding/syncer:go_default_library", - "//sharding/types:go_default_library", - "@com_github_sirupsen_logrus//:go_default_library", - ], -) - -go_test( - name = "go_default_test", - srcs = ["service_test.go"], - embed = [":go_default_library"], - deps = [ - "//sharding/database:go_default_library", - "//sharding/mainchain:go_default_library", - "//sharding/p2p:go_default_library", - "//sharding/params:go_default_library", - "//sharding/syncer:go_default_library", - "//sharding/types:go_default_library", - "@com_github_sirupsen_logrus//hooks/test:go_default_library", - ], -) diff --git a/shared/BUILD.bazel b/shared/BUILD.bazel index bb4e645be..3ed321fe6 100644 --- a/shared/BUILD.bazel +++ b/shared/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "service_registry.go", "types.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/shared", + importpath = "github.com/prysmaticlabs/prysm/shared", visibility = ["//visibility:public"], deps = ["@com_github_ethereum_go_ethereum//rlp:go_default_library"], ) diff --git a/shared/cmd/BUILD.bazel b/shared/cmd/BUILD.bazel index 938f6fecf..e69be1ad0 100644 --- a/shared/cmd/BUILD.bazel +++ b/shared/cmd/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "customflags.go", "flags.go", ], - importpath = "github.com/prysmaticlabs/geth-sharding/shared/cmd", + importpath = "github.com/prysmaticlabs/prysm/shared/cmd", visibility = ["//visibility:public"], deps = [ "@com_github_ethereum_go_ethereum//node:go_default_library", diff --git a/shared/database/BUILD.bazel b/shared/database/BUILD.bazel index b4b11d49a..469bb0a55 100644 --- a/shared/database/BUILD.bazel +++ b/shared/database/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["inmemory.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/shared/database", + importpath = "github.com/prysmaticlabs/prysm/shared/database", visibility = ["//visibility:public"], deps = [ "@com_github_ethereum_go_ethereum//common:go_default_library", diff --git a/shared/debug/BUILD.bazel b/shared/debug/BUILD.bazel index e00032fb6..c294e35cb 100644 --- a/shared/debug/BUILD.bazel +++ b/shared/debug/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["debug.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/shared/debug", + importpath = "github.com/prysmaticlabs/prysm/shared/debug", visibility = ["//visibility:public"], deps = [ "@com_github_fjl_memsize//memsizeui:go_default_library", diff --git a/shared/legacyutil/BUILD.bazel b/shared/legacyutil/BUILD.bazel index 49ba49b22..4db551024 100644 --- a/shared/legacyutil/BUILD.bazel +++ b/shared/legacyutil/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["convert_transaction.go"], - importpath = "github.com/prysmaticlabs/geth-sharding/shared/legacyutil", + importpath = "github.com/prysmaticlabs/prysm/shared/legacyutil", visibility = ["//visibility:public"], deps = [ "//proto/sharding/v1:go_default_library", diff --git a/shared/legacyutil/convert_transaction.go b/shared/legacyutil/convert_transaction.go index 86584ed06..e6f2a8bad 100644 --- a/shared/legacyutil/convert_transaction.go +++ b/shared/legacyutil/convert_transaction.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" gethTypes "github.com/ethereum/go-ethereum/core/types" - pb "github.com/prysmaticlabs/geth-sharding/proto/sharding/v1" + pb "github.com/prysmaticlabs/prysm/proto/sharding/v1" ) // TransformTransaction of proto transaction to geth's transction.