Commits · cbf221f6b7a48ece543d6141d8a7e9dbf9b8d86d · 张蕾 / Geth-Modification

21 May, 2014 1 commit
- Fixed competing block method · cbf221f6
  obscuren authored May 21, 2014
  
  cbf221f6
20 May, 2014 35 commits
- Merge branch 'hotfix/4' into develop · 734b2e4c
  obscuren authored May 20, 2014
  
  734b2e4c
- Fixed state overwriting issue · 3c35ba7c
  obscuren authored May 20, 2014
  
  3c35ba7c
- Fixed couple issues · 5ceb1620
  obscuren authored May 20, 2014
```
* (imp) Lock / RLock tries
* (fix) stack
```
  5ceb1620
- Merge branch 'master' into develop · e8b45852
  obscuren authored May 20, 2014
  
  e8b45852
- Upped prot · 6ef28320
  obscuren authored May 20, 2014
  
  6ef28320
- Merge branch 'hotfix/3' into develop · 6ba534af
  obscuren authored May 20, 2014
  
  6ba534af
- Merge branch 'hotfix/3' · 47fd4833
  obscuren authored May 20, 2014
  
  47fd4833
- Fixed state issue · 64701e38
  obscuren authored May 20, 2014
  
  64701e38
- Merge branch 'hotfix/2' into develop · 27aae603
  obscuren authored May 20, 2014
  
  27aae603
- Merge branch 'hotfix/2' · 7dae955c
  obscuren authored May 20, 2014
  
  7dae955c
- Fixed casting issue · 3b38df08
  obscuren authored May 20, 2014
  
  3b38df08
- Merge branch 'hotfix/1' into develop · de87e436
  obscuren authored May 20, 2014
  
  de87e436
- Merge branch 'hotfix/1' · e837c9ab
  obscuren authored May 20, 2014
  
  e837c9ab
- Fixed crash · ad51c85e
  obscuren authored May 20, 2014
  
  ad51c85e
- Merge branch 'release/poc5-rc7' into develop · 9562aba8
  obscuren authored May 20, 2014
  
  9562aba8
- Merge branch 'release/poc5-rc7' · 4b13f93a
  obscuren authored May 20, 2014
  
  4b13f93a
- Bump · c37b3cef
  obscuren authored May 20, 2014
  
  c37b3cef
- Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop · 0c4040d1
  obscuren authored May 20, 2014
  
  0c4040d1
- Changed transaction hash for poc 5 · 2bd377a3
  obscuren authored May 20, 2014
  
  2bd377a3
- Change shorthands · 31e44c2a
  Maran authored May 20, 2014
  
  31e44c2a
- Fix notification when processing block that didn't have this client as origin · f5d44147
  Maran authored May 20, 2014
  
  f5d44147
- Fixed genesis and block data · 7d3e99a2
  obscuren authored May 20, 2014
  
  7d3e99a2
- Up protocol version · b4e156e1
  obscuren authored May 20, 2014
  
  b4e156e1
- added roman · 6a31d55b
  obscuren authored May 20, 2014
  
  6a31d55b
- ... · 45b81045
  obscuren authored May 20, 2014
  
  45b81045
- Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop · f292e93e
  obscuren authored May 20, 2014
```
Conflicts:
	ethchain/transaction.go
```
  f292e93e
- Rearranged according to YP · 378815ee
  obscuren authored May 20, 2014
  
  378815ee
- Merge pull request #21 from nicksavers/patch-1 · 38b4dc2c
  Jeffrey Wilcke authored May 20, 2014
```
Rearrange transaction RLP encoding...
```
  38b4dc2c
- Re-arranged transaction RLP encoding... · 530ab6b8
  Nick Savers authored May 20, 2014
```
According to latest Yellow Paper specs and conform other clients
https://github.com/ethereum/latexpaper/commit/4794642e51ac1884e5e1af8a18ebc83aca115d64
```
  530ab6b8
- unused · fafdd21e
  obscuren authored May 20, 2014
  
  fafdd21e
- Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop · faa57eca
  obscuren authored May 20, 2014
  
  faa57eca
- Added Maran to premine · 24503988
  obscuren authored May 20, 2014
  
  24503988
- Merge branch 'develop' of github.com:ethereum/eth-go into develop · 36c9c937
  Maran authored May 20, 2014
  
  36c9c937
- Refactored a lot of the chain catchup/reorg. · 12f30e62
  Maran authored May 20, 2014
  
  12f30e62
- No longer store script directly in the state tree · fd19142c
  obscuren authored May 20, 2014
  
  fd19142c
19 May, 2014 3 commits
- Added a fatal method · a2fb2655
  obscuren authored May 19, 2014
  
  a2fb2655
- Increment nonce in the public api · b8034f4d
  obscuren authored May 19, 2014
  
  b8034f4d
- Testing different mining state · bd48690f
  obscuren authored May 19, 2014
  
  bd48690f
17 May, 2014 1 commit
- Changed how changes are being applied to states · 8730dfdc
  obscuren authored May 17, 2014
  
  8730dfdc