forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-10 14:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

change package name

Browse source
This commit is contained in:
Jaynti Kanani 2019-11-12 13:17:12 -05:00
parent a93cda9827
commit 0f172fd0eb
No known key found for this signature in database
GPG key ID: 4396982C976BAE5E
593 changed files with 2615 additions and 2615 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/CONTRIBUTING.md vendored
View file

@ -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 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 possible through some other means. The JavaScript-enabled console is a powerful
feature in the right hands. Please check our 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. and help.
## Configuration, dependencies, and tests ## 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 for more details on configuring your environment, managing project dependencies
and testing procedures. and testing procedures.

4
.travis.yml
View file

@ -1,5 +1,5 @@
language: go language: go
go_import_path: github.com/ethereum/go-ethereum go_import_path: github.com/maticnetwork/bor
sudo: false sudo: false
matrix: matrix:
include: include:
@ -169,7 +169,7 @@ matrix:
- mv android-ndk-r19b $ANDROID_HOME/ndk-bundle - mv android-ndk-r19b $ANDROID_HOME/ndk-bundle
- mkdir -p $GOPATH/src/github.com/ethereum - 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 - 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 # This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads

20
README.md
View file

@ -2,8 +2,8 @@
Official Golang implementation of the Ethereum protocol. Official Golang implementation of the Ethereum protocol.
[![API Reference](https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667)](https://godoc.org/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/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum) [![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) [![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) [![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 ## 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 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 them using your favourite package manager. Once the dependencies are installed, run
@ -34,8 +34,8 @@ directory.
| Command | Description | | 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. | | **`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/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. | | `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. | | `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`). | | `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. | | `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` ## Running `geth`
Going through all the possible command line flags is out of scope here (please consult our 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 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. 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), - 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 causing it to download more data in exchange for avoiding processing the entire history
of the Ethereum network, which is very CPU intensive. 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) (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 This tool is optional and if you leave it out you can always attach to an already running
`geth` instance with `geth attach`. `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 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 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) 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 These can be exposed via HTTP, WebSockets and IPC (UNIX sockets on UNIX based
platforms, and named pipes on Windows). 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. - Commit messages should be prefixed with the package(s) they modify.
- E.g. "eth, rpc: make trace configs optional" - 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 for more details on configuring your environment, managing project dependencies, and
testing procedures. testing procedures.

6
SECURITY.md
View file

@ -6,13 +6,13 @@ Please see Releases. We recommend to use the most recent released version.
## Audit reports ## 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 | | Scope | Date | Report Link |
| ------- | ------- | ----------- | | ------- | ------- | ----------- |
| `geth` | 20170425 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.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/ethereum/go-ethereum/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) | | `clef` | 20180914 | [pdf](https://github.com/maticnetwork/bor/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) |

2
accounts/abi/abi.go
View file

@ -22,7 +22,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
) )
// The ABI holds information about a contract's context and available // The ABI holds information about a contract's context and available

4
accounts/abi/abi_test.go
View file

@ -26,8 +26,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
) )
const jsondata = ` const jsondata = `

12
accounts/abi/bind/auth.go
View file

@ -22,12 +22,12 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/accounts/external" "github.com/maticnetwork/bor/accounts/external"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/maticnetwork/bor/accounts/keystore"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
) )
// NewTransactor is a utility method to easily create a transaction signer from // NewTransactor is a utility method to easily create a transaction signer from

6
accounts/abi/bind/backend.go
View file

@ -21,9 +21,9 @@ import (
"errors" "errors"
"math/big" "math/big"
"github.com/ethereum/go-ethereum" "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
) )
var ( var (

32
accounts/abi/bind/backends/simulated.go
View file

@ -24,22 +24,22 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum" "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/maticnetwork/bor/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/maticnetwork/bor/common/math"
"github.com/ethereum/go-ethereum/consensus/ethash" "github.com/maticnetwork/bor/consensus/ethash"
"github.com/ethereum/go-ethereum/core" "github.com/maticnetwork/bor/core"
"github.com/ethereum/go-ethereum/core/bloombits" "github.com/maticnetwork/bor/core/bloombits"
"github.com/ethereum/go-ethereum/core/rawdb" "github.com/maticnetwork/bor/core/rawdb"
"github.com/ethereum/go-ethereum/core/state" "github.com/maticnetwork/bor/core/state"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/core/vm" "github.com/maticnetwork/bor/core/vm"
"github.com/ethereum/go-ethereum/eth/filters" "github.com/maticnetwork/bor/eth/filters"
"github.com/ethereum/go-ethereum/ethdb" "github.com/maticnetwork/bor/ethdb"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
"github.com/ethereum/go-ethereum/rpc" "github.com/maticnetwork/bor/rpc"
) )
// This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend. // This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend.

