Skip to content

Add meta-call feature flag #146

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

Merged
artob merged 1 commit into from
Jun 17, 2021
Merged

Add meta-call feature flag #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,5 @@ contract = ["engine"]
evm_bully = []
log = []
exit-precompiles = ["contract"]
meta-call = ["contract"]
integration-test = ["log"]
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ target/wasm32-unknown-unknown/debug/aurora_engine.wasm: Cargo.toml Cargo.lock $(
$(CARGO) build --target wasm32-unknown-unknown --no-default-features --features=$(FEATURES) -Z avoid-dev-deps

test-build: etc/eth-contracts/artifacts/contracts/test/StateTest.sol/StateTest.json etc/eth-contracts/res/EvmErc20.bin
RUSTFLAGS='-C link-arg=-s' $(CARGO) build --target wasm32-unknown-unknown --release --no-default-features --features=contract,integration-test,exit-precompiles -Z avoid-dev-deps
RUSTFLAGS='-C link-arg=-s' $(CARGO) build --target wasm32-unknown-unknown --release --no-default-features --features=contract,integration-test,exit-precompiles,meta-call -Z avoid-dev-deps
ln -sf target/wasm32-unknown-unknown/release/aurora_engine.wasm release.wasm
ls -l target/wasm32-unknown-unknown/release/aurora_engine.wasm

Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use crate::parameters::PromiseCreateArgs;

#[cfg(feature = "engine")]
mod map;
#[cfg(feature = "meta-call")]
pub mod meta_parsing;
pub mod parameters;
pub mod prelude;
Expand Down Expand Up @@ -279,6 +280,7 @@ mod contract {
.sdk_process();
}

#[cfg(feature = "meta-call")]
#[no_mangle]
pub extern "C" fn meta_call() {
let input = sdk::read_input();
Expand Down
4 changes: 3 additions & 1 deletion tests/test_meta_parsing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ use borsh::BorshSerialize;

use near_crypto::{InMemorySigner, KeyType, PublicKey, Signature, Signer};

#[cfg(feature = "meta-call")]
use aurora_engine::meta_parsing::{near_erc712_domain, parse_meta_call, prepare_meta_call_args};
use aurora_engine::parameters::MetaCallArgs;
use aurora_engine::prelude::{Address, U256};
use aurora_engine::types::{keccak, u256_to_arr, InternalMetaCallArgs, Wei};

#[cfg(feature = "meta-call")]
pub fn encode_meta_call_function_args(
signer: &dyn Signer,
chain_id: u64,
Expand Down Expand Up @@ -73,7 +75,7 @@ pub fn public_key_to_address(public_key: PublicKey) -> Address {
}
}

#[test]
#[cfg(all(feature = "meta-call", test))]
fn test_meta_parsing() {
let chain_id = 1313161555;
let signer = InMemorySigner::from_seed("doesnt", KeyType::SECP256K1, "a");
Expand Down