Ethan Buchman
7 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 546 additions and 300 deletions
Split View
Diff Options
-
+3 -3benchmarks/codec_test.go
-
+17 -16blockchain/pool.go
-
+8 -7blockchain/pool_test.go
-
+5 -5blockchain/reactor.go
-
+6 -6blockchain/reactor_test.go
-
+11 -0config/config.go
-
+3 -0config/toml.go
-
+5 -5consensus/reactor.go
-
+6 -6consensus/replay.go
-
+24 -23consensus/state.go
-
+8 -7consensus/types/height_vote_set.go
-
+1 -1consensus/wal.go
-
+13 -10node/node.go
-
+0 -1p2p/README.md
-
+19 -15p2p/addrbook.go
-
+6 -2p2p/addrbook_test.go
-
+0 -6p2p/connection.go
-
+113 -0p2p/key.go
-
+50 -0p2p/key_test.go
-
+52 -27p2p/netaddress.go
-
+19 -2p2p/netaddress_test.go
-
+17 -18p2p/peer.go
-
+12 -12p2p/peer_set.go
-
+7 -6p2p/peer_set_test.go
-
+14 -13p2p/peer_test.go
-
+23 -34p2p/pex_reactor.go
-
+5 -4p2p/pex_reactor_test.go
-
+8 -8p2p/secret_connection.go
-
+7 -8p2p/secret_connection_test.go
-
+46 -34p2p/switch.go
-
+7 -7p2p/switch_test.go
-
+23 -8p2p/types.go
-
+3 -2rpc/core/consensus.go
-
+1 -1rpc/core/types/responses.go
-
+4 -3types/vote_set.go
+ 3
- 3
benchmarks/codec_test.go
View File
+ 17
- 16
blockchain/pool.go
View File
+ 8
- 7
blockchain/pool_test.go
View File
+ 5
- 5
blockchain/reactor.go
View File
+ 6
- 6
blockchain/reactor_test.go
View File
+ 11
- 0
config/config.go
View File
+ 3
- 0
config/toml.go
View File
+ 5
- 5
consensus/reactor.go
View File
+ 6
- 6
consensus/replay.go
View File
+ 24
- 23
consensus/state.go
View File
+ 8
- 7
consensus/types/height_vote_set.go
View File
+ 1
- 1
consensus/wal.go
View File
+ 13
- 10
node/node.go
View File
+ 0
- 1
p2p/README.md
View File
+ 19
- 15
p2p/addrbook.go
View File
+ 6
- 2
p2p/addrbook_test.go
View File
+ 0
- 6
p2p/connection.go
View File
+ 113
- 0
p2p/key.go
View File
| @ -0,0 +1,113 @@ | |||
| package p2p | |||
| import ( | |||
| "bytes" | |||
| "encoding/hex" | |||
| "encoding/json" | |||
| "fmt" | |||
| "io/ioutil" | |||
| crypto "github.com/tendermint/go-crypto" | |||
| cmn "github.com/tendermint/tmlibs/common" | |||
| ) | |||
| // ID is a hex-encoded crypto.Address | |||
| type ID string | |||
| // IDByteLength is the length of a crypto.Address. Currently only 20. | |||
| // TODO: support other length addresses ? | |||
| const IDByteLength = 20 | |||
| //------------------------------------------------------------------------------ | |||
| // Persistent peer ID | |||
| // TODO: encrypt on disk | |||
| // NodeKey is the persistent peer key. | |||
| // It contains the nodes private key for authentication. | |||
| type NodeKey struct { | |||
| PrivKey crypto.PrivKey `json:"priv_key"` // our priv key | |||
| } | |||
| // ID returns the peer's canonical ID - the hash of its public key. | |||
| func (nodeKey *NodeKey) ID() ID { | |||
| return PubKeyToID(nodeKey.PubKey()) | |||
| } | |||
| // PubKey returns the peer's PubKey | |||
| func (nodeKey *NodeKey) PubKey() crypto.PubKey { | |||
| return nodeKey.PrivKey.PubKey() | |||
| } | |||
| // PubKeyToID returns the ID corresponding to the given PubKey. | |||
| // It's the hex-encoding of the pubKey.Address(). | |||
| func PubKeyToID(pubKey crypto.PubKey) ID { | |||
| return ID(hex.EncodeToString(pubKey.Address())) | |||
| } | |||
| // LoadOrGenNodeKey attempts to load the NodeKey from the given filePath. | |||
| // If the file does not exist, it generates and saves a new NodeKey. | |||
| func LoadOrGenNodeKey(filePath string) (*NodeKey, error) { | |||
| if cmn.FileExists(filePath) { | |||
| nodeKey, err := loadNodeKey(filePath) | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| return nodeKey, nil | |||
| } else { | |||
| return genNodeKey(filePath) | |||
| } | |||
| } | |||
| func loadNodeKey(filePath string) (*NodeKey, error) { | |||
| jsonBytes, err := ioutil.ReadFile(filePath) | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| nodeKey := new(NodeKey) | |||
| err = json.Unmarshal(jsonBytes, nodeKey) | |||
| if err != nil { | |||
| return nil, fmt.Errorf("Error reading NodeKey from %v: %v\n", filePath, err) | |||
| } | |||
| return nodeKey, nil | |||
| } | |||
| func genNodeKey(filePath string) (*NodeKey, error) { | |||
| privKey := crypto.GenPrivKeyEd25519().Wrap() | |||
| nodeKey := &NodeKey{ | |||
| PrivKey: privKey, | |||
| } | |||
| jsonBytes, err := json.Marshal(nodeKey) | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| err = ioutil.WriteFile(filePath, jsonBytes, 0600) | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| return nodeKey, nil | |||
| } | |||
| //------------------------------------------------------------------------------ | |||
| // MakePoWTarget returns the big-endian encoding of 2^(targetBits - difficulty) - 1. | |||
| // It can be used as a Proof of Work target. | |||
| // NOTE: targetBits must be a multiple of 8 and difficulty must be less than targetBits. | |||
| func MakePoWTarget(difficulty, targetBits uint) []byte { | |||
| if targetBits%8 != 0 { | |||
| panic(fmt.Sprintf("targetBits (%d) not a multiple of 8", targetBits)) | |||
| } | |||
| if difficulty >= targetBits { | |||
| panic(fmt.Sprintf("difficulty (%d) >= targetBits (%d)", difficulty, targetBits)) | |||
| } | |||
| targetBytes := targetBits / 8 | |||
| zeroPrefixLen := (int(difficulty) / 8) | |||
| prefix := bytes.Repeat([]byte{0}, zeroPrefixLen) | |||
| mod := (difficulty % 8) | |||
| if mod > 0 { | |||
| nonZeroPrefix := byte(1<<(8-mod) - 1) | |||
| prefix = append(prefix, nonZeroPrefix) | |||
| } | |||
| tailLen := int(targetBytes) - len(prefix) | |||
| return append(prefix, bytes.Repeat([]byte{0xFF}, tailLen)...) | |||
| } | |||
+ 50
- 0
p2p/key_test.go
View File
| @ -0,0 +1,50 @@ | |||
| package p2p | |||
| import ( | |||
| "bytes" | |||
| "os" | |||
| "path/filepath" | |||
| "testing" | |||
| "github.com/stretchr/testify/assert" | |||
| cmn "github.com/tendermint/tmlibs/common" | |||
| ) | |||
| func TestLoadOrGenNodeKey(t *testing.T) { | |||
| filePath := filepath.Join(os.TempDir(), cmn.RandStr(12)+"_peer_id.json") | |||
| nodeKey, err := LoadOrGenNodeKey(filePath) | |||
| assert.Nil(t, err) | |||
| nodeKey2, err := LoadOrGenNodeKey(filePath) | |||
| assert.Nil(t, err) | |||
| assert.Equal(t, nodeKey, nodeKey2) | |||
| } | |||
| //---------------------------------------------------------- | |||
| func padBytes(bz []byte, targetBytes int) []byte { | |||
| return append(bz, bytes.Repeat([]byte{0xFF}, targetBytes-len(bz))...) | |||
| } | |||
| func TestPoWTarget(t *testing.T) { | |||
| targetBytes := 20 | |||
| cases := []struct { | |||
| difficulty uint | |||
| target []byte | |||
| }{ | |||
| {0, padBytes([]byte{}, targetBytes)}, | |||
| {1, padBytes([]byte{127}, targetBytes)}, | |||
| {8, padBytes([]byte{0}, targetBytes)}, | |||
| {9, padBytes([]byte{0, 127}, targetBytes)}, | |||
| {10, padBytes([]byte{0, 63}, targetBytes)}, | |||
| {16, padBytes([]byte{0, 0}, targetBytes)}, | |||
| {17, padBytes([]byte{0, 0, 127}, targetBytes)}, | |||
| } | |||
| for _, c := range cases { | |||
| assert.Equal(t, MakePoWTarget(c.difficulty, 20*8), c.target) | |||
| } | |||
| } | |||