14
accounts/abi/bind/backends/simulated_test.go
View file

@ -21,13 +21,13 @@ import (
"math/big" "math/big"
"testing" "testing"
ethereum "github.com/ethereum/go-ethereum" ethereum "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/maticnetwork/bor/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends" "github.com/maticnetwork/bor/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core" "github.com/maticnetwork/bor/core"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
) )
func TestSimulatedBackend(t *testing.T) { func TestSimulatedBackend(t *testing.T) {

12
accounts/abi/bind/base.go
View file

@ -22,12 +22,12 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/ethereum/go-ethereum" "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/maticnetwork/bor/accounts/abi"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
) )
// SignerFn is a signer function callback when a contract requires a method to // SignerFn is a signer function callback when a contract requires a method to

16
accounts/abi/bind/base_test.go
View file

@ -23,14 +23,14 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum" "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/maticnetwork/bor/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/maticnetwork/bor/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/rlp" "github.com/maticnetwork/bor/rlp"
) )
type mockCaller struct { type mockCaller struct {

6
accounts/abi/bind/bind.go
View file

@ -17,7 +17,7 @@
// Package bind generates Ethereum contract Go bindings. // Package bind generates Ethereum contract Go bindings.
// //
// Detailed usage document and tutorial available on the go-ethereum Wiki page: // 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 package bind
import ( import (
@ -30,8 +30,8 @@ import (
"text/template" "text/template"
"unicode" "unicode"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/maticnetwork/bor/accounts/abi"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
) )
// Lang is a target programming language selector to generate bindings for. // Lang is a target programming language selector to generate bindings for.

126
accounts/abi/bind/bind_test.go
View file

File diff suppressed because one or more lines are too long

14
accounts/abi/bind/template.go
View file

@ -16,7 +16,7 @@
package bind 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. // tmplData is the data structure required to fill the binding template.
type tmplData struct { type tmplData struct {
@ -88,12 +88,12 @@ import (
"math/big" "math/big"
"strings" "strings"
ethereum "github.com/ethereum/go-ethereum" ethereum "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/maticnetwork/bor/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/maticnetwork/bor/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

6
accounts/abi/bind/topics.go
View file

@ -23,9 +23,9 @@ import (
"math/big" "math/big"
"reflect" "reflect"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/maticnetwork/bor/accounts/abi"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
) )
// makeTopics converts a filter query argument list into a filter topic set. // makeTopics converts a filter query argument list into a filter topic set.

4
accounts/abi/bind/topics_test.go
View file

@ -20,8 +20,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/maticnetwork/bor/accounts/abi"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
) )
func TestMakeTopics(t *testing.T) { func TestMakeTopics(t *testing.T) {

6
accounts/abi/bind/util.go
View file

@ -21,9 +21,9 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
) )
// WaitMined waits for tx to be mined on the blockchain. // WaitMined waits for tx to be mined on the blockchain.

12
accounts/abi/bind/util_test.go
View file

@ -22,12 +22,12 @@ import (
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/maticnetwork/bor/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends" "github.com/maticnetwork/bor/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core" "github.com/maticnetwork/bor/core"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
) )
var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")

4
accounts/abi/event.go
View file

@ -20,8 +20,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
) )
// Event is an event potentially triggered by the EVM's LOG mechanism. The Event // Event is an event potentially triggered by the EVM's LOG mechanism. The Event

6
accounts/abi/event_test.go
View file

