mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-22 03:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename Entire Project to Repo, Change Import Paths and Readmes (#298)

Browse Source 
Former-commit-id: b7b8bbd10777012ae6f7d30eb6b05c3b1c3ec5d3 [formerly 06e1112fa0e1092a7137186d3a386972daa2effe]
Former-commit-id: ff2bc760c9dafb6250f056606eb2cbf96b6afa5b
This commit is contained in:
Raul Jordan 2018-07-20 16:31:26 -05:00 committed by GitHub
parent dbdd8f14bd
commit 92af8bc351
104 changed files with 319 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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:

4
BUILD.bazel
View File

@ -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",
)

26
README.md
View File

@ -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)

2
beacon-chain/BUILD.bazel
View File

@ -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",

2
beacon-chain/README.md
View File

@ -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)

2
beacon-chain/blockchain/BUILD.bazel
View File

@ -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",

2
beacon-chain/blockchain/core.go
View File

@ -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"
)

8
beacon-chain/blockchain/core_test.go
View File

@ -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 {

2
beacon-chain/blockchain/service.go
View File

@ -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"
)

2
beacon-chain/blockchain/service_test.go
View File

@ -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"
)

2
beacon-chain/database/BUILD.bazel
View File

@ -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",

2
beacon-chain/database/database.go
View File

@ -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"
)

2
beacon-chain/database/database_test.go
View File

@ -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"
)

8
beacon-chain/main.go
View File

@ -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"
)

2
beacon-chain/node/BUILD.bazel
View File

@ -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",

14
beacon-chain/node/node.go
View File

@ -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"
)

2
beacon-chain/params/BUILD.bazel
View File

@ -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__"],
)

2
beacon-chain/powchain/BUILD.bazel
View File

@ -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",

2
beacon-chain/types/BUILD.bazel
View File

@ -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"],
)

2
beacon-chain/utils/BUILD.bazel
View File

@ -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"],
)

12
sharding/BUILD.bazel → client/BUILD.bazel
View File

@ -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__"],
)

20
sharding/CONTRIBUTING.md → client/CONTRIBUTING.md
View File

