Extend the Math API with EVM precompiles

chain/jsonrpc/res/rpc_errors_schema.json

@@ -15,6 +15,18 @@
  "subtypes": [],
  "props": {}
  },
+ "Blake2HashDataOverflow": {
+ "name": "Blake2HashDataOverflow",
+ "subtypes": [],
+ "props": {}
+ },
+ "Blake2InvalidStateLength": {
+ "name": "Blake2InvalidStateLength",
+ "subtypes": [],
+ "props": {
+ "length": ""
+ }
+ },
  "BreakpointTrap": {
  "name": "BreakpointTrap",
  "subtypes": [],
@@ -163,7 +175,9 @@
  "NumberInputDataDependenciesExceeded",
  "ReturnedValueLengthExceeded",
  "ContractSizeExceeded",
- "Deprecated"
+ "Deprecated",
+ "Blake2InvalidStateLength",
+ "Blake2HashDataOverflow"
  ],
  "props": {}
  },

core/crypto/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 arrayref = "0.3"
-blake2 = "0.9.1"
+blake2 = { package = "near-blake2", git = "https://github.com/near/near-blake2.git", rev = "29a15a" }
 borsh = "0.8.1"
 bs58 = "0.4"
 c2-chacha = "0.3"

core/primitives-core/Cargo.toml

@@ -24,7 +24,7 @@ lazy_static = "1.4"
 
 [features]
 default = []
-protocol_feature_add_account_versions = []
 protocol_feature_evm = []
+protocol_feature_add_account_versions = []
 protocol_feature_alt_bn128 = []
 protocol_feature_tx_size_limit = []

core/primitives-core/src/config.rs