@ -25,8 +25,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
@ -356,7 +356,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass
/* /*
Taken from Taken from
https://github.com/ethereum/go-ethereum/pull/15568 https://github.com/maticnetwork/bor/pull/15568
*/ */
type testResult struct { type testResult struct {

2
accounts/abi/method.go
View file

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"strings" "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. // Method represents a callable given a `Name` and whether the method is a constant.

4
accounts/abi/numbers.go
View file

@ -20,8 +20,8 @@ import (
"math/big" "math/big"
"reflect" "reflect"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/maticnetwork/bor/common/math"
) )
var ( var (

4
accounts/abi/pack.go
View file

@ -20,8 +20,8 @@ import (
"math/big" "math/big"
"reflect" "reflect"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/maticnetwork/bor/common/math"
) )
// packBytesSlice packs the given bytes as [L, V] as the canonical representation // packBytesSlice packs the given bytes as [L, V] as the canonical representation

2
accounts/abi/pack_test.go
View file

@ -24,7 +24,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
) )
func TestPack(t *testing.T) { func TestPack(t *testing.T) {

2
accounts/abi/type_test.go
View file

@ -22,7 +22,7 @@ import (
"testing" "testing"
"github.com/davecgh/go-spew/spew" "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 // typeWithoutStringer is a alias for the Type type which simply doesn't implement

2
accounts/abi/unpack.go
View file

@ -22,7 +22,7 @@ import (
"math/big" "math/big"
"reflect" "reflect"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
) )
var ( var (

2
accounts/abi/unpack_test.go
View file

@ -26,7 +26,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

8
accounts/accounts.go
View file

@ -21,10 +21,10 @@ import (
"fmt" "fmt"
"math/big" "math/big"
ethereum "github.com/ethereum/go-ethereum" ethereum "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"
) )

2
accounts/accounts_test.go
View file

@ -20,7 +20,7 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
) )
func TestTextHash(t *testing.T) { func TestTextHash(t *testing.T) {

20
accounts/external/backend.go vendored
View file

@ -21,16 +21,16 @@ import (
"math/big" "math/big"
"sync" "sync"
"github.com/ethereum/go-ethereum" "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
"github.com/ethereum/go-ethereum/internal/ethapi" "github.com/maticnetwork/bor/internal/ethapi"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/rpc" "github.com/maticnetwork/bor/rpc"
"github.com/ethereum/go-ethereum/signer/core" "github.com/maticnetwork/bor/signer/core"
) )
type ExternalBackend struct { type ExternalBackend struct {

6
accounts/keystore/account_cache.go
View file

@ -28,9 +28,9 @@ import (
"time" "time"
mapset "github.com/deckarep/golang-set" mapset "github.com/deckarep/golang-set"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
) )
// Minimum amount of time between cache reloads. This limit applies if the platform does // Minimum amount of time between cache reloads. This limit applies if the platform does

4
accounts/keystore/account_cache_test.go
View file

@ -29,8 +29,8 @@ import (
"github.com/cespare/cp" "github.com/cespare/cp"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
) )
var ( var (

2
accounts/keystore/file_cache.go
View file

@ -25,7 +25,7 @@ import (
"time" "time"
mapset "github.com/deckarep/golang-set" 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. // fileCache is a cache of files seen during scan of keystore.

6
accounts/keystore/key.go
View file

@ -29,9 +29,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/pborman/uuid" "github.com/pborman/uuid"
) )

10
accounts/keystore/keystore.go
View file

@ -33,11 +33,11 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
) )
var ( var (

6
accounts/keystore/keystore_test.go
View file

@ -26,9 +26,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
) )
var testSigData = make([]byte, 32) var testSigData = make([]byte, 32)

10
accounts/keystore/passphrase.go
View file

@ -38,10 +38,10 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/maticnetwork/bor/common/math"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/pborman/uuid" "github.com/pborman/uuid"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
"golang.org/x/crypto/scrypt" "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" + "This indicates that the keystore is corrupted. \n" +
"The corrupted file is stored at \n%v\n" + "The corrupted file is stored at \n%v\n" +
"Please file a ticket at:\n\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" "The error was : %s"
return fmt.Errorf(msg, tmpName, err) return fmt.Errorf(msg, tmpName, err)
} }

2
accounts/keystore/passphrase_test.go
View file

@ -20,7 +20,7 @@ import (
"io/ioutil" "io/ioutil"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
) )
const ( const (

2
accounts/keystore/plain.go
View file

@ -22,7 +22,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
) )
type keyStorePlain struct { type keyStorePlain struct {

4
accounts/keystore/plain_test.go
View file

@ -27,8 +27,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
) )
func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) {

4
accounts/keystore/presale.go
View file

@ -25,8 +25,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/pborman/uuid" "github.com/pborman/uuid"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
) )

8
accounts/keystore/wallet.go
View file

@ -19,10 +19,10 @@ package keystore
import ( import (
"math/big" "math/big"
ethereum "github.com/ethereum/go-ethereum" ethereum "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
) )
// keystoreWallet implements the accounts.Wallet interface for the original // keystoreWallet implements the accounts.Wallet interface for the original

2
accounts/keystore/watch.go
View file

@ -21,7 +21,7 @@ package keystore
import ( import (
"time" "time"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/rjeczalik/notify" "github.com/rjeczalik/notify"
) )

2
accounts/manager.go
View file

@ -21,7 +21,7 @@ import (
"sort" "sort"
"sync" "sync"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
) )
// Config contains the settings of the global account manager. // Config contains the settings of the global account manager.

8
accounts/scwallet/hub.go
View file

@ -41,10 +41,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
pcsc "github.com/gballet/go-libpcsclite" pcsc "github.com/gballet/go-libpcsclite"
) )

2
accounts/scwallet/securechannel.go
View file

