Merge branch 'master' into publish-10-1

Author: andrei-marinica

contracts/feature-tests/basic-features/mandos/block_info.scen.json

@@ -22,13 +22,15 @@
                 "blockTimestamp": "506",
                 "blockNonce": "521",
                 "blockRound": "532",
-                "blockEpoch": "544"
+                "blockEpoch": "544",
+                "blockRandomSeed": "u64:0|u64:0|u64:0|u64:0|u64:0|u64:0"
             },
             "currentBlockInfo": {
                 "blockTimestamp": "511",
                 "blockNonce": "522",
                 "blockRound": "533",
-                "blockEpoch": "544"
+                "blockEpoch": "544",
+                "blockRandomSeed": "u64:42|u64:12345|u64:64|u64:7"
             }
         },
         {
@@ -111,6 +113,26 @@
                 "refund": "*"
             }
         },
+        {
+            "step": "scCall",
+            "txId": "get_prev_block_random_seed",
+            "tx": {
+                "from": "address:an_account",
+                "to": "address:features_contract",
+                "value": "0",
+                "function": "get_prev_block_random_seed",
+                "arguments": [],
+                "gasLimit": "0x100000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [ "u64:0|u64:0|u64:0|u64:0|u64:0|u64:0" ],
+                "status": "",
+                "logs": [],
+                "gas": "*",
+                "refund": "*"
+            }
+        },
 
         {
             "step": "scCall",
@@ -191,6 +213,27 @@
                 "gas": "*",
                 "refund": "*"
             }
+        },
+        {
+            "step": "scCall",
+            "txId": "get_block_random_seed",
+            "comment": "0-padding added in out-value",
+            "tx": {
+                "from": "address:an_account",
+                "to": "address:features_contract",
+                "value": "0",
+                "function": "get_block_random_seed",
+                "arguments": [],
+                "gasLimit": "0x100000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [ "u64:0|u64:0|u64:42|u64:12345|u64:64|u64:7" ],
+                "status": "",
+                "logs": [],
+                "gas": "*",
+                "refund": "*"
+            }
         }
     ]
 }

contracts/feature-tests/basic-features/src/lib.rs

@@ -463,6 +463,11 @@ pub trait BasicFeatures {
 		self.get_block_epoch()
 	}
 
+	#[view(get_block_random_seed)]
+	fn get_block_random_seed_view(&self) -> Box<[u8;48]> {
+		self.get_block_random_seed()
+	}
+
 	#[view(get_prev_block_timestamp)]
 	fn get_prev_block_timestamp_view(&self) -> u64 {
 		self.get_prev_block_timestamp()
@@ -483,6 +488,11 @@ pub trait BasicFeatures {
 		self.get_prev_block_epoch()
 	}
 
+	#[view(get_prev_block_random_seed)]
+	fn get_prev_block_random_seed_view(&self) -> Box<[u8;48]> {
+		self.get_prev_block_random_seed()
+	}
+
 	// EVENTS
 
 	#[event("0x0123456789abcdef0123456789abcdef0123456789abcdef000000000000000a")]

elrond-wasm-debug/src/blockchain_mock.rs

@@ -83,6 +83,7 @@ pub struct BlockInfo {
 	pub block_nonce: u64,
 	pub block_round: u64,
 	pub block_epoch: u64,
+	pub block_random_seed: Box<[u8;48]>,
 }
 
 impl BlockInfo {
@@ -92,6 +93,7 @@ impl BlockInfo {
 			block_nonce: 0,
 			block_round: 0,
 			block_epoch: 0,
+			block_random_seed: Box::from([0u8;48]),
 		}
 	}
 }

elrond-wasm-debug/src/execute_mandos.rs

