Merge branch 'develop' into c/create-contract-carmen

Fantom-foundation · Oct 5, 2024 · 9c74fb5 · 9c74fb5
2 parents 3081522 + 05a1b07
commit 9c74fb5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/executor/transaction_processor.go b/executor/transaction_processor.go
@@ -377,6 +377,7 @@ func prepareBlockCtx(inputEnv txcontext.BlockEnvironment, hashError *error) *vm.
 		BlockNumber: new(big.Int).SetUint64(inputEnv.GetNumber()),
 		Time:        inputEnv.GetTimestamp(),
 		Difficulty:  inputEnv.GetDifficulty(),
+		Random:      inputEnv.GetRandom(),
 		GasLimit:    inputEnv.GetGasLimit(),
 		GetHash:     getHash,
 	}

diff --git a/txcontext/substate/block_environment.go b/txcontext/substate/block_environment.go
@@ -34,7 +34,12 @@ type blockEnvironment struct {
 }
 
 func (e *blockEnvironment) GetRandom() *common.Hash {
-	return nil
+	if e.Random == nil {
+		return nil
+	}
+
+	h := common.Hash(e.Random.Bytes())
+	return &h
 }
 
 func (e *blockEnvironment) GetBlockHash(block uint64) (common.Hash, error) {