deps: bump some dependencies and rust version

Cargo.toml

@@ -19,10 +19,10 @@ simple = ["toml"]
 advanced = ["near-chain-configs"]
 
 [dependencies]
-aurora-engine-precompiles = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", features = ["std"] }
-aurora-engine-sdk = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", features = ["std"] }
-aurora-engine-transactions = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", features = ["std"] }
-aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.3", features = ["std", "impl-serde"] }
+aurora-engine-precompiles = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", features = ["std"] }
+aurora-engine-sdk = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", features = ["std"] }
+aurora-engine-transactions = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", features = ["std"] }
+aurora-engine-types = { git = "https://github.com/aurora-is-near/aurora-engine.git", tag = "3.6.4", features = ["std", "impl-serde"] }
 
 anyhow = "1"
 borsh = "1"
@@ -32,20 +32,20 @@ ethabi = "18"
 hex = "0.4"
 lazy_static = "1"
 libsecp256k1 = { version = "0.7", features = ["std"] }
-near-chain-configs = { version = "0.23", optional = true }
-near-crypto = "0.23"
-near-jsonrpc-client = "0.10"
-near-jsonrpc-primitives = "0.23"
-near-primitives = "0.23"
+near-chain-configs = { version = "0.25", optional = true }
+near-crypto = "0.25"
+near-jsonrpc-client = "0.12"
+near-jsonrpc-primitives = "0.25"
+near-primitives = "0.25"
 reqwest = { version = "0.12", features = ["json"] }
 rand = "0.8"
 rlp = "0.5"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 toml = { version = "0.8", optional = true }
-shadow-rs = "0.29"
+shadow-rs = "0.33"
 thiserror = "1"
 tokio = { version = "1", features = ["full"] }
 
 [build-dependencies]
-shadow-rs = "0.29"
+shadow-rs = "0.33"

rust-toolchain

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.75.0"
+channel = "1.80.0"
 components = [ "clippy", "rustfmt" ]

scripts/simple-silo.sh

@@ -87,6 +87,22 @@ aurora-cli --engine $ENGINE_ACCOUNT init \
   --ft-metadata-path docs/res/ft_metadata.json || error_exit
 sleep 2
 
+# Prerequisites for the start-hashchain command: Change the key manager of ENGINE_ACCOUNT to ENGINE_ACCOUNT
+aurora-cli --engine $ENGINE_ACCOUNT set-key-manager $ENGINE_ACCOUNT || error_exit
+wait_for_block
+
+# Prerequisites for the start-hashchain command: The contract must be paused
+aurora-cli --engine $ENGINE_ACCOUNT pause-contract
+wait_for_block
+
+# Start Hashchain. The aurora-engine will resume the contract automatically
+aurora-cli --engine $ENGINE_ACCOUNT start-hashchain --block-height 0 --block-hashchain 0000000000000000000000000000000000000000000000000000000000000000
+wait_for_block
+
+# Set eth connector params
+aurora-cli --engine $ENGINE_ACCOUNT set-eth-connector-contract-account --account-id 0f2bb8ad44996a7762256477fe3b42b27e63a00d.factory.bridge.near --withdraw-ser borsh
+wait_for_block
+
 # Silo methods
 # Get fixed gas
 result=$(aurora-cli --engine $ENGINE_ACCOUNT get-fixed-gas || error_exit)

src/cli/advanced/near.rs

