good morning!!!!

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

B

bor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4d0ae8b0

Commit 4d0ae8b0 authored 10 years ago by Jeffrey Wilcke

Downloads
- Plain Diff

Merge branch 'conversion' of github.com-obscure:ethereum/go-ethereum into conversion

parents 48dd601d 064279c0

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

cmd/ethereum/admin.go 1 addition, 4 deletions

cmd/ethereum/admin.go
cmd/utils/cmd.go 21 additions, 15 deletions

cmd/utils/cmd.go
core/block_processor_test.go 3 additions, 2 deletions

core/block_processor_test.go
core/chain_manager.go 12 additions, 15 deletions

core/chain_manager.go
core/chain_manager_test.go 4 additions, 5 deletions

core/chain_manager_test.go
core/genesis.go 0 additions, 4 deletions

core/genesis.go
core/transaction_pool.go 1 addition, 1 deletion

core/transaction_pool.go
core/transaction_pool_test.go 5 additions, 7 deletions

core/transaction_pool_test.go
core/types/block.go 77 additions, 22 deletions

core/types/block.go
core/types/block_test.go 49 additions, 8 deletions

core/types/block_test.go
core/types/derive_sha.go 3 additions, 1 deletion

core/types/derive_sha.go
core/types/transaction.go 26 additions, 29 deletions

core/types/transaction.go
rlp/decode.go 7 additions, 0 deletions

rlp/decode.go
rlp/encode.go 6 additions, 1 deletion

rlp/encode.go
rlp/encode_test.go 1 addition, 0 deletions

rlp/encode_test.go

with 216 additions and 114 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment