Merge branch 'main' into testnet

massalabs · Jul 4, 2023 · 78bd53d · 78bd53d
2 parents 7bffa6f + 67993f9
commit 78bd53d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/massa-execution-worker/src/interface_impl.rs b/massa-execution-worker/src/interface_impl.rs
@@ -617,8 +617,8 @@ impl Interface for InterfaceImpl {
     ///   Length: 65 bytes
     fn verify_evm_signature(
         &self,
-        signature_: &[u8],
         message_: &[u8],
+        signature_: &[u8],
         public_key_: &[u8],
     ) -> Result<bool> {
         // check the signature length

diff --git a/massa-models/src/config/constants.rs b/massa-models/src/config/constants.rs
@@ -61,7 +61,7 @@ lazy_static::lazy_static! {
             )
         )
     } else {
-        MassaTime::from_millis(1688484600000) // Tuesday, July 4, 2023 05:30:00 PM UTC
+        MassaTime::from_millis(1688490000000) // Tuesday, July 4, 2023 05:00:00 PM UTC
     };
 
     /// TESTNET: time when the blockclique is ended.

diff --git a/massa-node/base_config/gas_costs/abi_gas_costs.json b/massa-node/base_config/gas_costs/abi_gas_costs.json
@@ -34,6 +34,7 @@
   "assembly_script_has_op_key": 291,
   "assembly_script_hash": 211,
   "assembly_script_hash_sha256": 198,
+  "assembly_script_keccak256_hash": 211,
   "assembly_script_local_call": 15000,
   "assembly_script_local_execution": 15000,
   "assembly_script_print": 171,
@@ -44,6 +45,7 @@
   "assembly_script_set_data": 188,
   "assembly_script_set_data_for": 214,
   "assembly_script_signature_verify": 240,
+  "assembly_script_evm_signature_verify": 662,
   "assembly_script_transfer_coins": 209,
   "assembly_script_transfer_coins_for": 238,
   "assembly_script_unsafe_random": 158,