@ -25,7 +25,7 @@ import (
"crypto/sha512" "crypto/sha512"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
pcsc "github.com/gballet/go-libpcsclite" pcsc "github.com/gballet/go-libpcsclite"
"github.com/wsddn/go-ecdh" "github.com/wsddn/go-ecdh"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"

12
accounts/scwallet/wallet.go
View file

@ -33,12 +33,12 @@ import (
"sync" "sync"
"time" "time"
ethereum "github.com/ethereum/go-ethereum" ethereum "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
pcsc "github.com/gballet/go-libpcsclite" pcsc "github.com/gballet/go-libpcsclite"
"github.com/status-im/keycard-go/derivationpath" "github.com/status-im/keycard-go/derivationpath"
) )

6
accounts/usbwallet/hub.go
View file

@ -23,9 +23,9 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/karalabe/usb" "github.com/karalabe/usb"
) )

12
accounts/usbwallet/ledger.go
View file

@ -28,12 +28,12 @@ import (
"io" "io"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/rlp" "github.com/maticnetwork/bor/rlp"
) )
// ledgerOpcode is an enumeration encoding the supported Ledger opcodes. // ledgerOpcode is an enumeration encoding the supported Ledger opcodes.

12
accounts/usbwallet/trezor.go
View file

@ -27,12 +27,12 @@ import (
"io" "io"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/accounts/usbwallet/trezor" "github.com/maticnetwork/bor/accounts/usbwallet/trezor"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

12
accounts/usbwallet/wallet.go
View file

@ -25,12 +25,12 @@ import (
"sync" "sync"
"time" "time"
ethereum "github.com/ethereum/go-ethereum" ethereum "github.com/maticnetwork/bor"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/karalabe/usb" "github.com/karalabe/usb"
) )

8
build/ci.go
View file

@ -58,8 +58,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/internal/build" "github.com/maticnetwork/bor/internal/build"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
) )
var ( var (
@ -778,7 +778,7 @@ func doAndroidArchive(cmdline []string) {
} }
// Build the Android archive and Maven resources // 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(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 *local {
// If we're building locally, copy bundle to build dir and skip Maven // 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 the iOS XCode framework
build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind"))
build.MustRun(gomobileTool("init")) 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 *local {
// If we're building locally, use the build folder and stop afterwards // If we're building locally, use the build folder and stop afterwards

4
build/deb/ethereum/deb.control
View file

@ -5,8 +5,8 @@ Maintainer: {{.Author}}
Build-Depends: debhelper (>= 8.0.0), golang-1.11 Build-Depends: debhelper (>= 8.0.0), golang-1.11
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Homepage: https://ethereum.org Homepage: https://ethereum.org
Vcs-Git: git://github.com/ethereum/go-ethereum.git Vcs-Git: git://github.com/maticnetwork/bor.git
Vcs-Browser: https://github.com/ethereum/go-ethereum Vcs-Browser: https://github.com/maticnetwork/bor
Package: {{.Name}} Package: {{.Name}}
Architecture: any Architecture: any

10
build/env.sh
View file

@ -10,11 +10,11 @@ fi
# Create fake Go workspace if it doesn't exist yet. # Create fake Go workspace if it doesn't exist yet.
workspace="$PWD/build/_workspace" workspace="$PWD/build/_workspace"
root="$PWD" root="$PWD"
ethdir="$workspace/src/github.com/ethereum" ethdir="$workspace/src/github.com/maticnetwork"
if [ ! -L "$ethdir/go-ethereum" ]; then if [ ! -L "$ethdir/bor" ]; then
mkdir -p "$ethdir" mkdir -p "$ethdir"
cd "$ethdir" cd "$ethdir"
ln -s ../../../../../. go-ethereum ln -s ../../../../../. bor
cd "$root" cd "$root"
fi fi
@ -23,8 +23,8 @@ GOPATH="$workspace"
export GOPATH export GOPATH
# Run the command inside the workspace. # Run the command inside the workspace.
cd "$ethdir/go-ethereum" cd "$ethdir/bor"
PWD="$ethdir/go-ethereum" PWD="$ethdir/bor"
# Launch the arguments with the configured environment. # Launch the arguments with the configured environment.
exec "$@" exec "$@"

6
build/mvn.pom
View file

@ -11,7 +11,7 @@
<name>Android Ethereum Client</name> <name>Android Ethereum Client</name>
<description>Android port of the go-ethereum libraries and node</description> <description>Android port of the go-ethereum libraries and node</description>
<url>https://github.com/ethereum/go-ethereum</url> <url>https://github.com/maticnetwork/bor</url>
<inceptionYear>2015</inceptionYear> <inceptionYear>2015</inceptionYear>
<licenses> <licenses>
@ -48,10 +48,10 @@
<issueManagement> <issueManagement>
<system>GitHub Issues</system> <system>GitHub Issues</system>
<url>https://github.com/ethereum/go-ethereum/issues/</url> <url>https://github.com/maticnetwork/bor/issues/</url>
</issueManagement> </issueManagement>
<scm> <scm>
<url>https://github.com/ethereum/go-ethereum</url> <url>https://github.com/maticnetwork/bor</url>
</scm> </scm>
</project> </project>

6
build/nsis.install.nsh
View file

@ -3,9 +3,9 @@ InstallDir "$InstDir"
OutFile "${OUTPUTFILE}" # set through command line arguments OutFile "${OUTPUTFILE}" # set through command line arguments
# Links for "Add/Remove Programs" # Links for "Add/Remove Programs"
!define HELPURL "https://github.com/ethereum/go-ethereum/issues" !define HELPURL "https://github.com/maticnetwork/bor/issues"
!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases" !define UPDATEURL "https://github.com/maticnetwork/bor/releases"
!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go" !define ABOUTURL "https://github.com/maticnetwork/bor#ethereum-go"
!define /date NOW "%Y%m%d" !define /date NOW "%Y%m%d"
PageEx license PageEx license

4
build/pod.podspec
View file

@ -2,12 +2,12 @@ Pod::Spec.new do |spec|
spec.name = 'Geth' spec.name = 'Geth'
spec.version = '{{.Version}}' spec.version = '{{.Version}}'
spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' } 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}} spec.authors = { {{range .Contributors}}
'{{.Name}}' => '{{.Email}}',{{end}} '{{.Name}}' => '{{.Email}}',{{end}}
} }
spec.summary = 'iOS Ethereum Client' 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.platform = :ios
spec.ios.deployment_target = '9.0' spec.ios.deployment_target = '9.0'

