blockworks-foundation
/
pyth-crosschain
mirror of https://github.com/blockworks-foundation/pyth-crosschain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade SDK; add balance rpc call (#80)

This commit is contained in:
Hendrik Hofstadt 2020-11-13 14:14:56 +01:00 committed by GitHub
parent aed8f6637c
commit cee28540bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 1100 additions and 635 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
proto/agent/v1/service.proto
View File

@ -7,19 +7,20 @@ package agent.v1;
option go_package = "proto/agent/v1;agentv1";
service Agent {
rpc SubmitVAA (SubmitVAARequest) returns (SubmitVAAResponse);
rpc WatchLockups (WatchLockupsRequest) returns (stream LockupEvent);
rpc SubmitVAA (SubmitVAARequest) returns (SubmitVAAResponse);
rpc WatchLockups (WatchLockupsRequest) returns (stream LockupEvent);
rpc GetBalance (GetBalanceRequest) returns (GetBalanceResponse);
}
message Empty {
}
message SubmitVAARequest {
bytes vaa = 1;
bytes vaa = 1;
}
message SubmitVAAResponse {
string signature = 1;
string signature = 1;
}
message WatchLockupsRequest {
@ -27,40 +28,48 @@ message WatchLockupsRequest {
}
message LockupEvent {
uint64 slot = 1;
string lockupAddress = 2; // TODO: why is this a string?
uint64 time = 3;
oneof event {
LockupEventNew new = 4;
LockupEventVAAPosted vaaPosted = 5;
Empty empty = 6;
}
uint64 slot = 1;
string lockupAddress = 2; // TODO: why is this a string?
uint64 time = 3;
oneof event {
LockupEventNew new = 4;
LockupEventVAAPosted vaaPosted = 5;
Empty empty = 6;
}
}
// Token on Solana was locked or burned.
message LockupEventNew {
uint32 nonce = 1;
uint32 sourceChain = 2;
uint32 targetChain = 3;
bytes sourceAddress = 4;
bytes targetAddress = 5;
uint32 tokenChain = 6;
bytes tokenAddress = 7;
uint32 tokenDecimals = 8;
bytes amount = 9;
uint32 nonce = 1;
uint32 sourceChain = 2;
uint32 targetChain = 3;
bytes sourceAddress = 4;
bytes targetAddress = 5;
uint32 tokenChain = 6;
bytes tokenAddress = 7;
uint32 tokenDecimals = 8;
bytes amount = 9;
}
// A VAA was posted to Solana for data availability.
message LockupEventVAAPosted {
uint32 nonce = 1;
uint32 sourceChain = 2;
uint32 targetChain = 3;
bytes sourceAddress = 4;
bytes targetAddress = 5;
uint32 tokenChain = 6;
bytes tokenAddress = 7;
uint32 tokenDecimals = 8;
bytes amount = 9;
uint32 nonce = 1;
uint32 sourceChain = 2;
uint32 targetChain = 3;
bytes sourceAddress = 4;
bytes targetAddress = 5;
uint32 tokenChain = 6;
bytes tokenAddress = 7;
uint32 tokenDecimals = 8;
bytes amount = 9;
bytes vaa = 10;
bytes vaa = 10;
}
message GetBalanceRequest{
}
message GetBalanceResponse{
uint64 balance = 1;
}

1387
solana/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

5
solana/Cargo.toml
View File

@ -1,7 +1,2 @@
[workspace]
members = ["agent", "bridge", "cli"]
[patch.crates-io]
solana-sdk = { git="https://github.com/solana-labs/solana", branch="master" }
solana-client = { git="https://github.com/solana-labs/solana", branch="master" }
solana-account-decoder = { git="https://github.com/solana-labs/solana", branch="master" }

8
solana/agent/Cargo.toml
View File

@ -9,10 +9,10 @@ tonic = "0.3.0"
tokio = { version = "0.2", features = ["rt-threaded", "time", "stream", "fs", "macros", "uds"] }
prost = "0.6"
prost-types = "0.6"
solana-sdk = { version = "1.3.11" }
solana-client = { version = "1.3.11" }
solana-faucet = "1.3.11"
spl-token = "=2.0.3"
solana-sdk = { version = "1.4.7" }
solana-client = { version = "1.4.7" }
solana-faucet = "1.4.7"
spl-token = "=3.0.0"
wormhole-bridge = { path = "../bridge" }
primitive-types = { version = "0.7.2" }
hex = "0.4.2"

37
solana/agent/src/main.rs
View File

@ -18,6 +18,7 @@ use service::{
agent_server::{Agent, AgentServer},
lockup_event::Event,
Empty, LockupEvent, LockupEventNew, LockupEventVaaPosted, SubmitVaaRequest, SubmitVaaResponse,
GetBalanceResponse, GetBalanceRequest,
WatchLockupsRequest,
};
use spl_bridge::{
@ -111,8 +112,39 @@ impl Agent for AgentImpl {
)),
}
})
.join()
.unwrap()
.join()
.unwrap()
}
async fn get_balance(
&self,
request: Request<GetBalanceRequest>,
) -> Result<Response<GetBalanceResponse>, Status> {
// Hack to clone keypair
let b = self.key.pubkey();
let rpc_url = self.rpc_url.clone();
// we need to spawn an extra thread because tokio does not allow nested runtimes
std::thread::spawn(move || {
let rpc = RpcClient::new(rpc_url);
let balance = match rpc.get_balance(&b) {
Ok(v) => v,
Err(e) => {
return Err(Status::new(
Code::Internal,
format!("failed to fetch balance: {}", e),
));
}
};
Ok(Response::new(GetBalanceResponse {
balance,
}))
})
.join()
.unwrap()
}
type WatchLockupsStream = mpsc::Receiver<Result<LockupEvent, Status>>;
@ -377,6 +409,7 @@ fn sign_and_send(
RpcSendTransactionConfig {
skip_preflight: false,
preflight_commitment: Some(CommitmentLevel::SingleGossip),
encoding: None,
},
)
}