@@ -77,6 +77,16 @@ fn parse_execute_mandos_steps(
 					if let Some(u64_value) = &block_info_obj.block_round {
 						state.previous_block_info.block_round = u64_value.value;
 					}
+					if let Some(bytes_value) = &block_info_obj.block_random_seed {
+						const SEED_LEN: usize = 48;
+						let val = &bytes_value.value;
+
+						assert!(val.len() <= SEED_LEN, "block random seed input value too long!");
+
+						let mut seed = [0u8; SEED_LEN];
+						&seed[SEED_LEN - val.len()..].copy_from_slice(val.as_slice());
+						state.previous_block_info.block_random_seed = Box::from(seed);
+					}
 				}
 				if let Some(block_info_obj) = &**current_block_info {
 					if let Some(u64_value) = &block_info_obj.block_timestamp {
@@ -91,6 +101,16 @@ fn parse_execute_mandos_steps(
 					if let Some(u64_value) = &block_info_obj.block_round {
 						state.current_block_info.block_round = u64_value.value;
 					}
+					if let Some(bytes_value) = &block_info_obj.block_random_seed {
+						const SEED_LEN: usize = 48;
+						let val = &bytes_value.value;
+
+						assert!(val.len() <= SEED_LEN, "block random seed input value too long!");
+
+						let mut seed = [0u8; SEED_LEN];
+						&seed[SEED_LEN - val.len()..].copy_from_slice(val.as_slice());
+						state.current_block_info.block_random_seed = Box::from(seed);
+					}
 				}
 			},
 			Step::ScCall {

elrond-wasm-debug/src/ext_mock.rs

@@ -402,7 +402,7 @@ impl elrond_wasm::ContractHookApi<RustBigInt, RustBigUint> for TxContext {
 	}
 
 	fn get_block_random_seed(&self) -> Box<[u8; 48]> {
-		Box::new([0u8; 48])
+		self.blockchain_info_box.current_block_info.block_random_seed.clone()
 	}
 
 	fn get_prev_block_timestamp(&self) -> u64 {
@@ -422,7 +422,7 @@ impl elrond_wasm::ContractHookApi<RustBigInt, RustBigUint> for TxContext {
 	}
 
 	fn get_prev_block_random_seed(&self) -> Box<[u8; 48]> {
-		Box::new([0u8; 48])
+		self.blockchain_info_box.previous_block_info.block_random_seed.clone()
 	}
 
 	fn sha256(&self, data: &[u8]) -> H256 {

mandos/example.scen.json

@@ -61,13 +61,15 @@
             "previousBlockInfo": {
                 "blockNonce": "222",
                 "blockRound": "333",
-                "blockEpoch": "444"
+                "blockEpoch": "444",
+                "blockRandomSeed": "0x42BA9AE77C08604DD7EB9D209488B88DD5A301D9C9F3D4A6B4B40E95AA6F4A1E20519698D3F774052F475B6877449CF3"
             },
             "currentBlockInfo": {
                 "blockTimestamp": "511",
                 "blockNonce": "522",
                 "blockRound": "533",
-                "blockEpoch": "544"
+                "blockEpoch": "544",
+                "blockRandomSeed": "0x567A4637C658910A21C2AED8638D8A1A543B065929CD6D0452F279A9CF72CE80F6A15F66A217E92045DED9E3DF9441FB"
             }
         },
         {

mandos/src/scenario.rs

@@ -169,6 +169,7 @@ pub struct BlockInfo {
 	pub block_nonce: Option<U64Value>,
 	pub block_round: Option<U64Value>,
 	pub block_epoch: Option<U64Value>,
+	pub block_random_seed: Option<BytesValue>,
 }
 
 impl InterpretableFrom<BlockInfoRaw> for BlockInfo {
@@ -186,6 +187,9 @@ impl InterpretableFrom<BlockInfoRaw> for BlockInfo {
 			block_epoch: from
 				.block_epoch
 				.map(|v| U64Value::interpret_from(v, context)),
+			block_random_seed: from
+				.block_random_seed
+				.map(|v| BytesValue::interpret_from(v, context)),
 		}
 	}
 }

mandos/src/scenario_raw.rs

@@ -147,6 +147,10 @@ pub struct BlockInfoRaw {
 	#[serde(default)]
 	#[serde(skip_serializing_if = "Option::is_none")]
 	pub block_epoch: Option<ValueSubTree>,
+
+	#[serde(default)]
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub block_random_seed: Option<ValueSubTree>,
 }
 
 #[derive(Serialize, Deserialize)]