Merge pull request #339 from ava-labs/dev

New Release
ava-labs · Nov 27, 2024 · ac7750c · ac7750c
2 parents bbe02c6 + 4a09ceb
commit ac7750c
Show file tree

Hide file tree

Showing 375 changed files with 2,363 additions and 276 deletions.
diff --git a/app-derive/src/lib.rs b/app-derive/src/lib.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app-derive/src/unroll.rs b/app-derive/src/unroll.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app-derive/src/version.rs b/app-derive/src/version.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app-derive/tests/version.rs b/app-derive/tests/version.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *   (c) 2021 Zondax GmbH
+ *   (c) 2018-2024 Zondax AG
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

diff --git a/app/Makefile.version b/app/Makefile.version
@@ -1,6 +1,6 @@
 # Major
 APPVERSION_M=1
 # Minor
-APPVERSION_N=0
+APPVERSION_N=1
 # Patch
-APPVERSION_P=0
+APPVERSION_P=0
diff --git a/app/rust/src/constants.rs b/app/rust/src/constants.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/crypto.rs b/app/rust/src/crypto.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/dispatcher.rs b/app/rust/src/dispatcher.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers.rs b/app/rust/src/handlers.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/avax.rs b/app/rust/src/handlers/avax.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/avax/message.rs b/app/rust/src/handlers/avax/message.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/avax/sign_hash.rs b/app/rust/src/handlers/avax/sign_hash.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/avax/signing.rs b/app/rust/src/handlers/avax/signing.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/dev.rs b/app/rust/src/handlers/dev.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/dev/debug.rs b/app/rust/src/handlers/dev/debug.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/eth.rs b/app/rust/src/handlers/eth.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/eth/personal_msg.rs b/app/rust/src/handlers/eth/personal_msg.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/eth/provide_erc20.rs b/app/rust/src/handlers/eth/provide_erc20.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/eth/provide_nft_info.rs b/app/rust/src/handlers/eth/provide_nft_info.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/eth/public_key.rs b/app/rust/src/handlers/eth/public_key.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/eth/public_key/ui.rs b/app/rust/src/handlers/eth/public_key/ui.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/eth/set_plugin.rs b/app/rust/src/handlers/eth/set_plugin.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/eth/signing.rs b/app/rust/src/handlers/eth/signing.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/lock.rs b/app/rust/src/handlers/lock.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/public_key.rs b/app/rust/src/handlers/public_key.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/public_key/ui.rs b/app/rust/src/handlers/public_key/ui.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/public_key/xpub.rs b/app/rust/src/handlers/public_key/xpub.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2022 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/utils.rs b/app/rust/src/handlers/utils.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/version.rs b/app/rust/src/handlers/version.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/handlers/wallet_id.rs b/app/rust/src/handlers/wallet_id.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/lib.rs b/app/rust/src/lib.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/parser.rs b/app/rust/src/parser.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -20,18 +20,21 @@ use zemu_sys::ViewError;
 mod address;
 mod asset_id;
 mod avm_output;
+mod chain_id;
 mod constants;
 mod coreth;
 mod defer;
 mod error;
 mod initial_state;
 mod inputs;
+mod l1_validator;
 mod message;
 mod network_info;
 mod node_id;
 mod object_list;
 mod operations;
 mod outputs;
+mod pchain_owner;
 mod pvm_output;
 mod subnet_auth;
 mod subnet_id;

diff --git a/app/rust/src/parser/address.rs b/app/rust/src/parser/address.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/parser/asset_id.rs b/app/rust/src/parser/asset_id.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/parser/avm_output.rs b/app/rust/src/parser/avm_output.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.