10
cmd/abigen/main.go
View file

@ -23,11 +23,11 @@ import (
"os" "os"
"strings" "strings"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/maticnetwork/bor/accounts/abi/bind"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common/compiler" "github.com/maticnetwork/bor/common/compiler"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

16
cmd/bootnode/main.go
View file

@ -24,14 +24,14 @@ import (
"net" "net"
"os" "os"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/p2p/discover" "github.com/maticnetwork/bor/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/discv5" "github.com/maticnetwork/bor/p2p/discv5"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/maticnetwork/bor/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/nat" "github.com/maticnetwork/bor/p2p/nat"
"github.com/ethereum/go-ethereum/p2p/netutil" "github.com/maticnetwork/bor/p2p/netutil"
) )
func main() { func main() {

12
cmd/bor/accountcmd.go
View file

@ -20,12 +20,12 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/maticnetwork/bor/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/console" "github.com/maticnetwork/bor/console"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

2
cmd/bor/accountcmd_test.go
View file

@ -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) { func TestUnlockFlagMultiIndex(t *testing.T) {
datadir := tmpDatadirWithKeystore(t) datadir := tmpDatadirWithKeystore(t)
geth := runGeth(t, geth := runGeth(t,

22
cmd/bor/chaincmd.go
View file

@ -26,17 +26,17 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/console" "github.com/maticnetwork/bor/console"
"github.com/ethereum/go-ethereum/core" "github.com/maticnetwork/bor/core"
"github.com/ethereum/go-ethereum/core/rawdb" "github.com/maticnetwork/bor/core/rawdb"
"github.com/ethereum/go-ethereum/core/state" "github.com/maticnetwork/bor/core/state"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/eth/downloader" "github.com/maticnetwork/bor/eth/downloader"
"github.com/ethereum/go-ethereum/event" "github.com/maticnetwork/bor/event"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/trie" "github.com/maticnetwork/bor/trie"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

12
cmd/bor/config.go
View file

@ -26,12 +26,12 @@ import (
cli "gopkg.in/urfave/cli.v1" cli "gopkg.in/urfave/cli.v1"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/dashboard" "github.com/maticnetwork/bor/dashboard"
"github.com/ethereum/go-ethereum/eth" "github.com/maticnetwork/bor/eth"
"github.com/ethereum/go-ethereum/node" "github.com/maticnetwork/bor/node"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" whisper "github.com/maticnetwork/bor/whisper/whisperv6"
"github.com/naoina/toml" "github.com/naoina/toml"
) )

14
cmd/bor/consolecmd.go
View file

@ -24,10 +24,10 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/console" "github.com/maticnetwork/bor/console"
"github.com/ethereum/go-ethereum/node" "github.com/maticnetwork/bor/node"
"github.com/ethereum/go-ethereum/rpc" "github.com/maticnetwork/bor/rpc"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )
@ -43,7 +43,7 @@ var (
Description: ` Description: `
The Geth console is an interactive shell for the JavaScript runtime environment 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. 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{ attachCommand = cli.Command{
@ -56,7 +56,7 @@ See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console.`,
Description: ` Description: `
The Geth console is an interactive shell for the JavaScript runtime environment 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. 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.`, 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", Category: "CONSOLE COMMANDS",
Description: ` Description: `
The JavaScript VM exposes a node admin interface as well as the Ðapp 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`,
} }
) )

2
cmd/bor/consolecmd_test.go
View file

@ -27,7 +27,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
) )
const ( const (

6
cmd/bor/dao_test.go
View file

@ -23,9 +23,9 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core/rawdb" "github.com/maticnetwork/bor/core/rawdb"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
) )
// Genesis block for nodes which don't care about the DAO fork (i.e. not configured) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured)

26
cmd/bor/main.go
View file

@ -29,19 +29,19 @@ import (
"time" "time"
"github.com/elastic/gosigar" "github.com/elastic/gosigar"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/maticnetwork/bor/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/console" "github.com/maticnetwork/bor/console"
"github.com/ethereum/go-ethereum/eth" "github.com/maticnetwork/bor/eth"
"github.com/ethereum/go-ethereum/eth/downloader" "github.com/maticnetwork/bor/eth/downloader"
"github.com/ethereum/go-ethereum/ethclient" "github.com/maticnetwork/bor/ethclient"
"github.com/ethereum/go-ethereum/internal/debug" "github.com/maticnetwork/bor/internal/debug"
"github.com/ethereum/go-ethereum/les" "github.com/maticnetwork/bor/les"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/metrics" "github.com/maticnetwork/bor/metrics"
"github.com/ethereum/go-ethereum/node" "github.com/maticnetwork/bor/node"
cli "gopkg.in/urfave/cli.v1" cli "gopkg.in/urfave/cli.v1"
) )

8
cmd/bor/misccmd.go
View file

@ -23,10 +23,10 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/consensus/ethash" "github.com/maticnetwork/bor/consensus/ethash"
"github.com/ethereum/go-ethereum/eth" "github.com/maticnetwork/bor/eth"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

40
cmd/bor/retesteth.go
View file

@ -26,26 +26,26 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
"github.com/ethereum/go-ethereum/common/math" "github.com/maticnetwork/bor/common/math"
"github.com/ethereum/go-ethereum/consensus" "github.com/maticnetwork/bor/consensus"
"github.com/ethereum/go-ethereum/consensus/ethash" "github.com/maticnetwork/bor/consensus/ethash"
"github.com/ethereum/go-ethereum/consensus/misc" "github.com/maticnetwork/bor/consensus/misc"
"github.com/ethereum/go-ethereum/core" "github.com/maticnetwork/bor/core"
"github.com/ethereum/go-ethereum/core/rawdb" "github.com/maticnetwork/bor/core/rawdb"
"github.com/ethereum/go-ethereum/core/state" "github.com/maticnetwork/bor/core/state"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/core/vm" "github.com/maticnetwork/bor/core/vm"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/ethdb" "github.com/maticnetwork/bor/ethdb"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/node" "github.com/maticnetwork/bor/node"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
"github.com/ethereum/go-ethereum/rlp" "github.com/maticnetwork/bor/rlp"
"github.com/ethereum/go-ethereum/rpc" "github.com/maticnetwork/bor/rpc"
"github.com/ethereum/go-ethereum/trie" "github.com/maticnetwork/bor/trie"
cli "gopkg.in/urfave/cli.v1" cli "gopkg.in/urfave/cli.v1"
) )

6
cmd/bor/retesteth_copypaste.go
View file

@ -19,9 +19,9 @@ package main
import ( import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
) )
// RPCTransaction represents a transaction that will serialize to the RPC representation of a transaction // RPCTransaction represents a transaction that will serialize to the RPC representation of a transaction

2
cmd/bor/run_test.go
View file

@ -23,7 +23,7 @@ import (
"testing" "testing"
"github.com/docker/docker/pkg/reexec" "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 { func tmpdir(t *testing.T) string {

4
cmd/bor/usage.go
View file

@ -24,8 +24,8 @@ import (
"strings" "strings"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/internal/debug" "github.com/maticnetwork/bor/internal/debug"
cli "gopkg.in/urfave/cli.v1" cli "gopkg.in/urfave/cli.v1"
) )

18
cmd/checkpoint-admin/common.go
View file

@ -19,15 +19,15 @@ package main
import ( import (
"strconv" "strconv"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/maticnetwork/bor/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/external" "github.com/maticnetwork/bor/accounts/external"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/contracts/checkpointoracle" "github.com/maticnetwork/bor/contracts/checkpointoracle"
"github.com/ethereum/go-ethereum/ethclient" "github.com/maticnetwork/bor/ethclient"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
"github.com/ethereum/go-ethereum/rpc" "github.com/maticnetwork/bor/rpc"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

22
cmd/checkpoint-admin/exec.go
View file

@ -25,17 +25,17 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
"github.com/ethereum/go-ethereum/contracts/checkpointoracle" "github.com/maticnetwork/bor/contracts/checkpointoracle"
"github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" "github.com/maticnetwork/bor/contracts/checkpointoracle/contract"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/ethclient" "github.com/maticnetwork/bor/ethclient"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
"github.com/ethereum/go-ethereum/rpc" "github.com/maticnetwork/bor/rpc"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/checkpoint-admin/main.go
View file

@ -22,9 +22,9 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common/fdlimit" "github.com/maticnetwork/bor/common/fdlimit"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

4
cmd/checkpoint-admin/status.go
View file

@ -19,8 +19,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

36
cmd/clef/main.go
View file

@ -35,24 +35,24 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/maticnetwork/bor/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
"github.com/ethereum/go-ethereum/console" "github.com/maticnetwork/bor/console"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/internal/ethapi" "github.com/maticnetwork/bor/internal/ethapi"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/node" "github.com/maticnetwork/bor/node"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
"github.com/ethereum/go-ethereum/rlp" "github.com/maticnetwork/bor/rlp"
"github.com/ethereum/go-ethereum/rpc" "github.com/maticnetwork/bor/rpc"
"github.com/ethereum/go-ethereum/signer/core" "github.com/maticnetwork/bor/signer/core"
"github.com/ethereum/go-ethereum/signer/fourbyte" "github.com/maticnetwork/bor/signer/fourbyte"
"github.com/ethereum/go-ethereum/signer/rules" "github.com/maticnetwork/bor/signer/rules"
"github.com/ethereum/go-ethereum/signer/storage" "github.com/maticnetwork/bor/signer/storage"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/clef/tutorial.md
View file

@ -100,9 +100,9 @@ or
{"jsonrpc":"2.0","id":1,"error":{"code":-32000,"message":"Request denied"}} {"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 ## 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" 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 ## Geth integration

8
cmd/devp2p/discv4cmd.go
View file

@ -23,10 +23,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/p2p/discover" "github.com/maticnetwork/bor/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/maticnetwork/bor/p2p/enode"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/devp2p/enrcmd.go
View file

@ -27,9 +27,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/maticnetwork/bor/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/enr" "github.com/maticnetwork/bor/p2p/enr"
"github.com/ethereum/go-ethereum/rlp" "github.com/maticnetwork/bor/rlp"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

4
cmd/devp2p/main.go
View file

@ -21,8 +21,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/ethereum/go-ethereum/internal/debug" "github.com/maticnetwork/bor/internal/debug"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

4
cmd/ethkey/changepassphrase.go
View file

@ -5,8 +5,8 @@ import (
"io/ioutil" "io/ioutil"
"strings" "strings"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/maticnetwork/bor/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/ethkey/generate.go
View file

@ -23,9 +23,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/maticnetwork/bor/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/pborman/uuid" "github.com/pborman/uuid"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/ethkey/inspect.go
View file

@ -21,9 +21,9 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/maticnetwork/bor/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

2
cmd/ethkey/main.go
View file

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

8
cmd/ethkey/message.go
View file

@ -21,10 +21,10 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/maticnetwork/bor/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

2
cmd/ethkey/run_test.go
View file

@ -22,7 +22,7 @@ import (
"testing" "testing"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/ethereum/go-ethereum/internal/cmdtest" "github.com/maticnetwork/bor/internal/cmdtest"
) )
type testEthkey struct { type testEthkey struct {

6
cmd/ethkey/utils.go
View file

@ -22,9 +22,9 @@ import (
"io/ioutil" "io/ioutil"
"strings" "strings"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/console" "github.com/maticnetwork/bor/console"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

2
cmd/evm/compiler.go
View file

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"io/ioutil" "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" cli "gopkg.in/urfave/cli.v1"
) )

2
cmd/evm/disasm.go
View file

@ -22,7 +22,7 @@ import (
"io/ioutil" "io/ioutil"
"strings" "strings"
"github.com/ethereum/go-ethereum/core/asm" "github.com/maticnetwork/bor/core/asm"
cli "gopkg.in/urfave/cli.v1" cli "gopkg.in/urfave/cli.v1"
) )

2
cmd/evm/internal/compiler/compiler.go
View file

@ -20,7 +20,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/core/asm" "github.com/maticnetwork/bor/core/asm"
) )
func Compile(fn string, src []byte, debug bool) (string, error) { func Compile(fn string, src []byte, debug bool) (string, error) {

2
cmd/evm/main.go
View file

@ -22,7 +22,7 @@ import (
"math/big" "math/big"
"os" "os"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

20
cmd/evm/runner.go
View file

@ -26,16 +26,16 @@ import (
"runtime/pprof" "runtime/pprof"
"time" "time"
"github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" "github.com/maticnetwork/bor/cmd/evm/internal/compiler"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/maticnetwork/bor/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core" "github.com/maticnetwork/bor/core"
"github.com/ethereum/go-ethereum/core/rawdb" "github.com/maticnetwork/bor/core/rawdb"
"github.com/ethereum/go-ethereum/core/state" "github.com/maticnetwork/bor/core/state"
"github.com/ethereum/go-ethereum/core/vm" "github.com/maticnetwork/bor/core/vm"
"github.com/ethereum/go-ethereum/core/vm/runtime" "github.com/maticnetwork/bor/core/vm/runtime"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
cli "gopkg.in/urfave/cli.v1" cli "gopkg.in/urfave/cli.v1"
) )

8
cmd/evm/staterunner.go
View file

@ -23,10 +23,10 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/ethereum/go-ethereum/core/state" "github.com/maticnetwork/bor/core/state"
"github.com/ethereum/go-ethereum/core/vm" "github.com/maticnetwork/bor/core/vm"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/tests" "github.com/maticnetwork/bor/tests"
cli "gopkg.in/urfave/cli.v1" cli "gopkg.in/urfave/cli.v1"
) )

36
cmd/faucet/faucet.go
View file

@ -41,23 +41,23 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/maticnetwork/bor/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/maticnetwork/bor/accounts/keystore"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/core" "github.com/maticnetwork/bor/core"
"github.com/ethereum/go-ethereum/core/types" "github.com/maticnetwork/bor/core/types"
"github.com/ethereum/go-ethereum/eth" "github.com/maticnetwork/bor/eth"
"github.com/ethereum/go-ethereum/eth/downloader" "github.com/maticnetwork/bor/eth/downloader"
"github.com/ethereum/go-ethereum/ethclient" "github.com/maticnetwork/bor/ethclient"
"github.com/ethereum/go-ethereum/ethstats" "github.com/maticnetwork/bor/ethstats"
"github.com/ethereum/go-ethereum/les" "github.com/maticnetwork/bor/les"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
"github.com/ethereum/go-ethereum/node" "github.com/maticnetwork/bor/node"
"github.com/ethereum/go-ethereum/p2p" "github.com/maticnetwork/bor/p2p"
"github.com/ethereum/go-ethereum/p2p/discv5" "github.com/maticnetwork/bor/p2p/discv5"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/maticnetwork/bor/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/nat" "github.com/maticnetwork/bor/p2p/nat"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
"golang.org/x/net/websocket" "golang.org/x/net/websocket"
) )
@ -458,7 +458,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) {
case *noauthFlag: case *noauthFlag:
username, avatar, address, err = authNoAuth(msg.URL) username, avatar, address, err = authNoAuth(msg.URL)
default: 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 != nil {
if err = sendError(conn, err); err != nil { if err = sendError(conn, err); err != nil {

12
cmd/p2psim/main.go
View file

@ -45,12 +45,12 @@ import (
"strings" "strings"
"text/tabwriter" "text/tabwriter"
"github.com/ethereum/go-ethereum/crypto" "github.com/maticnetwork/bor/crypto"
"github.com/ethereum/go-ethereum/p2p" "github.com/maticnetwork/bor/p2p"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/maticnetwork/bor/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/simulations" "github.com/maticnetwork/bor/p2p/simulations"
"github.com/ethereum/go-ethereum/p2p/simulations/adapters" "github.com/maticnetwork/bor/p2p/simulations/adapters"
"github.com/ethereum/go-ethereum/rpc" "github.com/maticnetwork/bor/rpc"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

12
cmd/puppeth/genesis.go
View file

@ -23,12 +23,12 @@ import (
"math/big" "math/big"
"strings" "strings"
"github.com/ethereum/go-ethereum/common" "github.com/maticnetwork/bor/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/maticnetwork/bor/common/hexutil"
math2 "github.com/ethereum/go-ethereum/common/math" math2 "github.com/maticnetwork/bor/common/math"
"github.com/ethereum/go-ethereum/consensus/ethash" "github.com/maticnetwork/bor/consensus/ethash"
"github.com/ethereum/go-ethereum/core" "github.com/maticnetwork/bor/core"
"github.com/ethereum/go-ethereum/params" "github.com/maticnetwork/bor/params"
) )
// alethGenesisSpec represents the genesis specification format used by the // alethGenesisSpec represents the genesis specification format used by the

2
cmd/puppeth/genesis_test.go
View file

@ -25,7 +25,7 @@ import (
"testing" "testing"
"github.com/davecgh/go-spew/spew" "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. // Tests the go-ethereum to Aleth chainspec conversion for the Stureby testnet.

2
cmd/puppeth/module.go
View file

@ -25,7 +25,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/log" "github.com/maticnetwork/bor/log"
) )
var ( var (

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