Gate all NEAR host functions behind the contract feature

engine-sdk/Cargo.toml

@@ -16,6 +16,7 @@ autobenches = false
 aurora-engine-types = { path = "../engine-types", default-features = false }
 borsh = { version = "0.8.2", default-features = false }
 sha3 = { version = "0.9.1", default-features = false }
+sha2 = { version = "0.9.3", default-features = false }
 
 [features]
 contract = []

engine-sdk/src/lib.rs

@@ -3,43 +3,47 @@
 #![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(feature = "log", feature(panic_info_message))]
 
-use crate::prelude::{Address, H256, STORAGE_PRICE_PER_BYTE};
+#[cfg(feature = "contract")]
+use crate::prelude::Address;
+use crate::prelude::{H256, STORAGE_PRICE_PER_BYTE};
 pub use types::keccak;
 
 pub mod env;
 pub mod error;
 pub mod io;
+#[cfg(feature = "contract")]
 pub mod near_runtime;
 mod prelude;
 pub mod promise;
 pub mod types;
 
+#[cfg(feature = "contract")]
 use near_runtime::exports;
 
+#[cfg(feature = "contract")]
 const ECRECOVER_MESSAGE_SIZE: u64 = 32;
+#[cfg(feature = "contract")]
 const ECRECOVER_SIGNATURE_LENGTH: u64 = 64;
+#[cfg(feature = "contract")]
 const ECRECOVER_MALLEABILITY_FLAG: u64 = 1;
 
-#[allow(dead_code)]
-pub fn panic() {
-    unsafe { exports::panic() }
-}
-
+#[cfg(feature = "contract")]
 pub fn panic_utf8(bytes: &[u8]) -> ! {
     unsafe {
         exports::panic_utf8(bytes.len() as u64, bytes.as_ptr() as u64);
     }
     unreachable!()
 }
 
-#[allow(dead_code)]
+#[cfg(feature = "contract")]
 pub fn log_utf8(bytes: &[u8]) {
     unsafe {
         exports::log_utf8(bytes.len() as u64, bytes.as_ptr() as u64);
     }
 }
 
 /// Calls environment sha256 on given input.
