chore: update some rust dependencies (#673)

engine-sdk/Cargo.toml

@@ -14,12 +14,14 @@ autobenches = false
 
 [dependencies]
 aurora-engine-types = { path = "../engine-types", default-features = false }
-borsh = { version = "0.9.3", default-features = false }
-sha3 = { version = "0.10.2", default-features = false }
-sha2 = { version = "0.10.2", default-features = false }
+
+base64 = { version = "0.21", default-features = false, features = [ "alloc" ] }
+borsh = { version = "0.9", default-features = false }
+sha2 = { version = "0.10", default-features = false }
+sha3 = { version = "0.10", default-features = false }
 
 [features]
-std = ["aurora-engine-types/std", "borsh/std", "sha3/std", "sha2/std"]
+std = ["aurora-engine-types/std", "borsh/std", "sha3/std", "sha2/std", "base64/std" ]
 contract = []
 log = []
 all-promise-actions = []

engine-sdk/src/base64.rs

@@ -0,0 +1,13 @@
+use aurora_engine_types::{String, Vec};
+pub use base64::DecodeError;
+use base64::Engine;
+
+/// Encode arbitrary octets as base64 using the standard `base64::Engine`.
+pub fn encode<T: AsRef<[u8]>>(input: T) -> String {
+    base64::engine::general_purpose::STANDARD.encode(input)
+}
+
+/// Decode from string reference as octets using the standard `base64::Engine`.
+pub fn decode<T: AsRef<[u8]>>(input: T) -> Result<Vec<u8>, DecodeError> {
+    base64::engine::general_purpose::STANDARD.decode(input)
+}

engine-sdk/src/lib.rs

@@ -5,6 +5,7 @@ use crate::prelude::{Address, Vec, U256};
 use crate::prelude::{H256, STORAGE_PRICE_PER_BYTE};
 pub use types::keccak;
 
+pub mod base64;
 pub mod caching;
 pub mod env;
 pub mod error;

engine-standalone-storage/Cargo.toml

@@ -19,14 +19,13 @@ aurora-engine-types = { path = "../engine-types", default-features = false, feat
 aurora-engine-sdk = { path = "../engine-sdk", default-features = false, features = ["std"] }
 aurora-engine-transactions = { path = "../engine-transactions", default-features = false, features = ["std"] }
 aurora-engine-precompiles = { path = "../engine-precompiles", default-features = false, features = ["std"] }
-borsh = { version = "0.9.3" }
+borsh = "0.9"
 evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.37.4-aurora", default-features = false }
 hex = "0.4.3"
 rocksdb = { version = "0.19.0", default-features = false }
 postgres = "0.19.2"
 serde = "1.0.130"
 serde_json = "1.0.72"
-base64 = "0.13.0"
 
 [features]
 default = ["snappy", "lz4", "zstd", "zlib"]

engine-standalone-storage/src/json_snapshot/mod.rs

@@ -14,8 +14,8 @@ pub fn initialize_engine_state(
 
     let mut batch = rocksdb::WriteBatch::default();
     for entry in snapshot.result.values {
-        let key = base64::decode(entry.key)?;
-        let value = base64::decode(entry.value)?;
+        let key = aurora_engine_sdk::base64::decode(entry.key)?;
+        let value = aurora_engine_sdk::base64::decode(entry.value)?;
         let storage_key = crate::construct_engine_key(&key, block_height, transaction_position);
         let storage_value = crate::diff::DiffValue::Modified(value);
         batch.put(storage_key, storage_value.try_to_bytes()?);
@@ -26,15 +26,17 @@ pub fn initialize_engine_state(
 }
 
 pub mod error {
+    use aurora_engine_sdk::base64::DecodeError;
+
     #[derive(Debug)]
     pub enum Error {
-        Base64(base64::DecodeError),
+        Base64(DecodeError),
         Rocksdb(rocksdb::Error),
         Borsh(std::io::Error),
     }
 
-    impl From<base64::DecodeError> for Error {
-        fn from(e: base64::DecodeError) -> Self {
+    impl From<DecodeError> for Error {
+        fn from(e: DecodeError) -> Self {
             Self::Base64(e)
         }
     }

engine-standalone-storage/src/lib.rs

@@ -315,11 +315,11 @@ impl Storage {
 
                 let value = if iter.valid() {
                     let bytes = iter.value().unwrap();
-                    diff::DiffValue::try_from_bytes(bytes).unwrap_or_else(|e| {
+                    DiffValue::try_from_bytes(bytes).unwrap_or_else(|e| {
                         panic!(
                             "Could not deserialize key={} value={} error={:?}",
-                            base64::encode(&db_key),
-                            base64::encode(bytes),
+                            aurora_engine_sdk::base64::encode(&db_key),
+                            aurora_engine_sdk::base64::encode(bytes),
                             e,
                         )
                     })

engine-tests/Cargo.toml

@@ -29,7 +29,6 @@ evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.37.4-
 evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.37.4-aurora", default-features = false, features = ["std", "tracing"] }
 evm-gasometer = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.37.4-aurora", default-features = false, features = ["std", "tracing"] }
 rlp = { version = "0.5.0", default-features = false }
-base64 = "0.13.0"
 bstr = "1.0.1"
 byte-slice-cast = { version = "1.0", default-features = false }
 ethabi = "18.0"
@@ -47,7 +46,7 @@ near-primitives = { git = "https://github.com/birchmd/nearcore.git", rev = "6033
 libsecp256k1 = { version = "0.7.0", default-features = false }
 rand = "0.8.5"
 criterion = "0.4.0"
-git2 = "0.15"
+git2 = "0.16"
 tempfile = "3.2.0"
 walrus = "0.19"
 

engine-tests/src/test_utils/mod.rs

@@ -248,8 +248,8 @@ impl AuroraRunner {
     ) {
         let trie = &mut self.ext.underlying.fake_trie;
         for entry in snapshot.result.values {
-            let key = base64::decode(entry.key).unwrap();
-            let value = base64::decode(entry.value).unwrap();
+            let key = aurora_engine_sdk::base64::decode(entry.key).unwrap();
+            let value = aurora_engine_sdk::base64::decode(entry.value).unwrap();
             trie.insert(key, value);
         }
     }

engine-tests/src/tests/standalone/json_snapshot.rs

@@ -19,8 +19,8 @@ fn test_consume_snapshot() {
     // check accounts to see they were written properly
     runner.env.block_height = snapshot.result.block_height + 1;
     for entry in snapshot.result.values {
-        let key = base64::decode(entry.key).unwrap();
-        let value = base64::decode(entry.value).unwrap();
+        let key = aurora_engine_sdk::base64::decode(entry.key).unwrap();
+        let value = aurora_engine_sdk::base64::decode(entry.value).unwrap();
         if key.as_slice().starts_with(&NONCE_PREFIX) {
             let address = address_from_key(&key);
             let nonce = U256::from_big_endian(&value);
@@ -80,8 +80,8 @@ fn test_produce_snapshot() {
 
     // Computed snapshot should exactly the same keys from initial snapshot
     for entry in snapshot.result.values.iter() {
-        let key = base64::decode(&entry.key).unwrap();
-        let value = base64::decode(&entry.value).unwrap();
+        let key = aurora_engine_sdk::base64::decode(&entry.key).unwrap();
+        let value = aurora_engine_sdk::base64::decode(&entry.value).unwrap();
         assert_eq!(computed_snapshot.remove(&key).unwrap(), value);
     }
     assert!(computed_snapshot.is_empty());
@@ -94,12 +94,12 @@ fn test_produce_snapshot() {
 
     // New snapshot should still contain all keys from initial snapshot
     for entry in snapshot.result.values {
-        let key = base64::decode(entry.key).unwrap();
+        let key = aurora_engine_sdk::base64::decode(entry.key).unwrap();
         // skip the eth-connector keys; they were changed by minting the new account
         if key[0..3] == [7, 6, 1] {
             continue;
         }
-        let value = base64::decode(entry.value).unwrap();
+        let value = aurora_engine_sdk::base64::decode(entry.value).unwrap();
         assert_eq!(computed_snapshot.get(&key).unwrap(), &value);
     }
 

engine/Cargo.toml

@@ -20,7 +20,6 @@ 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 }
 aurora-engine-transactions = { path = "../engine-transactions", default-features = false }
-base64 = { version = "0.13.0", default-features = false, features = ["alloc"] }
 bitflags = { version = "1.3", default-features = false }
 borsh = { version = "0.9.3", default-features = false }
 byte-slice-cast = { version = "1.0", default-features = false }
@@ -42,7 +41,7 @@ digest = "0.10"
 
 [features]
 default = ["std"]
-std = ["aurora-engine-types/std", "aurora-engine-sdk/std", "aurora-engine-precompiles/std", "aurora-engine-transactions/std", "base64/std", "borsh/std", "byte-slice-cast/std", "ethabi/std", "evm/std", "hex/std", "rjson/std", "rlp/std"]
+std = ["aurora-engine-types/std", "aurora-engine-sdk/std", "aurora-engine-precompiles/std", "aurora-engine-transactions/std", "borsh/std", "byte-slice-cast/std", "ethabi/std", "evm/std", "hex/std", "rjson/std", "rlp/std"]
 contract = ["aurora-engine-sdk/contract", "aurora-engine-precompiles/contract"]
 evm_bully = []
 log = ["aurora-engine-sdk/log", "aurora-engine-precompiles/log"]

engine/src/fungible_token.rs

@@ -63,7 +63,7 @@ pub struct FungibleReferenceHash([u8; 32]);
 impl FungibleReferenceHash {
     /// Encode to base64-encoded string
     pub fn encode(&self) -> String {
-        base64::encode(self)
+        aurora_engine_sdk::base64::encode(self)
     }
 }