Good!
A - B - C - D <develop>
\
E - F - G <PR1>
\
H - I - J <PR2>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/core/state/statedb.go b/core/state/statedb.go | |
| index ec9e939..465e986 100644 | |
| --- a/core/state/statedb.go | |
| +++ b/core/state/statedb.go | |
| @@ -516,11 +516,15 @@ func (self *StateDB) GetRefund() *big.Int { | |
| func (s *StateDB) IntermediateRoot() common.Hash { | |
| for addr, _ := range s.stateObjectsDirty { | |
| stateObject := s.stateObjects[addr] | |
| - if stateObject.suicided { | |
| + if /* some block && */ (stateObject.data == Account{}) { |
obscuren
/ lazy_mofos.go
Created
October 12, 2016 10:16
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| func (pool *TxPool) validateTx(tx *types.Transaction) error { | |
| local := pool.localTx.contains(tx.Hash()) | |
| // Drop transactions under our own minimal accepted gas price | |
| if !local && pool.minGasPrice.Cmp(tx.GasPrice()) > 0 { | |
| return ErrCheap | |
| } | |
| currentState, err := pool.currentState() | |
| if err != nil { | |
| return err |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| infoContext := vm.InfoContext{ | |
| Origin: common.HexToAddress(exeValues["caller"]), | |
| Parent: common.HexToHash(envValues["previousHash"]), | |
| Coinbase: common.HexToAddress(envValues["currentCoinbase"]), | |
| Number: common.Big(envValues["currentNumber"]), | |
| Time: common.Big(envValues["currentTimestamp"]), | |
| Difficulty: common.Big(envValues["currentDifficulty"]), | |
| GasLimit: common.Big(envValues["currentGasLimit"]), | |
| GasPrice: common.Big(exeValues["gasPrice"]), | |
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| func (evm *EVM) Run(contract *Contract, input []byte) (ret []byte, err error) { | |
| evm.env.SetDepth(evm.env.Depth() + 1) | |
| defer evm.env.SetDepth(evm.env.Depth() - 1) | |
| if contract.CodeAddr != nil { | |
| if p := Precompiled[contract.CodeAddr.Str()]; p != nil { | |
| return evm.RunPrecompiled(p, input, contract) | |
| } | |
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| benchcmp -best /tmp/old.txt /tmp/new.txt | |
| benchmark old ns/op new ns/op delta | |
| BenchmarkInsertChain_empty_memdb-4 212512 107700 -49.32% | |
| BenchmarkInsertChain_empty_diskdb-4 254959 112891 -55.72% | |
| BenchmarkInsertChain_valueTx_memdb-4 314136 187073 -40.45% | |
| BenchmarkInsertChain_valueTx_diskdb-4 378256 198848 -47.43% | |
| BenchmarkInsertChain_valueTx_100kB_memdb-4 2987998 1137615 -61.93% | |
| BenchmarkInsertChain_valueTx_100kB_diskdb-4 3359490 1195969 -64.40% | |
| BenchmarkInsertChain_uncles_memdb-4 321783 201386 -37.42% | |
| BenchmarkInsertChain_uncles_diskdb-4 358764 223787 -37.62% |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ############## OLD CODE | |
| tests git:(evm-64bit) ✗ $ godep go test -run=- -bench=Ackermann32 -benchtime=10s | |
| PASS | |
| BenchmarkVmAckermann32Tests-4 2000 9586668 ns/op | |
| ok github.com/ethereum/go-ethereum/tests 20.326s | |
| tests git:(develop) $ JITFORCE= true; JITVM=true godep go test -run=- -bench=Ackermann32 -benchtime=5s | |
| PASS |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| func (_TemperatureMeasurementA *TemperatureMeasurementACaller) TemperatureRange(opts *bind.CallOpts) (uint8, uint8, error) { | |
| out := []interface{}{} | |
| err := _TemperatureMeasurementA.contract.Call(opts, out, "temperatureRange") | |
| value := reflect.ValueOf(out) | |
| typ := value.Type() | |
| fmt.Println(typ) | |
| return out[0].(uint8), out[1].(uint8), err | |
| } |
obscuren
/ gist:e3a41f430e534ee32ab1f9d956f14b5d
Created
April 23, 2016 14:14
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| handling block 1389290 ...done. 228310 hashes | |
| handling block 1389291 ...done. 15 hashes | |
| handling block 1389292 ...done. 50 hashes | |
| handling block 1389293 ...done. 36 hashes | |
| handling block 1389294 ...done. 26 hashes | |
| handling block 1389295 ...done. 6 hashes | |
| handling block 1389296 ...done. 5 hashes | |
| handling block 1389297 ...done. 5 hashes | |
| handling block 1389298 ...done. 36 hashes | |
| handling block 1389299 ...done. 5 hashes |
obscuren
/ rebase onto.md
Last active
March 23, 2016 13:32
obscuren
/ gist:54b6f8b0b1e42c2f7af0
Created
March 22, 2016 11:48
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| starting instance 00 (875665409755edd838dad567dc4e4f33c28b4d8b @ /home/styge/swarm/322//data/00 ).../home/styge/go/bin/geth --datadir /home/styge/swarm/322//data/00 --port 30300 --identity=00 --bzzaccount=875665409755edd838dad567dc4e4f33c28b4d8b --bzzport=32200 --unlock=875665409755edd838dad567dc4e4f33c28b4d8b --password=<(echo -n 00) --rpc --rpcport=3200 --rpccorsdomain='*' --networkid=322 --vmdebug=false --maxpeers=20 --dev --shh=false --nodiscover --vmodule=network/*=6,syncb=6,syncer=6,protocol=6,swap=6,chequebook=6 2>&1 | tee /home/styge/swarm/322//log/00.log > /home/styge/swarm/322//log/00.12:47:02.log & # comment out if you pipe it to a tty etc. | |
| ............instance 00 failed to start | |
| launching node 1/20 ---> tail-f /home/styge/swarm/322/log/01.log | |
| ls -l /home/styge/go/bin/geth | |
| -rwxrwxr-x 1 styge styge 26836272 mrt 7 14:12 /home/styge/go/bin/geth | |
| KeyStore dir: /home/styge/swarm/322//data/01/keystore/ | |
| create an account with password 01 [DO NOT EVER USE THIS ON LIVE] | |
| copying k |