@@ -145,7 +145,7 @@ pub enum WriteCommand {
         #[clap(short, long)]
         wasm_path: String,
         /// Unique identifier for the chain. The default value is 1313161556 (Aurora localnet).
-        /// See https://chainlist.org/ for a list of taken chain IDs.
+        /// See `https://chainlist.org/` for a list of taken chain IDs.
         #[clap(short, long)]
         chain_id: Option<u64>,
         /// Near account ID for the owner of the Engine contract.
@@ -167,7 +167,7 @@ pub enum WriteCommand {
         eth_custodian_address: Option<String>,
         /// The metadata for the ETH token the connector creates.
         /// The value is expected to be a value JSON string
-        /// (see https://nomicon.io/Standards/Tokens/FungibleToken/Metadata for fields).
+        /// (see `https://nomicon.io/Standards/Tokens/FungibleToken/Metadata` for fields).
         /// The default value is 18 decimals with name and symbol equal to "localETH".
         #[clap(short, long)]
         ft_metadata: Option<String>,

src/cli/simple/mod.rs

@@ -44,7 +44,7 @@ pub struct Cli {
 pub enum Command {
     /// Create new NEAR account
     CreateAccount {
-        /// AccountId
+        /// `AccountId`
         #[arg(long, short)]
         account: String,
         /// Initial account balance in NEAR
@@ -53,7 +53,7 @@ pub enum Command {
     },
     /// View NEAR account
     ViewAccount {
-        /// AccountId
+        /// `AccountId`
         account: String,
     },
     /// Deploy Aurora EVM smart contract
@@ -213,9 +213,9 @@ pub enum Command {
         #[arg(long)]
         seed: Option<u64>,
     },
-    /// Return randomly generated NEAR key for AccountId
+    /// Return randomly generated NEAR key for `AccountId`
     GenerateNearKey {
-        /// AccountId
+        /// `AccountId`
         account_id: String,
         /// Key type: ed25519 or secp256k1
         key_type: KeyType,
@@ -224,12 +224,12 @@ pub enum Command {
     GetFixedGas,
     /// Set fixed gas
     SetFixedGas {
-        /// Fixed gas in EthGas.
+        /// Fixed gas in `EthGas`.
         cost: u64,
     },
     /// Set SILO params.
     SetSiloParams {
-        /// Fixed gas in EthGas.
+        /// Fixed gas in `EthGas`.
         #[arg(long, short)]
         gas: u64,
         /// Fallback EVM address.
@@ -275,7 +275,7 @@ pub enum Command {
     },
     /// Set relayer key manager
     SetKeyManager {
-        /// AccountId of the key manager
+        /// `AccountId` of the key manager
         #[arg(value_parser = parse_account_id)]
         account_id: Option<AccountId>,
     },

src/client/mod.rs

@@ -72,6 +72,7 @@ impl Client {
 
 #[cfg(feature = "advanced")]
 #[derive(Debug)]
+#[allow(dead_code)]
 pub enum TransactionOutcome {
     Result(SubmitResult),
     Failure(near_primitives::errors::TxExecutionError),

src/client/near.rs

@@ -6,7 +6,7 @@ use aurora_engine_types::{
     types::{Address, Wei},
     U256,
 };
-use near_crypto::InMemorySigner;
+use near_crypto::{InMemorySigner, Signer};
 use near_jsonrpc_client::{
     methods::broadcast_tx_commit::RpcBroadcastTxCommitRequest, AsUrl, JsonRpcClient,
 };
@@ -265,10 +265,11 @@ impl NearClient {
             signed_transaction: SignedTransaction::from_actions(
                 nonce,
                 signer.account_id.clone(),
-                self.engine_account_id.as_str().parse().unwrap(),
-                &signer,
+                self.engine_account_id.as_str().parse()?,
+                &Signer::InMemory(signer),
                 actions,
                 block_hash,
+                0,
             ),
         };
         let response = self.client.call(request).await?;
@@ -294,7 +295,7 @@ impl NearClient {
                     new_account_id,
                     initial_balance,
                     new_key_pair.public_key(),
-                    &signer,
+                    &Signer::InMemory(signer),
                     block_hash,
                 ),
             }
@@ -305,7 +306,7 @@ impl NearClient {
                     nonce,
                     signer.account_id.clone(),
                     contract_id,
-                    &signer,
+                    &Signer::InMemory(signer),
                     initial_balance,
                     "create_account".to_string(),
                     serde_json::json!({
@@ -357,11 +358,12 @@ impl NearClient {
                 nonce,
                 signer.account_id.clone(),
                 signer.account_id.clone(),
-                &signer,
+                &Signer::InMemory(signer),
                 vec![Action::DeployContract(
                     near_primitives::transaction::DeployContractAction { code },
                 )],
                 block_hash,
+                0,
             ),
         };
 

src/transaction_reader/aggregator.rs

@@ -88,7 +88,7 @@ impl Aggregator for GroupByFlatStatus {
                 (FlatTxStatus::Reverted, 0),
                 (FlatTxStatus::GasLimit, 0),
                 (FlatTxStatus::IncorrectNonce, 0),
-                (FlatTxStatus::Other, 0),
+                (FlatTxStatus::Other(String::new()), 0),
             ];
             init_data.into_iter().collect()
         };

src/transaction_reader/mod.rs

@@ -186,25 +186,25 @@ enum TxStatus {
     Other(String),
 }
 
-#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub enum FlatTxStatus {
     Succeeded,
     Reverted,
     GasLimit,
     IncorrectNonce,
-    Other,
+    Other(String),
 }
 
 impl TxStatus {
-    const fn flatten(&self) -> FlatTxStatus {
+    fn flatten(&self) -> FlatTxStatus {
         match self {
             Self::Executed(result) => match result.status {
                 TransactionStatus::Succeed(_) => FlatTxStatus::Succeeded,
                 _ => FlatTxStatus::Reverted,
             },
             Self::GasLimit => FlatTxStatus::GasLimit,
             Self::IncorrectNonce => FlatTxStatus::IncorrectNonce,
-            Self::Other(_) => FlatTxStatus::Other,
+            Self::Other(msg) => FlatTxStatus::Other(msg.clone()),
         }
     }
 }