Merge 313ee9a into d7264d1

radix-engine-interface/src/api/actor_api.rs

@@ -17,7 +17,7 @@ bitflags! {
 }
 
 /// Api which exposes methods in the context of the actor
-pub trait ClientActorApi<E: Debug> {
+pub trait SystemActorApi<E: Debug> {
     /// Retrieve the current blueprint id
     fn actor_get_blueprint_id(&mut self) -> Result<BlueprintId, E>;
 

radix-engine-interface/src/api/actor_index_api.rs

@@ -5,7 +5,7 @@ use sbor::rust::prelude::*;
 use sbor::rust::vec::Vec;
 
 /// Api to manage an iterable index
-pub trait ClientActorIndexApi<E> {
+pub trait SystemActorIndexApi<E> {
     /// Inserts an entry into an index
     fn actor_index_insert(
         &mut self,

radix-engine-interface/src/api/actor_key_value_entry_api.rs

@@ -4,7 +4,7 @@ use radix_engine_interface::api::{ActorStateHandle, CollectionIndex, LockFlags};
 use sbor::rust::fmt::Debug;
 use sbor::rust::vec::Vec;
 
-pub trait ClientActorKeyValueEntryApi<E: Debug> {
+pub trait SystemActorKeyValueEntryApi<E: Debug> {
     /// If the key value entry doesn't exist, it uses the default "Option::None"
     fn actor_open_key_value_entry(
         &mut self,

radix-engine-interface/src/api/actor_sorted_index_api.rs

@@ -8,7 +8,7 @@ use sbor::rust::vec::Vec;
 pub trait SortedIndexKeyPayloadMarker {}
 pub trait SortedIndexEntryPayloadMarker {}
 
-pub trait ClientActorSortedIndexApi<E> {
+pub trait SystemActorSortedIndexApi<E> {
     /// Inserts an entry into a sorted index
     fn actor_sorted_index_insert(
         &mut self,

radix-engine-interface/src/api/blueprint_api.rs

@@ -3,7 +3,7 @@ use radix_common::types::*;
 use sbor::rust::prelude::*;
 use sbor::rust::vec::Vec;
 
-pub trait ClientBlueprintApi<E> {
+pub trait SystemBlueprintApi<E> {
     /// Calls a function on a blueprint
     fn call_function(
         &mut self,

radix-engine-interface/src/api/costing_api.rs

@@ -2,7 +2,7 @@ use crate::blueprints::resource::LiquidFungibleResource;
 use crate::types::*;
 use radix_common::math::Decimal;
 
-pub trait ClientCostingApi<E> {
+pub trait SystemCostingApi<E> {
     /// Check if costing is enabled.
     fn start_lock_fee(&mut self, amount: Decimal) -> Result<bool, E>;
 

radix-engine-interface/src/api/execution_trace_api.rs

@@ -1,3 +1,3 @@
-pub trait ClientExecutionTraceApi<E> {
+pub trait SystemExecutionTraceApi<E> {
     fn update_instruction_index(&mut self, new_index: usize) -> Result<(), E>;
 }

radix-engine-interface/src/api/field_api.rs

@@ -32,7 +32,7 @@ pub trait FieldPayloadMarker {}
 impl<T: FieldPayloadMarker> FieldPayloadMarker for &T {}
 
 /// A high level api to read/write fields
-pub trait ClientFieldApi<E: Debug> {
+pub trait SystemFieldApi<E: Debug> {
     fn field_read(&mut self, handle: FieldHandle) -> Result<Vec<u8>, E>;
 
     fn field_read_typed<S: ScryptoDecode>(&mut self, handle: FieldHandle) -> Result<S, E> {

radix-engine-interface/src/api/key_value_entry_api.rs

@@ -6,7 +6,7 @@ pub type KeyValueEntryHandle = u32;
 pub trait KeyValueKeyPayloadMarker {}
 pub trait KeyValueEntryPayloadMarker {}
 
-pub trait ClientKeyValueEntryApi<E> {
+pub trait SystemKeyValueEntryApi<E> {
     fn key_value_entry_get(&mut self, handle: KeyValueEntryHandle) -> Result<Vec<u8>, E>;
 
     fn key_value_entry_get_typed<S: ScryptoDecode>(

radix-engine-interface/src/api/key_value_store_api.rs

@@ -137,7 +137,7 @@ impl KeyValueStoreDataSchema {
     }
 }
 
-pub trait ClientKeyValueStoreApi<E> {
+pub trait SystemKeyValueStoreApi<E> {
     /// Creates a new key value store with a given schema
     fn key_value_store_new(&mut self, data_schema: KeyValueStoreDataSchema) -> Result<NodeId, E>;
 

radix-engine-interface/src/api/mod.rs

@@ -4,7 +4,6 @@ pub mod actor_key_value_entry_api;
 pub mod actor_sorted_index_api;
 pub mod blueprint_api;
 pub mod costing_api;
-pub mod crypto_utils_api;
 pub mod execution_trace_api;
 pub mod field_api;
 pub mod key_value_entry_api;
@@ -19,7 +18,6 @@ pub use actor_key_value_entry_api::*;
 pub use actor_sorted_index_api::*;
 pub use blueprint_api::*;
 pub use costing_api::*;
-pub use crypto_utils_api::*;
 pub use execution_trace_api::*;
 pub use field_api::*;
 pub use key_value_entry_api::*;
@@ -45,19 +43,18 @@ pub type CollectionIndex = u8;
 /// Interface of the system, for blueprints and Node modules.
 ///
 /// For WASM blueprints, only a subset of the API is exposed at the moment.
-pub trait ClientApi<E: sbor::rust::fmt::Debug>:
-    ClientActorApi<E>
-    + ClientActorKeyValueEntryApi<E>
-    + ClientObjectApi<E>
-    + ClientKeyValueStoreApi<E>
-    + ClientKeyValueEntryApi<E>
-    + ClientActorSortedIndexApi<E>
-    + ClientActorIndexApi<E>
-    + ClientFieldApi<E>
-    + ClientBlueprintApi<E>
-    + ClientCostingApi<E>
-    + ClientTransactionRuntimeApi<E>
-    + ClientExecutionTraceApi<E>
-    + ClientCryptoUtilsApi<E>
+pub trait SystemApi<E: sbor::rust::fmt::Debug>:
+    SystemActorApi<E>
+    + SystemActorKeyValueEntryApi<E>
+    + SystemObjectApi<E>
+    + SystemKeyValueStoreApi<E>
+    + SystemKeyValueEntryApi<E>
+    + SystemActorSortedIndexApi<E>
+    + SystemActorIndexApi<E>
+    + SystemFieldApi<E>
+    + SystemBlueprintApi<E>
+    + SystemCostingApi<E>
+    + SystemTransactionRuntimeApi<E>
+    + SystemExecutionTraceApi<E>
 {
 }

radix-engine-interface/src/api/object_api.rs

@@ -206,7 +206,7 @@ pub struct KVEntry {
 }
 
 /// A high level interface to manipulate objects in the actor's call frame
-pub trait ClientObjectApi<E> {
+pub trait SystemObjectApi<E> {
     /// Creates a new simple blueprint object of a given blueprint type
     fn new_simple_object(
         &mut self,

radix-engine-interface/src/api/transaction_runtime_api.rs

@@ -3,7 +3,7 @@ use crate::types::Level;
 use radix_common::crypto::Hash;
 use radix_common::types::GlobalAddress;
 
-pub trait ClientTransactionRuntimeApi<E> {
+pub trait SystemTransactionRuntimeApi<E> {
     fn bech32_encode_address(&mut self, address: GlobalAddress) -> Result<String, E>;
 
     fn get_transaction_hash(&mut self) -> Result<Hash, E>;

radix-engine-interface/src/types/costing_reason.rs

@@ -15,4 +15,20 @@ pub enum ClientCostingEntry<'a> {
     PrepareWasmCode {
         size: usize,
     },
+    Bls12381V1Verify {
+        size: usize,
+    },
+    Bls12381V1AggregateVerify {
+        sizes: &'a [usize],
+    },
+    Bls12381V1FastAggregateVerify {
+        size: usize,
+        keys_cnt: usize,
+    },
+    Bls12381G2SignatureAggregate {
+        signatures_cnt: usize,
+    },
+    Keccak256Hash {
+        size: usize,
+    },
 }

radix-engine-monkey-tests/src/resource.rs

@@ -11,7 +11,7 @@ use radix_engine::errors::RuntimeError;
 use radix_engine::kernel::kernel_api::{KernelNodeApi, KernelSubstateApi};
 use radix_engine::system::system_callback::SystemLockData;
 use radix_engine::vm::{VmApi, VmInvoke};
-use radix_engine_interface::api::{AttachedModuleId, ClientApi, LockFlags, ACTOR_STATE_SELF};
+use radix_engine_interface::api::{AttachedModuleId, LockFlags, SystemApi, ACTOR_STATE_SELF};
 use radix_engine_interface::prelude::*;
 use radix_engine_interface::prelude::{
     Bucket, FieldValue, FungibleResourceManagerMintInput,
@@ -41,7 +41,7 @@ impl VmInvoke for ResourceTestInvoke {
         _vm_api: &V,
     ) -> Result<IndexedScryptoValue, RuntimeError>
     where
-        Y: ClientApi<RuntimeError> + KernelNodeApi + KernelSubstateApi<SystemLockData>,
+        Y: SystemApi<RuntimeError> + KernelNodeApi + KernelSubstateApi<SystemLockData>,
         V: VmApi,
     {
         match export_name {