@@ -223,6 +223,36 @@ pub struct ExtCostsConfig {
  /// Cost of getting sha256 per byte
  pub keccak512_byte: Gas,
 
+ /// Cost of getting ripemd160 base
+ #[cfg(feature = "protocol_feature_evm")]
+ pub ripemd160_base: Gas,
+ /// Cost of getting ripemd160 per message block
+ #[cfg(feature = "protocol_feature_evm")]
+ pub ripemd160_block: Gas,
+
+ /// Cost of getting blake2b base
+ #[cfg(feature = "protocol_feature_evm")]
+ pub blake2b_base: Gas,
+ /// Cost of getting blake2b per 128 byte message block.
+ #[cfg(feature = "protocol_feature_evm")]
+ pub blake2b_block: Gas,
+ /// Cost of a single blake2b round.
+ #[cfg(feature = "protocol_feature_evm")]
+ pub blake2b_round: Gas,
+ /// Cost of getting blake2b base
+ #[cfg(feature = "protocol_feature_evm")]
+ pub blake2s_base: Gas,
+ /// Cost of getting blake2b per 128 byte message block.
+ #[cfg(feature = "protocol_feature_evm")]
+ pub blake2s_block: Gas,
+ /// Cost of a single blake2b round.
+ #[cfg(feature = "protocol_feature_evm")]
+ pub blake2s_round: Gas,
+
+ /// Cost of calling ecrecover
+ #[cfg(feature = "protocol_feature_evm")]
+ pub ecrecover_base: Gas,
+
  /// Cost for calling logging.
  pub log_base: Gas,
  /// Cost for logging per byte
@@ -353,6 +383,24 @@ impl Default for ExtCostsConfig {
  keccak256_byte: SAFETY_MULTIPLIER * 7157035,
  keccak512_base: SAFETY_MULTIPLIER * 1937129412,
  keccak512_byte: SAFETY_MULTIPLIER * 12216567,
+ #[cfg(feature = "protocol_feature_evm")]
+ ripemd160_base: SAFETY_MULTIPLIER * 15136567500, // 10 x sha256_base
+ #[cfg(feature = "protocol_feature_evm")]
+ ripemd160_block: SAFETY_MULTIPLIER * 80391170 * 8, // 10 x sha256_byte x 8 bytes
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_base: SAFETY_MULTIPLIER * 88256037, // same as base.
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_block: SAFETY_MULTIPLIER * 1029006976, // sha256 per byte x 128
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_round: SAFETY_MULTIPLIER * 25227612, // sha256 base / 60
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_base: SAFETY_MULTIPLIER * 58837358, // blake2b * (2/3)
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_block: SAFETY_MULTIPLIER * 686004650, // blake2b * (2/3)
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_round: SAFETY_MULTIPLIER * 16818408, // blake2b * (2/3)
+ #[cfg(feature = "protocol_feature_evm")]
+ ecrecover_base: SAFETY_MULTIPLIER * 75682837500, // 50 x sha256_base
  log_base: SAFETY_MULTIPLIER * 1181104350,
  log_byte: SAFETY_MULTIPLIER * 4399597,
  storage_write_base: SAFETY_MULTIPLIER * 21398912000,
@@ -423,6 +471,24 @@ impl ExtCostsConfig {
  keccak256_byte: 0,
  keccak512_base: 0,
  keccak512_byte: 0,
+ #[cfg(feature = "protocol_feature_evm")]
+ ripemd160_base: 0,
+ #[cfg(feature = "protocol_feature_evm")]
+ ripemd160_block: 0,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_base: 0,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_block: 0,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_round: 0,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_base: 0,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_block: 0,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_round: 0,
+ #[cfg(feature = "protocol_feature_evm")]
+ ecrecover_base: 0,
  log_base: 0,
  log_byte: 0,
  storage_write_base: 0,
@@ -494,6 +560,24 @@ pub enum ExtCosts {
  keccak256_byte,
  keccak512_base,
  keccak512_byte,
+ #[cfg(feature = "protocol_feature_evm")]
+ ripemd160_base,
+ #[cfg(feature = "protocol_feature_evm")]
+ ripemd160_block,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_base,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_block,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_round,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_base,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_block,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_round,
+ #[cfg(feature = "protocol_feature_evm")]
+ ecrecover_base,
  log_base,
  log_byte,
  storage_write_base,
@@ -618,6 +702,24 @@ impl ExtCosts {
  keccak256_byte => config.keccak256_byte,
  keccak512_base => config.keccak512_base,
  keccak512_byte => config.keccak512_byte,
+ #[cfg(feature = "protocol_feature_evm")]
+ ripemd160_base => config.ripemd160_base,
+ #[cfg(feature = "protocol_feature_evm")]
+ ripemd160_block => config.ripemd160_block,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_base => config.blake2b_base,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_block => config.blake2b_block,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2b_round => config.blake2b_round,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_base => config.blake2s_base,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_block => config.blake2s_block,
+ #[cfg(feature = "protocol_feature_evm")]
+ blake2s_round => config.blake2s_round,
+ #[cfg(feature = "protocol_feature_evm")]
+ ecrecover_base => config.ecrecover_base,
  log_base => config.log_base,
  log_byte => config.log_byte,
  storage_write_base => config.storage_write_base,
@@ -692,6 +794,11 @@ impl ExtCosts {
  "keccak256_byte",
  "keccak512_base",
  "keccak512_byte",
+ "ripemd160_base",
+ "ripemd160_block",
+ "blake2b_base",
+ "blake2b_byte",
+ "ecrecover_base",
  "log_base",
  "log_byte",
  "storage_write_base",

core/primitives/Cargo.toml

@@ -42,7 +42,7 @@ near-rpc-error-macro = { path = "../../tools/rpctypegen/macro" }
 default = ["jemallocator"]
 dump_errors_schema = ["near-rpc-error-macro/dump_errors_schema"]
 protocol_feature_add_account_versions = ["near-primitives-core/protocol_feature_add_account_versions"]
-protocol_feature_evm = ["near-primitives-core/protocol_feature_evm"]
+protocol_feature_evm = ["near-primitives-core/protocol_feature_evm", "near-vm-errors/protocol_feature_evm"]
 protocol_feature_block_header_v3 = []
 protocol_feature_alt_bn128 = ["near-primitives-core/protocol_feature_alt_bn128", "near-vm-errors/protocol_feature_alt_bn128"]
 protocol_feature_tx_size_limit = ["near-primitives-core/protocol_feature_tx_size_limit"]

runtime/near-vm-errors/Cargo.toml

@@ -22,6 +22,7 @@ near-rpc-error-macro = { path = "../../tools/rpctypegen/macro", version = "0.1.0
 
 [features]
 dump_errors_schema = ["near-rpc-error-macro/dump_errors_schema"]
+protocol_feature_evm = []
 protocol_feature_alt_bn128 = []
 
 [package.metadata.workspaces]

runtime/near-vm-errors/src/lib.rs

@@ -206,6 +206,12 @@ pub enum HostError {
  ContractSizeExceeded { size: u64, limit: u64 },
  /// The host function was deprecated.
  Deprecated { method_name: String },
+ /// The length of the state is not 64.
+ #[cfg(feature = "protocol_feature_evm")]
+ Blake2InvalidStateLength { length: u64 },
+ /// Blake2 hash data overflow error.
+ #[cfg(feature = "protocol_feature_evm")]
+ Blake2HashDataOverflow,
  /// Deserialization error for alt_bn128 functions
  #[cfg(feature = "protocol_feature_alt_bn128")]
  AltBn128DeserializationError { msg: String },
@@ -494,6 +500,10 @@ impl std::fmt::Display for HostError {
  ReturnedValueLengthExceeded { length, limit } => write!(f, "The length of a returned value {} exceeds the limit {}", length, limit),
  ContractSizeExceeded { size, limit } => write!(f, "The size of a contract code in DeployContract action {} exceeds the limit {}", size, limit),
  Deprecated {method_name}=> write!(f, "Attempted to call deprecated host function {}", method_name),
+ #[cfg(feature = "protocol_feature_evm")]
+ Blake2InvalidStateLength { length } => write!(f, "Invalid Blake2 state length {}, must be 8 words of 8 bytes", length),
+ #[cfg(feature = "protocol_feature_evm")]
+ Blake2HashDataOverflow => write!(f, "Blake2 hash data length overflow."),
  #[cfg(feature = "protocol_feature_alt_bn128")]
  AltBn128DeserializationError { msg } => write!(f, "AltBn128 deserialization error: {}", msg),
  #[cfg(feature = "protocol_feature_alt_bn128")]

runtime/near-vm-logic/Cargo.toml

@@ -14,9 +14,12 @@ This crate implements the specification of the interface that Near blockchain ex
 
 [dependencies]
 base64 = "0.13"
+blake2 = { package = "near-blake2", git = "https://github.com/near/near-blake2.git", rev = "29a15a", optional = true }
 borsh = "0.8.1"
 bs58 = "0.4"
 byteorder = "1.2"
+libsecp256k1 = { version = "0.3.5", optional = true }
+ripemd160 = { version = "0.9.0", optional = true }
 serde = { version = "1", features = ["derive"] }
 sha2 = ">=0.8,<0.10"
 sha3 = ">=0.8,<0.10"
@@ -33,7 +36,7 @@ serde_json = {version= "1", features= ["preserve_order"]}
 
 [features]
 default = []
-protocol_feature_evm = ["near-primitives-core/protocol_feature_evm"]
+protocol_feature_evm = ["near-primitives-core/protocol_feature_evm", "near-vm-errors/protocol_feature_evm", "blake2", "ripemd160", "libsecp256k1"]
 protocol_feature_alt_bn128 = ["bn", "near-primitives-core/protocol_feature_alt_bn128", "near-vm-errors/protocol_feature_alt_bn128"]
 protocol_feature_allow_create_account_on_delete = []
 

runtime/near-vm-logic/src/gas_counter.rs

@@ -144,18 +144,18 @@ impl GasCounter {
  self.deduct_gas(value, value)
  }
 
- /// A helper function to pay per byte gas
- pub fn pay_per_byte(&mut self, cost: ExtCosts, num_bytes: u64) -> Result<()> {
- let use_gas = num_bytes
+ /// A helper function to pay a multiple of a cost.
+ pub fn pay_per(&mut self, cost: ExtCosts, num: u64) -> Result<()> {
+ let use_gas = num
  .checked_mul(cost.value(&self.ext_costs_config))
  .ok_or(HostError::IntegerOverflow)?;
 
- self.inc_ext_costs_counter(cost, num_bytes);
+ self.inc_ext_costs_counter(cost, num);
  self.update_profile_host(cost, use_gas);
  self.deduct_gas(use_gas, use_gas)
  }
 
- /// A helper function to pay base cost gas
+ /// A helper function to pay base cost gas.
  pub fn pay_base(&mut self, cost: ExtCosts) -> Result<()> {
  let base_fee = cost.value(&self.ext_costs_config);
  self.inc_ext_costs_counter(cost, 1);