diff --git a/app/rust/src/parser/chain_id.rs b/app/rust/src/parser/chain_id.rs
@@ -0,0 +1,89 @@
+/*******************************************************************************
+*   (c) 2018-2024 Zondax AG
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+********************************************************************************/
+use crate::handlers::handle_ui_message;
+use crate::sys::ViewError;
+use core::{mem::MaybeUninit, ptr::addr_of_mut};
+use nom::bytes::complete::take;
+
+use crate::parser::{DisplayableItem, FromBytes, ParserError};
+use crate::utils::hex_encode;
+
+pub const CHAIN_ID_LEN: usize = 32;
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+#[cfg_attr(test, derive(Debug))]
+pub struct ChainId<'b>(&'b [u8; CHAIN_ID_LEN]);
+
+impl<'b> ChainId<'b> {
+    pub fn new(id: &'b [u8; CHAIN_ID_LEN]) -> Self {
+        Self(id)
+    }
+}
+
+impl<'b> FromBytes<'b> for ChainId<'b> {
+    #[inline(never)]
+    fn from_bytes_into(
+        input: &'b [u8],
+        out: &mut MaybeUninit<Self>,
+    ) -> Result<&'b [u8], nom::Err<ParserError>> {
+        crate::sys::zemu_log_stack("ChainId::from_bytes_into\x00");
+
+        let (rem, chain_id) = take(CHAIN_ID_LEN)(input)?;
+        // This would not fail as previous line ensures we take
+        // the right amount of bytes, also the alignemnt is correct
+        let chain_id = arrayref::array_ref!(chain_id, 0, CHAIN_ID_LEN);
+
+        //good ptr and no uninit reads
+        let out = out.as_mut_ptr();
+        unsafe {
+            addr_of_mut!((*out).0).write(&chain_id);
+        }
+
+        Ok(rem)
+    }
+}
+
+impl<'b> DisplayableItem for ChainId<'b> {
+    fn num_items(&self) -> Result<u8, ViewError> {
+        Ok(1)
+    }
+
+    fn render_item(
+        &self,
+        item_n: u8,
+        title: &mut [u8],
+        message: &mut [u8],
+        page: u8,
+    ) -> Result<u8, ViewError> {
+        use bolos::{pic_str, PIC};
+
+        if item_n != 0 {
+            return Err(ViewError::NoData);
+        }
+        let prefix = pic_str!(b"0x"!);
+        let label = pic_str!(b"Chain ID");
+        title[..label.len()].copy_from_slice(label);
+
+        // prefix
+        let mut out = [0; CHAIN_ID_LEN * 2 + 2];
+        let mut sz = prefix.len();
+        out[..prefix.len()].copy_from_slice(&prefix[..]);
+
+        sz += hex_encode(self.0, &mut out[prefix.len()..]).map_err(|_| ViewError::Unknown)?;
+
+        handle_ui_message(&out[..sz], message, page)
+    }
+}
diff --git a/app/rust/src/parser/constants.rs b/app/rust/src/parser/constants.rs
@@ -1,5 +1,5 @@
 /*******************************************************************************
-*   (c) 2021 Zondax GmbH
+*   (c) 2018-2024 Zondax AG
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -19,14 +19,15 @@ pub const NETWORK_ID_MAINNET: u32 = 1;
 pub const NETWORK_ID_FUJI: u32 = 5;
 pub const NETWORK_ID_LOCAL: u32 = 12345;
 pub const NETWORK_ID_CUSTOM: u32 = 1337;
+pub const NETWORK_ID_DEVNET: u32 = 76;
 pub const ETH_MAINNET_ID: u64 = 1;
 
 // hrp
 pub const HRP_MAINNET: &str = "avax";
 pub const HRP_TESTNET: &str = "fuji";
 pub const HRP_LOCAL: &str = "local";
 pub const HRP_CUSTOM: &str = "custom";
-
+pub const HRP_DEVNET: &str = "custom";
 pub const TRANSFER_TX: u32 = 0;
 
 // pvm transaction types
@@ -41,6 +42,13 @@ pub const PVM_REMOVE_SUBNET_VALIDATOR: u32 = 0x00000017;
 pub const PVM_TRANSFORM_SUBNET: u32 = 0x00000018;
 pub const PVM_ADD_PERMISSIONLESS_VALIDATOR: u32 = 0x00000019;
 pub const PVM_ADD_PERMISSIONLESS_DELEGATOR: u32 = 0x0000001A;
+
+pub const PVM_CONVERT_SUBNET_L1: u32 = 0x00000023;
+pub const PVM_REGISTER_L1_VALIDATOR: u32 = 0x00000024;
+pub const PVM_SET_L1_VALIDATOR_WEIGHT: u32 = 0x00000025;
+pub const PVM_DISABLE_L1_VALIDATOR: u32 = 0x00000027;
+pub const PVM_INCREASE_L1_VALIDATOR_BALANCE: u32 = 0x00000026;
+
 //  base tx for p-chain which collides with evm import tx.
 //  we should check chain-id
 pub const PVM_BASE_TX: u32 = 0x00000000;