Insanity

r-near · r-near · commit 08eb5558afb4 · 2025-04-17T19:14:27.000-07:00
diff --git a/contracts/near/Cargo.lock b/contracts/near/Cargo.lock
diff --git a/contracts/near/Cargo.toml b/contracts/near/Cargo.toml
@@ -31,7 +31,7 @@ ethereum_hashing = "1.0.0-beta.2"
 derive_more = "^0.99.2"
 hex = "0.4.2"
 bitvec = "1.0.0"
-near-plugins = { git = "https://github.com/aurora-is-near/near-plugins", tag = "v0.1.0" }
+near-plugins = { git = "https://github.com/aurora-is-near/near-plugins", tag = "v0.5.0" }
 
 [patch]
 [patch.crates-io]
diff --git a/contracts/near/admin-controlled/Cargo.toml b/contracts/near/admin-controlled/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-near-sdk = "4.1.1"
+near-sdk = "5.12.0"
diff --git a/contracts/near/admin-controlled/src/macros.rs b/contracts/near/admin-controlled/src/macros.rs
@@ -4,7 +4,7 @@ macro_rules! impl_admin_controlled {
         use admin_controlled::{AdminControlled as AdminControlledInner, Mask as MaskInner};
         use near_sdk as near_sdk_inner;
 
-        #[near_bindgen]
+        #[near]
         impl AdminControlledInner for $contract {
             #[result_serializer(borsh)]
             fn get_paused(&self) -> MaskInner {
diff --git a/contracts/near/eth-client/Cargo.toml b/contracts/near/eth-client/Cargo.toml
@@ -9,15 +9,15 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 eth-types = { path = "../eth-types", default-features = false }
-near-sdk = "4.1.1"
+near-sdk = "5.12.0"
 borsh = "0.9.3"
 rlp = "0.5.2"
 primal = "0.2.3"
 arrutil = "0.1.2"
 ethash = { git = "https://github.com/aurora-is-near/rust-ethash", tag = "0.2.0", default-features = false }
 hex = "0.4.0"
 rustc-hex = "2.1.0"
-near-plugins = { git = "https://github.com/aurora-is-near/near-plugins", tag = "v0.1.0" }
+near-plugins = { git = "https://github.com/aurora-is-near/near-plugins", tag = "v0.5.0" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 # serde's Serialize and Deserialize traits are required for `near_bindgen` macro for non-wasm32 targets
diff --git a/contracts/near/eth-client/rust-toolchain b/contracts/near/eth-client/rust-toolchain
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.68.0"
+channel = "1.84.0"
diff --git a/contracts/near/eth-client/src/lib.rs b/contracts/near/eth-client/src/lib.rs
@@ -69,7 +69,7 @@ pub enum Role {
     DAO,
 }
 
-#[near_bindgen]
+#[near]
 #[derive(BorshDeserialize, BorshSerialize, PanicOnDefault, Pausable, Upgradable)]
 #[access_control(role_type(Role))]
 #[pausable(manager_roles(Role::PauseManager))]
@@ -123,7 +123,7 @@ pub struct EthClient {
     paused: u128,
 }
 
-#[near_bindgen]
+#[near]
 impl EthClient {
     #[init]
     #[private]
diff --git a/contracts/near/eth-prover/Cargo.toml b/contracts/near/eth-prover/Cargo.toml
@@ -20,8 +20,8 @@ serde_json = "1.0"
 hex = { version = "0.4.3", features = ["serde"] }
 indicatif = "0.14"
 lazy_static = "*"
-near-crypto = "0.16.0"
-near-primitives = "0.16.0"
+near-crypto = "0.29.2"
+near-primitives = "0.29.2"
 workspaces = "0.6.0"
 tokio = { version = "1.18.1", features = ["full"] }
 
diff --git a/contracts/near/eth-prover/src/lib.rs b/contracts/near/eth-prover/src/lib.rs
@@ -29,7 +29,7 @@ pub enum Role {
     DAO,
 }
 
-#[near_bindgen]
+#[near]
 #[derive(BorshDeserialize, BorshSerialize, PanicOnDefault, Pausable, Upgradable)]
 #[access_control(role_type(Role))]
 #[pausable(manager_roles(Role::PauseManager, Role::DAO))]
@@ -69,7 +69,7 @@ fn get_vec(data: &Rlp, pos: usize) -> Vec<u8> {
     data.at(pos).unwrap().as_val::<Vec<u8>>().unwrap()
 }
 
-#[near_bindgen]
+#[near]
 impl EthProver {
     #[init]
     #[private]
diff --git a/contracts/near/eth-types/Cargo.toml b/contracts/near/eth-types/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 near-sdk.workspace = true
-borsh.workspace = true
+borsh = "1.5.6"
 rlp.workspace = true
 rlp-derive.workspace = true
 ethereum-types.workspace = true
diff --git a/contracts/near/eth-types/src/lib.rs b/contracts/near/eth-types/src/lib.rs
@@ -1,4 +1,5 @@
 use borsh::{BorshDeserialize, BorshSerialize};
+use borsh::io::Read;
 use derive_more::{
     Add, AddAssign, Display, Div, DivAssign, From, Into, Mul, MulAssign, Rem, RemAssign, Sub,
     SubAssign,
@@ -89,10 +90,10 @@ macro_rules! uint_declare_wrapper_and_serde {
 
         impl BorshDeserialize for $name {
             #[inline]
-            fn deserialize(buf: &mut &[u8]) -> Result<Self, Error> {
+            fn deserialize_reader<R: Read>(reader: &mut R) -> borsh::io::Result<Self> {
                 let mut data = [0u64; $len];
                 for i in 0..$len {
-                    data[i] = borsh::de::BorshDeserialize::deserialize(buf)?;
+                    data[i] = u64::deserialize_reader(reader)?;
                 }
                 Ok($name(ethereum_types::$name(data)))
             }
diff --git a/contracts/near/eth-types/src/macros.rs b/contracts/near/eth-types/src/macros.rs
@@ -32,16 +32,9 @@ macro_rules! arr_wrapper_impl_tree_hash_and_borsh {
 
         impl BorshDeserialize for $name {
             #[inline]
-            fn deserialize(buf: &mut &[u8]) -> Result<Self, Error> {
-                if buf.len() < $len {
-                    return Err(std::io::Error::new(
-                        std::io::ErrorKind::InvalidInput,
-                        "Unexpected length of input",
-                    ));
-                }
+            fn deserialize_reader<R: Read>(reader: &mut R) -> Result<Self, Error> {
                 let mut data = [0u8; $len];
-                data.copy_from_slice(&buf[..$len]);
-                *buf = &buf[$len..];
+                reader.read_exact(&mut data)?;
                 Ok($name(data.into()))
             }
         }
@@ -178,16 +171,9 @@ macro_rules! arr_ethereum_types_wrapper_impl_borsh_serde_ssz {
 
         impl BorshDeserialize for $name {
             #[inline]
-            fn deserialize(buf: &mut &[u8]) -> Result<Self, Error> {
-                if buf.len() < $len {
-                    return Err(std::io::Error::new(
-                        std::io::ErrorKind::InvalidInput,
-                        "Unexpected length of input",
-                    ));
-                }
+            fn deserialize_reader<R: Read>(reader: &mut R) -> Result<Self, Error> {
                 let mut data = [0u8; $len];
-                data.copy_from_slice(&buf[..$len]);
-                *buf = &buf[$len..];
+                reader.read_exact(&mut data)?;
                 Ok($name(data.into()))
             }
         }
@@ -226,6 +212,18 @@ macro_rules! arr_ethereum_types_wrapper_impl_borsh_serde_ssz {
             }
         }
 
+        impl Ord for $name {
+            fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+                self.0.cmp(&other.0)
+            }
+        }
+
+        impl PartialOrd for $name {
+            fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+                Some(self.cmp(other))
+            }
+        }
+
         #[cfg(feature = "eth2")]
         impl ssz::Encode for $name {
             fn is_ssz_fixed_len() -> bool {
diff --git a/contracts/near/eth2-client/Cargo.toml b/contracts/near/eth2-client/Cargo.toml
@@ -14,7 +14,7 @@ bls = { git = "https://github.com/aurora-is-near/lighthouse.git", optional = tru
 ethereum-types.workspace = true
 tree_hash.workspace = true
 near-sdk.workspace = true
-borsh.workspace = true
+borsh = "1.5.6"
 bitvec.workspace = true
 near-plugins.workspace = true
 
diff --git a/contracts/near/eth2-client/src/lib.rs b/contracts/near/eth2-client/src/lib.rs
@@ -12,9 +12,9 @@ use eth2_utility::consensus::*;
 use eth2_utility::types::*;
 use eth_types::eth2::*;
 use eth_types::{BlockHeader, H256};
-use near_sdk::collections::{LazyOption, LookupMap};
+use near_sdk::store::{LazyOption, LookupMap};
 use near_sdk::{
-    env, near_bindgen, require, AccountId, BorshStorageKey, PanicOnDefault, Promise, PublicKey,
+    env, near, require, AccountId, BorshStorageKey, PanicOnDefault, Promise, PublicKey,
 };
 use tree_hash::TreeHash;
 
@@ -50,12 +50,16 @@ pub enum Role {
     UnrestrictedSubmitLightClientUpdate,
     UnrestrictedSubmitExecutionHeader,
     DAO,
+    UnpauseManager,
 }
 
-#[near_bindgen]
-#[derive(BorshDeserialize, BorshSerialize, PanicOnDefault, Pausable, Upgradable)]
+#[near(contract_state)]
+#[derive(PanicOnDefault, Pausable, Upgradable)]
 #[access_control(role_type(Role))]
-#[pausable(manager_roles(Role::PauseManager, Role::DAO))]
+#[pausable(
+    pause_roles(Role::PauseManager, Role::DAO),
+    unpause_roles(Role::UnpauseManager, Role::DAO)
+)]
 #[upgradable(access_control_roles(
     code_stagers(Role::UpgradableCodeStager, Role::DAO),
     code_deployers(Role::UpgradableCodeDeployer, Role::DAO),
@@ -95,7 +99,7 @@ pub struct Eth2Client {
     trusted_blocks_submitter: Option<AccountId>,
 }
 
-#[near_bindgen]
+#[near]
 impl Eth2Client {
     #[init]
     #[private]
@@ -142,15 +146,15 @@ impl Eth2Client {
             finalized_beacon_header: args.finalized_beacon_header,
             finalized_execution_header: LazyOption::new(
                 StorageKey::FinalizedExecutionHeader,
-                Some(&finalized_execution_header_info),
+                Some(finalized_execution_header_info),
             ),
             current_sync_committee: LazyOption::new(
                 StorageKey::CurrentSyncCommittee,
-                Some(&args.current_sync_committee),
+                Some(args.current_sync_committee),
             ),
             next_sync_committee: LazyOption::new(
                 StorageKey::NextSyncCommittee,
-                Some(&args.next_sync_committee),
+                Some(args.next_sync_committee),
             ),
             client_mode: ClientMode::SubmitLightClientUpdate,
             unfinalized_head_execution_header: None,
@@ -159,8 +163,8 @@ impl Eth2Client {
         };
 
         contract.finalized_execution_blocks.insert(
-            &args.finalized_execution_header.number,
-            &finalized_execution_header_hash,
+            args.finalized_execution_header.number,
+            finalized_execution_header_hash,
         );
 
         contract.acl_init_super_admin(env::predecessor_account_id());
@@ -175,16 +179,16 @@ impl Eth2Client {
     /// Returns finalized execution block number
     #[result_serializer(borsh)]
     pub fn last_block_number(&self) -> u64 {
-        self.finalized_execution_header.get().unwrap().block_number
+        self.finalized_execution_header.get().clone().unwrap().block_number
     }
 
     /// Returns finalized execution block hash
     #[result_serializer(borsh)]
     pub fn block_hash_safe(&self, #[serializer(borsh)] block_number: u64) -> Option<H256> {
-        if block_number > self.finalized_execution_header.get().unwrap().block_number {
+        if block_number > self.finalized_execution_header.get().clone().unwrap().block_number {
             return None;
         }
-        self.finalized_execution_blocks.get(&block_number)
+        self.finalized_execution_blocks.get(&block_number).copied()
     }
 
     /// Checks if the execution header is already submitted.
@@ -216,8 +220,8 @@ impl Eth2Client {
     pub fn get_light_client_state(&self) -> LightClientState {
         LightClientState {
             finalized_beacon_header: self.finalized_beacon_header.clone(),
-            current_sync_committee: self.current_sync_committee.get().unwrap(),
-            next_sync_committee: self.next_sync_committee.get().unwrap(),
+            current_sync_committee: self.current_sync_committee.get().clone().unwrap(),
+            next_sync_committee: self.next_sync_committee.get().clone().unwrap(),
         }
     }
 
@@ -277,14 +281,14 @@ impl Eth2Client {
 
         let insert_result = self
             .finalized_execution_blocks
-            .insert(&block_header.number, &block_hash);
+            .insert(block_header.number, block_hash);
 
         require!(
             insert_result.is_none(),
             format!("The block {:#?} already submitted!", &block_hash)
         );
 
-        let finalized_execution_header = self.finalized_execution_header.get().unwrap();
+        let finalized_execution_header = self.finalized_execution_header.get().clone().unwrap();
         // Apply gc
         if let Some(diff_between_unfinalized_head_and_tail) =
             self.get_diff_between_unfinalized_head_and_tail()
@@ -310,7 +314,7 @@ impl Eth2Client {
                 .get(&finalized_execution_header.block_number)
                 .unwrap();
             require!(
-                block_header.parent_hash == finalized_execution_header_hash,
+                block_header.parent_hash == *finalized_execution_header_hash,
                 "The chain cannot be closed"
             );
 
@@ -328,7 +332,7 @@ impl Eth2Client {
             );
 
             self.finalized_execution_header
-                .set(self.unfinalized_head_execution_header.as_ref().unwrap());
+                .set(Some(self.unfinalized_head_execution_header.as_ref().unwrap().clone()));
             self.unfinalized_tail_execution_header = None;
             self.unfinalized_head_execution_header = None;
             self.client_mode = ClientMode::SubmitLightClientUpdate;
@@ -597,9 +601,9 @@ impl Eth2Client {
 
         if update_period == finalized_period + 1 {
             self.current_sync_committee
-                .set(&self.next_sync_committee.get().unwrap());
+                .set(Some(self.next_sync_committee.get().clone().unwrap()));
             self.next_sync_committee
-                .set(&update.sync_committee_update.unwrap().next_sync_committee);
+                .set(Some(update.sync_committee_update.unwrap().next_sync_committee));
         }
 
         #[cfg(feature = "logs")]
diff --git a/contracts/near/eth2-client/src/migrate.rs b/contracts/near/eth2-client/src/migrate.rs
@@ -1,9 +1,7 @@
 use crate::*;
-use near_sdk::collections::UnorderedMap;
-use near_sdk::Balance;
-
-#[near_bindgen]
-#[derive(BorshDeserialize, BorshSerialize, PanicOnDefault)]
+use near_sdk::store::UnorderedMap;
+#[near(contract_state)]
+#[derive(PanicOnDefault)]
 pub struct Eth2ClientV1 {
     trusted_signer: Option<AccountId>,
     #[deprecated]
@@ -16,14 +14,14 @@ pub struct Eth2ClientV1 {
     unfinalized_headers: UnorderedMap<H256, ExecutionHeaderInfo>,
     submitters: LookupMap<AccountId, u32>,
     max_submitted_blocks_by_account: u32,
-    min_storage_balance_for_submitter: Balance,
+    min_storage_balance_for_submitter: u128,
     finalized_beacon_header: ExtendedBeaconBlockHeader,
     finalized_execution_header: LazyOption<ExecutionHeaderInfo>,
     current_sync_committee: LazyOption<SyncCommittee>,
     next_sync_committee: LazyOption<SyncCommittee>,
 }
 
-#[near_bindgen]
+#[near]
 impl Eth2Client {
     #[private]
     #[init(ignore_state)]
diff --git a/contracts/near/eth2-utility/Cargo.toml b/contracts/near/eth2-utility/Cargo.toml
@@ -13,7 +13,7 @@ ethereum-types.workspace = true
 tree_hash.workspace = true
 ethereum_hashing.workspace = true
 near-sdk.workspace = true
-borsh.workspace = true
+borsh = "1.5.6"
 bitvec.workspace = true
 
 [dev-dependencies]
diff --git a/contracts/near/rust-toolchain b/contracts/near/rust-toolchain
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.68.0"
+channel = "1.84.0"
diff --git a/eth2near/Cargo.lock b/eth2near/Cargo.lock
diff --git a/eth2near/contract_wrapper/Cargo.toml b/eth2near/contract_wrapper/Cargo.toml
diff --git a/eth2near/eth2-contract-init/Cargo.toml b/eth2near/eth2-contract-init/Cargo.toml
diff --git a/eth2near/eth2near-block-relay-rs/Cargo.toml b/eth2near/eth2near-block-relay-rs/Cargo.toml
diff --git a/eth2near/eth2near-block-relay-rs/rust-toolchain b/eth2near/eth2near-block-relay-rs/rust-toolchain
diff --git a/eth2near/rust-toolchain b/eth2near/rust-toolchain

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[toolchain]`
`2`		`-channel = "1.68.0"`
	`2`	`+channel = "1.84.0"`