diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f87996cdcb..f68afdb82f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -30,11 +30,11 @@ Please make sure your contributions adhere to our coding guidelines: Before you submit a feature request, please check and make sure that it isn't possible through some other means. The JavaScript-enabled console is a powerful feature in the right hands. Please check our -[Wiki page](https://github.com/ethereum/go-ethereum/wiki) for more info +[Wiki page](https://github.com/maticnetwork/bor/wiki) for more info and help. ## Configuration, dependencies, and tests -Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) +Please see the [Developers' Guide](https://github.com/maticnetwork/bor/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies and testing procedures. diff --git a/.travis.yml b/.travis.yml index 36defe308b..c3bc169677 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/ethereum/go-ethereum +go_import_path: github.com/maticnetwork/bor sudo: false matrix: include: @@ -169,7 +169,7 @@ matrix: - mv android-ndk-r19b $ANDROID_HOME/ndk-bundle - mkdir -p $GOPATH/src/github.com/ethereum - - ln -s `pwd` $GOPATH/src/github.com/ethereum/go-ethereum + - ln -s `pwd` $GOPATH/src/github.com/maticnetwork/bor - go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds # This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads diff --git a/README.md b/README.md index fa5c73c4cd..fdc0bf331c 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ Official Golang implementation of the Ethereum protocol. -[![API Reference](https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667)](https://godoc.org/github.com/ethereum/go-ethereum) -[![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum) +[![API Reference](https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667)](https://godoc.org/github.com/maticnetwork/bor) +[![Go Report Card](https://goreportcard.com/badge/github.com/maticnetwork/bor)](https://goreportcard.com/report/github.com/maticnetwork/bor) [![Travis](https://travis-ci.org/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.org/ethereum/go-ethereum) [![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv) @@ -12,7 +12,7 @@ archives are published at https://geth.ethereum.org/downloads/. ## Building the source -For prerequisites and detailed build instructions please read the [Installation Instructions](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum) on the wiki. +For prerequisites and detailed build instructions please read the [Installation Instructions](https://github.com/maticnetwork/bor/wiki/Building-Ethereum) on the wiki. Building `geth` requires both a Go (version 1.10 or later) and a C compiler. You can install them using your favourite package manager. Once the dependencies are installed, run @@ -34,8 +34,8 @@ directory. | Command | Description | | :-----------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default), archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options) for command line options. | -| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However, it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. | +| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default), archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/maticnetwork/bor/wiki/Command-Line-Options) for command line options. | +| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However, it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/maticnetwork/bor/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. | | `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. | | `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). | | `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details. | @@ -45,7 +45,7 @@ directory. ## Running `geth` Going through all the possible command line flags is out of scope here (please consult our -[CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options)), +[CLI Wiki page](https://github.com/maticnetwork/bor/wiki/Command-Line-Options)), but we've enumerated a few common parameter combos to get you up to speed quickly on how you can run your own `geth` instance. @@ -65,9 +65,9 @@ This command will: - Start `geth` in fast sync mode (default, can be changed with the `--syncmode` flag), causing it to download more data in exchange for avoiding processing the entire history of the Ethereum network, which is very CPU intensive. -- Start up `geth`'s built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console), +- Start up `geth`'s built-in interactive [JavaScript console](https://github.com/maticnetwork/bor/wiki/JavaScript-Console), (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ethereum/wiki/wiki/JavaScript-API) - as well as `geth`'s own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs). + as well as `geth`'s own [management APIs](https://github.com/maticnetwork/bor/wiki/Management-APIs). This tool is optional and if you leave it out you can always attach to an already running `geth` instance with `geth attach`. @@ -160,7 +160,7 @@ accessible from the outside. As a developer, sooner rather than later you'll want to start interacting with `geth` and the Ethereum network via your own programs and not manually through the console. To aid this, `geth` has built-in support for a JSON-RPC based APIs ([standard APIs](https://github.com/ethereum/wiki/wiki/JSON-RPC) -and [`geth` specific APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs)). +and [`geth` specific APIs](https://github.com/maticnetwork/bor/wiki/Management-APIs)). These can be exposed via HTTP, WebSockets and IPC (UNIX sockets on UNIX based platforms, and named pipes on Windows). @@ -328,7 +328,7 @@ Please make sure your contributions adhere to our coding guidelines: - Commit messages should be prefixed with the package(s) they modify. - E.g. "eth, rpc: make trace configs optional" -Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) +Please see the [Developers' Guide](https://github.com/maticnetwork/bor/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies, and testing procedures. diff --git a/SECURITY.md b/SECURITY.md index bc54ede42f..525da2eaad 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,13 +6,13 @@ Please see Releases. We recommend to use the most recent released version. ## Audit reports -Audit reports are published in the `docs` folder: https://github.com/ethereum/go-ethereum/tree/master/docs/audits +Audit reports are published in the `docs` folder: https://github.com/maticnetwork/bor/tree/master/docs/audits | Scope | Date | Report Link | | ------- | ------- | ----------- | -| `geth` | 20170425 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) | -| `clef` | 20180914 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) | +| `geth` | 20170425 | [pdf](https://github.com/maticnetwork/bor/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) | +| `clef` | 20180914 | [pdf](https://github.com/maticnetwork/bor/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) | diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index 97a3a98bd3..ba242b14e5 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -22,7 +22,7 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // The ABI holds information about a contract's context and available diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 9cfe4208d5..ee6979c054 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index e51f0bd8ea..7a75a989bd 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -22,12 +22,12 @@ import ( "io" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/external" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/external" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" ) // NewTransactor is a utility method to easily create a transaction signer from diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index ca60cc1b43..1d93807d15 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 6c59092b79..58c2c4a44d 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,22 +24,22 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/bloombits" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/eth/filters" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rpc" ) // This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend. diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go index bd75807d75..a142b35167 100644 --- a/accounts/abi/bind/backends/simulated_test.go +++ b/accounts/abi/bind/backends/simulated_test.go @@ -21,13 +21,13 @@ import ( "math/big" "testing" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + ethereum "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" ) func TestSimulatedBackend(t *testing.T) { diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index f70f911d37..93a43f5029 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/event" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index 3ae685e00f..08b28b3366 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -23,14 +23,14 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/rlp" ) type mockCaller struct { diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index cd8c942b57..e07cc04893 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -17,7 +17,7 @@ // Package bind generates Ethereum contract Go bindings. // // Detailed usage document and tutorial available on the go-ethereum Wiki page: -// https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/maticnetwork/bor/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -30,8 +30,8 @@ import ( "text/template" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/log" ) // Lang is a target programming language selector to generate bindings for. diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index f11966c812..49c1b8da76 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) var bindTests = []struct { @@ -46,7 +46,7 @@ var bindTests = []struct { `contract NilContract {}`, []string{`606060405260068060106000396000f3606060405200`}, []string{`[]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/maticnetwork/bor/common"`, ` if b, err := NewEmpty(common.Address{}, nil); b == nil || err != nil { t.Fatalf("combined binding (%v) nil or error (%v) not nil", b, nil) @@ -68,7 +68,7 @@ var bindTests = []struct { `https://ethereum.org/token`, []string{`60606040526040516107fd3803806107fd83398101604052805160805160a05160c051929391820192909101600160a060020a0333166000908152600360209081526040822086905581548551838052601f6002600019610100600186161502019093169290920482018390047f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56390810193919290918801908390106100e857805160ff19168380011785555b506101189291505b8082111561017157600081556001016100b4565b50506002805460ff19168317905550505050610658806101a56000396000f35b828001600101855582156100ac579182015b828111156100ac5782518260005055916020019190600101906100fa565b50508060016000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017557805160ff19168380011785555b506100c89291506100b4565b5090565b82800160010185558215610165579182015b8281111561016557825182600050559160200191906001019061018756606060405236156100775760e060020a600035046306fdde03811461007f57806323b872dd146100dc578063313ce5671461010e57806370a082311461011a57806395d89b4114610132578063a9059cbb1461018e578063cae9ca51146101bd578063dc3080f21461031c578063dd62ed3e14610341575b610365610002565b61036760008054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b6103d5600435602435604435600160a060020a038316600090815260036020526040812054829010156104f357610002565b6103e760025460ff1681565b6103d560043560036020526000908152604090205481565b610367600180546020600282841615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b610365600435602435600160a060020a033316600090815260036020526040902054819010156103f157610002565b60806020604435600481810135601f8101849004909302840160405260608381526103d5948235946024803595606494939101919081908382808284375094965050505050505060006000836004600050600033600160a060020a03168152602001908152602001600020600050600087600160a060020a031681526020019081526020016000206000508190555084905080600160a060020a0316638f4ffcb1338630876040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156102f25780820380516001836020036101000a031916815260200191505b50955050505050506000604051808303816000876161da5a03f11561000257505050509392505050565b6005602090815260043560009081526040808220909252602435815220546103d59081565b60046020818152903560009081526040808220909252602435815220546103d59081565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156103c75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60408051918252519081900360200190f35b6060908152602090f35b600160a060020a03821660009081526040902054808201101561041357610002565b806003600050600033600160a060020a03168152602001908152602001600020600082828250540392505081905550806003600050600084600160a060020a0316815260200190815260200160002060008282825054019250508190555081600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b820191906000526020600020905b8154815290600101906020018083116104ce57829003601f168201915b505050505081565b600160a060020a03831681526040812054808301101561051257610002565b600160a060020a0380851680835260046020908152604080852033949094168086529382528085205492855260058252808520938552929052908220548301111561055c57610002565b816003600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816003600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816005600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054019250508190555082600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3939250505056`}, []string{`[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"},{"name":"_extraData","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"spentAllowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"},{"name":"tokenName","type":"string"},{"name":"decimalUnits","type":"uint8"},{"name":"tokenSymbol","type":"string"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/maticnetwork/bor/common"`, ` if b, err := NewToken(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -83,7 +83,7 @@ var bindTests = []struct { `https://ethereum.org/crowdsale`, []string{`606060408190526007805460ff1916905560a0806105a883396101006040529051608051915160c05160e05160008054600160a060020a03199081169095178155670de0b6b3a7640000958602600155603c9093024201600355930260045560058054909216909217905561052f90819061007990396000f36060604052361561006c5760e060020a600035046301cb3b20811461008257806329dcb0cf1461014457806338af3eed1461014d5780636e66f6e91461015f5780637a3a0e84146101715780637b3e5e7b1461017a578063a035b1fe14610183578063dc0d3dff1461018c575b61020060075460009060ff161561032357610002565b61020060035460009042106103205760025460015490106103cb576002548154600160a060020a0316908290606082818181858883f150915460025460408051600160a060020a039390931683526020830191909152818101869052517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf6945090819003909201919050a15b60405160008054600160a060020a039081169230909116319082818181858883f150506007805460ff1916600117905550505050565b6103a160035481565b6103ab600054600160a060020a031681565b6103ab600554600160a060020a031681565b6103a160015481565b6103a160025481565b6103a160045481565b6103be60043560068054829081101561000257506000526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f8101547ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d409190910154600160a060020a03919091169082565b005b505050815481101561000257906000526020600020906002020160005060008201518160000160006101000a815481600160a060020a030219169083021790555060208201518160010160005055905050806002600082828250540192505081905550600560009054906101000a9004600160a060020a0316600160a060020a031663a9059cbb3360046000505484046040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506000604051808303816000876161da5a03f11561000257505060408051600160a060020a03331681526020810184905260018183015290517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf692509081900360600190a15b50565b5060a0604052336060908152346080819052600680546001810180835592939282908280158290116102025760020281600202836000526020600020918201910161020291905b8082111561039d57805473ffffffffffffffffffffffffffffffffffffffff19168155600060019190910190815561036a565b5090565b6060908152602090f35b600160a060020a03166060908152602090f35b6060918252608052604090f35b5b60065481101561010e576006805482908110156100025760009182526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f0190600680549254600160a060020a0316928490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460405190915082818181858883f19350505050507fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf660066000508281548110156100025760008290526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f01548154600160a060020a039190911691908490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460408051600160a060020a0394909416845260208401919091526000838201525191829003606001919050a16001016103cc56`}, []string{`[{"constant":false,"inputs":[],"name":"checkGoalReached","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"deadline","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"beneficiary","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"tokenReward","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"fundingGoal","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"amountRaised","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"price","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"funders","outputs":[{"name":"addr","type":"address"},{"name":"amount","type":"uint256"}],"type":"function"},{"inputs":[{"name":"ifSuccessfulSendTo","type":"address"},{"name":"fundingGoalInEthers","type":"uint256"},{"name":"durationInMinutes","type":"uint256"},{"name":"etherCostOfEachToken","type":"uint256"},{"name":"addressOfTokenUsedAsReward","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"backer","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"isContribution","type":"bool"}],"name":"FundTransfer","type":"event"}]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/maticnetwork/bor/common"`, ` if b, err := NewCrowdsale(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -98,7 +98,7 @@ var bindTests = []struct { `https://ethereum.org/dao`, []string{`606060405260405160808061145f833960e06040529051905160a05160c05160008054600160a060020a03191633179055600184815560028490556003839055600780549182018082558280158290116100b8576003028160030283600052602060002091820191016100b891906101c8565b50506060919091015160029190910155600160a060020a0381166000146100a65760008054600160a060020a031916821790555b505050506111f18061026e6000396000f35b505060408051608081018252600080825260208281018290528351908101845281815292820192909252426060820152600780549194509250811015610002579081527fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c6889050815181546020848101517401000000000000000000000000000000000000000002600160a060020a03199290921690921760a060020a60ff021916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f9081018390048201949192919091019083901061023e57805160ff19168380011785555b50610072929150610226565b5050600060028201556001015b8082111561023a578054600160a860020a031916815560018181018054600080835592600290821615610100026000190190911604601f81901061020c57506101bb565b601f0160209004906000526020600020908101906101bb91905b8082111561023a5760008155600101610226565b5090565b828001600101855582156101af579182015b828111156101af57825182600050559160200191906001019061025056606060405236156100b95760e060020a6000350463013cf08b81146100bb578063237e9492146101285780633910682114610281578063400e3949146102995780635daf08ca146102a257806369bd34361461032f5780638160f0b5146103385780638da5cb5b146103415780639644fcbd14610353578063aa02a90f146103be578063b1050da5146103c7578063bcca1fd3146104b5578063d3c0715b146104dc578063eceb29451461058d578063f2fde38b1461067b575b005b61069c6004356004805482908110156100025790600052602060002090600a02016000506005810154815460018301546003840154600485015460068601546007870154600160a060020a03959095169750929560020194919360ff828116946101009093041692919089565b60408051602060248035600481810135601f81018590048502860185019096528585526107759581359591946044949293909201918190840183828082843750949650505050505050600060006004600050848154811015610002575090527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19e600a8402908101547f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b909101904210806101e65750600481015460ff165b8061026757508060000160009054906101000a9004600160a060020a03168160010160005054846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816007016000505414155b8061027757506001546005820154105b1561109257610002565b61077560043560066020526000908152604090205481565b61077560055481565b61078760043560078054829081101561000257506000526003026000805160206111d18339815191528101547fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c68a820154600160a060020a0382169260a060020a90920460ff16917fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c689019084565b61077560025481565b61077560015481565b610830600054600160a060020a031681565b604080516020604435600481810135601f81018490048402850184019095528484526100b9948135946024803595939460649492939101918190840183828082843750949650505050505050600080548190600160a060020a03908116339091161461084d57610002565b61077560035481565b604080516020604435600481810135601f8101849004840285018401909552848452610775948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a019093528282529698976084979196506024909101945090925082915084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806104ab5750604081205460078054909190811015610002579082526003026000805160206111d1833981519152015460a060020a900460ff16155b15610ce557610002565b6100b960043560243560443560005433600160a060020a03908116911614610b1857610002565b604080516020604435600481810135601f810184900484028501840190955284845261077594813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806105835750604081205460078054909190811015610002579082526003026000805160206111d18339815191520181505460a060020a900460ff16155b15610f1d57610002565b604080516020606435600481810135601f81018490048402850184019095528484526107759481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600460005086815481101561000257908252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01815090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005054149150610cdc565b6100b960043560005433600160a060020a03908116911614610f0857610002565b604051808a600160a060020a031681526020018981526020018060200188815260200187815260200186815260200185815260200184815260200183815260200182810382528981815460018160011615610100020316600290048152602001915080546001816001161561010002031660029004801561075e5780601f106107335761010080835404028352916020019161075e565b820191906000526020600020905b81548152906001019060200180831161074157829003601f168201915b50509a505050505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a038616815260208101859052606081018390526080918101828152845460026001821615610100026000190190911604928201839052909160a08301908590801561081e5780601f106107f35761010080835404028352916020019161081e565b820191906000526020600020905b81548152906001019060200180831161080157829003601f168201915b50509550505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b600160a060020a03851660009081526006602052604081205414156108a957604060002060078054918290556001820180825582801582901161095c5760030281600302836000526020600020918201910161095c9190610a4f565b600160a060020a03851660009081526006602052604090205460078054919350908390811015610002575060005250600381026000805160206111d183398151915201805474ff0000000000000000000000000000000000000000191660a060020a85021781555b60408051600160a060020a03871681526020810186905281517f27b022af4a8347100c7a041ce5ccf8e14d644ff05de696315196faae8cd50c9b929181900390910190a15050505050565b505050915081506080604051908101604052808681526020018581526020018481526020014281526020015060076000508381548110156100025790600052602060002090600302016000508151815460208481015160a060020a02600160a060020a03199290921690921774ff00000000000000000000000000000000000000001916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f90810183900482019491929190910190839010610ad357805160ff19168380011785555b50610b03929150610abb565b5050600060028201556001015b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610aa15750610a42565b601f016020900490600052602060002090810190610a4291905b80821115610acf5760008155600101610abb565b5090565b82800160010185558215610a36579182015b82811115610a36578251826000505591602001919060010190610ae5565b50506060919091015160029190910155610911565b600183905560028290556003819055604080518481526020810184905280820183905290517fa439d3fa452be5e0e1e24a8145e715f4fd8b9c08c96a42fd82a855a85e5d57de9181900360600190a1505050565b50508585846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005081905550600260005054603c024201816003016000508190555060008160040160006101000a81548160ff0219169083021790555060008160040160016101000a81548160ff02191690830217905550600081600501600050819055507f646fec02522b41e7125cfc859a64fd4f4cefd5dc3b6237ca0abe251ded1fa881828787876040518085815260200184600160a060020a03168152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015610cc45780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1600182016005555b50949350505050565b6004805460018101808355909190828015829011610d1c57600a0281600a028360005260206000209182019101610d1c9190610db8565b505060048054929450918491508110156100025790600052602060002090600a02016000508054600160a060020a031916871781556001818101879055855160028381018054600082815260209081902096975091959481161561010002600019011691909104601f90810182900484019391890190839010610ed857805160ff19168380011785555b50610b6c929150610abb565b50506001015b80821115610acf578054600160a060020a03191681556000600182810182905560028381018054848255909281161561010002600019011604601f819010610e9c57505b5060006003830181905560048301805461ffff191690556005830181905560068301819055600783018190556008830180548282559082526020909120610db2916002028101905b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610eba57505b5050600101610e44565b601f016020900490600052602060002090810190610dfc9190610abb565b601f016020900490600052602060002090810190610e929190610abb565b82800160010185558215610da6579182015b82811115610da6578251826000505591602001919060010190610eea565b60008054600160a060020a0319168217905550565b600480548690811015610002576000918252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260098201602052604090205490915060ff1660011415610f8457610002565b33600160a060020a031660009081526009820160205260409020805460ff1916600190811790915560058201805490910190558315610fcd576006810180546001019055610fda565b6006810180546000190190555b7fc34f869b7ff431b034b7b9aea9822dac189a685e0b015c7d1be3add3f89128e8858533866040518085815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f16801561107a5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1509392505050565b6006810154600354901315611158578060000160009054906101000a9004600160a060020a0316600160a060020a03168160010160005054670de0b6b3a76400000284604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156111225780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f15050505060048101805460ff191660011761ff00191661010017905561116d565b60048101805460ff191660011761ff00191690555b60068101546005820154600483015460408051888152602081019490945283810192909252610100900460ff166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a1509291505056a66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c688`}, []string{`[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"proposals","outputs":[{"name":"recipient","type":"address"},{"name":"amount","type":"uint256"},{"name":"description","type":"string"},{"name":"votingDeadline","type":"uint256"},{"name":"executed","type":"bool"},{"name":"proposalPassed","type":"bool"},{"name":"numberOfVotes","type":"uint256"},{"name":"currentResult","type":"int256"},{"name":"proposalHash","type":"bytes32"}],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"executeProposal","outputs":[{"name":"result","type":"int256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"memberId","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"numProposals","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"members","outputs":[{"name":"member","type":"address"},{"name":"canVote","type":"bool"},{"name":"name","type":"string"},{"name":"memberSince","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"debatingPeriodInMinutes","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"minimumQuorum","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"targetMember","type":"address"},{"name":"canVote","type":"bool"},{"name":"memberName","type":"string"}],"name":"changeMembership","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"majorityMargin","outputs":[{"name":"","type":"int256"}],"type":"function"},{"constant":false,"inputs":[{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"JobDescription","type":"string"},{"name":"transactionBytecode","type":"bytes"}],"name":"newProposal","outputs":[{"name":"proposalID","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"}],"name":"changeVotingRules","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"supportsProposal","type":"bool"},{"name":"justificationText","type":"string"}],"name":"vote","outputs":[{"name":"voteID","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"checkProposalCode","outputs":[{"name":"codeChecksOut","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"type":"function"},{"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"},{"name":"congressLeader","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"description","type":"string"}],"name":"ProposalAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"position","type":"bool"},{"indexed":false,"name":"voter","type":"address"},{"indexed":false,"name":"justification","type":"string"}],"name":"Voted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"result","type":"int256"},{"indexed":false,"name":"quorum","type":"uint256"},{"indexed":false,"name":"active","type":"bool"}],"name":"ProposalTallied","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"member","type":"address"},{"indexed":false,"name":"isMember","type":"bool"}],"name":"MembershipChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"minimumQuorum","type":"uint256"},{"indexed":false,"name":"debatingPeriodInMinutes","type":"uint256"},{"indexed":false,"name":"majorityMargin","type":"int256"}],"name":"ChangeOfRules","type":"event"}]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/maticnetwork/bor/common"`, ` if b, err := NewDAO(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -124,7 +124,7 @@ var bindTests = []struct { ` "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" `, `if b, err := NewInputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -161,7 +161,7 @@ var bindTests = []struct { ` "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" `, `if b, err := NewOutputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -200,7 +200,7 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" `, `if e, err := NewEventChecker(common.Address{}, nil); e == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", e, nil) @@ -273,10 +273,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -325,10 +325,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -368,10 +368,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -422,11 +422,11 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -468,10 +468,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -512,10 +512,10 @@ var bindTests = []struct { []string{`6060604052609f8060106000396000f3606060405260e060020a6000350463f97a60058114601a575b005b600060605260c0604052600d60809081527f4920646f6e27742065786973740000000000000000000000000000000000000060a052602060c0908152600d60e081905281906101009060a09080838184600060046012f15050815172ffffffffffffffffffffffffffffffffffffff1916909152505060405161012081900392509050f3`}, []string{`[{"constant":true,"inputs":[],"name":"String","outputs":[{"name":"","type":"string"}],"type":"function"}]`}, ` - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" `, ` // Create a simulator and wrap a non-deployed contract @@ -557,10 +557,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -603,11 +603,11 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -676,10 +676,10 @@ var bindTests = []struct { "fmt" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -766,11 +766,11 @@ var bindTests = []struct { "math/big" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -954,10 +954,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator @@ -1082,10 +1082,10 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` @@ -1216,10 +1216,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" `, ` // Generate a new random account and a funded simulator diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 3683a1eb4f..c33e69a94f 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/ethereum/go-ethereum/accounts/abi" +import "github.com/maticnetwork/bor/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { @@ -88,12 +88,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/accounts/abi/bind/topics.go b/accounts/abi/bind/topics.go index c7657b4a41..ea5a64b610 100644 --- a/accounts/abi/bind/topics.go +++ b/accounts/abi/bind/topics.go @@ -23,9 +23,9 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) // makeTopics converts a filter query argument list into a filter topic set. diff --git a/accounts/abi/bind/topics_test.go b/accounts/abi/bind/topics_test.go index e6f745a15e..2b4f4cb0b8 100644 --- a/accounts/abi/bind/topics_test.go +++ b/accounts/abi/bind/topics_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/common" ) func TestMakeTopics(t *testing.T) { diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index d129993ca1..59f3520775 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/log" ) // WaitMined waits for tx to be mined on the blockchain. diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index 87bc29822b..3aa173d667 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 9392c1990c..e68b495759 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) // Event is an event potentially triggered by the EVM's LOG mechanism. The Event diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go index e735cceb88..137528406d 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -356,7 +356,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass /* Taken from -https://github.com/ethereum/go-ethereum/pull/15568 +https://github.com/maticnetwork/bor/pull/15568 */ type testResult struct { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index d3c02599f2..7a76a91145 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/crypto" ) // Method represents a callable given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 4d706846da..eb6fbd7f28 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 36c58265bd..b5b704deec 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go index 10cd3a3962..acfb4ad5d5 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index 5023456aec..006cb5f4dc 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index b2e61d06c4..79b71d4030 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index c85b86d8c0..79348b595d 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index d63744bd9f..742270c9dd 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -21,10 +21,10 @@ import ( "fmt" "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/event" "golang.org/x/crypto/sha3" ) diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go index a49e3954ee..aad7c07ded 100644 --- a/accounts/accounts_test.go +++ b/accounts/accounts_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common/hexutil" ) func TestTextHash(t *testing.T) { diff --git a/accounts/external/backend.go b/accounts/external/backend.go index 705c987227..a364734dd1 100644 --- a/accounts/external/backend.go +++ b/accounts/external/backend.go @@ -21,16 +21,16 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core" + "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rpc" + "github.com/maticnetwork/bor/signer/core" ) type ExternalBackend struct { diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index 8f660e282f..0e340b2fbf 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -28,9 +28,9 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/log" ) // Minimum amount of time between cache reloads. This limit applies if the platform does diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index fe9233c046..f2ff1bf04c 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -29,8 +29,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 73ff6ae9ee..54da2b3829 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -25,7 +25,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // fileCache is a cache of files seen during scan of keystore. diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 84d8df0c5a..9487960755 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" "github.com/pborman/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 434e035048..37fbbf6b54 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/event" ) var ( diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index a691c50627..5a6fff7b59 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go index 1ced41e997..e3a683317d 100644 --- a/accounts/keystore/passphrase.go +++ b/accounts/keystore/passphrase.go @@ -38,10 +38,10 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" @@ -121,7 +121,7 @@ func (ks keyStorePassphrase) StoreKey(filename string, key *Key, auth string) er "This indicates that the keystore is corrupted. \n" + "The corrupted file is stored at \n%v\n" + "Please file a ticket at:\n\n" + - "https://github.com/ethereum/go-ethereum/issues." + + "https://github.com/maticnetwork/bor/issues." + "The error was : %s" return fmt.Errorf(msg, tmpName, err) } diff --git a/accounts/keystore/passphrase_test.go b/accounts/keystore/passphrase_test.go index 630682cebd..ea640bdefe 100644 --- a/accounts/keystore/passphrase_test.go +++ b/accounts/keystore/passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) const ( diff --git a/accounts/keystore/plain.go b/accounts/keystore/plain.go index f62a133ce1..ecbb60372f 100644 --- a/accounts/keystore/plain.go +++ b/accounts/keystore/plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go index 32852a0add..f25fcbc914 100644 --- a/accounts/keystore/plain_test.go +++ b/accounts/keystore/plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 03055245f5..f1acfb1134 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/wallet.go b/accounts/keystore/wallet.go index 498067d497..7ad47168a0 100644 --- a/accounts/keystore/wallet.go +++ b/accounts/keystore/wallet.go @@ -19,10 +19,10 @@ package keystore import ( "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + ethereum "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index d6ef53327d..5e81b8ef10 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -21,7 +21,7 @@ package keystore import ( "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index 3cf3422e77..e02c34d30c 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/maticnetwork/bor/event" ) // Config contains the settings of the global account manager. diff --git a/accounts/scwallet/hub.go b/accounts/scwallet/hub.go index 5f939c6586..dfcc5ac4bf 100644 --- a/accounts/scwallet/hub.go +++ b/accounts/scwallet/hub.go @@ -41,10 +41,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" pcsc "github.com/gballet/go-libpcsclite" ) diff --git a/accounts/scwallet/securechannel.go b/accounts/scwallet/securechannel.go index fad876a019..3d0be4728e 100644 --- a/accounts/scwallet/securechannel.go +++ b/accounts/scwallet/securechannel.go @@ -25,7 +25,7 @@ import ( "crypto/sha512" "fmt" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/crypto" pcsc "github.com/gballet/go-libpcsclite" "github.com/wsddn/go-ecdh" "golang.org/x/crypto/pbkdf2" diff --git a/accounts/scwallet/wallet.go b/accounts/scwallet/wallet.go index 57b5977062..540bcc1a60 100644 --- a/accounts/scwallet/wallet.go +++ b/accounts/scwallet/wallet.go @@ -33,12 +33,12 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + ethereum "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" pcsc "github.com/gballet/go-libpcsclite" "github.com/status-im/keycard-go/derivationpath" ) diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index 23be98a084..a80eff5a93 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -23,9 +23,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" "github.com/karalabe/usb" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index c30903b5b7..aa1e69a8df 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 1892097baf..f88501e32f 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,12 +27,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/usbwallet/trezor" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/usbwallet/trezor" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index ed786d9b42..09a140a756 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,12 +25,12 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + ethereum "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" "github.com/karalabe/usb" ) diff --git a/build/ci.go b/build/ci.go index 8be5233898..274bdd45ff 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,8 +58,8 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/internal/build" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/internal/build" + "github.com/maticnetwork/bor/params" ) var ( @@ -778,7 +778,7 @@ func doAndroidArchive(cmdline []string) { } // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) - build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ethereum/go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/maticnetwork/bor/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -899,7 +899,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/ethereum/go-ethereum/mobile") + bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/maticnetwork/bor/mobile") if *local { // If we're building locally, use the build folder and stop afterwards diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control index 5b3ff93542..b5c7036dbe 100644 --- a/build/deb/ethereum/deb.control +++ b/build/deb/ethereum/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.11 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum +Vcs-Git: git://github.com/maticnetwork/bor.git +Vcs-Browser: https://github.com/maticnetwork/bor Package: {{.Name}} Architecture: any diff --git a/build/env.sh b/build/env.sh index 3914555d1b..acbc70c576 100755 --- a/build/env.sh +++ b/build/env.sh @@ -10,11 +10,11 @@ fi # Create fake Go workspace if it doesn't exist yet. workspace="$PWD/build/_workspace" root="$PWD" -ethdir="$workspace/src/github.com/ethereum" -if [ ! -L "$ethdir/go-ethereum" ]; then +ethdir="$workspace/src/github.com/maticnetwork" +if [ ! -L "$ethdir/bor" ]; then mkdir -p "$ethdir" cd "$ethdir" - ln -s ../../../../../. go-ethereum + ln -s ../../../../../. bor cd "$root" fi @@ -23,8 +23,8 @@ GOPATH="$workspace" export GOPATH # Run the command inside the workspace. -cd "$ethdir/go-ethereum" -PWD="$ethdir/go-ethereum" +cd "$ethdir/bor" +PWD="$ethdir/bor" # Launch the arguments with the configured environment. exec "$@" diff --git a/build/mvn.pom b/build/mvn.pom index 7670246ba9..68623c6309 100644 --- a/build/mvn.pom +++ b/build/mvn.pom @@ -11,7 +11,7 @@ Android Ethereum Client Android port of the go-ethereum libraries and node - https://github.com/ethereum/go-ethereum + https://github.com/maticnetwork/bor 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/ethereum/go-ethereum/issues/ + https://github.com/maticnetwork/bor/issues/ - https://github.com/ethereum/go-ethereum + https://github.com/maticnetwork/bor diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 9068fbfa76..8055859924 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -3,9 +3,9 @@ InstallDir "$InstDir" OutFile "${OUTPUTFILE}" # set through command line arguments # Links for "Add/Remove Programs" -!define HELPURL "https://github.com/ethereum/go-ethereum/issues" -!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases" -!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go" +!define HELPURL "https://github.com/maticnetwork/bor/issues" +!define UPDATEURL "https://github.com/maticnetwork/bor/releases" +!define ABOUTURL "https://github.com/maticnetwork/bor#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/pod.podspec b/build/pod.podspec index 2c14c280c7..1f0152c04d 100644 --- a/build/pod.podspec +++ b/build/pod.podspec @@ -2,12 +2,12 @@ Pod::Spec.new do |spec| spec.name = 'Geth' spec.version = '{{.Version}}' spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' } - spec.homepage = 'https://github.com/ethereum/go-ethereum' + spec.homepage = 'https://github.com/maticnetwork/bor' spec.authors = { {{range .Contributors}} '{{.Name}}' => '{{.Email}}',{{end}} } spec.summary = 'iOS Ethereum Client' - spec.source = { :git => 'https://github.com/ethereum/go-ethereum.git', :commit => '{{.Commit}}' } + spec.source = { :git => 'https://github.com/maticnetwork/bor.git', :commit => '{{.Commit}}' } spec.platform = :ios spec.ios.deployment_target = '9.0' diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 6af34c5fe8..416d9095f3 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -23,11 +23,11 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common/compiler" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common/compiler" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 2f9bba1117..4f3ef77ff0 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,14 +24,14 @@ import ( "net" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/discover" + "github.com/maticnetwork/bor/p2p/discv5" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/nat" + "github.com/maticnetwork/bor/p2p/netutil" ) func main() { diff --git a/cmd/bor/accountcmd.go b/cmd/bor/accountcmd.go index 8fd149cacc..0511cd11b1 100644 --- a/cmd/bor/accountcmd.go +++ b/cmd/bor/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/console" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/bor/accountcmd_test.go b/cmd/bor/accountcmd_test.go index 6c97f0ddc3..43004f3077 100644 --- a/cmd/bor/accountcmd_test.go +++ b/cmd/bor/accountcmd_test.go @@ -183,7 +183,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/ethereum/go-ethereum/issues/1785 +// https://github.com/maticnetwork/bor/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { datadir := tmpDatadirWithKeystore(t) geth := runGeth(t, diff --git a/cmd/bor/chaincmd.go b/cmd/bor/chaincmd.go index 49e6a05949..0f7c71a175 100644 --- a/cmd/bor/chaincmd.go +++ b/cmd/bor/chaincmd.go @@ -26,17 +26,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/console" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/trie" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/bor/config.go b/cmd/bor/config.go index f03381a614..b525cedb09 100644 --- a/cmd/bor/config.go +++ b/cmd/bor/config.go @@ -26,12 +26,12 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/dashboard" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/params" + whisper "github.com/maticnetwork/bor/whisper/whisperv6" "github.com/naoina/toml" ) diff --git a/cmd/bor/consolecmd.go b/cmd/bor/consolecmd.go index 8cc89eb0f2..c1fcce5657 100644 --- a/cmd/bor/consolecmd.go +++ b/cmd/bor/consolecmd.go @@ -24,10 +24,10 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/console" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/rpc" "gopkg.in/urfave/cli.v1" ) @@ -43,7 +43,7 @@ var ( Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console.`, +See https://github.com/maticnetwork/bor/wiki/JavaScript-Console.`, } attachCommand = cli.Command{ @@ -56,7 +56,7 @@ See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console.`, Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console. +See https://github.com/maticnetwork/bor/wiki/JavaScript-Console. This command allows to open a console on a running geth node.`, } @@ -69,7 +69,7 @@ This command allows to open a console on a running geth node.`, Category: "CONSOLE COMMANDS", Description: ` The JavaScript VM exposes a node admin interface as well as the Ðapp -JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console`, +JavaScript API. See https://github.com/maticnetwork/bor/wiki/JavaScript-Console`, } ) diff --git a/cmd/bor/consolecmd_test.go b/cmd/bor/consolecmd_test.go index 7c0fafe9ac..925da2994d 100644 --- a/cmd/bor/consolecmd_test.go +++ b/cmd/bor/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/params" ) const ( diff --git a/cmd/bor/dao_test.go b/cmd/bor/dao_test.go index cb06038ec8..aedd691ca5 100644 --- a/cmd/bor/dao_test.go +++ b/cmd/bor/dao_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/cmd/bor/main.go b/cmd/bor/main.go index 7d30c92434..6c25578489 100644 --- a/cmd/bor/main.go +++ b/cmd/bor/main.go @@ -29,19 +29,19 @@ import ( "time" "github.com/elastic/gosigar" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/console" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/ethclient" + "github.com/maticnetwork/bor/internal/debug" + "github.com/maticnetwork/bor/les" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/node" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/bor/misccmd.go b/cmd/bor/misccmd.go index 39ca47872b..668636b528 100644 --- a/cmd/bor/misccmd.go +++ b/cmd/bor/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/bor/retesteth.go b/cmd/bor/retesteth.go index 6d5763f887..b466058e47 100644 --- a/cmd/bor/retesteth.go +++ b/cmd/bor/retesteth.go @@ -26,26 +26,26 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/consensus/misc" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/rpc" + "github.com/maticnetwork/bor/trie" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/bor/retesteth_copypaste.go b/cmd/bor/retesteth_copypaste.go index e2795af7f9..7bc45b89ec 100644 --- a/cmd/bor/retesteth_copypaste.go +++ b/cmd/bor/retesteth_copypaste.go @@ -19,9 +19,9 @@ package main import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" ) // RPCTransaction represents a transaction that will serialize to the RPC representation of a transaction diff --git a/cmd/bor/run_test.go b/cmd/bor/run_test.go index da82facac3..baa1c2eb8f 100644 --- a/cmd/bor/run_test.go +++ b/cmd/bor/run_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/maticnetwork/bor/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/bor/usage.go b/cmd/bor/usage.go index af195425b1..6d3260e701 100644 --- a/cmd/bor/usage.go +++ b/cmd/bor/usage.go @@ -24,8 +24,8 @@ import ( "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/debug" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/internal/debug" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/checkpoint-admin/common.go b/cmd/checkpoint-admin/common.go index 107cd1de02..98c7b0e16d 100644 --- a/cmd/checkpoint-admin/common.go +++ b/cmd/checkpoint-admin/common.go @@ -19,15 +19,15 @@ package main import ( "strconv" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/external" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/external" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/contracts/checkpointoracle" + "github.com/maticnetwork/bor/ethclient" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/checkpoint-admin/exec.go b/cmd/checkpoint-admin/exec.go index 1ce975f494..0b00785653 100644 --- a/cmd/checkpoint-admin/exec.go +++ b/cmd/checkpoint-admin/exec.go @@ -25,17 +25,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/contracts/checkpointoracle" + "github.com/maticnetwork/bor/contracts/checkpointoracle/contract" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethclient" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/checkpoint-admin/main.go b/cmd/checkpoint-admin/main.go index 1fdec60a0c..ae6c3ef7ce 100644 --- a/cmd/checkpoint-admin/main.go +++ b/cmd/checkpoint-admin/main.go @@ -22,9 +22,9 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common/fdlimit" + "github.com/maticnetwork/bor/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/checkpoint-admin/status.go b/cmd/checkpoint-admin/status.go index c134ec090e..91d58cf6cd 100644 --- a/cmd/checkpoint-admin/status.go +++ b/cmd/checkpoint-admin/status.go @@ -19,8 +19,8 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/clef/main.go b/cmd/clef/main.go index f4d94f0274..3f710a688b 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -35,24 +35,24 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/fourbyte" - "github.com/ethereum/go-ethereum/signer/rules" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/console" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/rpc" + "github.com/maticnetwork/bor/signer/core" + "github.com/maticnetwork/bor/signer/fourbyte" + "github.com/maticnetwork/bor/signer/rules" + "github.com/maticnetwork/bor/signer/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/clef/tutorial.md b/cmd/clef/tutorial.md index a0a6b052af..08ad9a4488 100644 --- a/cmd/clef/tutorial.md +++ b/cmd/clef/tutorial.md @@ -100,9 +100,9 @@ or {"jsonrpc":"2.0","id":1,"error":{"code":-32000,"message":"Request denied"}} ``` -Apart from listing accounts, you can also *request* creating a new account; signing transactions and data; and recovering signatures. You can find the available methods in the Clef [External API Spec](https://github.com/ethereum/go-ethereum/tree/master/cmd/clef#external-api-1) and the [External API Changelog](https://github.com/ethereum/go-ethereum/blob/master/cmd/clef/extapi_changelog.md). +Apart from listing accounts, you can also *request* creating a new account; signing transactions and data; and recovering signatures. You can find the available methods in the Clef [External API Spec](https://github.com/maticnetwork/bor/tree/master/cmd/clef#external-api-1) and the [External API Changelog](https://github.com/maticnetwork/bor/blob/master/cmd/clef/extapi_changelog.md). -*Note, the number of things you can do from the External API is deliberately small, since we want to limit the power of remote calls by as much as possible! Clef has an [Internal API](https://github.com/ethereum/go-ethereum/tree/master/cmd/clef#ui-api-1) too for the UI (User Interface) which is much richer and can support custom interfaces on top. But that's out of scope here.* +*Note, the number of things you can do from the External API is deliberately small, since we want to limit the power of remote calls by as much as possible! Clef has an [Internal API](https://github.com/maticnetwork/bor/tree/master/cmd/clef#ui-api-1) too for the UI (User Interface) which is much richer and can support custom interfaces on top. But that's out of scope here.* ## Automatic rules @@ -288,7 +288,7 @@ t=2019-07-01T15:52:23+0300 lvl=info msg=SignData api=signer type=request meta t=2019-07-01T15:52:23+0300 lvl=info msg=SignData api=signer type=response data= error="Request denied" ``` -For more details on writing automatic rules, please see the [rules spec](https://github.com/ethereum/go-ethereum/blob/master/cmd/clef/rules.md). +For more details on writing automatic rules, please see the [rules spec](https://github.com/maticnetwork/bor/blob/master/cmd/clef/rules.md). ## Geth integration diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go index 1e56687a6c..1d12aa7028 100644 --- a/cmd/devp2p/discv4cmd.go +++ b/cmd/devp2p/discv4cmd.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/discover" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/enrcmd.go b/cmd/devp2p/enrcmd.go index 15d77dd011..938d770857 100644 --- a/cmd/devp2p/enrcmd.go +++ b/cmd/devp2p/enrcmd.go @@ -27,9 +27,9 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/rlp" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/devp2p/main.go b/cmd/devp2p/main.go index 4532ab9683..30d48d898e 100644 --- a/cmd/devp2p/main.go +++ b/cmd/devp2p/main.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/internal/debug" + "github.com/maticnetwork/bor/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/changepassphrase.go b/cmd/ethkey/changepassphrase.go index d1ae2ae0d8..f9bfb72e5f 100644 --- a/cmd/ethkey/changepassphrase.go +++ b/cmd/ethkey/changepassphrase.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index fe9a0c1519..0cb51a5d4c 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,9 +23,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/crypto" "github.com/pborman/uuid" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index ba03d4d936..d14151df63 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index a8399ad7c5..ea178839e2 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/maticnetwork/bor/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 5caea69ff6..1bcf378acd 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 6006f6b5bb..31643c26dc 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/maticnetwork/bor/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 6f60ebaf1b..88400d2978 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,9 +22,9 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/console" + "github.com/maticnetwork/bor/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index c019a2fe70..49801df723 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" + "github.com/maticnetwork/bor/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 69f611e39b..063fdaf8d4 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/maticnetwork/bor/core/asm" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index 54981b6697..2e0b138cb8 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/maticnetwork/bor/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index a5159c6b7e..1d564e714c 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/maticnetwork/bor/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 318aa222a3..d8084e0a42 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -26,16 +26,16 @@ import ( "runtime/pprof" "time" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/core/vm/runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/cmd/evm/internal/compiler" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/core/vm/runtime" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index cef2aedb5e..d35f7608d5 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/tests" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index f8092084ad..3f0a954187 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/ethclient" + "github.com/maticnetwork/bor/ethstats" + "github.com/maticnetwork/bor/les" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/discv5" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/nat" + "github.com/maticnetwork/bor/params" "golang.org/x/net/websocket" ) @@ -458,7 +458,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { case *noauthFlag: username, avatar, address, err = authNoAuth(msg.URL) default: - err = errors.New("Something funky happened, please open an issue at https://github.com/ethereum/go-ethereum/issues") + err = errors.New("Something funky happened, please open an issue at https://github.com/maticnetwork/bor/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index f2c1bf9703..f9aa76600e 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,12 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations" + "github.com/maticnetwork/bor/p2p/simulations/adapters" + "github.com/maticnetwork/bor/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index ae7675cd9b..9bf5c4a788 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -23,12 +23,12 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - math2 "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + math2 "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/params" ) // alethGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/genesis_test.go b/cmd/puppeth/genesis_test.go index 83e7383605..022d03d06a 100644 --- a/cmd/puppeth/genesis_test.go +++ b/cmd/puppeth/genesis_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/core" + "github.com/maticnetwork/bor/core" ) // Tests the go-ethereum to Aleth chainspec conversion for the Stureby testnet. diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index b6a029a01a..a8f4870d1d 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 706d7fccd5..6e845a4e99 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -256,7 +256,7 @@ var dashboardContent = `

Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.

Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.


-

The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive. +

The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive.

Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.

Inside your Java code you can now import the geth archive and connect to Ethereum: 

import org.ethereum.geth.*;
@@ -287,7 +287,7 @@ node.start();

Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.

Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.


-

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework. +

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework.

Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.

Inside your Swift code you can now import the geth framework and connect to Ethereum (ObjC should be analogous): 

import Geth
@@ -419,7 +419,7 @@ try! node?.start();

Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.

Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.


-

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get github.com/ethereum/go-ethereum/cmd/puppeth

+

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get github.com/maticnetwork/bor/cmd/puppeth


Copyright 2017. The go-ethereum Authors.

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index 58ecb83951..a479ec3d16 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index 8fffe1a1c4..15335766b7 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // explorerDockerfile is the Dockerfile required to run a block explorer. diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 3a06bf3c68..c5094a83bd 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/log" ) // faucetDockerfile is the Dockerfile required to build a faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 1b1ae61ff5..e01e3e9e42 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // nginxDockerfile is theis the Dockerfile required to build an nginx reverse- diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index 5d9ef46523..6337724b1f 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index ebaa5b6ae1..a0a9e07259 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index c3de5f9360..40aec347a3 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index c507596065..d43c28a394 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go index 83536506c4..2f22ad677e 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -31,9 +31,9 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index b699d7617d..7b5a362bab 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // deployDashboard queries the user for various input on deploying a web-service diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go index 58ff3efbe9..26fac9b600 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // deployEthstats queries the user for various input on deploying an ethstats diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go index 1df9cbc0f3..707c55805c 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // deployExplorer creates a new block explorer based on some user input. diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 9068c1d30b..85e556045c 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/log" ) // deployFaucet queries the user for various input on deploying a faucet, after diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index f4dd814f97..439143586c 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -29,10 +29,10 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" ) // makeGenesis creates a new genesis struct based on some user input. diff --git a/cmd/puppeth/wizard_intro.go b/cmd/puppeth/wizard_intro.go index 75fb04b76f..a35da1be55 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 99ca11bb17..94dc95c2e6 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index 97302c0df8..e9fa1ba60a 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // manageServers displays a list of servers the user can disconnect from, and an diff --git a/cmd/puppeth/wizard_nginx.go b/cmd/puppeth/wizard_nginx.go index 8397b7fd57..934fb6171a 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // ensureVirtualHost checks whether a reverse-proxy is running on the specified diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go index e37297f6d6..42b254b205 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go index ca1ea5bd25..ada259493d 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // deployWallet creates a new web wallet based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index d0f993c5b8..13313e1cbb 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/rlp" ) var ( diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index a3ee45ba7f..fa0fd8ffce 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,16 +27,16 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/internal/debug" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf8724c1..ce89c51e7f 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index da739abd7b..920071cf73 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -29,38 +29,38 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/bor" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/graphql" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/fdlimit" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/bor" + "github.com/maticnetwork/bor/consensus/clique" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/dashboard" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/eth/gasprice" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/ethstats" + "github.com/maticnetwork/bor/graphql" + "github.com/maticnetwork/bor/les" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/metrics/influxdb" + "github.com/maticnetwork/bor/miner" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/discv5" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/nat" + "github.com/maticnetwork/bor/p2p/netutil" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rpc" + whisper "github.com/maticnetwork/bor/whisper/whisperv6" pcsclite "github.com/gballet/go-libpcsclite" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 99cf84ec1b..4c107506e1 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -35,16 +35,16 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/whisper/mailserver" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/console" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/nat" + "github.com/maticnetwork/bor/whisper/mailserver" + whisper "github.com/maticnetwork/bor/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 13a13011dc..e42d4accf1 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 61acd8ce70..3ec8f886c6 100644 --- a/common/debug.go +++ b/common/debug.go @@ -26,7 +26,7 @@ import ( // Report gives off a warning requesting the user to submit an issue to the github tracker. func Report(extra ...interface{}) { - fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ethereum/go-ethereum/issues") + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/maticnetwork/bor/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d9186..37bee62c64 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index be9810dc8c..ce6b142cdd 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/types.go b/common/types.go index 98c83edd4f..8c3f9aae39 100644 --- a/common/types.go +++ b/common/types.go @@ -26,7 +26,7 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common/hexutil" "golang.org/x/crypto/sha3" ) diff --git a/consensus/bor/api.go b/consensus/bor/api.go index 3e9cf87fa2..cca115ebc0 100644 --- a/consensus/bor/api.go +++ b/consensus/bor/api.go @@ -17,10 +17,10 @@ package bor import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/rpc" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go index f2d8e43772..dd7cee90ea 100644 --- a/consensus/bor/bor.go +++ b/consensus/bor/bor.go @@ -17,24 +17,24 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/misc" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/rpc" lru "github.com/hashicorp/golang-lru" "golang.org/x/crypto/sha3" diff --git a/consensus/bor/clerk.go b/consensus/bor/clerk.go index 70ea4e4664..755b695839 100644 --- a/consensus/bor/clerk.go +++ b/consensus/bor/clerk.go @@ -1,7 +1,7 @@ package bor import ( - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // EventRecord represents state record diff --git a/consensus/bor/snapshot.go b/consensus/bor/snapshot.go index 41a844eaa5..09f08af5ad 100644 --- a/consensus/bor/snapshot.go +++ b/consensus/bor/snapshot.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/bor/validator.go b/consensus/bor/validator.go index 50b4a58ae4..0592ab3b13 100644 --- a/consensus/bor/validator.go +++ b/consensus/bor/validator.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // Validator represets Volatile state for each Validator diff --git a/consensus/bor/validator_set.go b/consensus/bor/validator_set.go index 1de37a715c..2f22d5b59f 100644 --- a/consensus/bor/validator_set.go +++ b/consensus/bor/validator_set.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // MaxTotalVotingPower - the maximum allowed total voting power. diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 6bcf987af5..f5caf4ff61 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -17,10 +17,10 @@ package clique import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/rpc" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index 084009a066..b90f611766 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -26,19 +26,19 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/misc" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/rpc" lru "github.com/hashicorp/golang-lru" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go index 710f448055..5db69c8238 100644 --- a/consensus/clique/clique_test.go +++ b/consensus/clique/clique_test.go @@ -20,13 +20,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) // This test case is a repro of an annoying bug that took us forever to catch. diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 4ee731a908..593dfe8b99 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -22,11 +22,11 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index fc08722efd..26d6bcf7de 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,13 +22,13 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) // testerAccountPool is a pool to maintain currently active tester accounts, @@ -363,7 +363,7 @@ func TestClique(t *testing.T) { failure: errRecentlySigned, }, { // Recent signatures should not reset on checkpoint blocks imported in a new - // batch (https://github.com/ethereum/go-ethereum/issues/17593). Whilst this + // batch (https://github.com/maticnetwork/bor/issues/17593). Whilst this // seems overly specific and weird, it was a Rinkeby consensus split. epoch: 3, signers: []string{"A", "B", "C"}, diff --git a/consensus/consensus.go b/consensus/consensus.go index f753af550c..e86583f394 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,11 +20,11 @@ package consensus import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rpc" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index d6c871092e..b4e5bc1735 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,10 +27,10 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/bitutil" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index cf8552f3ab..6dfdeab75e 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -26,9 +26,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" ) // prepare converts an ethash cache or dataset from a byte stream into the internal diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go index 4d8eed4161..1cae20aea8 100644 --- a/consensus/ethash/api.go +++ b/consensus/ethash/api.go @@ -19,9 +19,9 @@ package ethash import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" ) var errEthashStopped = errors.New("ethash stopped") diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index d271518f4f..b75bdffb73 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -25,14 +25,14 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/misc" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 675737d9e1..208ba7ed75 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index 78892e1da8..999d92012a 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -34,12 +34,12 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/rpc" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 90cb6470f7..16180abd6d 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" ) // Tests that ethash works correctly in test mode. @@ -55,7 +55,7 @@ func TestTestMode(t *testing.T) { } // This test checks that cache lru logic doesn't crash under load. -// It reproduces https://github.com/ethereum/go-ethereum/issues/14943 +// It reproduces https://github.com/maticnetwork/bor/issues/14943 func TestCacheFileEvict(t *testing.T) { tmpdir, err := ioutil.TempDir("", "ethash-test") if err != nil { diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 43db1fcb7f..6c7790cc60 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -29,11 +29,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/log" ) const ( diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go index 436359af7c..fd03412bcb 100644 --- a/consensus/ethash/sealer_test.go +++ b/consensus/ethash/sealer_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" ) // Tests whether remote HTTP servers are correctly notified of new work. diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 9b22bd7a52..aa41413774 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4a5e7c37e0..ce63b3f267 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index bb14abca25..f0d43f7d41 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts/scwallet" + "github.com/maticnetwork/bor/accounts/usbwallet" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index 5326ed2c87..a1ef4ec338 100644 --- a/console/console.go +++ b/console/console.go @@ -28,9 +28,9 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/web3ext" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/internal/jsre" + "github.com/maticnetwork/bor/internal/web3ext" + "github.com/maticnetwork/bor/rpc" "github.com/mattn/go-colorable" "github.com/peterh/liner" "github.com/robertkrimen/otto" diff --git a/console/console_test.go b/console/console_test.go index 89dd7cd838..a3fb83ff8b 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/internal/jsre" + "github.com/maticnetwork/bor/miner" + "github.com/maticnetwork/bor/node" ) const ( diff --git a/contracts/checkpointoracle/contract/oracle.go b/contracts/checkpointoracle/contract/oracle.go index 3bb351792f..9b7bedd12a 100644 --- a/contracts/checkpointoracle/contract/oracle.go +++ b/contracts/checkpointoracle/contract/oracle.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/contracts/checkpointoracle/oracle.go b/contracts/checkpointoracle/oracle.go index 13ff236f2d..428c4df040 100644 --- a/contracts/checkpointoracle/oracle.go +++ b/contracts/checkpointoracle/oracle.go @@ -23,10 +23,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/contracts/checkpointoracle/contract" + "github.com/maticnetwork/bor/core/types" ) // CheckpointOracle is a Go wrapper around an on-chain light client checkpoint oracle. diff --git a/contracts/checkpointoracle/oracle_test.go b/contracts/checkpointoracle/oracle_test.go index 8c123a3b41..1d7616eaae 100644 --- a/contracts/checkpointoracle/oracle_test.go +++ b/contracts/checkpointoracle/oracle_test.go @@ -27,13 +27,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/contracts/checkpointoracle/contract" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index 4257198cc7..22238d0a74 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/maticnetwork/bor/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index c7a5440701..f896f4c776 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -22,8 +22,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index 79c369d5fc..ceb5cb10c6 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index b36ca56d7f..5890022430 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,10 +19,10 @@ package core import ( "fmt" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/block_validator_test.go b/core/block_validator_test.go index 06e2ba1a4f..343ec72b3f 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 10ee73e351..34bbd400ef 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -27,21 +27,21 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/common/prque" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" "github.com/hashicorp/golang-lru" ) diff --git a/core/blockchain_insert.go b/core/blockchain_insert.go index 5685b0a4bd..adc1bdd751 100644 --- a/core/blockchain_insert.go +++ b/core/blockchain_insert.go @@ -19,10 +19,10 @@ package core import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/log" ) // insertStats tracks and reports on block insertion. diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 27115af52d..5274abfb19 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -26,16 +26,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/params" ) // So we can deterministically seed different blockchains @@ -1482,7 +1482,7 @@ func TestEIP161AccountRemoval(t *testing.T) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/ethereum/go-ethereum/pull/15941 +// https://github.com/maticnetwork/bor/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() @@ -1743,8 +1743,8 @@ func TestIncompleteAncientReceiptChainInsertion(t *testing.T) { // overtake the 'canon' chain until after it's passed canon by about 200 blocks. // // Details at: -// - https://github.com/ethereum/go-ethereum/issues/18977 -// - https://github.com/ethereum/go-ethereum/pull/18988 +// - https://github.com/maticnetwork/bor/issues/18977 +// - https://github.com/maticnetwork/bor/pull/18988 func TestLowDiffLongChain(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf2..c46c5604b9 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/ethereum/go-ethereum/common" +import "github.com/maticnetwork/bor/common" // BadHashes represent a set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index ae07481ada..1c622c0022 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index f9bcef96e0..f5e779d4b0 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/core/types" ) // Tests that batched bloom bits are correctly rotated from the input bloom diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index 3ec0d5ae94..e6eafbd5fe 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common/bitutil" + "github.com/maticnetwork/bor/crypto" ) // bloomIndexes represents the bit indexes inside the bloom filter that belong diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go index 91143e525e..5bb11c79a0 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) const testSectionSize = 4096 @@ -82,7 +82,7 @@ func TestMatcherRandom(t *testing.T) { // Tests that the matcher can properly find matches if the starting block is // shifter from a multiple of 8. This is needed to cover an optimisation with -// bitset matching https://github.com/ethereum/go-ethereum/issues/15309. +// bitset matching https://github.com/maticnetwork/bor/issues/15309. func TestMatcherShifted(t *testing.T) { // Block 0 always matches in the tests, skip ahead of first 8 blocks with the // start to get a potential zero byte in the matcher bitset. diff --git a/core/chain_indexer.go b/core/chain_indexer.go index c0c2c4f7f9..37860e3ffe 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -24,12 +24,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" ) // ChainIndexerBackend defines the methods needed to process chain segments in diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index abf5b3cc14..6bd0faa717 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 17f4042116..54b89c7dbc 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/misc" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/params" ) // BlockGen creates blocks for testing. diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 32e3888d55..9c062a454e 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 4e8dba9e84..a8d15644d0 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/events.go b/core/events.go index 710bdb5894..ba12738fa1 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index 979003bda7..af370f6c86 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go index 8c1700879a..64baae9616 100644 --- a/core/forkid/forkid.go +++ b/core/forkid/forkid.go @@ -26,10 +26,10 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" ) var ( diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index b33f85bec7..b0cc189704 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -21,9 +21,9 @@ import ( "math" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) // TestCreation tests that different genesis and fork rule combinations result in diff --git a/core/gen_genesis.go b/core/gen_genesis.go index bb8ea1d6a2..c7be3c4fca 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 64fb9b9248..d411ea9667 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index 57809fe73a..3851bd65d0 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,16 +25,16 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/genesis_test.go b/core/genesis_test.go index c6bcd0aa54..1d46cc971d 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,12 +22,12 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 034858f651..95634891fe 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,13 +26,13 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index e61c92dcdd..447ed8e996 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -19,10 +19,10 @@ package core import ( "container/list" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 5118a4fcb3..3c4b9ddc6a 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index fab7ca56c3..f141e2b600 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -21,12 +21,12 @@ import ( "encoding/binary" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) // ReadCanonicalHash retrieves the hash assigned to a canonical block number. diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index 8c8affffd9..d1815380cd 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -23,10 +23,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 38f8fe10ea..1e324c912c 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -19,12 +19,12 @@ package rawdb import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) // ReadTxLookupEntry retrieves the positional metadata associated with a transaction diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index c09bff0101..c2a62699a5 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/rlp" ) // Tests that positional lookup metadata can be stored and retrieved. diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index f8d09fbddf..12aa8166ae 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -19,11 +19,11 @@ package rawdb import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/database.go b/core/rawdb/database.go index 353b7dce62..c8a7801704 100644 --- a/core/rawdb/database.go +++ b/core/rawdb/database.go @@ -23,11 +23,11 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/leveldb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/ethdb/leveldb" + "github.com/maticnetwork/bor/ethdb/memorydb" + "github.com/maticnetwork/bor/log" "github.com/olekukonko/tablewriter" ) diff --git a/core/rawdb/freezer.go b/core/rawdb/freezer.go index 3f377447ce..110e488713 100644 --- a/core/rawdb/freezer.go +++ b/core/rawdb/freezer.go @@ -25,11 +25,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/params" "github.com/prometheus/tsdb/fileutil" ) diff --git a/core/rawdb/freezer_reinit.go b/core/rawdb/freezer_reinit.go index ea4dd33d1d..7a14673205 100644 --- a/core/rawdb/freezer_reinit.go +++ b/core/rawdb/freezer_reinit.go @@ -22,11 +22,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/prque" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" ) // InitDatabaseFromFreezer reinitializes an empty database from a previous batch diff --git a/core/rawdb/freezer_table.go b/core/rawdb/freezer_table.go index 2fe354a064..868d81f6a5 100644 --- a/core/rawdb/freezer_table.go +++ b/core/rawdb/freezer_table.go @@ -26,9 +26,9 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" "github.com/golang/snappy" ) diff --git a/core/rawdb/freezer_table_test.go b/core/rawdb/freezer_table_test.go index 116e26a7fe..80a4784496 100644 --- a/core/rawdb/freezer_table_test.go +++ b/core/rawdb/freezer_table_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/maticnetwork/bor/metrics" ) func init() { diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index a44a2c99f9..f4aefe3384 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -20,8 +20,8 @@ package rawdb import ( "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/rawdb/table.go b/core/rawdb/table.go index 6610b7f5a2..f2fbab8ecf 100644 --- a/core/rawdb/table.go +++ b/core/rawdb/table.go @@ -17,7 +17,7 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/ethdb" + "github.com/maticnetwork/bor/ethdb" ) // table is a wrapper around a database that prefixes each key access with a pre- diff --git a/core/state/database.go b/core/state/database.go index ecc2c134da..834e8ad96b 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -19,9 +19,9 @@ package state import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index 51d3e5554f..ceb747871b 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,11 +20,11 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) // DumpAccount represents an account in the state diff --git a/core/state/iterator.go b/core/state/iterator.go index 6a5c73d3d1..47d4bf9068 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) // NodeIterator is an iterator to traverse the entire state trie post-order, diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go index 69f51c4c7d..a2bd123e55 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb" ) // Tests that the node iterator indeed walks over the entire database contents. diff --git a/core/state/journal.go b/core/state/journal.go index a03ca57dbc..7466aa9bf1 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/state_object.go b/core/state/state_object.go index 852c340b82..7e2a63293d 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index d6ff714ee4..7abf3476f1 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 3bb9862edd..2a5df49a2c 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -24,13 +24,13 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) type revision struct { @@ -561,7 +561,7 @@ func (self *StateDB) Copy() *StateDB { } // Copy the dirty states, logs, and preimages for addr := range self.journal.dirties { - // As documented [here](https://github.com/ethereum/go-ethereum/pull/16485#issuecomment-380438527), + // As documented [here](https://github.com/maticnetwork/bor/pull/16485#issuecomment-380438527), // and in the Finalise-method, there is a case where an object is in the journal but not // in the stateObjects: OOG after touch on ripeMD prior to Byzantium. Thus, we need to check for // nil diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index c78ef38fd3..d91ac6de0a 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -30,9 +30,9 @@ import ( check "gopkg.in/check.v1" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" ) // Tests that updating a state trie does not leak any database writes prior to @@ -124,7 +124,7 @@ func TestIntermediateLeaks(t *testing.T) { // TestCopy tests that copying a statedb object indeed makes the original and // the copy independent of each other. This test is a regression test against -// https://github.com/ethereum/go-ethereum/pull/15549. +// https://github.com/maticnetwork/bor/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" orig, _ := New(common.Hash{}, NewDatabase(rawdb.NewMemoryDatabase())) @@ -436,7 +436,7 @@ func (s *StateSuite) TestTouchDelete(c *check.C) { } // TestCopyOfCopy tests that modified objects are carried over to the copy, and the copy of the copy. -// See https://github.com/ethereum/go-ethereum/pull/15225#issuecomment-380191512 +// See https://github.com/maticnetwork/bor/pull/15225#issuecomment-380191512 func TestCopyOfCopy(t *testing.T) { sdb, _ := New(common.Hash{}, NewDatabase(rawdb.NewMemoryDatabase())) addr := common.HexToAddress("aaaa") diff --git a/core/state/sync.go b/core/state/sync.go index ef79305273..19592b74be 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,10 +19,10 @@ package state import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index de098dce0f..b01510051c 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/ethdb/memorydb" + "github.com/maticnetwork/bor/trie" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state_prefetcher.go b/core/state_prefetcher.go index cb85a05b57..5a70450bad 100644 --- a/core/state_prefetcher.go +++ b/core/state_prefetcher.go @@ -19,12 +19,12 @@ package core import ( "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/params" ) // statePrefetcher is a basic Prefetcher, which blindly executes a block on top diff --git a/core/state_processor.go b/core/state_processor.go index bed6a07306..e7b1f84c02 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,14 +17,14 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/misc" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index 1f879d9633..bfcd4fc1ed 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -21,11 +21,11 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" ) var ( diff --git a/core/tx_cacher.go b/core/tx_cacher.go index b1e5d676a2..462f3e6518 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/core/types" ) // senderCacher is a concurrent transaction sender recoverer and cacher. diff --git a/core/tx_journal.go b/core/tx_journal.go index 41b5156d4a..0124bf4b23 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rlp" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/tx_list.go b/core/tx_list.go index 75bfdaedac..6fb0cbb894 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,9 +22,9 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/log" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/tx_list_test.go b/core/tx_list_test.go index d579f501af..479d56b2a4 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/tx_noncer.go b/core/tx_noncer.go index 98a78e087e..9b37412eb5 100644 --- a/core/tx_noncer.go +++ b/core/tx_noncer.go @@ -17,8 +17,8 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/state" ) // txNoncer is a tiny virtual state database to manage the executable nonces of diff --git a/core/tx_pool.go b/core/tx_pool.go index 43caf16b18..a089394a18 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/prque" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/params" ) const ( diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 7df1a2c6f9..d9d3f7dd92 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index 4c5b74a498..e88d7175fb 100644 --- a/core/types.go +++ b/core/types.go @@ -17,9 +17,9 @@ package core import ( - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" ) // Validator is an interface which defines the standard for block validation. It diff --git a/core/types/block.go b/core/types/block.go index b0ec7fc77d..b4e650327b 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -27,9 +27,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/types/block_test.go b/core/types/block_test.go index ff0a641e5c..b2ec5e34a9 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index d045c9e667..8460b42672 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7af..d909f0285e 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -54,7 +54,7 @@ func TestBloom(t *testing.T) { import ( "testing" - "github.com/ethereum/go-ethereum/core/state" + "github.com/maticnetwork/bor/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5bc6..94ea679847 100644 --- a/core/types/derive_sha.go +++ b/core/types/derive_sha.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 4212b8d94d..627e63a78b 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 6e94339478..7744f35f63 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 790ed65b58..a76581dec8 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index e676058ecc..e78502bec8 100644 --- a/core/types/gen_tx_json.go +++ b/core/types/gen_tx_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index 006f62bbf6..81dde5a838 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -19,9 +19,9 @@ package types import ( "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 0e56acfe4a..84cd89ab48 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index a96c7525ef..870424dc65 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -24,11 +24,11 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) //go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go index 806b3dd2ab..956fcb031f 100644 --- a/core/types/receipt_test.go +++ b/core/types/receipt_test.go @@ -23,10 +23,10 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) func TestLegacyReceiptDecoding(t *testing.T) { diff --git a/core/types/transaction.go b/core/types/transaction.go index 3eb8df0ac7..b19901c8ec 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -23,10 +23,10 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/rlp" ) //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 63132048ee..572c0e98d6 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 689fc38a9b..0defa023b8 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index f38d8e7177..9ee8163848 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index fd2d744d87..dfde21243f 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -19,7 +19,7 @@ package vm import ( "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index d592a9410d..72b98fbed2 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" ) // calcMemSize64 calculates the required memory size, and returns diff --git a/core/vm/contract.go b/core/vm/contract.go index 20baa6e751..4736d6ac97 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 20b741f8f1..dd762fdf89 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/bn256" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/crypto/bn256" + "github.com/maticnetwork/bor/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 96083337c9..1d7215e0b1 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index d47b009388..ba14d5beba 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/gas.go b/core/vm/gas.go index 022a84f243..67b9870c65 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/params" ) // Gas costs diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 8270300ba7..aa34ea413f 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/params" ) // memoryGasCost calculates the quadratic gas for memory expansion. It does so diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index 726012e59e..d96811dae8 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 2a062d7e77..80af2a9a84 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -20,10 +20,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" "golang.org/x/crypto/sha3" ) diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 50d0a9ddae..7e7cdb4d88 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -24,9 +24,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) type TwoOperandTestcase struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index dd401466ad..502d5f4ec0 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 989f85f5d3..724d04703f 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -21,9 +21,9 @@ import ( "hash" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 425436f9e5..f32b7f89d4 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -19,7 +19,7 @@ package vm import ( "errors" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 262ee5cc3e..7b5165f23c 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core/types" ) // Storage represents a contract's storage. diff --git a/core/vm/logger_json.go b/core/vm/logger_json.go index ff379a4efd..8bbae70d32 100644 --- a/core/vm/logger_json.go +++ b/core/vm/logger_json.go @@ -22,8 +22,8 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" ) type JSONLogger struct { diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 2ea7535a79..7c7f7a01ca 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/params" ) type dummyContractRef struct { diff --git a/core/vm/memory.go b/core/vm/memory.go index 7e6f0eb940..45a87f7e00 100644 --- a/core/vm/memory.go +++ b/core/vm/memory.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common/math" ) // Memory implements a simple memory model for the ethereum virtual machine. diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 31c9b9cf9d..b7be63c698 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,9 +17,9 @@ package runtime import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index db1f6f3822..e9c7ea49f7 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index b7d0ddc384..5aabd9bfa2 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -19,8 +19,8 @@ package runtime_test import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm/runtime" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 15f545ddca..b134523c99 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,12 +21,12 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/params" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index 10c12901af..963c375919 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -17,7 +17,7 @@ package vm import ( - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/params" ) func minSwapStack(n int) int { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index 5c081493b0..1ab2c11fbd 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" +import "github.com/maticnetwork/bor/crypto/bn256/cloudflare" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go index 6aa1421170..40aaf44386 100644 --- a/crypto/bn256/bn256_fuzz.go +++ b/crypto/bn256/bn256_fuzz.go @@ -10,8 +10,8 @@ import ( "bytes" "math/big" - cloudflare "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" - google "github.com/ethereum/go-ethereum/crypto/bn256/google" + cloudflare "github.com/maticnetwork/bor/crypto/bn256/cloudflare" + google "github.com/maticnetwork/bor/crypto/bn256/google" ) // FuzzAdd fuzzez bn256 addition between the Google and Cloudflare libraries. diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go index 47df49d417..81c303b9a0 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/google" +import "github.com/maticnetwork/bor/crypto/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/crypto.go b/crypto/crypto.go index 4567fafc72..c53ce6bece 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,9 +28,9 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/rlp" "golang.org/x/crypto/sha3" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 177c19c0cf..10223a481a 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -26,8 +26,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 6bd57145db..0863f41cb9 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -40,7 +40,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 6312daf5a1..089553018d 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/ethereum/go-ethereum/crypto" + ethcrypto "github.com/maticnetwork/bor/crypto" ) var ( diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index aadf028d26..b9e89aeb9e 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/crypto/secp256k1" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index aecff76bfb..751122963c 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" ) var ( diff --git a/dashboard/assets.go b/dashboard/assets.go index eb7a827103..7c2813fd8a 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -225,15 +225,15 @@ var _bundleJs = []byte((((`!function(e) { for (var t = 0; e > 1024 && t < 8; t++) e /= 1024; return e.toFixed(2).toString().concat(" ", _[t], "B"); }, y = [ "#00FF00", "#FFFF00", "#FF7F00", "#FF0000" ], b = [ 0, 2048, 102400, 2097152 ]; - (l = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).default) && (l.register(c, "menuSkeletons", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), - l.register(d, "MENU", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), - l.register(f, "DURATION", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), - l.register(p, "chartStrokeWidth", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), - l.register(h, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), - l.register(_, "unit", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), - l.register(m, "simplifyBytes", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), - l.register(y, "hues", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx"), - l.register(b, "hueScale", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/common.jsx")), + (l = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).default) && (l.register(c, "menuSkeletons", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), + l.register(d, "MENU", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), + l.register(f, "DURATION", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), + l.register(p, "chartStrokeWidth", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), + l.register(h, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), + l.register(_, "unit", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), + l.register(m, "simplifyBytes", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), + l.register(y, "hues", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx"), + l.register(b, "hueScale", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/common.jsx")), (u = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).leaveModule) && u(e); }).call(this, n("./node_modules/webpack/buildin/harmony-module.js")(e)); }, @@ -323,9 +323,9 @@ var _bundleJs = []byte((((`!function(e) { } ]), Body; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = Body, reactHotLoader, leaveModule; __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Body.jsx"), - reactHotLoader.register(Body, "Body", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Body.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Body.jsx")), + reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Body.jsx"), + reactHotLoader.register(Body, "Body", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Body.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Body.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -422,9 +422,9 @@ var _bundleJs = []byte((((`!function(e) { } ]), ChartRow; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = ChartRow, reactHotLoader, leaveModule; __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/ChartRow.jsx"), - reactHotLoader.register(ChartRow, "ChartRow", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/ChartRow.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/ChartRow.jsx")), + reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/ChartRow.jsx"), + reactHotLoader.register(ChartRow, "ChartRow", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/ChartRow.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/ChartRow.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -547,12 +547,12 @@ var _bundleJs = []byte((((`!function(e) { } ]), CustomTooltip; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = CustomTooltip, reactHotLoader, leaveModule; __webpack_exports__.c = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(multiplier, "multiplier", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), - reactHotLoader.register(percentPlotter, "percentPlotter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), - reactHotLoader.register(bytePlotter, "bytePlotter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), - reactHotLoader.register(bytePerSecPlotter, "bytePerSecPlotter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), - reactHotLoader.register(CustomTooltip, "CustomTooltip", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/CustomTooltip.jsx")), + reactHotLoader && (reactHotLoader.register(multiplier, "multiplier", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), + reactHotLoader.register(percentPlotter, "percentPlotter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), + reactHotLoader.register(bytePlotter, "bytePlotter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), + reactHotLoader.register(bytePerSecPlotter, "bytePerSecPlotter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), + reactHotLoader.register(CustomTooltip, "CustomTooltip", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/CustomTooltip.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -800,16 +800,16 @@ var _bundleJs = []byte((((`!function(e) { } ]), Dashboard; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = Object(react_hot_loader__WEBPACK_IMPORTED_MODULE_1__.hot)(module)(_material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_2___default()(themeStyles)(Dashboard)), reactHotLoader, leaveModule; __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(deepUpdate, "deepUpdate", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), - reactHotLoader.register(shouldUpdate, "shouldUpdate", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), - reactHotLoader.register(replacer, "replacer", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), - reactHotLoader.register(appender, "appender", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), - reactHotLoader.register(defaultContent, "defaultContent", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), - reactHotLoader.register(updaters, "updaters", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), - reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), - reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), - reactHotLoader.register(Dashboard, "Dashboard", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Dashboard.jsx")), + reactHotLoader && (reactHotLoader.register(deepUpdate, "deepUpdate", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), + reactHotLoader.register(shouldUpdate, "shouldUpdate", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), + reactHotLoader.register(replacer, "replacer", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), + reactHotLoader.register(appender, "appender", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), + reactHotLoader.register(defaultContent, "defaultContent", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), + reactHotLoader.register(updaters, "updaters", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), + reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), + reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), + reactHotLoader.register(Dashboard, "Dashboard", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Dashboard.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -1041,7 +1041,7 @@ var _bundleJs = []byte((((`!function(e) { }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("span", { style: _common__WEBPACK_IMPORTED_MODULE_12__.g.light }, "Commit "), react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("a", { - href: "https://github.com/ethereum/go-ethereum/commit/".concat(t.commit), + href: "https://github.com/maticnetwork/bor/commit/".concat(t.commit), target: "_blank", rel: "noopener noreferrer", style: styles.link @@ -1055,25 +1055,25 @@ var _bundleJs = []byte((((`!function(e) { } ]), Footer; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = _material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_1___default()(themeStyles)(Footer), reactHotLoader, leaveModule; __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(FOOTER_SYNC_ID, "FOOTER_SYNC_ID", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(CPU, "CPU", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(MEMORY, "MEMORY", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(DISK, "DISK", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(TRAFFIC, "TRAFFIC", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(TOP, "TOP", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(BOTTOM, "BOTTOM", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(cpuLabelTop, "cpuLabelTop", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(cpuLabelBottom, "cpuLabelBottom", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(memoryLabelTop, "memoryLabelTop", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(memoryLabelBottom, "memoryLabelBottom", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(diskLabelTop, "diskLabelTop", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(diskLabelBottom, "diskLabelBottom", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(trafficLabelTop, "trafficLabelTop", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(trafficLabelBottom, "trafficLabelBottom", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(Footer, "Footer", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Footer.jsx")), + reactHotLoader && (reactHotLoader.register(FOOTER_SYNC_ID, "FOOTER_SYNC_ID", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(CPU, "CPU", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(MEMORY, "MEMORY", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(DISK, "DISK", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(TRAFFIC, "TRAFFIC", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(TOP, "TOP", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(BOTTOM, "BOTTOM", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(cpuLabelTop, "cpuLabelTop", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(cpuLabelBottom, "cpuLabelBottom", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(memoryLabelTop, "memoryLabelTop", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(memoryLabelBottom, "memoryLabelBottom", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(diskLabelTop, "diskLabelTop", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(diskLabelBottom, "diskLabelBottom", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(trafficLabelTop, "trafficLabelTop", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(trafficLabelBottom, "trafficLabelBottom", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(Footer, "Footer", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Footer.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -1188,10 +1188,10 @@ var _bundleJs = []byte((((`!function(e) { } ]), Header; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = _material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_1___default()(themeStyles)(Header), reactHotLoader, leaveModule; __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Header.jsx"), - reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Header.jsx"), - reactHotLoader.register(Header, "Header", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Header.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Header.jsx")), + reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Header.jsx"), + reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Header.jsx"), + reactHotLoader.register(Header, "Header", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Header.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Header.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -1447,16 +1447,16 @@ var _bundleJs = []byte((((`!function(e) { } ]), Logs; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = Logs, reactHotLoader, leaveModule; __webpack_exports__.b = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(requestBand, "requestBand", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), - reactHotLoader.register(fieldPadding, "fieldPadding", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), - reactHotLoader.register(createChunk, "createChunk", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), - reactHotLoader.register(ADDED, "ADDED", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), - reactHotLoader.register(SAME, "SAME", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), - reactHotLoader.register(REMOVED, "REMOVED", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), - reactHotLoader.register(inserter, "inserter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), - reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), - reactHotLoader.register(Logs, "Logs", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Logs.jsx")), + reactHotLoader && (reactHotLoader.register(requestBand, "requestBand", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), + reactHotLoader.register(fieldPadding, "fieldPadding", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), + reactHotLoader.register(createChunk, "createChunk", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), + reactHotLoader.register(ADDED, "ADDED", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), + reactHotLoader.register(SAME, "SAME", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), + reactHotLoader.register(REMOVED, "REMOVED", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), + reactHotLoader.register(inserter, "inserter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), + reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), + reactHotLoader.register(Logs, "Logs", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Logs.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -1613,10 +1613,10 @@ var _bundleJs = []byte((((`!function(e) { } ]), Main; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = _material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_1___default()(themeStyles)(Main), reactHotLoader, leaveModule; __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Main.jsx"), - reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Main.jsx"), - reactHotLoader.register(Main, "Main", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Main.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Main.jsx")), + reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Main.jsx"), + reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Main.jsx"), + reactHotLoader.register(Main, "Main", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Main.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Main.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -2093,16 +2093,16 @@ var _bundleJs = []byte((((`!function(e) { } ]), Network; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = Network, reactHotLoader, leaveModule; __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(trafficChartHeight, "trafficChartHeight", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), - reactHotLoader.register(trafficChartWidth, "trafficChartWidth", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), - reactHotLoader.register(setMaxIngress, "setMaxIngress", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), - reactHotLoader.register(setMaxEgress, "setMaxEgress", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), - reactHotLoader.register(setIngressChartAttributes, "setIngressChartAttributes", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), - reactHotLoader.register(setEgressChartAttributes, "setEgressChartAttributes", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), - reactHotLoader.register(inserter, "inserter", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), - reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), - reactHotLoader.register(Network, "Network", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/Network.jsx")), + reactHotLoader && (reactHotLoader.register(trafficChartHeight, "trafficChartHeight", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), + reactHotLoader.register(trafficChartWidth, "trafficChartWidth", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), + reactHotLoader.register(setMaxIngress, "setMaxIngress", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), + reactHotLoader.register(setMaxEgress, "setMaxEgress", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), + reactHotLoader.register(setIngressChartAttributes, "setIngressChartAttributes", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), + reactHotLoader.register(setEgressChartAttributes, "setEgressChartAttributes", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), + reactHotLoader.register(inserter, "inserter", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), + reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), + reactHotLoader.register(Network, "Network", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/Network.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -2261,10 +2261,10 @@ var _bundleJs = []byte((((`!function(e) { } ]), SideBar; }(react__WEBPACK_IMPORTED_MODULE_0__.Component), _default = _material_ui_core_styles_withStyles__WEBPACK_IMPORTED_MODULE_1___default()(themeStyles)(SideBar), reactHotLoader, leaveModule; __webpack_exports__.a = _default, reactHotLoader = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).default, - reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/SideBar.jsx"), - reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/SideBar.jsx"), - reactHotLoader.register(SideBar, "SideBar", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/SideBar.jsx"), - reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/components/SideBar.jsx")), + reactHotLoader && (reactHotLoader.register(styles, "styles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/SideBar.jsx"), + reactHotLoader.register(themeStyles, "themeStyles", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/SideBar.jsx"), + reactHotLoader.register(SideBar, "SideBar", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/SideBar.jsx"), + reactHotLoader.register(_default, "default", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/components/SideBar.jsx")), leaveModule = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : __webpack_require__("./node_modules/react-hot-loader/index.js")).leaveModule, leaveModule && leaveModule(module); }).call(this, __webpack_require__("./node_modules/webpack/buildin/harmony-module.js")(module)); @@ -2281,8 +2281,8 @@ var _bundleJs = []byte((((`!function(e) { }), h = document.getElementById("dashboard"); h && Object(a.render)(o.a.createElement(s.a, { theme: p - }, o.a.createElement(c.a, null)), h), (d = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).default) && (d.register(p, "theme", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/index.jsx"), - d.register(h, "dashboard", "/home/misi/Work/src/github.com/ethereum/go-ethereum/dashboard/assets/index.jsx")), + }, o.a.createElement(c.a, null)), h), (d = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).default) && (d.register(p, "theme", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/index.jsx"), + d.register(h, "dashboard", "/home/misi/Work/src/github.com/maticnetwork/bor/dashboard/assets/index.jsx")), (f = ("undefined" != typeof reactHotLoaderGlobal ? reactHotLoaderGlobal : n("./node_modules/react-hot-loader/index.js")).leaveModule) && f(e); }.call(this, n("./node_modules/webpack/buildin/harmony-module.js")(e)); }, @@ -37778,7 +37778,7 @@ var _bundleJsMap = []byte(((((((((((((`{ "// @flow\n\n// Copyright 2018 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see .\n\nimport React, {Component} from 'react';\nimport type {ChildrenArray} from 'react';\n\nimport Grid from '@material-ui/core/Grid';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tcontainer: {\n\t\tflexWrap: 'nowrap',\n\t\theight: '100%',\n\t\tmaxWidth: '100%',\n\t\tmargin: 0,\n\t},\n\titem: {\n\t\tflex: 1,\n\t\tpadding: 0,\n\t},\n};\n\nexport type Props = {\n\tchildren: ChildrenArray>,\n};\n\n// ChartRow renders a row of equally sized responsive charts.\nclass ChartRow extends Component {\n\trender() {\n\t\treturn (\n\t\t\t\n\t\t\t\t{React.Children.map(this.props.children, child => (\n\t\t\t\t\t\n\t\t\t\t\t\t{child}\n\t\t\t\t\t\n\t\t\t\t))}\n\t\t\t\n\t\t);\n\t}\n}\n\nexport default ChartRow;\n", "// @flow\n\n// Copyright 2018 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see .\n\nimport React, {Component} from 'react';\n\nimport Typography from '@material-ui/core/Typography';\nimport {styles, simplifyBytes} from '../common';\n\n// multiplier multiplies a number by another.\nexport const multiplier = (by: number = 1) => (x: number) => x * by;\n\n// percentPlotter renders a tooltip, which displays the value of the payload followed by a percent sign.\nexport const percentPlotter = (text: string, mapper: (T => T) = multiplier(1)) => (payload: T) => {\n\tconst p = mapper(payload);\n\tif (typeof p !== 'number') {\n\t\treturn null;\n\t}\n\treturn (\n\t\t\n\t\t\t{text} {p.toFixed(2)} %\n\t\t\n\t);\n};\n\n// bytePlotter renders a tooltip, which displays the payload as a byte value.\nexport const bytePlotter = (text: string, mapper: (T => T) = multiplier(1)) => (payload: T) => {\n\tconst p = mapper(payload);\n\tif (typeof p !== 'number') {\n\t\treturn null;\n\t}\n\treturn (\n\t\t\n\t\t\t{text} {simplifyBytes(p)}\n\t\t\n\t);\n};\n\n// bytePlotter renders a tooltip, which displays the payload as a byte value followed by '/s'.\nexport const bytePerSecPlotter = (text: string, mapper: (T => T) = multiplier(1)) => (payload: T) => {\n\tconst p = mapper(payload);\n\tif (typeof p !== 'number') {\n\t\treturn null;\n\t}\n\treturn (\n\t\t\n\t\t\t{text}\n\t\t\t{simplifyBytes(p)}/s\n\t\t\n\t);\n};\n\nexport type Props = {\n\tactive: boolean,\n\tpayload: Object,\n\ttooltip: (text: string, mapper?: T => T) => (payload: mixed) => null | React$Element,\n};\n\n// CustomTooltip takes a tooltip function, and uses it to plot the active value of the chart.\nclass CustomTooltip extends Component {\n\trender() {\n\t\tconst {active, payload, tooltip} = this.props;\n\t\tif (!active || typeof tooltip !== 'function' || !Array.isArray(payload) || payload.length < 1) {\n\t\t\treturn null;\n\t\t}\n\t\treturn tooltip(payload[0].value);\n\t}\n}\n\nexport default CustomTooltip;\n", "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see .\n\nimport React, {Component} from 'react';\nimport {hot} from 'react-hot-loader';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\n\nimport Header from 'Header';\nimport Body from 'Body';\nimport {inserter as logInserter, SAME} from 'Logs';\nimport {inserter as peerInserter} from 'Network';\nimport {MENU} from '../common';\nimport type {Content} from '../types/content';\n\n// deepUpdate updates an object corresponding to the given update data, which has\n// the shape of the same structure as the original object. updater also has the same\n// structure, except that it contains functions where the original data needs to be\n// updated. These functions are used to handle the update.\n//\n// Since the messages have the same shape as the state content, this approach allows\n// the generalization of the message handling. The only necessary thing is to set a\n// handler function for every path of the state in order to maximize the flexibility\n// of the update.\nconst deepUpdate = (updater: Object, update: Object, prev: Object): $Shape => {\n\tif (typeof update === 'undefined') {\n\t\treturn prev;\n\t}\n\tif (typeof updater === 'function') {\n\t\treturn updater(update, prev);\n\t}\n\tconst updated = {};\n\tObject.keys(prev).forEach((key) => {\n\t\tupdated[key] = deepUpdate(updater[key], update[key], prev[key]);\n\t});\n\n\treturn updated;\n};\n\n// shouldUpdate returns the structure of a message. It is used to prevent unnecessary render\n// method triggerings. In the affected component's shouldComponentUpdate method it can be checked\n// whether the involved data was changed or not by checking the message structure.\n//\n// We could return the message itself too, but it's safer not to give access to it.\nconst shouldUpdate = (updater: Object, msg: Object) => {\n\tconst su = {};\n\tObject.keys(msg).forEach((key) => {\n\t\tsu[key] = typeof updater[key] !== 'function' ? shouldUpdate(updater[key], msg[key]) : true;\n\t});\n\n\treturn su;\n};\n\n// replacer is a state updater function, which replaces the original data.\nconst replacer = (update: T) => update;\n\n// appender is a state updater function, which appends the update data to the\n// existing data. limit defines the maximum allowed size of the created array,\n// mapper maps the update data.\nconst appender = (limit: number, mapper = replacer) => (update: Array, prev: Array) => [\n\t...prev,\n\t...update.map(sample => mapper(sample)),\n].slice(-limit);\n\n// defaultContent returns the initial value of the state content. Needs to be a function in order to\n// instantiate the object again, because it is used by the state, and isn't automatically cleaned\n// when a new connection is established. The state is mutated during the update in order to avoid\n// the execution of unnecessary operations (e.g. copy of the log array).\nconst defaultContent: () => Content = () => ({\n\tgeneral: {\n\t\tversion: null,\n\t\tcommit: null,\n\t},\n\thome: {},\n\tchain: {},\n\ttxpool: {},\n\tnetwork: {\n\t\tpeers: {\n\t\t\tbundles: {},\n\t\t},\n\t\tdiff: [],\n\t},\n\tsystem: {\n\t\tactiveMemory: [],\n\t\tvirtualMemory: [],\n\t\tnetworkIngress: [],\n\t\tnetworkEgress: [],\n\t\tprocessCPU: [],\n\t\tsystemCPU: [],\n\t\tdiskRead: [],\n\t\tdiskWrite: [],\n\t},\n\tlogs: {\n\t\tchunks: [],\n\t\tendTop: false,\n\t\tendBottom: true,\n\t\ttopChanged: SAME,\n\t\tbottomChanged: SAME,\n\t},\n});\n\n// updaters contains the state updater functions for each path of the state.\n//\n// TODO (kurkomisi): Define a tricky type which embraces the content and the updaters.\nconst updaters = {\n\tgeneral: {\n\t\tversion: replacer,\n\t\tcommit: replacer,\n\t},\n\thome: null,\n\tchain: null,\n\ttxpool: null,\n\tnetwork: peerInserter(200),\n\tsystem: {\n\t\tactiveMemory: appender(200),\n\t\tvirtualMemory: appender(200),\n\t\tnetworkIngress: appender(200),\n\t\tnetworkEgress: appender(200),\n\t\tprocessCPU: appender(200),\n\t\tsystemCPU: appender(200),\n\t\tdiskRead: appender(200),\n\t\tdiskWrite: appender(200),\n\t},\n\tlogs: logInserter(5),\n};\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tdashboard: {\n\t\tdisplay: 'flex',\n\t\tflexFlow: 'column',\n\t\twidth: '100%',\n\t\theight: '100%',\n\t\tzIndex: 1,\n\t\toverflow: 'hidden',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles: Object = (theme: Object) => ({\n\tdashboard: {\n\t\tbackground: theme.palette.background.default,\n\t},\n});\n\nexport type Props = {\n\tclasses: Object, // injected by withStyles()\n};\n\ntype State = {\n\tactive: string, // active menu\n\tsideBar: boolean, // true if the sidebar is opened\n\tcontent: Content, // the visualized data\n\tshouldUpdate: Object, // labels for the components, which need to re-render based on the incoming message\n\tserver: ?WebSocket,\n};\n\n// Dashboard is the main component, which renders the whole page, makes connection with the server and\n// listens for messages. When there is an incoming message, updates the page's content correspondingly.\nclass Dashboard extends Component {\n\tconstructor(props: Props) {\n\t\tsuper(props);\n\t\tthis.state = {\n\t\t\tactive: MENU.get('home').id,\n\t\t\tsideBar: true,\n\t\t\tcontent: defaultContent(),\n\t\t\tshouldUpdate: {},\n\t\t\tserver: null,\n\t\t};\n\t}\n\n\t// componentDidMount initiates the establishment of the first websocket connection after the component is rendered.\n\tcomponentDidMount() {\n\t\tthis.reconnect();\n\t}\n\n\t// reconnect establishes a websocket connection with the server, listens for incoming messages\n\t// and tries to reconnect on connection loss.\n\treconnect = () => {\n\t\tconst host = process.env.NODE_ENV === 'production' ? window.location.host : 'localhost:8080';\n\t\tconst server = new WebSocket(` + ("`" + `${((window.location.protocol === 'https:') ? 'wss://' : 'ws://')}${host}/api`)) + ("`" + (`);\n\t\tserver.onopen = () => {\n\t\t\tthis.setState({content: defaultContent(), shouldUpdate: {}, server});\n\t\t};\n\t\tserver.onmessage = (event) => {\n\t\t\tconst msg: $Shape = JSON.parse(event.data);\n\t\t\tif (!msg) {\n\t\t\t\tconsole.error(` + "`"))) + ((`Incoming message is ${msg}` + ("`" + `);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tthis.update(msg);\n\t\t};\n\t\tserver.onclose = () => {\n\t\t\tthis.setState({server: null});\n\t\t\tsetTimeout(this.reconnect, 3000);\n\t\t};\n\t};\n\n\t// send sends a message to the server, which can be accessed only through this function for safety reasons.\n\tsend = (msg: string) => {\n\t\tif (this.state.server != null) {\n\t\t\tthis.state.server.send(msg);\n\t\t}\n\t};\n\n\t// update updates the content corresponding to the incoming message.\n\tupdate = (msg: $Shape) => {\n\t\tthis.setState(prevState => ({\n\t\t\tcontent: deepUpdate(updaters, msg, prevState.content),\n\t\t\tshouldUpdate: shouldUpdate(updaters, msg),\n\t\t}));\n\t};\n\n\t// changeContent sets the active label, which is used at the content rendering.\n\tchangeContent = (newActive: string) => {\n\t\tthis.setState(prevState => (prevState.active !== newActive ? {active: newActive} : {}));\n\t};\n\n\t// switchSideBar opens or closes the sidebar's state.\n\tswitchSideBar = () => {\n\t\tthis.setState(prevState => ({sideBar: !prevState.sideBar}));\n\t};\n\n\trender() {\n\t\treturn (\n\t\t\t
\n\t\t\t\t\n\t\t\t\t\n\t\t\t
\n\t\t);\n\t}\n}\n\nexport default hot(module)(withStyles(themeStyles)(Dashboard));\n", - "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see .\n\nimport React, {Component} from 'react';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\nimport Typography from '@material-ui/core/Typography';\nimport Grid from '@material-ui/core/Grid';\nimport ResponsiveContainer from 'recharts/es6/component/ResponsiveContainer';\nimport AreaChart from 'recharts/es6/chart/AreaChart';\nimport Area from 'recharts/es6/cartesian/Area';\nimport ReferenceLine from 'recharts/es6/cartesian/ReferenceLine';\nimport Label from 'recharts/es6/component/Label';\nimport Tooltip from 'recharts/es6/component/Tooltip';\n\nimport ChartRow from 'ChartRow';\nimport CustomTooltip, {bytePlotter, bytePerSecPlotter, percentPlotter, multiplier} from 'CustomTooltip';\nimport {chartStrokeWidth, styles as commonStyles} from '../common';\nimport type {General, System} from '../types/content';\n\nconst FOOTER_SYNC_ID = 'footerSyncId';\n\nconst CPU = 'cpu';\nconst MEMORY = 'memory';\nconst DISK = 'disk';\nconst TRAFFIC = 'traffic';\n\nconst TOP = 'Top';\nconst BOTTOM = 'Bottom';\n\nconst cpuLabelTop = 'Process load';\nconst cpuLabelBottom = 'System load';\nconst memoryLabelTop = 'Active memory';\nconst memoryLabelBottom = 'Virtual memory';\nconst diskLabelTop = 'Disk read';\nconst diskLabelBottom = 'Disk write';\nconst trafficLabelTop = 'Download';\nconst trafficLabelBottom = 'Upload';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tfooter: {\n\t\tmaxWidth: '100%',\n\t\tflexWrap: 'nowrap',\n\t\tmargin: 0,\n\t},\n\tchartRowWrapper: {\n\t\theight: '100%',\n\t\tpadding: 0,\n\t},\n\tdoubleChartWrapper: {\n\t\theight: '100%',\n\t\twidth: '99%',\n\t},\n\tlink: {\n\t\tcolor: 'inherit',\n\t\ttextDecoration: 'none',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles: Object = (theme: Object) => ({\n\tfooter: {\n\t\tbackgroundColor: theme.palette.grey[900],\n\t\tcolor: theme.palette.getContrastText(theme.palette.grey[900]),\n\t\tzIndex: theme.zIndex.appBar,\n\t\theight: theme.spacing.unit * 10,\n\t},\n});\n\nexport type Props = {\n\tclasses: Object, // injected by withStyles()\n\ttheme: Object,\n\tgeneral: General,\n\tsystem: System,\n\tshouldUpdate: Object,\n};\n\ntype State = {};\n\n// Footer renders the footer of the dashboard.\nclass Footer extends Component {\n\tshouldComponentUpdate(nextProps: Readonly, nextState: Readonly, nextContext: any) {\n\t\treturn typeof nextProps.shouldUpdate.general !== 'undefined' || typeof nextProps.shouldUpdate.system !== 'undefined';\n\t}\n\n\t// halfHeightChart renders an area chart with half of the height of its parent.\n\thalfHeightChart = (chartProps, tooltip, areaProps, label, position) => (\n\t\t\n\t\t\t\n\t\t\t\t{!tooltip || (} />)}\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\n\t\t\n\t);\n\n\t// doubleChart renders a pair of charts separated by the baseline.\n\tdoubleChart = (syncId, chartKey, topChart, bottomChart) => {\n\t\tif (!Array.isArray(topChart.data) || !Array.isArray(bottomChart.data)) {\n\t\t\treturn null;\n\t\t}\n\t\tconst topDefault = topChart.default || 0;\n\t\tconst bottomDefault = bottomChart.default || 0;\n\t\tconst topKey = `)) + ("`" + (`${chartKey}${TOP}` + "`")))) + (((`;\n\t\tconst bottomKey = ` + ("`" + `${chartKey}${BOTTOM}`)) + ("`" + (`;\n\t\tconst topColor = '#8884d8';\n\t\tconst bottomColor = '#82ca9d';\n\n\t\treturn (\n\t\t\t
\n\t\t\t\t{this.halfHeightChart(\n\t\t\t\t\t{\n\t\t\t\t\t\tsyncId,\n\t\t\t\t\t\tdata: topChart.data.map(({value}) => ({[topKey]: value || topDefault})),\n\t\t\t\t\t\tmargin: {top: 5, right: 5, bottom: 0, left: 5},\n\t\t\t\t\t},\n\t\t\t\t\ttopChart.tooltip,\n\t\t\t\t\t{dataKey: topKey, stroke: topColor, fill: topColor},\n\t\t\t\t\ttopChart.label,\n\t\t\t\t\t'insideBottomLeft',\n\t\t\t\t)}\n\t\t\t\t{this.halfHeightChart(\n\t\t\t\t\t{\n\t\t\t\t\t\tsyncId,\n\t\t\t\t\t\tdata: bottomChart.data.map(({value}) => ({[bottomKey]: -value || -bottomDefault})),\n\t\t\t\t\t\tmargin: {top: 0, right: 5, bottom: 5, left: 5},\n\t\t\t\t\t},\n\t\t\t\t\tbottomChart.tooltip,\n\t\t\t\t\t{dataKey: bottomKey, stroke: bottomColor, fill: bottomColor},\n\t\t\t\t\tbottomChart.label,\n\t\t\t\t\t'insideTopLeft',\n\t\t\t\t)}\n\t\t\t
\n\t\t);\n\t};\n\n\trender() {\n\t\tconst {general, system} = this.props;\n\n\t\treturn (\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tCPU,\n\t\t\t\t\t\t\t{data: system.processCPU, tooltip: percentPlotter(cpuLabelTop), label: cpuLabelTop},\n\t\t\t\t\t\t\t{data: system.systemCPU, tooltip: percentPlotter(cpuLabelBottom, multiplier(-1)), label: cpuLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tMEMORY,\n\t\t\t\t\t\t\t{data: system.activeMemory, tooltip: bytePlotter(memoryLabelTop), label: memoryLabelTop},\n\t\t\t\t\t\t\t{data: system.virtualMemory, tooltip: bytePlotter(memoryLabelBottom, multiplier(-1)), label: memoryLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tDISK,\n\t\t\t\t\t\t\t{data: system.diskRead, tooltip: bytePerSecPlotter(diskLabelTop), label: diskLabelTop},\n\t\t\t\t\t\t\t{data: system.diskWrite, tooltip: bytePerSecPlotter(diskLabelBottom, multiplier(-1)), label: diskLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tTRAFFIC,\n\t\t\t\t\t\t\t{data: system.networkIngress, tooltip: bytePerSecPlotter(trafficLabelTop), label: trafficLabelTop},\n\t\t\t\t\t\t\t{data: system.networkEgress, tooltip: bytePerSecPlotter(trafficLabelBottom, multiplier(-1)), label: trafficLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\tGeth {general.version}\n\t\t\t\t\t\n\t\t\t\t\t{general.commit && (\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{'Commit '}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{general.commit.substring(0, 8)}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t)}\n\t\t\t\t\n\t\t\t\n\t\t);\n\t}\n}\n\nexport default withStyles(themeStyles)(Footer);\n", + "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see .\n\nimport React, {Component} from 'react';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\nimport Typography from '@material-ui/core/Typography';\nimport Grid from '@material-ui/core/Grid';\nimport ResponsiveContainer from 'recharts/es6/component/ResponsiveContainer';\nimport AreaChart from 'recharts/es6/chart/AreaChart';\nimport Area from 'recharts/es6/cartesian/Area';\nimport ReferenceLine from 'recharts/es6/cartesian/ReferenceLine';\nimport Label from 'recharts/es6/component/Label';\nimport Tooltip from 'recharts/es6/component/Tooltip';\n\nimport ChartRow from 'ChartRow';\nimport CustomTooltip, {bytePlotter, bytePerSecPlotter, percentPlotter, multiplier} from 'CustomTooltip';\nimport {chartStrokeWidth, styles as commonStyles} from '../common';\nimport type {General, System} from '../types/content';\n\nconst FOOTER_SYNC_ID = 'footerSyncId';\n\nconst CPU = 'cpu';\nconst MEMORY = 'memory';\nconst DISK = 'disk';\nconst TRAFFIC = 'traffic';\n\nconst TOP = 'Top';\nconst BOTTOM = 'Bottom';\n\nconst cpuLabelTop = 'Process load';\nconst cpuLabelBottom = 'System load';\nconst memoryLabelTop = 'Active memory';\nconst memoryLabelBottom = 'Virtual memory';\nconst diskLabelTop = 'Disk read';\nconst diskLabelBottom = 'Disk write';\nconst trafficLabelTop = 'Download';\nconst trafficLabelBottom = 'Upload';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tfooter: {\n\t\tmaxWidth: '100%',\n\t\tflexWrap: 'nowrap',\n\t\tmargin: 0,\n\t},\n\tchartRowWrapper: {\n\t\theight: '100%',\n\t\tpadding: 0,\n\t},\n\tdoubleChartWrapper: {\n\t\theight: '100%',\n\t\twidth: '99%',\n\t},\n\tlink: {\n\t\tcolor: 'inherit',\n\t\ttextDecoration: 'none',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles: Object = (theme: Object) => ({\n\tfooter: {\n\t\tbackgroundColor: theme.palette.grey[900],\n\t\tcolor: theme.palette.getContrastText(theme.palette.grey[900]),\n\t\tzIndex: theme.zIndex.appBar,\n\t\theight: theme.spacing.unit * 10,\n\t},\n});\n\nexport type Props = {\n\tclasses: Object, // injected by withStyles()\n\ttheme: Object,\n\tgeneral: General,\n\tsystem: System,\n\tshouldUpdate: Object,\n};\n\ntype State = {};\n\n// Footer renders the footer of the dashboard.\nclass Footer extends Component {\n\tshouldComponentUpdate(nextProps: Readonly, nextState: Readonly, nextContext: any) {\n\t\treturn typeof nextProps.shouldUpdate.general !== 'undefined' || typeof nextProps.shouldUpdate.system !== 'undefined';\n\t}\n\n\t// halfHeightChart renders an area chart with half of the height of its parent.\n\thalfHeightChart = (chartProps, tooltip, areaProps, label, position) => (\n\t\t\n\t\t\t\n\t\t\t\t{!tooltip || (} />)}\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\n\t\t\n\t);\n\n\t// doubleChart renders a pair of charts separated by the baseline.\n\tdoubleChart = (syncId, chartKey, topChart, bottomChart) => {\n\t\tif (!Array.isArray(topChart.data) || !Array.isArray(bottomChart.data)) {\n\t\t\treturn null;\n\t\t}\n\t\tconst topDefault = topChart.default || 0;\n\t\tconst bottomDefault = bottomChart.default || 0;\n\t\tconst topKey = `)) + ("`" + (`${chartKey}${TOP}` + "`")))) + (((`;\n\t\tconst bottomKey = ` + ("`" + `${chartKey}${BOTTOM}`)) + ("`" + (`;\n\t\tconst topColor = '#8884d8';\n\t\tconst bottomColor = '#82ca9d';\n\n\t\treturn (\n\t\t\t
\n\t\t\t\t{this.halfHeightChart(\n\t\t\t\t\t{\n\t\t\t\t\t\tsyncId,\n\t\t\t\t\t\tdata: topChart.data.map(({value}) => ({[topKey]: value || topDefault})),\n\t\t\t\t\t\tmargin: {top: 5, right: 5, bottom: 0, left: 5},\n\t\t\t\t\t},\n\t\t\t\t\ttopChart.tooltip,\n\t\t\t\t\t{dataKey: topKey, stroke: topColor, fill: topColor},\n\t\t\t\t\ttopChart.label,\n\t\t\t\t\t'insideBottomLeft',\n\t\t\t\t)}\n\t\t\t\t{this.halfHeightChart(\n\t\t\t\t\t{\n\t\t\t\t\t\tsyncId,\n\t\t\t\t\t\tdata: bottomChart.data.map(({value}) => ({[bottomKey]: -value || -bottomDefault})),\n\t\t\t\t\t\tmargin: {top: 0, right: 5, bottom: 5, left: 5},\n\t\t\t\t\t},\n\t\t\t\t\tbottomChart.tooltip,\n\t\t\t\t\t{dataKey: bottomKey, stroke: bottomColor, fill: bottomColor},\n\t\t\t\t\tbottomChart.label,\n\t\t\t\t\t'insideTopLeft',\n\t\t\t\t)}\n\t\t\t
\n\t\t);\n\t};\n\n\trender() {\n\t\tconst {general, system} = this.props;\n\n\t\treturn (\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tCPU,\n\t\t\t\t\t\t\t{data: system.processCPU, tooltip: percentPlotter(cpuLabelTop), label: cpuLabelTop},\n\t\t\t\t\t\t\t{data: system.systemCPU, tooltip: percentPlotter(cpuLabelBottom, multiplier(-1)), label: cpuLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tMEMORY,\n\t\t\t\t\t\t\t{data: system.activeMemory, tooltip: bytePlotter(memoryLabelTop), label: memoryLabelTop},\n\t\t\t\t\t\t\t{data: system.virtualMemory, tooltip: bytePlotter(memoryLabelBottom, multiplier(-1)), label: memoryLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tDISK,\n\t\t\t\t\t\t\t{data: system.diskRead, tooltip: bytePerSecPlotter(diskLabelTop), label: diskLabelTop},\n\t\t\t\t\t\t\t{data: system.diskWrite, tooltip: bytePerSecPlotter(diskLabelBottom, multiplier(-1)), label: diskLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\t{this.doubleChart(\n\t\t\t\t\t\t\tFOOTER_SYNC_ID,\n\t\t\t\t\t\t\tTRAFFIC,\n\t\t\t\t\t\t\t{data: system.networkIngress, tooltip: bytePerSecPlotter(trafficLabelTop), label: trafficLabelTop},\n\t\t\t\t\t\t\t{data: system.networkEgress, tooltip: bytePerSecPlotter(trafficLabelBottom, multiplier(-1)), label: trafficLabelBottom},\n\t\t\t\t\t\t)}\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\tGeth {general.version}\n\t\t\t\t\t\n\t\t\t\t\t{general.commit && (\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{'Commit '}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{general.commit.substring(0, 8)}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t)}\n\t\t\t\t\n\t\t\t\n\t\t);\n\t}\n}\n\nexport default withStyles(themeStyles)(Footer);\n", "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see .\n\nimport React, {Component} from 'react';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\nimport AppBar from '@material-ui/core/AppBar';\nimport Toolbar from '@material-ui/core/Toolbar';\nimport IconButton from '@material-ui/core/IconButton';\nimport {FontAwesomeIcon} from '@fortawesome/react-fontawesome';\nimport {faBars} from '@fortawesome/free-solid-svg-icons';\nimport Typography from '@material-ui/core/Typography';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\theader: {\n\t\theight: '8%',\n\t},\n\ttoolbar: {\n\t\theight: '100%',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles = (theme: Object) => ({\n\theader: {\n\t\tbackgroundColor: theme.palette.grey[900],\n\t\tcolor: theme.palette.getContrastText(theme.palette.grey[900]),\n\t\tzIndex: theme.zIndex.appBar,\n\t},\n\ttoolbar: {\n\t\tpaddingLeft: theme.spacing.unit,\n\t\tpaddingRight: theme.spacing.unit,\n\t},\n\ttitle: {\n\t\tpaddingLeft: theme.spacing.unit,\n\t\tfontSize: 3 * theme.spacing.unit,\n\t},\n});\n\nexport type Props = {\n\tclasses: Object, // injected by withStyles()\n\tswitchSideBar: () => void,\n};\n\n// Header renders the header of the dashboard.\nclass Header extends Component {\n\trender() {\n\t\tconst {classes} = this.props;\n\n\t\treturn (\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\tGo Ethereum Dashboard\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t);\n\t}\n}\n\nexport default withStyles(themeStyles)(Header);\n", "// @flow\n\n// Copyright 2018 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see .\n\nimport React, {Component} from 'react';\n\nimport List from '@material-ui/core/List';\nimport ListItem from '@material-ui/core/ListItem';\nimport escapeHtml from 'escape-html';\nimport type {Record, Content, LogsMessage, Logs as LogsType} from '../types/content';\n\n// requestBand says how wide is the top/bottom zone, eg. 0.1 means 10% of the container height.\nconst requestBand = 0.05;\n\n// fieldPadding is a global map with maximum field value lengths seen until now\n// to allow padding log contexts in a bit smarter way.\nconst fieldPadding = new Map();\n\n// createChunk creates an HTML formatted object, which displays the given array similarly to\n// the server side terminal.\nconst createChunk = (records: Array) => {\n\tlet content = '';\n\trecords.forEach((record) => {\n\t\tconst {t, ctx} = record;\n\t\tlet {lvl, msg} = record;\n\t\tlet color = '#ce3c23';\n\t\tswitch (lvl) {\n\t\tcase 'trace':\n\t\tcase 'trce':\n\t\t\tlvl = 'TRACE';\n\t\t\tcolor = '#3465a4';\n\t\t\tbreak;\n\t\tcase 'debug':\n\t\tcase 'dbug':\n\t\t\tlvl = 'DEBUG';\n\t\t\tcolor = '#3d989b';\n\t\t\tbreak;\n\t\tcase 'info':\n\t\t\tlvl = 'INFO ';\n\t\t\tcolor = '#4c8f0f';\n\t\t\tbreak;\n\t\tcase 'warn':\n\t\t\tlvl = 'WARN ';\n\t\t\tcolor = '#b79a22';\n\t\t\tbreak;\n\t\tcase 'error':\n\t\tcase 'eror':\n\t\t\tlvl = 'ERROR';\n\t\t\tcolor = '#754b70';\n\t\t\tbreak;\n\t\tcase 'crit':\n\t\t\tlvl = 'CRIT ';\n\t\t\tcolor = '#ce3c23';\n\t\t\tbreak;\n\t\tdefault:\n\t\t\tlvl = '';\n\t\t}\n\t\tconst time = new Date(t);\n\t\tif (lvl === '' || !(time instanceof Date) || isNaN(time) || typeof msg !== 'string' || !Array.isArray(ctx)) {\n\t\t\tcontent += 'Invalid log record
';\n\t\t\treturn;\n\t\t}\n\t\tif (ctx.length > 0) {\n\t\t\tmsg += ' '.repeat(Math.max(40 - msg.length, 0));\n\t\t}\n\t\tconst month = `)) + ("`" + (`0${time.getMonth() + 1}` + "`"))))) + ((((`.slice(-2);\n\t\tconst date = ` + ("`" + `0${time.getDate()}`)) + ("`" + (`.slice(-2);\n\t\tconst hours = ` + "`"))) + ((`0${time.getHours()}` + ("`" + `.slice(-2);\n\t\tconst minutes = `)) + ("`" + (`0${time.getMinutes()}` + "`")))) + (((`.slice(-2);\n\t\tconst seconds = ` + ("`" + `0${time.getSeconds()}`)) + ("`" + (`.slice(-2);\n\t\tcontent += ` + "`"))) + ((`${lvl}[${month}-${date}|${hours}:${minutes}:${seconds}] ${msg}` + ("`" + `;\n\n\t\tfor (let i = 0; i < ctx.length; i += 2) {\n\t\t\tconst key = escapeHtml(ctx[i]);\n\t\t\tconst val = escapeHtml(ctx[i + 1]);\n\t\t\tlet padding = fieldPadding.get(key);\n\t\t\tif (typeof padding !== 'number' || padding < val.length) {\n\t\t\t\tpadding = val.length;\n\t\t\t\tfieldPadding.set(key, padding);\n\t\t\t}\n\t\t\tlet p = '';\n\t\t\tif (i < ctx.length - 2) {\n\t\t\t\tp = ' '.repeat(padding - val.length);\n\t\t\t}\n\t\t\tcontent += `)) + (("`" + ` ${key}=${val}${p}`) + ("`" + `;\n\t\t}\n\t\tcontent += '
';\n\t});\n\treturn content;\n};\n\n// ADDED, SAME and REMOVED are used to track the change of the log chunk array.\n// The scroll position is set using these values.\nexport const ADDED = 1;\nexport const SAME = 0;\nexport const REMOVED = -1;\n\n// inserter is a state updater function for the main component, which inserts the new log chunk into the chunk array.\n// limit is the maximum length of the chunk array, used in order to prevent the browser from OOM.\nexport const inserter = (limit: number) => (update: LogsMessage, prev: LogsType) => {\n\tprev.topChanged = SAME;\n\tprev.bottomChanged = SAME;\n\tif (!Array.isArray(update.chunk) || update.chunk.length < 1) {\n\t\treturn prev;\n\t}\n\tif (!Array.isArray(prev.chunks)) {\n\t\tprev.chunks = [];\n\t}\n\tconst content = createChunk(update.chunk);\n\tif (!update.source) {\n\t\t// In case of stream chunk.\n\t\tif (!prev.endBottom) {\n\t\t\treturn prev;\n\t\t}\n\t\tif (prev.chunks.length < 1) {\n\t\t\t// This should never happen, because the first chunk is always a non-stream chunk.\n\t\t\treturn [{content, name: '00000000000000.log'}];\n\t\t}\n\t\tprev.chunks[prev.chunks.length - 1].content += content;\n\t\tprev.bottomChanged = ADDED;\n\t\treturn prev;\n\t}\n\tconst chunk = {\n\t\tcontent,\n\t\tname: update.source.name,\n\t};\n\tif (prev.chunks.length > 0 && update.source.name < prev.chunks[0].name) {\n\t\tif (update.source.last) {\n\t\t\tprev.endTop = true;\n\t\t}\n\t\tif (prev.chunks.length >= limit) {\n\t\t\tprev.endBottom = false;\n\t\t\tprev.chunks.splice(limit - 1, prev.chunks.length - limit + 1);\n\t\t\tprev.bottomChanged = REMOVED;\n\t\t}\n\t\tprev.chunks = [chunk, ...prev.chunks];\n\t\tprev.topChanged = ADDED;\n\t\treturn prev;\n\t}\n\tif (update.source.last) {\n\t\tprev.endBottom = true;\n\t}\n\tif (prev.chunks.length >= limit) {\n\t\tprev.endTop = false;\n\t\tprev.chunks.splice(0, prev.chunks.length - limit + 1);\n\t\tprev.topChanged = REMOVED;\n\t}\n\tprev.chunks = [...prev.chunks, chunk];\n\tprev.bottomChanged = ADDED;\n\treturn prev;\n};\n\n// styles contains the constant styles of the component.\nconst styles = {\n\tlogListItem: {\n\t\tpadding: 0,\n\t\tlineHeight: 1.231,\n\t},\n\tlogChunk: {\n\t\tcolor: 'white',\n\t\tfontFamily: 'monospace',\n\t\twhiteSpace: 'nowrap',\n\t\twidth: 0,\n\t},\n\twaitMsg: {\n\t\ttextAlign: 'center',\n\t\tcolor: 'white',\n\t\tfontFamily: 'monospace',\n\t},\n};\n\nexport type Props = {\n\tcontainer: Object,\n\tcontent: Content,\n\tshouldUpdate: Object,\n\tsend: string => void,\n};\n\ntype State = {\n\trequestAllowed: boolean,\n};\n\n// Logs renders the log page.\nclass Logs extends Component {\n\tconstructor(props: Props) {\n\t\tsuper(props);\n\t\tthis.content = React.createRef();\n\t\tthis.state = {\n\t\t\trequestAllowed: true,\n\t\t};\n\t}\n\n\tcomponentDidMount() {\n\t\tconst {container} = this.props;\n\t\tif (typeof container === 'undefined') {\n\t\t\treturn;\n\t\t}\n\t\tcontainer.scrollTop = container.scrollHeight - container.clientHeight;\n\t\tconst {logs} = this.props.content;\n\t\tif (typeof this.content === 'undefined' || logs.chunks.length < 1) {\n\t\t\treturn;\n\t\t}\n\t\tif (this.content.clientHeight < container.clientHeight && !logs.endTop) {\n\t\t\tthis.sendRequest(logs.chunks[0].name, true);\n\t\t}\n\t}\n\n\t// onScroll is triggered by the parent component's scroll event, and sends requests if the scroll position is\n\t// at the top or at the bottom.\n\tonScroll = () => {\n\t\tif (!this.state.requestAllowed || typeof this.content === 'undefined') {\n\t\t\treturn;\n\t\t}\n\t\tconst {logs} = this.props.content;\n\t\tif (logs.chunks.length < 1) {\n\t\t\treturn;\n\t\t}\n\t\tif (this.atTop() && !logs.endTop) {\n\t\t\tthis.sendRequest(logs.chunks[0].name, true);\n\t\t} else if (this.atBottom() && !logs.endBottom) {\n\t\t\tthis.sendRequest(logs.chunks[logs.chunks.length - 1].name, false);\n\t\t}\n\t};\n\n\tsendRequest = (name: string, past: boolean) => {\n\t\tthis.setState({requestAllowed: false});\n\t\tthis.props.send(JSON.stringify({\n\t\t\tLogs: {\n\t\t\t\tName: name,\n\t\t\t\tPast: past,\n\t\t\t},\n\t\t}));\n\t};\n\n\t// atTop checks if the scroll position it at the top of the container.\n\tatTop = () => this.props.container.scrollTop <= this.props.container.scrollHeight * requestBand;\n\n\t// atBottom checks if the scroll position it at the bottom of the container.\n\tatBottom = () => {\n\t\tconst {container} = this.props;\n\t\treturn container.scrollHeight - container.scrollTop\n\t\t\t<= container.clientHeight + container.scrollHeight * requestBand;\n\t};\n\n\t// beforeUpdate is called by the parent component, saves the previous scroll position\n\t// and the height of the first log chunk, which can be deleted during the insertion.\n\tbeforeUpdate = () => {\n\t\tlet firstHeight = 0;\n\t\tconst chunkList = this.content.children[1];\n\t\tif (chunkList && chunkList.children[0]) {\n\t\t\tfirstHeight = chunkList.children[0].clientHeight;\n\t\t}\n\t\treturn {\n\t\t\tscrollTop: this.props.container.scrollTop,\n\t\t\tfirstHeight,\n\t\t};\n\t};\n\n\t// didUpdate is called by the parent component, which provides the container. Sends the first request if the\n\t// visible part of the container isn't full, and resets the scroll position in order to avoid jumping when a\n\t// chunk is inserted or removed.\n\tdidUpdate = (prevProps, prevState, snapshot) => {\n\t\tif (typeof this.props.shouldUpdate.logs === 'undefined' || typeof this.content === 'undefined' || snapshot === null) {\n\t\t\treturn;\n\t\t}\n\t\tconst {logs} = this.props.content;\n\t\tconst {container} = this.props;\n\t\tif (typeof container === 'undefined' || logs.chunks.length < 1) {\n\t\t\treturn;\n\t\t}\n\t\tif (this.content.clientHeight < container.clientHeight) {\n\t\t\t// Only enters here at the beginning, when there aren't enough logs to fill the container\n\t\t\t// and the scroll bar doesn't appear.\n\t\t\tif (!logs.endTop) {\n\t\t\t\tthis.sendRequest(logs.chunks[0].name, true);\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\t\tlet {scrollTop} = snapshot;\n\t\tif (logs.topChanged === ADDED) {\n\t\t\t// It would be safer to use a ref to the list, but ref doesn't work well with HOCs.\n\t\t\tscrollTop += this.content.children[1].children[0].clientHeight;\n\t\t} else if (logs.bottomChanged === ADDED) {\n\t\t\tif (logs.topChanged === REMOVED) {\n\t\t\t\tscrollTop -= snapshot.firstHeight;\n\t\t\t} else if (this.atBottom() && logs.endBottom) {\n\t\t\t\tscrollTop = container.scrollHeight - container.clientHeight;\n\t\t\t}\n\t\t}\n\t\tcontainer.scrollTop = scrollTop;\n\t\tthis.setState({requestAllowed: true});\n\t};\n\n\trender() {\n\t\treturn (\n\t\t\t
{ this.content = ref; }}>\n\t\t\t\t
\n\t\t\t\t\t{this.props.content.logs.endTop ? 'No more logs.' : 'Waiting for server...'}\n\t\t\t\t
\n\t\t\t\t\n\t\t\t\t\t{this.props.content.logs.chunks.map((c, index) => (\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\n\t\t\t\t\t))}\n\t\t\t\t\n\t\t\t\t{this.props.content.logs.endBottom ||
Waiting for server...
}\n\t\t\t
\n\t\t);\n\t}\n}\n\nexport default Logs;\n", "// @flow\n\n// Copyright 2017 The go-ethereum Authors\n// This file is part of the go-ethereum library.\n//\n// The go-ethereum library is free software: you can redistribute it and/or modify\n// it under the terms of the GNU Lesser General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// The go-ethereum library is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU Lesser General Public License for more details.\n//\n// You should have received a copy of the GNU Lesser General Public License\n// along with the go-ethereum library. If not, see .\n\nimport React, {Component} from 'react';\n\nimport withStyles from '@material-ui/core/styles/withStyles';\n\nimport Network from 'Network';\nimport Logs from 'Logs';\nimport Footer from 'Footer';\nimport {MENU} from '../common';\nimport type {Content} from '../types/content';\n\n// styles contains the constant styles of the component.\nconst styles = {\n\twrapper: {\n\t\tdisplay: 'flex',\n\t\tflexDirection: 'column',\n\t\twidth: '100%',\n\t},\n\tcontent: {\n\t\tflex: 1,\n\t\toverflow: 'auto',\n\t},\n};\n\n// themeStyles returns the styles generated from the theme for the component.\nconst themeStyles = theme => ({\n\tcontent: {\n\t\tbackgroundColor: theme.palette.background.default,\n\t\tpadding: theme.spacing.unit * 3,\n\t},\n});\n\nexport type Props = {\n\tclasses: Object,\n\tactive: string,\n\tcontent: Content,\n\tshouldUpdate: Object,\n\tsend: string => void,\n};\n\ntype State = {};\n\n// Main renders the chosen content.\nclass Main extends Component {\n\tconstructor(props) {\n\t\tsuper(props);\n\t\tthis.container = React.createRef();\n\t\tthis.content = React.createRef();\n\t}\n\n\tcomponentDidUpdate(prevProps, prevState, snapshot) {\n\t\tif (this.content && typeof this.content.didUpdate === 'function') {\n\t\t\tthis.content.didUpdate(prevProps, prevState, snapshot);\n\t\t}\n\t}\n\n\tonScroll = () => {\n\t\tif (this.content && typeof this.content.onScroll === 'function') {\n\t\t\tthis.content.onScroll();\n\t\t}\n\t};\n\n\tgetSnapshotBeforeUpdate(prevProps: Readonly

, prevState: Readonly) {\n\t\tif (this.content && typeof this.content.beforeUpdate === 'function') {\n\t\t\treturn this.content.beforeUpdate();\n\t\t}\n\t\treturn null;\n\t}\n\n\trender() {\n\t\tconst {\n\t\t\tclasses, active, content, shouldUpdate,\n\t\t} = this.props;\n\n\t\tlet children = null;\n\t\tswitch (active) {\n\t\tcase MENU.get('home').id:\n\t\t\tchildren =

Work in progress.
;\n\t\t\tbreak;\n\t\tcase MENU.get('chain').id:\n\t\t\tchildren =
Work in progress.
;\n\t\t\tbreak;\n\t\tcase MENU.get('txpool').id:\n\t\t\tchildren =
Work in progress.
;\n\t\t\tbreak;\n\t\tcase MENU.get('network').id:\n\t\t\tchildren = ;\n\t\t\tbreak;\n\t\tcase MENU.get('system').id:\n\t\t\tchildren =
Work in progress.
;\n\t\t\tbreak;\n\t\tcase MENU.get('logs').id:\n\t\t\tchildren = (\n\t\t\t\t { this.content = ref; }}\n\t\t\t\t\tcontainer={this.container}\n\t\t\t\t\tsend={this.props.send}\n\t\t\t\t\tcontent={this.props.content}\n\t\t\t\t\tshouldUpdate={shouldUpdate}\n\t\t\t\t/>\n\t\t\t);\n\t\t}\n\n\t\treturn (\n\t\t\t
\n\t\t\t\t { this.container = ref; }}\n\t\t\t\t\tonScroll={this.onScroll}\n\t\t\t\t>\n\t\t\t\t\t{children}\n\t\t\t\t
\n\t\t\t\t\n\t\t\t
\n\t\t);\n\t}\n}\n\nexport default withStyles(themeStyles)(Main);\n", diff --git a/dashboard/assets/components/Footer.jsx b/dashboard/assets/components/Footer.jsx index a5cab08aab..6eac7bffe9 100644 --- a/dashboard/assets/components/Footer.jsx +++ b/dashboard/assets/components/Footer.jsx @@ -193,7 +193,7 @@ class Footer extends Component { {'Commit '} * @date 2016 * - * Reference: https://github.com/ethereum/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 + * Reference: https://github.com/maticnetwork/bor/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 1b3528a036..29069436ec 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,8 +26,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/jsre/deps" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/internal/testlog/testlog.go b/internal/testlog/testlog.go index ffe0546fe0..63e4bbbd97 100644 --- a/internal/testlog/testlog.go +++ b/internal/testlog/testlog.go @@ -20,7 +20,7 @@ package testlog import ( "testing" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // Logger returns a logger which logs to the unit test log of t. diff --git a/les/api.go b/les/api.go index 95e1b009e5..135b03b16b 100644 --- a/les/api.go +++ b/les/api.go @@ -19,7 +19,7 @@ package les import ( "errors" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common/hexutil" ) var ( diff --git a/les/api_backend.go b/les/api_backend.go index 6de15e7bd2..8333fdd8c3 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -21,22 +21,22 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/bloombits" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/eth/gasprice" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rpc" ) type LesApiBackend struct { diff --git a/les/api_test.go b/les/api_test.go index cec9459625..e99753cc37 100644 --- a/les/api_test.go +++ b/les/api_test.go @@ -29,18 +29,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/les/flowcontrol" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations" + "github.com/maticnetwork/bor/p2p/simulations/adapters" + "github.com/maticnetwork/bor/rpc" colorable "github.com/mattn/go-colorable" ) diff --git a/les/backend.go b/les/backend.go index bd7c73c98f..4481bd676e 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,29 +22,29 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/bloombits" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/eth/filters" + "github.com/maticnetwork/bor/eth/gasprice" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/discv5" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rpc" ) type LightEthereum struct { diff --git a/les/benchmark.go b/les/benchmark.go index 925d1d89e8..8a1feb2235 100644 --- a/les/benchmark.go +++ b/les/benchmark.go @@ -23,17 +23,17 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/les/flowcontrol" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) // requestBenchmark is an interface for different randomized request generators diff --git a/les/bloombits.go b/les/bloombits.go index aea0fcd5f4..35f29c0f47 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/light" + "github.com/maticnetwork/bor/common/bitutil" + "github.com/maticnetwork/bor/light" ) const ( diff --git a/les/checkpointoracle.go b/les/checkpointoracle.go index 4695fbc16c..5f03e0c9a7 100644 --- a/les/checkpointoracle.go +++ b/les/checkpointoracle.go @@ -20,12 +20,12 @@ import ( "encoding/binary" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/contracts/checkpointoracle" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" ) // checkpointOracle is responsible for offering the latest stable checkpoint diff --git a/les/commons.go b/les/commons.go index 7eaf39c843..6cbcc16259 100644 --- a/les/commons.go +++ b/les/commons.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/params" ) // lesCommons contains fields needed by both server and client. diff --git a/les/costtracker.go b/les/costtracker.go index 61b076d150..e401ac0d69 100644 --- a/les/costtracker.go +++ b/les/costtracker.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/les/flowcontrol" + "github.com/maticnetwork/bor/log" ) const makeCostStats = false // make request cost statistics during operation diff --git a/les/distributor.go b/les/distributor.go index 9235adc03f..c965e2c4af 100644 --- a/les/distributor.go +++ b/les/distributor.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/maticnetwork/bor/common/mclock" ) // requestDistributor implements a mechanism that distributes requests to diff --git a/les/distributor_test.go b/les/distributor_test.go index d2247212cd..19abbb9623 100644 --- a/les/distributor_test.go +++ b/les/distributor_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/maticnetwork/bor/common/mclock" ) type testDistReq struct { diff --git a/les/fetcher.go b/les/fetcher.go index 76e4f076a7..b520476eae 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -21,13 +21,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/log" ) const ( diff --git a/les/fetcher_test.go b/les/fetcher_test.go index 2ac72ddf78..daf0192952 100644 --- a/les/fetcher_test.go +++ b/les/fetcher_test.go @@ -6,11 +6,11 @@ import ( "net" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" ) func TestFetcherULCPeerSelector(t *testing.T) { diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index 490013677c..8767c45ae9 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/log" ) const ( diff --git a/les/flowcontrol/logger.go b/les/flowcontrol/logger.go index fcd1285a59..7f5f236c5a 100644 --- a/les/flowcontrol/logger.go +++ b/les/flowcontrol/logger.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/maticnetwork/bor/common/mclock" ) // logger collects events in string format and discards events older than the diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 68f1a47c97..ee57c47039 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/common/prque" ) // cmNodeFields are ClientNode fields used by the client manager diff --git a/les/flowcontrol/manager_test.go b/les/flowcontrol/manager_test.go index b32ec55990..3baf71af05 100644 --- a/les/flowcontrol/manager_test.go +++ b/les/flowcontrol/manager_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/maticnetwork/bor/common/mclock" ) type testNode struct { diff --git a/les/freeclient.go b/les/freeclient.go index 934b881537..5933fee753 100644 --- a/les/freeclient.go +++ b/les/freeclient.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/common/prque" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rlp" ) // freeClientPool implements a client database that limits the connection time diff --git a/les/freeclient_test.go b/les/freeclient_test.go index 1918222641..e398939a37 100644 --- a/les/freeclient_test.go +++ b/les/freeclient_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/core/rawdb" ) func TestFreeClientPoolL10C100(t *testing.T) { diff --git a/les/handler.go b/les/handler.go index 743776bd04..12081fe1fd 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,21 +26,21 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/discv5" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) var errTooManyInvalidRequest = errors.New("too many invalid requests made") diff --git a/les/handler_test.go b/les/handler_test.go index 4e16a89791..690002d7ff 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,19 +23,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) func expectResponse(r p2p.MsgReader, msgcode, reqID, bv uint64, data interface{}) error { diff --git a/les/helper_test.go b/les/helper_test.go index 4b9f270cc7..1fce570d19 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -27,24 +27,24 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/abi/bind/backends" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/contracts/checkpointoracle/contract" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/les/flowcontrol" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index 4c6737a4e8..ca7b4e0ac8 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index a26c06680b..83f7225fb6 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 3c4dd7090f..e81a6b5434 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -21,15 +21,15 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index 1e8a5f8b46..373e2eb186 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte diff --git a/les/peer.go b/les/peer.go index 1aa1613b0e..171d6b0aa3 100644 --- a/les/peer.go +++ b/les/peer.go @@ -25,16 +25,16 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/les/flowcontrol" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) var ( diff --git a/les/peer_test.go b/les/peer_test.go index 85de7cded6..ff89833606 100644 --- a/les/peer_test.go +++ b/les/peer_test.go @@ -4,11 +4,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/les/flowcontrol" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/rlp" ) const ( diff --git a/les/protocol.go b/les/protocol.go index 5fdf32b74a..a8ed86b346 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -23,10 +23,10 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index 42a63c351e..d38bcd8a06 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/light" ) var testBankSecureTrieKey = secAddr(bankAddr) diff --git a/les/retrieve.go b/les/retrieve.go index d17a02e1ae..59f54a9a72 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/light" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/light" ) var ( diff --git a/les/server.go b/les/server.go index 0795baf9fd..3652818165 100644 --- a/les/server.go +++ b/les/server.go @@ -21,20 +21,20 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/les/flowcontrol" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/discv5" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rpc" ) const bufLimitRatio = 6000 // fixed bufLimit/MRR ratio diff --git a/les/serverpool.go b/les/serverpool.go index 3e8cdee410..157d056771 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/discv5" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/rlp" ) const ( diff --git a/les/servingqueue.go b/les/servingqueue.go index a9e8369fe1..c1ac9f876a 100644 --- a/les/servingqueue.go +++ b/les/servingqueue.go @@ -21,8 +21,8 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/common/prque" ) // servingQueue allows running tasks in a limited number of threads and puts the diff --git a/les/sync.go b/les/sync.go index 54fd81c2c2..79ce8857ed 100644 --- a/les/sync.go +++ b/les/sync.go @@ -21,11 +21,11 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/log" ) var errInvalidCheckpoint = errors.New("invalid advertised checkpoint") diff --git a/les/sync_test.go b/les/sync_test.go index f5d1ad5bc5..8ebf8c0a5d 100644 --- a/les/sync_test.go +++ b/les/sync_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/params" ) // Test light syncing which will download all headers from genesis. diff --git a/les/txrelay.go b/les/txrelay.go index 49195161b7..66a6923e5b 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/rlp" ) type ltrInfo struct { diff --git a/les/ulc.go b/les/ulc.go index b97217e796..91428bb280 100644 --- a/les/ulc.go +++ b/les/ulc.go @@ -19,8 +19,8 @@ package les import ( "errors" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" ) type ulc struct { diff --git a/les/ulc_test.go b/les/ulc_test.go index cd2bedae84..2c41686ffc 100644 --- a/les/ulc_test.go +++ b/les/ulc_test.go @@ -25,12 +25,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/light" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" ) func TestULCSyncWithOnePeer(t *testing.T) { diff --git a/light/lightchain.go b/light/lightchain.go index 7f64d1c28b..cfa684e846 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -26,17 +26,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" lru "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 70d2e70c18..f0a1bc2f66 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 3662596785..d49b43a68f 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/rlp" ) // NodeSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/light/odr.go b/light/odr.go index 907712ede7..07855cb6d8 100644 --- a/light/odr.go +++ b/light/odr.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" ) // NoOdr is the default context passed to an ODR capable function when the ODR diff --git a/light/odr_test.go b/light/odr_test.go index debd5544c3..e2a0c13571 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index 82e33bb78f..0c96e8c400 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,12 +20,12 @@ import ( "bytes" "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/rlp" ) var sha3Nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index bf632a4496..a2b4ac9132 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -24,16 +24,16 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/bitutil" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/trie" ) // IndexerConfig includes a set of configs for chain indexers. diff --git a/light/trie.go b/light/trie.go index e512bf6f95..3bad26c3a3 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/trie" ) func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB { diff --git a/light/trie_test.go b/light/trie_test.go index 4919f89641..1dc50954c9 100644 --- a/light/trie_test.go +++ b/light/trie_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index e945ef2ec1..8ce4837951 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,16 +22,16 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index 0996bd7c9c..3359dcf2b6 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index a1b5dac629..1cedd1253e 100644 --- a/log/format.go +++ b/log/format.go @@ -23,7 +23,7 @@ const ( // locationTrims are trimmed for display to avoid unwieldy log lines. var locationTrims = []string{ - "github.com/ethereum/go-ethereum/", + "github.com/maticnetwork/bor/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/cpu_syscall.go b/metrics/cpu_syscall.go index e245453e82..98c9761a0b 100644 --- a/metrics/cpu_syscall.go +++ b/metrics/cpu_syscall.go @@ -21,7 +21,7 @@ package metrics import ( "syscall" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 55820f1aab..db9ea24d26 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,8 +8,8 @@ import ( "net/http" "sync" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/prometheus" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/metrics/prometheus" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index 6619915fdb..5971c50aa3 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -5,8 +5,8 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" "github.com/influxdata/influxdb/client" ) diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index 2138e01ae8..501f121baa 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/maticnetwork/bor/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 8ab4e28f2c..299e719732 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/metrics/prometheus/collector.go b/metrics/prometheus/collector.go index 8350fa2aaf..7413592d16 100644 --- a/metrics/prometheus/collector.go +++ b/metrics/prometheus/collector.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/metrics" + "github.com/maticnetwork/bor/metrics" ) var ( diff --git a/metrics/prometheus/prometheus.go b/metrics/prometheus/prometheus.go index 9ad5ec7e99..bd70d24e17 100644 --- a/metrics/prometheus/prometheus.go +++ b/metrics/prometheus/prometheus.go @@ -22,8 +22,8 @@ import ( "net/http" "sort" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" ) // Handler returns an HTTP handler which dump metrics in Prometheus format. diff --git a/miner/miner.go b/miner/miner.go index ab97b0c038..67e2fa59d5 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -23,16 +23,16 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" ) // Backend wraps all methods required for mining. diff --git a/miner/stress_clique.go b/miner/stress_clique.go index 7f5db2e520..89c9101d55 100644 --- a/miner/stress_clique.go +++ b/miner/stress_clique.go @@ -28,19 +28,19 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/fdlimit" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/params" ) func main() { diff --git a/miner/stress_ethash.go b/miner/stress_ethash.go index 7d4a7d24f7..32107ca83f 100644 --- a/miner/stress_ethash.go +++ b/miner/stress_ethash.go @@ -28,20 +28,20 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/fdlimit" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/params" ) func main() { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 3a176e8bd6..0161d73ce8 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/log" ) // chainRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go index 42e77f3e64..59cd233860 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" ) // noopChainRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 4a9528c395..1c265a1cb3 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -25,15 +25,15 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/misc" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/params" ) const ( diff --git a/miner/worker_test.go b/miner/worker_test.go index 7fa9a5f984..cc494f7fb6 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -21,18 +21,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/clique" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/params" ) var ( diff --git a/mobile/accounts.go b/mobile/accounts.go index 4d979bffff..1046e67282 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 3d3bd66d08..04a70fb9ff 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/maticnetwork/bor/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android @@ -207,7 +207,7 @@ func TestAndroid(t *testing.T) { } } // Generate the mobile bindings for Geth and add the tester class - gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ethereum/go-ethereum/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/maticnetwork/bor/mobile") if output, err := gobind.CombinedOutput(); err != nil { t.Logf("%s", output) t.Fatalf("failed to run gomobile bind: %v", err) diff --git a/mobile/big.go b/mobile/big.go index 86ea93245a..3cbe8948db 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index 90ecdf82c4..0f819ee3d4 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -23,12 +23,12 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/accounts/abi/bind" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" ) // Signer is an interface defining the callback when a contract requires a diff --git a/mobile/common.go b/mobile/common.go index d7e0457261..382fee8f28 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,8 +24,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 9b3c93ccd9..32bbdf74ab 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p/discv5" + "github.com/maticnetwork/bor/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 662125c4ad..ad9a0614b9 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethclient" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 59da852397..a3761e9809 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + ethereum "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index edcbfdbdbe..611a32af0a 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,18 +24,18 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/eth" + "github.com/maticnetwork/bor/eth/downloader" + "github.com/maticnetwork/bor/ethclient" + "github.com/maticnetwork/bor/ethstats" + "github.com/maticnetwork/bor/internal/debug" + "github.com/maticnetwork/bor/les" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/nat" + "github.com/maticnetwork/bor/params" + whisper "github.com/maticnetwork/bor/whisper/whisperv6" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 2025d85edc..12812ddf50 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index d5200d5b1b..149a34f291 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/interface_test.go b/mobile/interface_test.go index 4bd1af47aa..d3e9a5c3b1 100644 --- a/mobile/interface_test.go +++ b/mobile/interface_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) func TestInterfaceGetSet(t *testing.T) { diff --git a/mobile/logger.go b/mobile/logger.go index 7078c4fd2c..0ccc2e1719 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/p2p.go b/mobile/p2p.go index a80d9fff2e..3fc642a6a1 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p" + "github.com/maticnetwork/bor/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 45fe870ee3..331726edc2 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/p2p/discv5" + "github.com/maticnetwork/bor/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/primitives.go b/mobile/primitives.go index 7e1ab26ef0..3a5cb71043 100644 --- a/mobile/primitives.go +++ b/mobile/primitives.go @@ -22,7 +22,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // Strings represents s slice of strs. diff --git a/mobile/shhclient.go b/mobile/shhclient.go index a069c9bd40..78a3270a92 100644 --- a/mobile/shhclient.go +++ b/mobile/shhclient.go @@ -19,8 +19,8 @@ package geth import ( - "github.com/ethereum/go-ethereum/whisper/shhclient" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/maticnetwork/bor/whisper/shhclient" + whisper "github.com/maticnetwork/bor/whisper/whisperv6" ) // WhisperClient provides access to the Ethereum APIs. diff --git a/mobile/types.go b/mobile/types.go index b9c44c25d7..18d664c364 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,10 +23,10 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/rlp" + whisper "github.com/maticnetwork/bor/whisper/whisperv6" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/mobile/vm.go b/mobile/vm.go index 72093e3d5b..5d59c12275 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/core/types" ) // Log represents a contract log event. These events are generated by the LOG diff --git a/node/api.go b/node/api.go index 66cd1dde33..8d93e2862f 100644 --- a/node/api.go +++ b/node/api.go @@ -21,11 +21,11 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index 1905ac7fa5..07f97a72c0 100644 --- a/node/config.go +++ b/node/config.go @@ -26,17 +26,17 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/external" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/external" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/accounts/scwallet" + "github.com/maticnetwork/bor/accounts/usbwallet" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/rpc" ) const ( diff --git a/node/config_test.go b/node/config_test.go index 319932bbd8..6b639117aa 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index f84a5d5479..a1ababd144 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,9 +22,9 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/nat" + "github.com/maticnetwork/bor/rpc" ) const ( diff --git a/node/node.go b/node/node.go index c9c27d8262..c65010d021 100644 --- a/node/node.go +++ b/node/node.go @@ -26,14 +26,14 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/internal/debug" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/rpc" "github.com/prometheus/tsdb/fileutil" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index 57b18855f1..d828215cad 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/rpc" ) // SampleService is a trivial network service that can be attached to a node for diff --git a/node/node_test.go b/node/node_test.go index c464771cd8..8dce15e007 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 4dea00995c..527f1d4629 100644 --- a/node/service.go +++ b/node/service.go @@ -20,12 +20,12 @@ import ( "path/filepath" "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 9801b1ed45..187284bed4 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 8dee5063f1..66fc20c491 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -22,9 +22,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index de8fc4a6e3..e5fc7475cf 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -25,11 +25,11 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/maticnetwork/bor/internal/testlog" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/p2p/netutil" ) func init() { diff --git a/p2p/discover/common.go b/p2p/discover/common.go index 3c080359fd..7d5b4c2d08 100644 --- a/p2p/discover/common.go +++ b/p2p/discover/common.go @@ -20,9 +20,9 @@ import ( "crypto/ecdsa" "net" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/netutil" ) type UDPConn interface { diff --git a/p2p/discover/node.go b/p2p/discover/node.go index a7d9ce7368..33756094b0 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -23,9 +23,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/enode" ) // node represents a host on the network. diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399fb..f424b56539 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index e5a5793e35..5f0375f40c 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,10 +32,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 895c284b27..c9c8d2e928 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -27,10 +27,10 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/p2p/netutil" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go index 8e5fc7374b..48b3c20454 100644 --- a/p2p/discover/table_util_test.go +++ b/p2p/discover/table_util_test.go @@ -25,10 +25,10 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" ) var nullNode *enode.Node diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go index b2a5d85cf4..87d301a7f5 100644 --- a/p2p/discover/v4_udp.go +++ b/p2p/discover/v4_udp.go @@ -28,12 +28,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/p2p/netutil" + "github.com/maticnetwork/bor/rlp" ) // Errors diff --git a/p2p/discover/v4_udp_lookup_test.go b/p2p/discover/v4_udp_lookup_test.go index bc1cdfb089..79856a5c65 100644 --- a/p2p/discover/v4_udp_lookup_test.go +++ b/p2p/discover/v4_udp_lookup_test.go @@ -24,8 +24,8 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/enode" ) func TestUDPv4_Lookup(t *testing.T) { diff --git a/p2p/discover/v4_udp_test.go b/p2p/discover/v4_udp_test.go index c4f5b5de0f..252a53e4b5 100644 --- a/p2p/discover/v4_udp_test.go +++ b/p2p/discover/v4_udp_test.go @@ -32,13 +32,13 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/internal/testlog" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 3c2d5744c3..a39aa51fc5 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,9 +28,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/metrics.go b/p2p/discv5/metrics.go index cb11d7eacf..2d47918ec4 100644 --- a/p2p/discv5/metrics.go +++ b/p2p/discv5/metrics.go @@ -1,6 +1,6 @@ package discv5 -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/maticnetwork/bor/metrics" var ( ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil) diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index de7d8de6aa..dc1a72964c 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/netutil" + "github.com/maticnetwork/bor/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 1a8137673d..dd1edefa46 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index 3d47485122..b86791bd53 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index ce4ad9e4d4..d7ed052a1f 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 4fb5f657ae..d20cbb44e5 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 543faecd48..94ce4f651b 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 4f4b2426f4..a8e5d6623d 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943dab9..96babba6a6 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index ae4b18e7cd..6ba6a67497 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,10 +25,10 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 609a41297f..38a1a31ad9 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f29..fec1a880c8 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index ff5ed983ba..4a713f1f77 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/nat" + "github.com/maticnetwork/bor/p2p/netutil" + "github.com/maticnetwork/bor/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 62184aa9d3..712b2ad9aa 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/rlp" ) func init() { diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go index c1834f0699..48281f4310 100644 --- a/p2p/enode/idscheme.go +++ b/p2p/enode/idscheme.go @@ -21,10 +21,10 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go index 0910e6e83f..7c912456a1 100644 --- a/p2p/enode/idscheme_test.go +++ b/p2p/enode/idscheme_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go index d8aa02a77e..5bd6cc94aa 100644 --- a/p2p/enode/localnode.go +++ b/p2p/enode/localnode.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/p2p/netutil" ) const ( diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go index 00746a8d27..db0926d4be 100644 --- a/p2p/enode/localnode_test.go +++ b/p2p/enode/localnode_test.go @@ -21,8 +21,8 @@ import ( "net" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/enr" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/node.go b/p2p/enode/node.go index 9eb2544ffe..9f97ce10d0 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -27,8 +27,8 @@ import ( "net" "strings" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/rlp" ) var errMissingPrefix = errors.New("missing 'enr:' prefix for base64-encoded record") diff --git a/p2p/enode/node_test.go b/p2p/enode/node_test.go index d15859c477..04414f941a 100644 --- a/p2p/enode/node_test.go +++ b/p2p/enode/node_test.go @@ -24,8 +24,8 @@ import ( "testing" "testing/quick" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index a43e63868f..d160ffe699 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go index 2372d4820b..f387b34519 100644 --- a/p2p/enode/urlv4.go +++ b/p2p/enode/urlv4.go @@ -26,9 +26,9 @@ import ( "regexp" "strconv" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/enr" ) var incompleteNodeURL = regexp.MustCompile("(?i)^(?:enode://)?([0-9a-f]+)$") diff --git a/p2p/enode/urlv4_test.go b/p2p/enode/urlv4_test.go index 69ed111021..fbb46f4e1d 100644 --- a/p2p/enode/urlv4_test.go +++ b/p2p/enode/urlv4_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p/enr" ) var parseNodeTests = []struct { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index c36ae9e3ed..0ff9449f6a 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -40,7 +40,7 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/rlp" ) const SizeLimit = 300 // maximum encoded size of a node record in bytes diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go index 96a9ced5cf..eabeef67ac 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index f2118401af..8406d5eed5 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -21,7 +21,7 @@ import ( "io" "net" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index b987732225..e6e44736c8 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index c04e5ab4c3..8dd7f3fd3b 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -25,10 +25,10 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/p2p/enode" ) const ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 8fad921c48..08b7a39dda 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go index b9cbd5e1ca..e1ab3f24fd 100644 --- a/p2p/netutil/iptrack.go +++ b/p2p/netutil/iptrack.go @@ -19,7 +19,7 @@ package netutil import ( "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/maticnetwork/bor/common/mclock" ) // IPTracker predicts the external endpoint, i.e. IP address and port, of the local host diff --git a/p2p/netutil/iptrack_test.go b/p2p/netutil/iptrack_test.go index a9a2998a65..b5798e2b5e 100644 --- a/p2p/netutil/iptrack_test.go +++ b/p2p/netutil/iptrack_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/maticnetwork/bor/common/mclock" ) const ( diff --git a/p2p/peer.go b/p2p/peer.go index d370894f17..2695bb947b 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/rlp" ) var ( diff --git a/p2p/peer_test.go b/p2p/peer_test.go index 984cc411ad..3d78ecfc60 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) var discard = Protocol{ diff --git a/p2p/protocol.go b/p2p/protocol.go index 9ce4c20203..28094ad805 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,8 +19,8 @@ package p2p import ( "fmt" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 0636431f53..1513ed9d09 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,10 +35,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common/bitutil" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/crypto/ecies" + "github.com/maticnetwork/bor/rlp" "github.com/golang/snappy" "golang.org/x/crypto/sha3" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index e62196ff04..35f198b8e2 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -32,10 +32,10 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/crypto/ecies" + "github.com/maticnetwork/bor/p2p/simulations/pipes" + "github.com/maticnetwork/bor/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/server.go b/p2p/server.go index 692c9eb7d9..a364dcd113 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -29,17 +29,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/mclock" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/discover" + "github.com/maticnetwork/bor/p2p/discv5" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/p2p/nat" + "github.com/maticnetwork/bor/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index e8bc627e1d..596ffee066 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/internal/testlog" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" "golang.org/x/crypto/sha3" ) diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 4f17efc334..a4cbdabbb5 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -36,11 +36,11 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index c1cf23a175..6ab67f6a1a 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,13 +23,13 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations/pipes" + "github.com/maticnetwork/bor/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index e1e092f6e1..2bf8c4c1af 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "github.com/maticnetwork/bor/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index f65ce7b605..904926d319 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -26,13 +26,13 @@ import ( "strconv" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/rpc" ) // Node represents a node in a simulation network which is created by a diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go index ede96b34c1..3b38443d81 100644 --- a/p2p/simulations/connect.go +++ b/p2p/simulations/connect.go @@ -20,7 +20,7 @@ import ( "errors" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/p2p/enode" ) var ( diff --git a/p2p/simulations/connect_test.go b/p2p/simulations/connect_test.go index 32d18347d8..d164903f3f 100644 --- a/p2p/simulations/connect_test.go +++ b/p2p/simulations/connect_test.go @@ -19,9 +19,9 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations/adapters" ) func newTestNetwork(t *testing.T, nodeCount int) (*Network, []enode.ID) { diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index cde2f3a677..638a006f51 100644 --- a/p2p/simulations/examples/ping-pong.go +++ b/p2p/simulations/examples/ping-pong.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations" + "github.com/maticnetwork/bor/p2p/simulations/adapters" + "github.com/maticnetwork/bor/rpc" ) var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`) diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index 1f44cc6675..c42f2e8a0c 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,11 +29,11 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations/adapters" + "github.com/maticnetwork/bor/rpc" "github.com/julienschmidt/httprouter" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index ed43c0ed76..56bf4e09c1 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -28,13 +28,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations/adapters" + "github.com/maticnetwork/bor/rpc" "github.com/mattn/go-colorable" ) diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 8ce777a010..2fa99bd204 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations/adapters" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index 069040257e..d158314e4e 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/p2p/enode" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index f03c953e89..d8e021fc1f 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -27,11 +27,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/maticnetwork/bor/event" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 01cd1000de..dba297df69 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations/adapters" ) // Tests that a created snapshot with a minimal service only contains the expected connections diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index ae62c42b9c..9757a3173c 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/p2p/enode" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/simulations/test.go b/p2p/simulations/test.go index beeb414e41..8c173b909b 100644 --- a/p2p/simulations/test.go +++ b/p2p/simulations/test.go @@ -3,10 +3,10 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/enr" + "github.com/maticnetwork/bor/rpc" ) // NoopService is the service that does not do anything diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go index 09db4b2466..0dd5d2000d 100644 --- a/p2p/testing/peerpool.go +++ b/p2p/testing/peerpool.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index 476c2a9840..24ff6bfd79 100644 --- a/p2p/testing/protocolsession.go +++ b/p2p/testing/protocolsession.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index e798240a56..f231e6c381 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -32,14 +32,14 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/node" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/simulations" + "github.com/maticnetwork/bor/p2p/simulations/adapters" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index 611b2052d6..0573a76287 100644 --- a/params/config.go +++ b/params/config.go @@ -21,8 +21,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) // Genesis hashes to enforce below configs on. diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..824d6fda98 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/rpc/client.go b/rpc/client.go index 2053f54069..b00eb37582 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -28,7 +28,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 3bb8717b80..41b0d22249 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,7 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/rpc" ) // In this example, our client wishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index 759933f8c6..2c444e4b4b 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -31,7 +31,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) func TestClientRequest(t *testing.T) { @@ -306,7 +306,7 @@ func TestClientSubscribeClose(t *testing.T) { } } -// This test reproduces https://github.com/ethereum/go-ethereum/issues/17837 where the +// This test reproduces https://github.com/maticnetwork/bor/issues/17837 where the // client hangs during shutdown when Unsubscribe races with Client.Close. func TestClientCloseUnsubscribeRace(t *testing.T) { server := newTestServer() diff --git a/rpc/doc.go b/rpc/doc.go index e5840c32d3..5f7314af87 100644 --- a/rpc/doc.go +++ b/rpc/doc.go @@ -107,7 +107,7 @@ Subscriptions are deleted when the user sends an unsubscribe request or when the connection which was used to create the subscription is closed. This can be initiated by the client and server. The server will close the connection for any write error. -For more information about subscriptions, see https://github.com/ethereum/go-ethereum/wiki/RPC-PUB-SUB. +For more information about subscriptions, see https://github.com/maticnetwork/bor/wiki/RPC-PUB-SUB. Reverse Calls diff --git a/rpc/endpoints.go b/rpc/endpoints.go index 8ca6d4eb0c..c8c2a9bfde 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -19,7 +19,7 @@ package rpc import ( "net" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // StartHTTPEndpoint starts the HTTP RPC endpoint, configured with cors/vhosts/modules diff --git a/rpc/handler.go b/rpc/handler.go index 02ab06b6d1..81f02660eb 100644 --- a/rpc/handler.go +++ b/rpc/handler.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // handler handles JSON-RPC messages. There is one handler per connection. Note that diff --git a/rpc/http.go b/rpc/http.go index 518b3b874f..0678b4eaed 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -31,7 +31,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" "github.com/rs/cors" ) diff --git a/rpc/ipc.go b/rpc/ipc.go index ad8ce03098..3965163051 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -20,8 +20,8 @@ import ( "context" "net" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go index da6ce294d7..2370366f98 100644 --- a/rpc/ipc_unix.go +++ b/rpc/ipc_unix.go @@ -25,7 +25,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) // ipcListen will create a Unix socket on the given endpoint. diff --git a/rpc/server.go b/rpc/server.go index 5a92847f20..ad29a73388 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -22,7 +22,7 @@ import ( "sync/atomic" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) const MetadataApi = "rpc" diff --git a/rpc/service.go b/rpc/service.go index a9426c6b0e..e46f6c21f3 100644 --- a/rpc/service.go +++ b/rpc/service.go @@ -27,7 +27,7 @@ import ( "unicode" "unicode/utf8" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) var ( diff --git a/rpc/types.go b/rpc/types.go index f31f09a774..9ee441ebb4 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -22,7 +22,7 @@ import ( "math" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common/hexutil" ) // API describes the set of methods offered over the RPC interface diff --git a/rpc/types_test.go b/rpc/types_test.go index 68b6d3c54f..6d82e39508 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index c5383667d9..bc4debde43 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -32,7 +32,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" "golang.org/x/net/websocket" ) diff --git a/signer/core/api.go b/signer/core/api.go index d68919c6f4..5d223a94d3 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -25,16 +25,16 @@ import ( "os" "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/accounts/scwallet" + "github.com/maticnetwork/bor/accounts/usbwallet" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/signer/storage" ) const ( diff --git a/signer/core/api_test.go b/signer/core/api_test.go index 1eba20ef40..993fc30ac7 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -27,16 +27,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/fourbyte" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/signer/core" + "github.com/maticnetwork/bor/signer/fourbyte" + "github.com/maticnetwork/bor/signer/storage" ) //Used for testing diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index 9593ad7a53..da6d021df6 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -19,10 +19,10 @@ package core import ( "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/log" ) type AuditLogger struct { diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 381c40be3b..040629cf06 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -24,9 +24,9 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go index 64dc3a62ac..a679fe71d2 100644 --- a/signer/core/signed_data.go +++ b/signer/core/signed_data.go @@ -30,16 +30,16 @@ import ( "strings" "unicode" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/bor" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/consensus/bor" + "github.com/maticnetwork/bor/consensus/clique" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/rlp" ) type SigFormat struct { @@ -670,7 +670,7 @@ func (api *SignerAPI) EcRecover(ctx context.Context, data hexutil.Bytes, sig hex // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be be 27 or 28 for legacy reasons. // - // https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover + // https://github.com/maticnetwork/bor/wiki/Management-APIs#personal_ecRecover if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") } diff --git a/signer/core/signed_data_test.go b/signer/core/signed_data_test.go index 5a18defaac..e82539381c 100644 --- a/signer/core/signed_data_test.go +++ b/signer/core/signed_data_test.go @@ -25,12 +25,12 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/signer/core" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/signer/core" ) var typesStandard = core.Types{ diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index 0edb72def9..b89ce8b85d 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -21,9 +21,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rpc" ) type StdIOUI struct { diff --git a/signer/core/types.go b/signer/core/types.go index 91443b2471..f16b88812c 100644 --- a/signer/core/types.go +++ b/signer/core/types.go @@ -22,9 +22,9 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" ) type ValidationInfo struct { diff --git a/signer/core/uiapi.go b/signer/core/uiapi.go index 6dc68313b5..358a7ef5e3 100644 --- a/signer/core/uiapi.go +++ b/signer/core/uiapi.go @@ -25,11 +25,11 @@ import ( "io/ioutil" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/accounts/keystore" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/crypto" ) // SignerUIAPI implements methods Clef provides for a UI to query, in the bidirectional communication diff --git a/signer/fourbyte/abi.go b/signer/fourbyte/abi.go index eb5315355b..be58e94397 100644 --- a/signer/fourbyte/abi.go +++ b/signer/fourbyte/abi.go @@ -23,8 +23,8 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/common" ) // decodedCallData is an internal type to represent a method call parsed according diff --git a/signer/fourbyte/abi_test.go b/signer/fourbyte/abi_test.go index 4bd8a77601..afc4e1dcfb 100644 --- a/signer/fourbyte/abi_test.go +++ b/signer/fourbyte/abi_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/common" ) func verify(t *testing.T, jsondata, calldata string, exp []interface{}) { diff --git a/signer/fourbyte/fourbyte_test.go b/signer/fourbyte/fourbyte_test.go index 3ce042e721..02879d148e 100644 --- a/signer/fourbyte/fourbyte_test.go +++ b/signer/fourbyte/fourbyte_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/accounts/abi" + "github.com/maticnetwork/bor/common" ) // Tests that all the selectors contained in the 4byte database are valid. diff --git a/signer/fourbyte/validation.go b/signer/fourbyte/validation.go index 0997c63646..e09d48d71c 100644 --- a/signer/fourbyte/validation.go +++ b/signer/fourbyte/validation.go @@ -22,8 +22,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/signer/core" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/signer/core" ) // ValidateTransaction does a number of checks on the supplied transaction, and @@ -49,7 +49,7 @@ func (db *Database) ValidateTransaction(selector *string, tx *core.SendTxArgs) ( if tx.To == nil { // Contract creation should contain sufficient data to deploy a contract. A // typical error is omitting sender due to some quirk in the javascript call - // e.g. https://github.com/ethereum/go-ethereum/issues/16106. + // e.g. https://github.com/maticnetwork/bor/issues/16106. if len(data) == 0 { // Prevent sending ether into black hole (show stopper) if tx.Value.ToInt().Cmp(big.NewInt(0)) > 0 { diff --git a/signer/fourbyte/validation_test.go b/signer/fourbyte/validation_test.go index bdbc6b5b7a..8dc6f60f43 100644 --- a/signer/fourbyte/validation_test.go +++ b/signer/fourbyte/validation_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/signer/core" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/signer/core" ) func mixAddr(a string) (*common.MixedcaseAddress, error) { diff --git a/signer/rules/rules.go b/signer/rules/rules.go index f731dac40a..4d7851f1b3 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -22,11 +22,11 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/rules/deps" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/signer/core" + "github.com/maticnetwork/bor/signer/rules/deps" + "github.com/maticnetwork/bor/signer/storage" "github.com/robertkrimen/otto" ) diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index e1a23236cd..790b779491 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -22,13 +22,13 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/maticnetwork/bor/accounts" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/internal/ethapi" + "github.com/maticnetwork/bor/signer/core" + "github.com/maticnetwork/bor/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index e6a8f145cc..294e047052 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index 0aaaf58d25..82cb3d4644 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -23,8 +23,8 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/log" "github.com/mattn/go-colorable" ) diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 81dd7b1d04..9627d76624 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -24,18 +24,18 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/consensus" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index fde9db3ad4..9bd99f6ccc 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index fe6e90b027..4381628571 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/consensus/ethash" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" ) //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index f2e086a7b3..3b0f78ba16 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index cd15ae31b5..eb796091da 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 1d4baf2fd7..7dc0b211b7 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 451ffcbf43..c4268b95ff 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index a5f01cf456..4a484ea898 100644 --- a/tests/gen_vmexec.go +++ b/tests/gen_vmexec.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index 188cdffe9d..f023b17992 100644 --- a/tests/init.go +++ b/tests/init.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/params" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 053cbd6fcd..1b0e0d9f8a 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -30,7 +30,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 9069ec55a1..6a5f51ecb6 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 8b69da91f2..41dfddad33 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -24,8 +24,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/maticnetwork/bor/cmd/utils" + "github.com/maticnetwork/bor/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 0b78f26ed1..96aee67418 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,18 +23,18 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" "golang.org/x/crypto/sha3" ) diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 0e3670d04b..1a4046a881 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 12444720cc..54b72f565b 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -19,12 +19,12 @@ package tests import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/types" + "github.com/maticnetwork/bor/params" + "github.com/maticnetwork/bor/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index 441483dffa..6e25bd765d 100644 --- a/tests/vm_test.go +++ b/tests/vm_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/maticnetwork/bor/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index 91566c47e3..1e854f3caa 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -22,15 +22,15 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/common/math" + "github.com/maticnetwork/bor/core" + "github.com/maticnetwork/bor/core/rawdb" + "github.com/maticnetwork/bor/core/state" + "github.com/maticnetwork/bor/core/vm" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/database.go b/trie/database.go index d8a0fa9c53..2118a85591 100644 --- a/trie/database.go +++ b/trie/database.go @@ -26,11 +26,11 @@ import ( "time" "github.com/allegro/bigcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" + "github.com/maticnetwork/bor/rlp" ) var ( diff --git a/trie/database_test.go b/trie/database_test.go index 81c469500f..c3859cb0b7 100644 --- a/trie/database_test.go +++ b/trie/database_test.go @@ -19,8 +19,8 @@ package trie import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb/memorydb" ) // Tests that the trie database returns a missing trie node error if attempting diff --git a/trie/errors.go b/trie/errors.go index 567b80078c..199a95f551 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 54f6a9de2b..baa1ca23a7 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -20,8 +20,8 @@ import ( "hash" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/rlp" "golang.org/x/crypto/sha3" ) diff --git a/trie/iterator.go b/trie/iterator.go index da93b2fadb..3145e7c0c8 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,8 +21,8 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/rlp" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 88b8103fb3..325bdf56cc 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,8 +22,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb/memorydb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index f4055e779a..f7f6d86291 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/rlp" ) var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"} diff --git a/trie/proof.go b/trie/proof.go index 9985e730dd..c5d3c1aa2b 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -20,10 +20,10 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rlp" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/trie/proof_test.go b/trie/proof_test.go index c488f342c8..8a3891f233 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb/memorydb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index fbc591ed10..6ad8c1847d 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/log" ) // SecureTrie wraps a trie with key hashing. In a secure trie, all diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index fb6c38ee22..5eaf9e8f32 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb/memorydb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index 6f40b45a1e..175b0b7cb2 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/prque" + "github.com/maticnetwork/bor/ethdb" ) // ErrNotRequested is returned by the trie sync when it's requested to process a diff --git a/trie/sync_bloom.go b/trie/sync_bloom.go index 2182d1c437..31f5b18f5a 100644 --- a/trie/sync_bloom.go +++ b/trie/sync_bloom.go @@ -24,10 +24,10 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/metrics" "github.com/steakknife/bloomfilter" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index 0621bb4357..1fa2bdb6f6 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/ethdb/memorydb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 920e331fd6..7291fb0b65 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,9 +21,9 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index ea0b3cbdd7..9c51d90f9d 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -29,12 +29,12 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/leveldb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/ethdb" + "github.com/maticnetwork/bor/ethdb/leveldb" + "github.com/maticnetwork/bor/ethdb/memorydb" + "github.com/maticnetwork/bor/rlp" ) func init() { diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index d7af4baae3..6e1dc8e14e 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -21,11 +21,11 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/rlp" + whisper "github.com/maticnetwork/bor/whisper/whisperv6" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go index edb817cc75..70f1930edd 100644 --- a/whisper/mailserver/server_test.go +++ b/whisper/mailserver/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + whisper "github.com/maticnetwork/bor/whisper/whisperv6" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index a814154e47..226ab4fbd4 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -19,10 +19,10 @@ package shhclient import ( "context" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/maticnetwork/bor" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/rpc" + whisper "github.com/maticnetwork/bor/whisper/whisperv6" ) // Client defines typed wrappers for the Whisper v6 RPC API. diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index d6d4c8d3de..60d2f5ff2d 100644 --- a/whisper/whisperv6/api.go +++ b/whisper/whisperv6/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/rpc" ) // List of errors diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index 0473179da5..de5d8f1598 100644 --- a/whisper/whisperv6/benchmarks_test.go +++ b/whisper/whisperv6/benchmarks_test.go @@ -20,7 +20,7 @@ import ( "crypto/sha256" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index 5b6925edb3..68f2a1735b 100644 --- a/whisper/whisperv6/envelope.go +++ b/whisper/whisperv6/envelope.go @@ -26,10 +26,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/crypto/ecies" + "github.com/maticnetwork/bor/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv6/envelope_test.go b/whisper/whisperv6/envelope_test.go index c0bb4373b8..70e3fe78d1 100644 --- a/whisper/whisperv6/envelope_test.go +++ b/whisper/whisperv6/envelope_test.go @@ -22,7 +22,7 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/crypto" ) func TestPoWCalculationsWithNoLeadingZeros(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index 6a5b79674b..7a0f19d75f 100644 --- a/whisper/whisperv6/filter.go +++ b/whisper/whisperv6/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index 5ce99d9f6c..efabb7407f 100644 --- a/whisper/whisperv6/filter_test.go +++ b/whisper/whisperv6/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 1a428d6df7..b2ceb321e4 100644 --- a/whisper/whisperv6/gen_criteria_json.go +++ b/whisper/whisperv6/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 6218f5df6e..8b0129a198 100644 --- a/whisper/whisperv6/gen_message_json.go +++ b/whisper/whisperv6/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 75a1279ae3..7d281cd691 100644 --- a/whisper/whisperv6/gen_newmessage_json.go +++ b/whisper/whisperv6/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index 2d4e862441..282733d9fd 100644 --- a/whisper/whisperv6/message.go +++ b/whisper/whisperv6/message.go @@ -28,10 +28,10 @@ import ( mrand "math/rand" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/crypto/ecies" + "github.com/maticnetwork/bor/log" ) // MessageParams specifies the exact way a message should be wrapped diff --git a/whisper/whisperv6/message_test.go b/whisper/whisperv6/message_test.go index 0a5c1c8533..a77d0fb1c2 100644 --- a/whisper/whisperv6/message_test.go +++ b/whisper/whisperv6/message_test.go @@ -23,9 +23,9 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index 621d512081..2505d1eec8 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -23,10 +23,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/rlp" ) // Peer represents a whisper protocol peer connection. diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index c5b044e1a6..417a2bf236 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -28,13 +28,13 @@ import ( "net" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rlp" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/p2p/enode" + "github.com/maticnetwork/bor/p2p/nat" + "github.com/maticnetwork/bor/rlp" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index 4dd8f283c3..333416a480 100644 --- a/whisper/whisperv6/topic.go +++ b/whisper/whisperv6/topic.go @@ -19,8 +19,8 @@ package whisperv6 import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index eb713f84ee..b5daa5fc39 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -27,12 +27,12 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/maticnetwork/bor/common" + "github.com/maticnetwork/bor/crypto" + "github.com/maticnetwork/bor/log" + "github.com/maticnetwork/bor/p2p" + "github.com/maticnetwork/bor/rlp" + "github.com/maticnetwork/bor/rpc" "github.com/syndtr/goleveldb/leveldb/errors" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" diff --git a/whisper/whisperv6/whisper_test.go b/whisper/whisperv6/whisper_test.go index 895bb2b969..aa8ac3d197 100644 --- a/whisper/whisperv6/whisper_test.go +++ b/whisper/whisperv6/whisper_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/maticnetwork/bor/common" "golang.org/x/crypto/pbkdf2" )