8
solana/bridge/Cargo.toml
View File

@ -11,16 +11,14 @@ edition = "2018"
[features]
no-entrypoint = []
skip-no-mangle = ["solana-sdk/skip-no-mangle"]
program = ["solana-sdk/program", "spl-token/program", "spl-token/no-entrypoint"]
default = ["solana-sdk/default", "spl-token/default"]
program = ["spl-token/no-entrypoint"]
[dependencies]
num-derive = "0.2"
num-traits = "0.2"
remove_dir_all = "=0.5.0"
solana-sdk = { version = "1.3.11", default-features = false, optional = true }
spl-token = { version = "=2.0.3", default-features = false, optional = true }
solana-program = "1.4.7"
spl-token = { version = "=3.0.0" }
thiserror = "1.0"
byteorder = "1.3.4"
zerocopy = "0.3.0"

6
solana/bridge/src/entrypoint.rs
View File

@ -2,9 +2,9 @@
#![cfg(feature = "program")]
#![cfg(not(feature = "no-entrypoint"))]
use solana_sdk::{
account_info::AccountInfo, entrypoint, entrypoint::ProgramResult,
program_error::PrintProgramError, pubkey::Pubkey,
use solana_program::{
account_info::AccountInfo,entrypoint, entrypoint::ProgramResult, program_error::PrintProgramError,
pubkey::Pubkey,
};
use crate::{error::Error, state::Bridge};

2
solana/bridge/src/error.rs
View File

@ -1,7 +1,7 @@
//! Error types
use num_derive::FromPrimitive;
use solana_sdk::{decode_error::DecodeError, program_error::ProgramError};
use solana_program::{decode_error::DecodeError, program_error::ProgramError};
use thiserror::Error;
/// Errors that may be returned by the TokenSwap program.

6
solana/bridge/src/error_program.rs
View File

@ -1,14 +1,14 @@
#![cfg(feature = "program")]
use num_traits::FromPrimitive;
use solana_sdk::{decode_error::DecodeError, info, program_error::PrintProgramError};
use solana_program::{decode_error::DecodeError, program_error::PrintProgramError};
use crate::error::*;
impl PrintProgramError for Error {
fn print<E>(&self)
where
E: 'static + std::error::Error + DecodeError<E> + PrintProgramError + FromPrimitive,
where
E: 'static + std::error::Error + DecodeError<E> + PrintProgramError + FromPrimitive,
{
match self {
Error::ExpectedToken => info!("Error: ExpectedToken"),

26
solana/bridge/src/instruction.rs
View File

@ -4,7 +4,7 @@
use std::mem::size_of;
use primitive_types::U256;
use solana_sdk::{
use solana_program::{
instruction::{AccountMeta, Instruction},
program_error::ProgramError,
pubkey::Pubkey,
@ -286,8 +286,8 @@ pub fn initialize(
let guardian_set_key = Bridge::derive_guardian_set_id(program_id, &bridge_key, 0)?;
let accounts = vec![
AccountMeta::new_readonly(solana_sdk::system_program::id(), false),
AccountMeta::new_readonly(solana_sdk::sysvar::clock::id(), false),
AccountMeta::new_readonly(solana_program::system_program::id(), false),
AccountMeta::new_readonly(solana_program::sysvar::clock::id(), false),
AccountMeta::new(bridge_key, false),
AccountMeta::new(guardian_set_key, false),
AccountMeta::new(*sender, true),
@ -325,10 +325,10 @@ pub fn transfer_out(
let mut accounts = vec![
AccountMeta::new_readonly(*program_id, false),
AccountMeta::new_readonly(solana_sdk::system_program::id(), false),
AccountMeta::new_readonly(solana_program::system_program::id(), false),
AccountMeta::new_readonly(spl_token::id(), false),
AccountMeta::new_readonly(solana_sdk::sysvar::rent::id(), false),
AccountMeta::new_readonly(solana_sdk::sysvar::clock::id(), false),
AccountMeta::new_readonly(solana_program::sysvar::rent::id(), false),
AccountMeta::new_readonly(solana_program::sysvar::clock::id(), false),
AccountMeta::new(*token_account, false),
AccountMeta::new(bridge_key, false),
AccountMeta::new(transfer_key, false),
@ -366,8 +366,8 @@ pub fn verify_signatures(
let accounts = vec![
AccountMeta::new_readonly(*program_id, false),
AccountMeta::new_readonly(solana_sdk::system_program::id(), false),
AccountMeta::new_readonly(solana_sdk::sysvar::instructions::id(), false),
AccountMeta::new_readonly(solana_program::system_program::id(), false),
AccountMeta::new_readonly(solana_program::sysvar::instructions::id(), false),
AccountMeta::new(*signature_acc, false),
AccountMeta::new_readonly(guardian_set_key, false),
AccountMeta::new(*payer, true),
@ -407,9 +407,9 @@ pub fn post_vaa(
let mut accounts = vec![
AccountMeta::new_readonly(*program_id, false),
AccountMeta::new_readonly(solana_sdk::system_program::id(), false),
AccountMeta::new_readonly(solana_sdk::sysvar::rent::id(), false),
AccountMeta::new_readonly(solana_sdk::sysvar::clock::id(), false),
AccountMeta::new_readonly(solana_program::system_program::id(), false),
AccountMeta::new_readonly(solana_program::sysvar::rent::id(), false),
AccountMeta::new_readonly(solana_program::sysvar::clock::id(), false),
AccountMeta::new(bridge_key, false),
AccountMeta::new(guardian_set_key, false),
AccountMeta::new(claim_key, false),
@ -491,9 +491,9 @@ pub fn create_wrapped(
Bridge::derive_wrapped_meta_id(program_id, &bridge_key, &wrapped_mint_key)?;
let accounts = vec![
AccountMeta::new_readonly(solana_sdk::system_program::id(), false),
AccountMeta::new_readonly(solana_program::system_program::id(), false),
AccountMeta::new_readonly(spl_token::id(), false),
AccountMeta::new_readonly(solana_sdk::sysvar::rent::id(), false),
AccountMeta::new_readonly(solana_program::sysvar::rent::id(), false),
AccountMeta::new(bridge_key, false),
AccountMeta::new(*payer, true),
AccountMeta::new(wrapped_mint_key, false),

2
solana/bridge/src/lib.rs
View File

@ -1,5 +1,7 @@
#[macro_use]
extern crate zerocopy;
#[macro_use]
extern crate solana_program;
pub mod entrypoint;
pub mod error;

42
solana/bridge/src/processor.rs
View File

@ -7,9 +7,8 @@ use byteorder::ByteOrder;
use num_traits::AsPrimitive;
use primitive_types::U256;
use sha3::Digest;
#[cfg(target_arch = "bpf")]
use solana_sdk::program::invoke_signed;
use solana_sdk::{
use solana_program::program::invoke_signed;
use solana_program::{
account_info::{next_account_info, AccountInfo},
clock::Clock,
entrypoint::ProgramResult,
@ -22,7 +21,7 @@ use solana_sdk::{
system_instruction::{create_account, SystemInstruction},
sysvar::Sysvar,
};
use spl_token::{pack::Pack, state::Mint};
use spl_token::{state::Mint};
use crate::{
error::Error,
@ -33,6 +32,9 @@ use crate::{
state::*,
vaa::{BodyTransfer, BodyUpdateGuardianSet, VAABody, VAA},
};
use solana_program::program_pack::Pack;
use std::borrow::BorrowMut;
use std::ops::Add;
/// SigInfo contains metadata about signers in a VerifySignature ix
struct SigInfo {
@ -126,7 +128,7 @@ impl Bridge {
&bridge_seed,
)?;
let mut new_account_data = new_bridge_info.data.borrow_mut();
let mut new_account_data = new_bridge_info.try_borrow_mut_data()?;
let mut bridge: &mut Bridge = Self::unpack_unchecked(&mut new_account_data)?;
if bridge.is_initialized {
return Err(Error::AlreadyExists.into());
@ -143,7 +145,7 @@ impl Bridge {
&guardian_seed,
)?;
let mut new_guardian_data = new_guardian_info.data.borrow_mut();
let mut new_guardian_data = new_guardian_info.try_borrow_mut_data()?;
let mut guardian_info: &mut GuardianSet = Self::unpack_unchecked(&mut new_guardian_data)?;
if guardian_info.is_initialized {
return Err(Error::AlreadyExists.into());
@ -173,7 +175,7 @@ impl Bridge {
let account_info_iter = &mut accounts.iter();
let proposal_info = next_account_info(account_info_iter)?;
let mut transfer_data = proposal_info.data.borrow_mut();
let mut transfer_data = proposal_info.try_borrow_mut_data()?;
let mut proposal: &mut TransferOutProposal = Self::unpack(&mut transfer_data)?;
if proposal.vaa_time != 0 {
return Err(Error::VAAAlreadySubmitted.into());
@ -217,8 +219,8 @@ impl Bridge {
})
.collect();
let current_instruction = solana_sdk::sysvar::instructions::load_current_index(
&instruction_accounts.try_borrow_data()?,
let current_instruction = solana_program::sysvar::instructions::load_current_index(
&instruction_accounts.try_borrow_mut_data()?,
);
if current_instruction == 0 {
return Err(ProgramError::InvalidInstructionData);
@ -226,14 +228,14 @@ impl Bridge {
// The previous ix must be a secp verification instruction
let secp_ix_index = (current_instruction - 1) as u8;
let secp_ix = solana_sdk::sysvar::instructions::load_instruction_at(
let secp_ix = solana_program::sysvar::instructions::load_instruction_at(
secp_ix_index as usize,
&instruction_accounts.try_borrow_data()?,
&instruction_accounts.try_borrow_mut_data()?,
)
.map_err(|_| ProgramError::InvalidAccountData)?;
// Check that the instruction is actually for the secp program
if secp_ix.program_id != solana_sdk::secp256k1_program::id() {
if secp_ix.program_id != solana_program::secp256k1_program::id() {
return Err(ProgramError::InvalidArgument);
}
@ -316,7 +318,7 @@ impl Bridge {
return Err(Error::AlreadyExists.into());
}
let mut sig_state_data = sig_info.data.borrow_mut();
let mut sig_state_data = sig_info.try_borrow_mut_data()?;
let mut sig_state: &mut SignatureState = Self::unpack_unchecked(&mut sig_state_data)?;
if sig_state.is_initialized {
@ -416,7 +418,7 @@ impl Bridge {
)?;
// Load transfer account
let mut transfer_data = transfer_info.data.borrow_mut();
let mut transfer_data = transfer_info.try_borrow_mut_data()?;
let mut transfer: &mut TransferOutProposal = Self::unpack_unchecked(&mut transfer_data)?;
// Burn tokens
@ -498,7 +500,7 @@ impl Bridge {
)?;
// Load transfer account
let mut transfer_data = transfer_info.data.borrow_mut();
let mut transfer_data = transfer_info.try_borrow_mut_data()?;
let mut transfer: &mut TransferOutProposal = Self::unpack_unchecked(&mut transfer_data)?;
// Check that custody account was derived correctly
@ -608,7 +610,7 @@ impl Bridge {
}
// Verify sig state
let mut sig_state_data = sig_info.data.borrow_mut();
let mut sig_state_data = sig_info.try_borrow_mut_data()?;
let sig_state: &SignatureState = Self::unpack(&mut sig_state_data)?;
// Verify that signatures were made using the correct set
@ -671,7 +673,7 @@ impl Bridge {
}?;
// Load claim account
let mut claim_data = claim_info.data.borrow_mut();
let mut claim_data = claim_info.try_borrow_mut_data()?;
let claim: &mut ClaimedVAA = Bridge::unpack_unchecked(&mut claim_data)?;
if claim.is_initialized {
return Err(Error::VAAClaimed.into());
@ -724,7 +726,7 @@ impl Bridge {
&guardian_seed,
)?;
let mut guardian_set_new_data = new_guardian_info.data.borrow_mut();
let mut guardian_set_new_data = new_guardian_info.try_borrow_mut_data()?;
let guardian_set_new: &mut GuardianSet =
Bridge::unpack_unchecked(&mut guardian_set_new_data)?;
@ -845,7 +847,7 @@ impl Bridge {
return Err(Error::InvalidDerivedAccount.into());
}
let mut transfer_data = proposal_info.data.borrow_mut();
let mut transfer_data = proposal_info.try_borrow_mut_data()?;
let mut proposal: &mut TransferOutProposal = Self::unpack(&mut transfer_data)?;
if !proposal.matches_vaa(b) {
return Err(Error::VAAProposalMismatch.into());
@ -922,7 +924,7 @@ impl Bridge {
&wrapped_meta_seeds,
)?;
let mut wrapped_meta_data = wrapped_meta_info.data.borrow_mut();
let mut wrapped_meta_data = wrapped_meta_info.try_borrow_mut_data()?;
let wrapped_meta: &mut WrappedAssetMeta = Bridge::unpack_unchecked(&mut wrapped_meta_data)?;
wrapped_meta.is_initialized = true;

7
solana/bridge/src/state.rs
View File

@ -3,7 +3,7 @@
use std::mem::size_of;
use primitive_types::U256;
use solana_sdk::{account_info::AccountInfo, program_error::ProgramError, pubkey::Pubkey};
use solana_program::{account_info::AccountInfo, program_error::ProgramError, pubkey::Pubkey};
use zerocopy::AsBytes;
use crate::{
@ -11,6 +11,7 @@ use crate::{
instruction::{ForeignAddress, MAX_LEN_GUARDIAN_KEYS, MAX_VAA_SIZE},
vaa::BodyTransfer,
};
use solana_program::program_pack::Pack;
/// fee rate as a ratio
#[repr(C)]
@ -207,13 +208,13 @@ impl Bridge {
pub fn token_account_deserialize(
info: &AccountInfo,
) -> Result<spl_token::state::Account, Error> {
Ok(spl_token::pack::Pack::unpack(&mut info.data.borrow_mut())
Ok(spl_token::state::Account::unpack(&mut info.data.borrow_mut())
.map_err(|_| Error::ExpectedAccount)?)
}
/// Deserializes a spl_token `Mint`.
pub fn mint_deserialize(info: &AccountInfo) -> Result<spl_token::state::Mint, Error> {
Ok(spl_token::pack::Pack::unpack(&mut info.data.borrow_mut())
Ok(spl_token::state::Mint::unpack(&mut info.data.borrow_mut())
.map_err(|_| Error::ExpectedToken)?)
}

2
solana/bridge/src/vaa.rs
View File

@ -3,7 +3,7 @@ use std::io::{Cursor, Read, Write};
use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
use primitive_types::U256;
use sha3::Digest;
use solana_sdk::program_error::ProgramError;
use solana_program::program_error::ProgramError;
use crate::{error::Error, state::AssetMeta};

16
solana/cli/Cargo.toml
View File

@ -8,14 +8,14 @@ edition = "2018"
[dependencies]
clap = "2.33.0"
solana-clap-utils = { version = "1.3.11" }
solana-cli-config = { version = "1.3.11" }
solana-logger = { version = "1.3.11" }
solana-sdk = { version = "1.3.11" }
solana-client = { version = "1.3.11" }
solana-faucet = "1.3.11"
solana-account-decoder = { version = "1.3.11" }
spl-token = "=2.0.3"
solana-clap-utils = { version = "1.4.7" }
solana-cli-config = { version = "1.4.7" }
solana-logger = { version = "1.4.7" }
solana-sdk = { version = "1.4.7" }
solana-client = { version = "1.4.7" }
solana-faucet = "1.4.7"
solana-account-decoder = { version = "1.4.7" }
spl-token = "=3.0.0"
wormhole-bridge = { path = "../bridge" }
primitive-types = { version = "0.7.2" }
hex = "0.4.2"

27
solana/cli/src/main.rs
View File

@ -31,13 +31,13 @@ use spl_token::{
self,
instruction::*,
native_mint,
pack::Pack,
state::{Account, Mint},
};
use spl_bridge::{instruction::*, state::*};
use crate::faucet::request_and_confirm_airdrop;
use solana_sdk::program_pack::Pack;
mod faucet;
@ -79,7 +79,7 @@ fn command_deploy_bridge(
check_fee_payer_balance(
config,
minimum_balance_for_rent_exemption
+ fee_calculator.calculate_fee(&transaction.message(), None),
+ fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(&[&config.fee_payer, &config.owner], recent_blockhash);
Ok(Some(transaction))
@ -117,7 +117,7 @@ fn command_create_wrapped(
check_fee_payer_balance(
config,
minimum_balance_for_rent_exemption
+ fee_calculator.calculate_fee(&transaction.message(), None),
+ fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(&[&config.fee_payer, &config.owner], recent_blockhash);
Ok(Some(transaction))
@ -132,7 +132,7 @@ fn command_poke_proposal(config: &Config, bridge: &Pubkey, proposal: &Pubkey) ->
let (recent_blockhash, fee_calculator) = config.rpc_client.get_recent_blockhash()?;
check_fee_payer_balance(
config,
fee_calculator.calculate_fee(&transaction.message(), None),
fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(&[&config.fee_payer, &config.owner], recent_blockhash);
Ok(Some(transaction))
@ -211,7 +211,7 @@ fn command_lock_tokens(
check_fee_payer_balance(
config,
minimum_balance_for_rent_exemption
+ fee_calculator.calculate_fee(&transaction.message(), None),
+ fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(&[&config.fee_payer, &config.owner], recent_blockhash);
Ok(Some(transaction))
@ -278,7 +278,7 @@ fn command_create_token(config: &Config, decimals: u8, token: Keypair) -> Commma
check_fee_payer_balance(
config,
minimum_balance_for_rent_exemption
+ fee_calculator.calculate_fee(&transaction.message(), None),
+ fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(
&[&config.fee_payer, &config.owner, &token],
@ -317,7 +317,7 @@ fn command_create_account(config: &Config, token: Pubkey, account: Keypair) -> C
check_fee_payer_balance(
config,
minimum_balance_for_rent_exemption
+ fee_calculator.calculate_fee(&transaction.message(), None),
+ fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(
&[&config.fee_payer, &config.owner, &account],
@ -349,7 +349,7 @@ fn command_assign(config: &Config, account: Pubkey, new_owner: Pubkey) -> Commma
let (recent_blockhash, fee_calculator) = config.rpc_client.get_recent_blockhash()?;
check_fee_payer_balance(
config,
fee_calculator.calculate_fee(&transaction.message(), None),
fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(&[&config.fee_payer, &config.owner], recent_blockhash);
Ok(Some(transaction))
@ -388,7 +388,7 @@ fn command_transfer(
let (recent_blockhash, fee_calculator) = config.rpc_client.get_recent_blockhash()?;
check_fee_payer_balance(
config,
fee_calculator.calculate_fee(&transaction.message(), None),
fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(&[&config.fee_payer, &config.owner], recent_blockhash);
Ok(Some(transaction))
@ -424,7 +424,7 @@ fn command_burn(config: &Config, source: Pubkey, ui_amount: f64) -> CommmandResu
let (recent_blockhash, fee_calculator) = config.rpc_client.get_recent_blockhash()?;
check_fee_payer_balance(
config,
fee_calculator.calculate_fee(&transaction.message(), None),
fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(&[&config.fee_payer, &config.owner], recent_blockhash);
Ok(Some(transaction))
@ -462,7 +462,7 @@ fn command_mint(
let (recent_blockhash, fee_calculator) = config.rpc_client.get_recent_blockhash()?;
check_fee_payer_balance(
config,
fee_calculator.calculate_fee(&transaction.message(), None),
fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(&[&config.fee_payer, &config.owner], recent_blockhash);
Ok(Some(transaction))
@ -496,7 +496,7 @@ fn command_wrap(config: &Config, sol: f64) -> CommmandResult {
check_owner_balance(config, lamports)?;
check_fee_payer_balance(
config,
fee_calculator.calculate_fee(&transaction.message(), None),
fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(
&[&config.fee_payer, &config.owner, &account],
@ -532,7 +532,7 @@ fn command_unwrap(config: &Config, address: Pubkey) -> CommmandResult {
let (recent_blockhash, fee_calculator) = config.rpc_client.get_recent_blockhash()?;
check_fee_payer_balance(
config,
fee_calculator.calculate_fee(&transaction.message(), None),
fee_calculator.calculate_fee(&transaction.message()),
)?;
transaction.sign(&[&config.fee_payer, &config.owner], recent_blockhash);
Ok(Some(transaction))
@ -1321,6 +1321,7 @@ fn main() {
// TODO: move to https://github.com/solana-labs/solana/pull/11792
skip_preflight: true,
preflight_commitment: None,
encoding: None,
},
)?;
println!("Signature: {}", signature);

81
third_party/solana/Add_crypto_syscalls.patch vendored
View File

@ -15,84 +15,3 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
echo "${genesis_args[@]}" > spl-genesis-args.sh
echo
Index: account-decoder/src/parse_token.rs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- account-decoder/src/parse_token.rs (revision 97144cdb8e9cb4d83943b0b5898d08f57844a4dd)
+++ account-decoder/src/parse_token.rs (date 1598606089966)
@@ -30,11 +30,7 @@
if data.len() == size_of::<Account>() {
let account: Account = *unpack(&mut data)
.map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?;
- let decimals = mint_decimals.ok_or_else(|| {
- ParseAccountError::AdditionalDataMissing(
- "no mint_decimals provided to parse spl-token account".to_string(),
- )
- })?;
+ let decimals = mint_decimals.or(Some(0)).unwrap();
Ok(TokenAccountType::Account(UiTokenAccount {
mint: account.mint.to_string(),
owner: account.owner.to_string(),
Index: programs/bpf_loader/src/bpf_verifier.rs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- programs/bpf_loader/src/bpf_verifier.rs (revision 6563726f227414164c32a0373fa32b0f87fbd4e8)
+++ programs/bpf_loader/src/bpf_verifier.rs (date 1600862128332)
@@ -58,7 +58,7 @@
if prog.len() % ebpf::INSN_SIZE != 0 {
return Err(VerifierError::ProgramLengthNotMultiple.into());
}
- if prog.len() > ebpf::PROG_MAX_SIZE {
+ if prog.len() > ebpf::PROG_MAX_SIZE * 2 {
return Err(VerifierError::ProgramTooLarge(prog.len() / ebpf::INSN_SIZE).into());
}
--- core/src/rpc.rs
+++ core/src/rpc.rs
@@ -2210,6 +2210,10 @@ impl RpcSol for RpcSolImpl {
return Err(RpcCustomError::TransactionSignatureVerificationFailure.into());
}
+ if let Err(e) = transaction.verify_precompiles() {
+ return Err(RpcCustomError::TransactionPrecompileVerificationFailure(e).into());
+ }
+
if meta.health.check() != RpcHealthStatus::Ok {
return Err(RpcCustomError::RpcNodeUnhealthy.into());
}
--- core/src/rpc_error.rs
+++ core/src/rpc_error.rs
@@ -7,6 +7,7 @@ const JSON_RPC_SERVER_ERROR_2: i64 = -32002;
const JSON_RPC_SERVER_ERROR_3: i64 = -32003;
const JSON_RPC_SERVER_ERROR_4: i64 = -32004;
const JSON_RPC_SERVER_ERROR_5: i64 = -32005;
+const JSON_RPC_SERVER_ERROR_6: i64 = -32006;
pub enum RpcCustomError {
BlockCleanedUp {
@@ -22,6 +23,7 @@ pub enum RpcCustomError {
slot: Slot,
},
RpcNodeUnhealthy,
+ TransactionPrecompileVerificationFailure(solana_sdk::transaction::TransactionError),
}
impl From<RpcCustomError> for Error {
@@ -58,6 +60,11 @@ impl From<RpcCustomError> for Error {
message: "RPC node is unhealthy".to_string(),
data: None,
},
+ RpcCustomError::TransactionPrecompileVerificationFailure(e) => Self {
+ code: ErrorCode::ServerError(JSON_RPC_SERVER_ERROR_6),
+ message: format!("Transaction precompile verification failure {:?}", e),
+ data: None,
+ },
}
}
}

2
third_party/solana/Dockerfile vendored
View File

@ -11,7 +11,7 @@ RUN rustup component add rustfmt
WORKDIR /usr/src/solana
RUN git clone https://github.com/solana-labs/solana --branch master && \
cd solana && git checkout 5dcf3480986a87cc9c80788c1d8ccd8f0cb44a8d
cd solana && git checkout v1.4.7
ADD *.patch .