Skip to content

Feature(evm-loader): derive BorshSchema, silence dead code warnings #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gBaGu wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Feature(evm-loader): derive BorshSchema, silence dead code warnings #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b3e8dd
Feature(evm-loader): derive BorshSchema, silence dead code warnings
gBaGu Oct 5, 2022
05ba23b
Feature(cli): add subcommand for Borsh schema generation
gBaGu Oct 17, 2022
dc946a5
Fix(cli): fix tests
gBaGu Oct 17, 2022
a43338d
fix types for schema generation
gBaGu Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ homepage = "https://solana.com/"
documentation = "https://docs.rs/solana-cli"

[dependencies]
agsol-borsh-schema = { version = "0.0.2", features = ["full"] }
bincode = "1.3.3"
bs58 = "0.4.0"
clap = "2.33.1"
Expand Down
49 changes: 45 additions & 4 deletions cli/src/evm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,28 @@ impl EvmSubCommands for App<'_, '_> {
.long("lamports")
.help("Amount in lamports")))

.subcommand(
SubCommand::with_name("generate-borsh-schema")
.about("Generate Borsh schema for EVM instructions")
.display_order(3)
.arg(
Arg::with_name("input_path")
.short("i")
.long("input")
.value_name("DIR")
.takes_value(true)
.required(true)
.help("Parse Rust files from DIR for a borsh schema"),
)
.arg(
Arg::with_name("schema_path")
.long("schema-dir")
.value_name("DIR")
.takes_value(true)
.default_value("schema")
.help("Use DIR as generated schema location"),
))


// Hidden commands

Expand Down Expand Up @@ -152,6 +174,11 @@ pub enum EvmCliCommand {
amount: u64,
},

GenerateBorshSchema {
input_path: PathBuf,
schema_path: PathBuf,
},

