ETH-implicit account support

core/crypto/src/signature.rs

@@ -156,6 +156,13 @@ impl PublicKey {
             Self::SECP256K1(_) => panic!(),
         }
     }
+
+    pub fn unwrap_as_secp256k1(&self) -> &Secp256K1PublicKey {
+        match self {
+            Self::SECP256K1(key) => key,
+            Self::ED25519(_) => panic!(),
+        }
+    }
 }
 
 // This `Hash` implementation is safe since it retains the property

core/crypto/src/test_utils.rs

@@ -28,7 +28,10 @@ impl PublicKey {
                 let keypair = ed25519_key_pair_from_seed(seed);
                 PublicKey::ED25519(ED25519PublicKey(keypair.verifying_key().to_bytes()))
             }
-            _ => unimplemented!(),
+            KeyType::SECP256K1 => {
+                let secret_key = SecretKey::SECP256K1(secp256k1_secret_key_from_seed(seed));
+                PublicKey::SECP256K1(secret_key.public_key().unwrap_as_secp256k1().clone())
+            }
         }
     }
 }
@@ -40,7 +43,7 @@ impl SecretKey {
                 let keypair = ed25519_key_pair_from_seed(seed);
                 SecretKey::ED25519(ED25519SecretKey(keypair.to_keypair_bytes()))
             }
-            _ => SecretKey::SECP256K1(secp256k1_secret_key_from_seed(seed)),
+            KeyType::SECP256K1 => SecretKey::SECP256K1(secp256k1_secret_key_from_seed(seed)),
         }
     }
 }

core/primitives-core/src/parameter.rs

@@ -157,6 +157,7 @@ pub enum Parameter {
     AltBn128,
     FunctionCallWeight,
     VmKind,
+    EthImplicitAccounts,
 }
 
 #[derive(

core/primitives-core/src/runtime/fees.rs

@@ -203,24 +203,30 @@ impl StorageUsageConfig {
 }
 
 /// Helper functions for computing Transfer fees.