@ -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: <https://github.com/prysmaticlabs/geth-sharding>
- `git clone https://github.com/prysmaticlabs/prysm`
- Fork the our repository on Github: <https://github.com/prysmaticlabs/prysm>
- Add a remote to your fork
\`git remote add YOURNAME <https://github.com/YOURNAME/geth-sharding>
\`git remote add YOURNAME <https://github.com/YOURNAME/prysm>
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

0
sharding/READINGS.md → client/READINGS.md
View File

8
sharding/README.md → client/README.md
View File

@ -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

6
sharding/contracts/BUILD.bazel → client/contracts/BUILD.bazel
View File

@ -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",

0
sharding/contracts/contracts.go → client/contracts/contracts.go
View File

0
sharding/contracts/sharding_manager.go → client/contracts/sharding_manager.go
View File

0
sharding/contracts/sharding_manager.sol → client/contracts/sharding_manager.sol
View File

2
sharding/contracts/sharding_manager_test.go → client/contracts/sharding_manager_test.go
View File

@ -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 {

0
sharding/contracts/types.go → client/contracts/types.go
View File

6
sharding/database/BUILD.bazel → client/database/BUILD.bazel
View File

@ -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",
],

2
sharding/database/database.go → client/database/database.go
View File

@ -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"
)

2
sharding/database/database_test.go → client/database/database_test.go
View File

@ -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"
)

8
sharding/internal/BUILD.bazel → client/internal/BUILD.bazel
View File

@ -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",

0
sharding/internal/README.md → client/internal/README.md
View File

4
sharding/internal/client_helper.go → client/internal/client_helper.go
View File

@ -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 (

8
sharding/main.go → client/main.go
View File

@ -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"
)

10
sharding/mainchain/BUILD.bazel → client/mainchain/BUILD.bazel
View File

@ -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",

2
sharding/mainchain/interfaces.go → client/mainchain/interfaces.go
View File

@ -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

2
sharding/mainchain/smc_client.go → client/mainchain/smc_client.go
View File

@ -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"
)

2
sharding/mainchain/smc_client_test.go → client/mainchain/smc_client_test.go
View File

@ -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 (

4
sharding/mainchain/utils.go → client/mainchain/utils.go
View File

@ -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"
)

34
client/node/BUILD.bazel Normal file
View File

@ -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"],
)

28
sharding/node/backend.go → client/node/backend.go
View File

@ -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"
)

0
sharding/node/backend_test.go → client/node/backend_test.go
View File

20
sharding/notary/BUILD.bazel → client/notary/BUILD.bazel
View File

@ -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",
],
)

6
sharding/notary/notary.go → client/notary/notary.go
View File

@ -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"
)

8
sharding/notary/service.go → client/notary/service.go
View File

@ -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"
)

6
sharding/notary/service_test.go → client/notary/service_test.go
View File

@ -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.

31
client/observer/BUILD.bazel Normal file
View File

@ -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",
],
)

10
sharding/observer/service.go → client/observer/service.go
View File

@ -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"
)

12
sharding/observer/service_test.go → client/observer/service_test.go
View File

@ -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"
)

6
sharding/p2p/BUILD.bazel → client/p2p/BUILD.bazel
View File

@ -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",

2
sharding/p2p/discovery.go → client/p2p/discovery.go
View File

@ -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"
)

0
sharding/p2p/discovery_test.go → client/p2p/discovery_test.go
View File

0
sharding/p2p/feed.go → client/p2p/feed.go
View File

0
sharding/p2p/feed_example_test.go → client/p2p/feed_example_test.go
View File

0
sharding/p2p/feed_test.go → client/p2p/feed_test.go
View File

0
sharding/p2p/message.go → client/p2p/message.go
View File

0
sharding/p2p/options.go → client/p2p/options.go
View File

0
sharding/p2p/options_test.go → client/p2p/options_test.go
View File

2
sharding/p2p/peer.go → client/p2p/peer.go
View File

@ -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{}

6
sharding/p2p/service.go → client/p2p/service.go
View File

@ -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)

4
sharding/p2p/service_test.go → client/p2p/service_test.go
View File

@ -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"
)

2
sharding/p2p/topics.go → client/p2p/topics.go
View File

@ -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.

2
sharding/p2p/topics_test.go → client/p2p/topics_test.go
View File

@ -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{}

4
sharding/params/BUILD.bazel → client/params/BUILD.bazel
View File

@ -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"],
)

0
sharding/params/config.go → client/params/config.go
View File

0
sharding/params/config_test.go → client/params/config_test.go
View File

22
sharding/proposer/BUILD.bazel → client/proposer/BUILD.bazel
View File

@ -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",

4
sharding/proposer/proposer.go → client/proposer/proposer.go
View File

@ -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"
)

18
sharding/proposer/service.go → client/proposer/service.go
View File

@ -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"
)

4
sharding/proposer/service_test.go → client/proposer/service_test.go
View File

@ -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) {

20
sharding/simulator/BUILD.bazel → client/simulator/BUILD.bazel
View File

@ -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",

10
sharding/simulator/service.go → client/simulator/service.go
View File

@ -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"
)

8
sharding/simulator/service_test.go → client/simulator/service_test.go
View File

@ -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"
)

26
sharding/syncer/BUILD.bazel → client/syncer/BUILD.bazel
View File

@ -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",

8
sharding/syncer/handlers.go → client/syncer/handlers.go
View File

@ -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"
)

10
sharding/syncer/handlers_test.go → client/syncer/handlers_test.go
View File

@ -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 (

12
sharding/syncer/service.go → client/syncer/service.go
View File

@ -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"
)

12
sharding/syncer/service_test.go → client/syncer/service_test.go
View File

@ -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"
)

8
sharding/txpool/BUILD.bazel → client/txpool/BUILD.bazel
View File

@ -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"],
)

2
sharding/txpool/service.go → client/txpool/service.go
View File

@ -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"
)

2
sharding/txpool/service_test.go → client/txpool/service_test.go
View File

@ -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{})

4
sharding/types/BUILD.bazel → client/types/BUILD.bazel
View File

@ -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",

2
sharding/types/collation.go → client/types/collation.go
View File

@ -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"

2
sharding/types/collation_test.go → client/types/collation_test.go
View File

@ -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) {

0
sharding/types/interfaces.go → client/types/interfaces.go
View File

0
sharding/types/shard.go → client/types/shard.go
View File

2
sharding/types/shard_test.go → client/types/shard_test.go
View File

@ -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 {

6
sharding/utils/BUILD.bazel → client/utils/BUILD.bazel
View File

@ -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",
],
)

2
sharding/utils/flags.go → client/utils/flags.go
View File

@ -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"
)

2
contracts/BUILD.bazel
View File

@ -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",

2
contracts/deployVRC/BUILD.bazel
View File

@ -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",

2
contracts/deployVRC/deployVRC.go
View File

@ -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"
)

4
proto/sharding/v1/BUILD.bazel
View File

@ -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"],
)

34
sharding/node/BUILD.bazel
View File

@ -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"],
)

31
sharding/observer/BUILD.bazel
View File

@ -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",
],
)

2
shared/BUILD.bazel
View File

@ -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"],
)

2
shared/cmd/BUILD.bazel
View File

@ -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",

Some files were not shown because too many files have changed in this diff Show More