+#[cfg(feature = "contract")]
 pub fn sha256(input: &[u8]) -> H256 {
     unsafe {
         exports::sha256(input.len() as u64, input.as_ptr() as u64, 1);
@@ -49,7 +53,16 @@ pub fn sha256(input: &[u8]) -> H256 {
     }
 }
 
+#[cfg(not(feature = "contract"))]
+pub fn sha256(input: &[u8]) -> H256 {
+    use sha2::Digest;
+
+    let output = sha2::Sha256::digest(input);
+    H256(output.into())
+}
+
 /// Calls environment ripemd160 on given input.
+#[cfg(feature = "contract")]
 pub fn ripemd160(input: &[u8]) -> [u8; 20] {
     unsafe {
         const REGISTER_ID: u64 = 1;
@@ -61,6 +74,7 @@ pub fn ripemd160(input: &[u8]) -> [u8; 20] {
 }
 
 /// Recover address from message hash and signature.
+#[cfg(feature = "contract")]
 pub fn ecrecover(hash: H256, signature: &[u8]) -> Result<Address, ECRecoverErr> {
     unsafe {
         let hash_ptr = hash.as_ptr() as u64;
@@ -90,11 +104,16 @@ pub fn ecrecover(hash: H256, signature: &[u8]) -> Result<Address, ECRecoverErr>
     }
 }
 
-#[allow(dead_code)]
+#[cfg(feature = "contract")]
 pub fn log(data: &str) {
     log_utf8(data.as_bytes())
 }
 
+#[cfg(not(feature = "contract"))]
+pub fn log(_data: &str) {
+    // TODO: standalone logging
+}
+
 #[macro_export]
 macro_rules! log {
     ($e: expr) => {
@@ -103,11 +122,6 @@ macro_rules! log {
     };
 }
 
-#[allow(unused)]
-pub fn prepaid_gas() -> u64 {
-    unsafe { exports::prepaid_gas() }
-}
-
 pub fn storage_byte_cost() -> u128 {
     STORAGE_PRICE_PER_BYTE
 }

engine-sdk/src/promise.rs

@@ -7,10 +7,13 @@ use aurora_engine_types::types::PromiseResult;
 pub struct PromiseId(u64);
 
 impl PromiseId {
+    // TODO: can remove this annotation when there is a standalone implementation that uses PromiseId.
+    #[allow(dead_code)]
     pub(crate) fn new(id: u64) -> Self {
         Self(id)
     }
 
+    #[allow(dead_code)]
     pub(crate) fn raw(self) -> u64 {
         self.0
     }

engine-sdk/src/types.rs

@@ -1,5 +1,5 @@
+#[cfg(feature = "contract")]
 use crate::io::IO;
-use crate::panic_utf8;
 use crate::prelude::{Address, H256};
 
 #[cfg(not(feature = "contract"))]
@@ -22,86 +22,96 @@ pub fn keccak(data: &[u8]) -> H256 {
     H256::from_slice(Keccak256::digest(data).as_slice())
 }
 
-#[allow(dead_code)]
 pub fn near_account_to_evm_address(addr: &[u8]) -> Address {
     Address::from_slice(&keccak(addr)[12..])
 }
 
+#[cfg(feature = "contract")]
 pub trait ExpectUtf8<T> {
     fn expect_utf8(self, message: &[u8]) -> T;
 }
 
+#[cfg(feature = "contract")]
 impl<T> ExpectUtf8<T> for Option<T> {
     fn expect_utf8(self, message: &[u8]) -> T {
         match self {
             Some(t) => t,
-            None => panic_utf8(message),
+            None => crate::panic_utf8(message),
         }
     }
 }
 
+#[cfg(feature = "contract")]
 impl<T, E> ExpectUtf8<T> for core::result::Result<T, E> {
     fn expect_utf8(self, message: &[u8]) -> T {
         match self {
             Ok(t) => t,
-            Err(_) => panic_utf8(message),
+            Err(_) => crate::panic_utf8(message),
         }
     }
 }
 
+#[cfg(feature = "contract")]
 pub trait SdkExpect<T> {
     fn sdk_expect(self, msg: &str) -> T;
 }
 
+#[cfg(feature = "contract")]
 impl<T> SdkExpect<T> for Option<T> {
     fn sdk_expect(self, msg: &str) -> T {
         match self {
             Some(t) => t,
-            None => panic_utf8(msg.as_ref()),
+            None => crate::panic_utf8(msg.as_ref()),
         }
     }
 }
 
+#[cfg(feature = "contract")]
 impl<T, E> SdkExpect<T> for core::result::Result<T, E> {
     fn sdk_expect(self, msg: &str) -> T {
         match self {
             Ok(t) => t,
-            Err(_) => panic_utf8(msg.as_ref()),
+            Err(_) => crate::panic_utf8(msg.as_ref()),
         }
     }
 }
 
+#[cfg(feature = "contract")]
 pub trait SdkUnwrap<T> {
     fn sdk_unwrap(self) -> T;
 }
 
+#[cfg(feature = "contract")]
 impl<T> SdkUnwrap<T> for Option<T> {
     fn sdk_unwrap(self) -> T {
         match self {
             Some(t) => t,
-            None => panic_utf8("ERR_UNWRAP".as_bytes()),
+            None => crate::panic_utf8("ERR_UNWRAP".as_bytes()),
         }
     }
 }
 
+#[cfg(feature = "contract")]
 impl<T, E: AsRef<[u8]>> SdkUnwrap<T> for core::result::Result<T, E> {
     fn sdk_unwrap(self) -> T {
         match self {
             Ok(t) => t,
-            Err(e) => panic_utf8(e.as_ref()),
+            Err(e) => crate::panic_utf8(e.as_ref()),
         }
     }
 }
 
+#[cfg(feature = "contract")]
 pub trait SdkProcess<T> {
     fn sdk_process(self);
 }
 
+#[cfg(feature = "contract")]
 impl<T: AsRef<[u8]>, E: AsRef<[u8]>> SdkProcess<T> for Result<T, E> {
     fn sdk_process(self) {
         match self {
             Ok(r) => crate::near_runtime::Runtime.return_output(r.as_ref()),
-            Err(e) => panic_utf8(e.as_ref()),
+            Err(e) => crate::panic_utf8(e.as_ref()),
         }
     }
 }

engine-tests/Cargo.toml

@@ -13,7 +13,7 @@ publish = false
 autobenches = false
 
 [dependencies]
-aurora-engine = { path = "../engine", default-features = false, features=["sha2"] }
+aurora-engine = { path = "../engine", default-features = false }
 aurora-engine-types = { path = "../engine-types", default-features = false }
 aurora-engine-sdk = { path = "../engine-sdk", default-features = false }
 aurora-engine-precompiles = { path = "../engine-precompiles", default-features = false }

engine/Cargo.toml

@@ -30,7 +30,6 @@ num = { version = "0.4.0", default-features = false, features = ["alloc"] }
 primitive-types = { version = "0.10.0", default-features = false, features = ["rlp"] }
 ripemd160 = { version = "0.9.1", default-features = false }
 rlp = { version = "0.5.0", default-features = false }
-sha2 = { version = "0.9.3", default-features = false, optional = true }
 sha3 = { version = "0.9.1", default-features = false }
 wee_alloc = { version = "0.4.5", default-features = false }
 logos = { version = "0.12", default-features = false, features = ["export_derive"] }
@@ -45,7 +44,7 @@ serde_json = "1"
 rand = "0.7.3"
 
 [features]
-default = ["sha2", "std"]
+default = ["std"]
 std = ["borsh/std", "evm/std", "primitive-types/std", "rlp/std", "sha3/std", "ethabi/std", "logos/std", "bn/std", "aurora-engine-types/std"]
 contract = ["aurora-engine-sdk/contract", "aurora-engine-precompiles/contract"]
 evm_bully = []

engine/src/engine.rs

@@ -794,15 +794,6 @@ pub fn compute_block_hash(chain_id: [u8; 32], block_height: u64, account_id: &[u
     data.extend_from_slice(account_id);
     data.extend_from_slice(&block_height.to_be_bytes());
 
-    #[cfg(not(feature = "contract"))]
-    {
-        use sha2::Digest;
-
-        let output = sha2::Sha256::digest(&data);
-        H256(output.into())
-    }
-
-    #[cfg(feature = "contract")]
     sdk::sha256(&data)
 }
 

etc/state-migration-test/Cargo.toml

@@ -38,6 +38,6 @@ rpath = false
 
 [dependencies]
 borsh = { version = "0.8.2", default-features = false }
-aurora-engine = { path = "../../engine", default-features = false, features = ["sha2"] }
-aurora-engine-sdk = { path = "../../engine-sdk", default-features = false }
+aurora-engine = { path = "../../engine", default-features = false }
+aurora-engine-sdk = { path = "../../engine-sdk", default-features = false, features = ["contract"] }
 aurora-engine-types = { path = "../../engine-types", default-features = false }