-/// In case of implicit account creation they always include extra fees for the CreateAccount and
+/// In case of implicit account creation they include extra fees for the CreateAccount and
 /// AddFullAccessKey (for NEAR-implicit account only) actions that are implicit.
 /// We can assume that no overflow will happen here.
 pub fn transfer_exec_fee(
     cfg: &RuntimeFeesConfig,
     implicit_account_creation_allowed: bool,
+    eth_implicit_accounts_enabled: bool,
     receiver_account_type: AccountType,
 ) -> Gas {
     let transfer_fee = cfg.fee(ActionCosts::transfer).exec_fee();
-    match (implicit_account_creation_allowed, receiver_account_type) {
+    match (implicit_account_creation_allowed, eth_implicit_accounts_enabled, receiver_account_type)
+    {
         // Regular transfer to a named account.
-        (_, AccountType::NamedAccount) => transfer_fee,
+        (_, _, AccountType::NamedAccount) => transfer_fee,
         // No account will be created, just a regular transfer.
-        (false, _) => transfer_fee,
-        // Currently, no account is created on transfer to ETH-implicit account, just a regular transfer.
-        (true, AccountType::EthImplicitAccount) => transfer_fee,
+        (false, _, _) => transfer_fee,
+        // No account will be created, just a regular transfer.
+        (true, false, AccountType::EthImplicitAccount) => transfer_fee,
+        // Extra fee for the CreateAccount.
+        (true, true, AccountType::EthImplicitAccount) => {
+            transfer_fee + cfg.fee(ActionCosts::create_account).exec_fee()
+        }
         // Extra fees for the CreateAccount and AddFullAccessKey.
-        (true, AccountType::NearImplicitAccount) => {
+        (true, _, AccountType::NearImplicitAccount) => {
             transfer_fee
                 + cfg.fee(ActionCosts::create_account).exec_fee()
                 + cfg.fee(ActionCosts::add_full_access_key).exec_fee()
@@ -232,18 +238,24 @@ pub fn transfer_send_fee(
     cfg: &RuntimeFeesConfig,
     sender_is_receiver: bool,
     implicit_account_creation_allowed: bool,
+    eth_implicit_accounts_enabled: bool,
     receiver_account_type: AccountType,
 ) -> Gas {
     let transfer_fee = cfg.fee(ActionCosts::transfer).send_fee(sender_is_receiver);
-    match (implicit_account_creation_allowed, receiver_account_type) {
+    match (implicit_account_creation_allowed, eth_implicit_accounts_enabled, receiver_account_type)
+    {
         // Regular transfer to a named account.
-        (_, AccountType::NamedAccount) => transfer_fee,
+        (_, _, AccountType::NamedAccount) => transfer_fee,
         // No account will be created, just a regular transfer.
-        (false, _) => transfer_fee,
-        // Currently, no account is created on transfer to ETH-implicit account, just a regular transfer.
-        (true, AccountType::EthImplicitAccount) => transfer_fee,
+        (false, _, _) => transfer_fee,
+        // No account will be created, just a regular transfer.
+        (true, false, AccountType::EthImplicitAccount) => transfer_fee,
+        // Extra fee for the CreateAccount.
+        (true, true, AccountType::EthImplicitAccount) => {
+            transfer_fee + cfg.fee(ActionCosts::create_account).send_fee(sender_is_receiver)
+        }
         // Extra fees for the CreateAccount and AddFullAccessKey.
-        (true, AccountType::NearImplicitAccount) => {
+        (true, _, AccountType::NearImplicitAccount) => {
             transfer_fee
                 + cfg.fee(ActionCosts::create_account).send_fee(sender_is_receiver)
                 + cfg.fee(ActionCosts::add_full_access_key).send_fee(sender_is_receiver)

core/primitives-core/src/version.rs

@@ -128,6 +128,7 @@ pub enum ProtocolFeature {
     /// NEP: https://github.com/near/NEPs/pull/509
     #[cfg(feature = "protocol_feature_chunk_validation")]
     ChunkValidation,
+    EthImplicitAccounts,
 }
 
 impl ProtocolFeature {
@@ -183,6 +184,7 @@ impl ProtocolFeature {
             ProtocolFeature::SimpleNightshadeV2 => 135,
             #[cfg(feature = "protocol_feature_chunk_validation")]
             ProtocolFeature::ChunkValidation => 137,
+            ProtocolFeature::EthImplicitAccounts => 138,
         }
     }
 }

core/primitives/Cargo.toml

@@ -33,12 +33,14 @@ serde.workspace = true
 serde_json.workspace = true
 serde_with.workspace = true
 serde_yaml.workspace = true
+sha3.workspace = true
 smart-default.workspace = true
 stdx.workspace = true
 strum.workspace = true
 thiserror.workspace = true
 time.workspace = true
 tracing.workspace = true
+wat.workspace = true
 
 near-crypto.workspace = true
 near-fmt.workspace = true

core/primitives/res/runtime_configs/138.yaml

@@ -0,0 +1 @@
+eth_implicit_accounts: { old: false, new: true }

core/primitives/res/runtime_configs/parameters.snap

@@ -172,4 +172,5 @@ ed25519_verify                          true
 alt_bn128                               true
 function_call_weight                    true
 vm_kind                                 NearVm
+eth_implicit_accounts                   false
 

core/primitives/res/runtime_configs/parameters.yaml

@@ -207,3 +207,4 @@ ed25519_verify: false
 alt_bn128: false
 function_call_weight: false
 vm_kind: Wasmer0
+eth_implicit_accounts: false

core/primitives/res/runtime_configs/parameters_testnet.yaml

@@ -202,3 +202,4 @@ ed25519_verify: false
 alt_bn128: false
 function_call_weight: false
 vm_kind: Wasmer0
+eth_implicit_accounts: false

core/primitives/src/errors.rs

@@ -486,9 +486,9 @@ pub enum ActionErrorKind {
     /// Error occurs when a new `ActionReceipt` created by the `FunctionCall` action fails
     /// receipt validation.
     NewReceiptValidationError(ReceiptValidationError),
-    /// Error occurs when a `CreateAccount` action is called on hex-characters
-    /// account of length 64.  See implicit account creation NEP:
-    /// <https://github.com/nearprotocol/NEPs/pull/71>.
+    /// Error occurs when a `CreateAccount` action is called on a NEAR-implicit or ETH-implicit account.
+    /// See NEAR-implicit account creation NEP: <https://github.com/nearprotocol/NEPs/pull/71>.
+    /// Also, see ETH-implicit account creation NEP: <https://github.com/near/NEPs/issues/518>.
     ///
     /// TODO(#8598): This error is named very poorly. A better name would be
     /// `OnlyNamedAccountCreationAllowed`.

core/primitives/src/runtime/config_store.rs

@@ -38,6 +38,8 @@ static CONFIG_DIFFS: &[(ProtocolVersion, &str)] = &[
     (63, include_config!("63.yaml")),
     (64, include_config!("64.yaml")),
     (129, include_config!("129.yaml")),
+    // Introduce ETH-implicit accounts.
+    (138, include_config!("138.yaml")),
 ];
 
 /// Testnet parameters for versions <= 29, which (incorrectly) differed from mainnet parameters

core/primitives/src/runtime/parameter_table.rs

@@ -323,6 +323,7 @@ impl TryFrom<&ParameterTable> for RuntimeConfig {
                 ed25519_verify: params.get(Parameter::Ed25519Verify)?,
                 alt_bn128: params.get(Parameter::AltBn128)?,
                 function_call_weight: params.get(Parameter::FunctionCallWeight)?,
+                eth_implicit_accounts: params.get(Parameter::EthImplicitAccounts)?,
             },
             account_creation_config: AccountCreationConfig {
                 min_allowed_top_level_account_length: params

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__0.json.snap

@@ -181,6 +181,7 @@ expression: config_view
     "ed25519_verify": false,
     "alt_bn128": false,
     "function_call_weight": false,
+    "eth_implicit_accounts": false,
     "limit_config": {
       "max_gas_burnt": 200000000000000,
       "max_stack_height": 16384,

core/primitives/src/runtime/snapshots/near_primitives__runtime__config_store__tests__129.json.snap

@@ -181,6 +181,7 @@ expression: config_view
     "ed25519_verify": true,
     "alt_bn128": true,
     "function_call_weight": true,
+    "eth_implicit_accounts": false,
     "limit_config": {
       "max_gas_burnt": 300000000000000,
       "max_stack_height": 262144,