diff options
| author | Wei-Ning Huang <w@dexon.org> | 2019-01-25 12:52:26 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 13:50:02 +0800 |
| commit | c1a42b16ea2649613a28fa8a8705ff40e0246b1a (patch) | |
| tree | 8efdfe68e1f0ba9d1544964e847d4686f0d27841 | |
| parent | 9c331f6344b3353a5b585472090f76297d049122 (diff) | |
| download | dexon-c1a42b16ea2649613a28fa8a8705ff40e0246b1a.tar.gz dexon-c1a42b16ea2649613a28fa8a8705ff40e0246b1a.tar.zst dexon-c1a42b16ea2649613a28fa8a8705ff40e0246b1a.zip | |
core: vm: more change to the randomness calculation (#175)
To prevent attacker from sending TX through a intermediate contract.
Always use the original tx sender's adddress and nonce.
| -rw-r--r-- | core/vm/instructions.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 3d17287ed..cb1f1bbaa 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -413,9 +413,9 @@ func opSha3(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory func opRand(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) { evm := interpreter.evm - nonce := evm.StateDB.GetNonce(contract.Caller()) - binaryNonce := make([]byte, binary.MaxVarintLen64) - binary.PutUvarint(binaryNonce, nonce) + nonce := evm.StateDB.GetNonce(evm.Origin) + binaryOriginNonce := make([]byte, binary.MaxVarintLen64) + binary.PutUvarint(binaryOriginNonce, nonce) binaryUsedIndex := make([]byte, binary.MaxVarintLen64) binary.PutUvarint(binaryUsedIndex, evm.RandCallIndex) @@ -424,8 +424,8 @@ func opRand(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory hash := crypto.Keccak256( evm.Randomness, - contract.Caller().Bytes(), - binaryNonce, + evm.Origin.Bytes(), + binaryOriginNonce, binaryUsedIndex) stack.push(interpreter.intPool.get().SetBytes(hash)) |