// Hidden commands
SendRawTx {
raw_tx: PathBuf,
Expand Down Expand Up @@ -192,6 +219,9 @@ impl EvmCliCommand {
Self::TransferToEvm { address, amount } => {
transfer(rpc_client, config, *address, *amount)?;
}
Self::GenerateBorshSchema { input_path, schema_path } => {
generate_borsh_schema(input_path, schema_path)?;
}
// Hidden commands
Self::SendRawTx { raw_tx } => {
send_raw_tx(rpc_client, config, raw_tx)?;
Expand Down Expand Up @@ -262,8 +292,8 @@ fn transfer(
let message = Message::new(&ixs, Some(&from.pubkey()));
let mut create_account_tx = Transaction::new_unsigned(message);

let (blockhash, _last_height) = rpc_client
.get_latest_blockhash_with_commitment(CommitmentConfig::default())?;
let (blockhash, _last_height) =
rpc_client.get_latest_blockhash_with_commitment(CommitmentConfig::default())?;

create_account_tx.sign(&config.signers, blockhash);

Expand All @@ -276,6 +306,12 @@ fn transfer(
Ok(())
}

fn generate_borsh_schema<P: AsRef<Path>>(input_path: P, schema_path: P) -> anyhow::Result<()> {
fs::create_dir_all(&schema_path)?;
let layouts = agsol_borsh_schema::generate_layouts(input_path)?;
agsol_borsh_schema::generate_output(&layouts, schema_path)
}

fn find_block_header(
rpc_client: &RpcClient,
expected_block_hash: evm::H256,
Expand Down Expand Up @@ -332,8 +368,8 @@ fn send_raw_tx<P: AsRef<Path>>(
let msg = Message::new(&[ix], Some(&signer.pubkey()));
let mut tx = Transaction::new_unsigned(msg);

let (blockhash, _last_height) = rpc_client
.get_latest_blockhash_with_commitment(CommitmentConfig::default())?;
let (blockhash, _last_height) =
rpc_client.get_latest_blockhash_with_commitment(CommitmentConfig::default())?;
tx.sign(&config.signers, blockhash);

debug!("sending tx: {:?}", tx);
Expand Down Expand Up @@ -431,6 +467,11 @@ pub fn parse_evm_subcommand(matches: &ArgMatches<'_>) -> Result<CliCommandInfo,

EvmCliCommand::TransferToEvm { address, amount }
}
("generate-borsh-schema", Some(matches)) => {
let input_path = value_t_or_exit!(matches, "input_path", PathBuf);
let schema_path = value_t_or_exit!(matches, "schema_path", PathBuf);
EvmCliCommand::GenerateBorshSchema { input_path, schema_path }
}
("send-raw-tx", Some(matches)) => {
let raw_tx = value_t_or_exit!(matches, "raw_tx", PathBuf);
EvmCliCommand::SendRawTx { raw_tx }
Expand Down
38 changes: 16 additions & 22 deletions evm-utils/programs/evm_loader/src/instructions/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#![allow(dead_code)]
use super::scope::*;
use borsh::{BorshDeserialize, BorshSerialize};
use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
use evm_state::{Address, Transaction, UnsignedTransaction};
use serde::{Deserialize, Serialize};

Expand All @@ -10,8 +11,7 @@ pub const EVM_INSTRUCTION_BORSH_PREFIX: u8 = 255u8;
#[derive(
BorshSerialize,
BorshDeserialize,
// TODO: add schema generation custom command
// BorshSchema,
BorshSchema,
Clone,
Debug,
PartialEq,
Expand All @@ -37,12 +37,10 @@ impl FeePayerType {

/// Solana blockchain limit amount of data that transaction can have.
/// To get around this limitation, we use design that is similar to LoaderInstruction in sdk.

#[derive(
BorshSerialize,
BorshDeserialize,
// TODO: add schema generation custom command
// BorshSchema,
BorshSchema,
Clone,
Debug,
PartialEq,
Expand All @@ -52,8 +50,6 @@ impl FeePayerType {
Serialize,
Deserialize,
)]

// #[allow(clippy::dead_code)]
pub enum EvmBigTransaction {
/// Allocate data in storage, pay fee should be taken from EVM.
EvmTransactionAllocate { size: u64 },
Expand All @@ -65,8 +61,7 @@ pub enum EvmBigTransaction {
#[derive(
BorshSerialize,
BorshDeserialize,
// TODO: add schema generation custom command
// BorshSchema,
BorshSchema,
Clone,
Debug,
PartialEq,
Expand All @@ -82,7 +77,7 @@ pub enum ExecuteTransaction {
},
ProgramAuthorized {
tx: Option<UnsignedTransaction>,
from: evm::Address,
from: Address,
},
}

Expand All @@ -96,8 +91,7 @@ impl ExecuteTransaction {
#[derive(
BorshSerialize,
BorshDeserialize,
// TODO: add schema generation custom command
// BorshSchema,
BorshSchema,
Clone,
Debug,
PartialEq,
Expand All @@ -122,7 +116,7 @@ pub enum EvmInstruction {
///
SwapNativeToEther {
lamports: u64,
evm_address: evm::Address,
evm_address: Address,
},

/// Transfer user account ownership back to system program.
Expand Down Expand Up @@ -285,9 +279,9 @@ mod test {
#[derive(Clone, Debug)]
struct Generator<T>(T);

impl Arbitrary for Generator<evm::Address> {
impl Arbitrary for Generator<Address> {
fn arbitrary(g: &mut Gen) -> Self {
Generator(evm::Address::from_low_u64_ne(u64::arbitrary(g)))
Generator(Address::from_low_u64_ne(u64::arbitrary(g)))
}
}

Expand All @@ -296,7 +290,7 @@ mod test {
let action = if bool::arbitrary(g) {
evm::TransactionAction::Create
} else {
evm::TransactionAction::Call(evm::Address::from_low_u64_ne(u64::arbitrary(g)))
evm::TransactionAction::Call(Address::from_low_u64_ne(u64::arbitrary(g)))
};
let tx = evm::UnsignedTransaction {
nonce: evm::U256::from(u64::arbitrary(g)),
Expand All @@ -315,7 +309,7 @@ mod test {
let action = if bool::arbitrary(g) {
evm::TransactionAction::Create
} else {
evm::TransactionAction::Call(evm::Address::from_low_u64_ne(u64::arbitrary(g)))
evm::TransactionAction::Call(Address::from_low_u64_ne(u64::arbitrary(g)))
};
let tx = evm::Transaction {
nonce: evm::U256::from(u64::arbitrary(g)),
Expand All @@ -335,8 +329,8 @@ mod test {
}

#[quickcheck]
fn test_serialize_swap_native_to_ether_layout(lamports: u64, addr: Generator<evm::Address>) {
fn custom_serialize(lamports: u64, addr: evm::Address) -> Vec<u8> {
fn test_serialize_swap_native_to_ether_layout(lamports: u64, addr: Generator<Address>) {
fn custom_serialize(lamports: u64, addr: Address) -> Vec<u8> {
use byteorder::{LittleEndian, WriteBytesExt};

let tag: [u8; 4] = [1, 0, 0, 0];
Expand Down Expand Up @@ -397,14 +391,14 @@ mod test {

#[quickcheck]
fn test_serialize_unsigned_transaction(
addr: Generator<evm::Address>,
addr: Generator<Address>,
tx: Generator<evm::UnsignedTransaction>,
) {
let data =
EvmInstruction::new_execute_authorized_tx(tx.0.clone(), addr.0, FeePayerType::Evm);

fn custom_serialize(
from: evm::Address,
from: Address,
nonce: evm::U256,
gas_price: evm::U256,
gas_limit: evm::U256,
Expand Down