Skip to content

Emit vaultless add-order IO #2770

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
findolor wants to merge 1 commit into
base: rai-1063-settings-vaultless-io
Choose a base branch
from
Open

Emit vaultless add-order IO #2770

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
152 changes: 149 additions & 3 deletions crates/common/src/add_order.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use rain_metadata::{
ContentLanguage, ContentType, Error as RainMetaError, KnownMagic, RainMetaDocumentV1Item,
};
use rain_metadata_bindings::MetaBoard::emitMetaCall;
use raindex_app_settings::deployment::DeploymentCfg;
use raindex_app_settings::{deployment::DeploymentCfg, order::OrderIOCfg};
use raindex_bindings::provider::{mk_read_provider, ReadProviderError};
use raindex_bindings::IRaindexV6::{addOrder4Call, EvaluableV4, OrderConfigV4, TaskV2, IOV2};
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -98,6 +98,14 @@ pub struct AddOrderArgs {
}

impl AddOrderArgs {
fn order_io_vault_id(io: &OrderIOCfg, random_vault_id: B256) -> B256 {
if io.vaultless {
B256::ZERO
} else {
io.vault_id.map(B256::from).unwrap_or(random_vault_id)
}
}

/// create a new instance from Deployment
pub async fn new_from_deployment(
dotrain: String,
Expand All @@ -115,7 +123,7 @@ impl AddOrderArgs {

inputs.push(IOV2 {
token: input_token.address,
vaultId: input.vault_id.map(B256::from).unwrap_or(random_vault_id),
vaultId: Self::order_io_vault_id(input, random_vault_id),
});
}

Expand All @@ -128,7 +136,7 @@ impl AddOrderArgs {

outputs.push(IOV2 {
token: output_token.address,
vaultId: output.vault_id.map(B256::from).unwrap_or(random_vault_id),
vaultId: Self::order_io_vault_id(output, random_vault_id),
});
}

Expand Down Expand Up @@ -759,6 +767,144 @@ _ _: 0 0;
assert_eq!(result.inputs[0].vaultId, result.outputs[0].vaultId);
}

#[tokio::test]
async fn test_add_order_vaultless_io_uses_zero_vault_id() {
let network = NetworkCfg {
document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
key: "test-network".to_string(),
rpcs: vec![Url::parse("https://some-rpc.com").unwrap()],
chain_id: 137,
label: None,
network_id: None,
currency: None,
};
let network_arc = Arc::new(network);
let rainlang = RainlangCfg {
document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
key: "".to_string(),
network: network_arc.clone(),
address: Address::default(),
};
let scenario = ScenarioCfg {
document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
documents: default_documents(),
key: "test-scenario".to_string(),
bindings: HashMap::new(),
runs: None,
blocks: None,
rainlang: Arc::new(rainlang),
};
let token1 = Arc::new(TokenCfg {
document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
key: "token1".to_string(),
address: Address::repeat_byte(1),
network: network_arc.clone(),
decimals: Some(18),
label: None,
symbol: Some("Token1".to_string()),
logo_uri: None,
extensions: None,
});
let token2 = Arc::new(TokenCfg {
document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
key: "token2".to_string(),
address: Address::repeat_byte(2),
network: network_arc.clone(),
decimals: Some(18),
label: None,
symbol: Some("Token2".to_string()),
logo_uri: None,
extensions: None,
});
let token3 = Arc::new(TokenCfg {
document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
key: "token3".to_string(),
address: Address::repeat_byte(3),
network: network_arc.clone(),
decimals: Some(18),
label: None,
symbol: Some("Token3".to_string()),
logo_uri: None,
extensions: None,
});
let token4 = Arc::new(TokenCfg {
document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
key: "token4".to_string(),
address: Address::repeat_byte(4),
network: network_arc.clone(),
decimals: Some(18),
label: None,
symbol: Some("Token4".to_string()),
logo_uri: None,
extensions: None,
});
let known_vault_id = U256::from(7);
let order = OrderCfg {
document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
key: "".to_string(),
inputs: vec![
OrderIOCfg {
token_key: token1.key.clone(),
token: Some(token1.clone()),
vaultless: true,
vault_id: None,
},
OrderIOCfg {
token_key: token2.key.clone(),
token: Some(token2.clone()),
vaultless: false,
vault_id: Some(known_vault_id),
},
],
outputs: vec![
OrderIOCfg {
token_key: token3.key.clone(),
token: Some(token3.clone()),
vaultless: true,
vault_id: None,
},
OrderIOCfg {
token_key: token4.key.clone(),
token: Some(token4.clone()),
vaultless: false,
vault_id: None,
},
],
network: network_arc.clone(),
rainlang: None,
raindex: None,
oracle_url: None,
};
let deployment = DeploymentCfg {
document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
key: "".to_string(),
scenario: Arc::new(scenario),
order: Arc::new(order),
};

let dotrain = format!(
"
version: {spec_version}
---
#calculate-io
_ _: 0 0;
#handle-io
:;
#handle-add-order
_ _: 0 0;
",
spec_version = SpecVersion::current()
);
let result = AddOrderArgs::new_from_deployment(dotrain, deployment, None)
.await
.unwrap();

assert_eq!(result.inputs[0].vaultId, B256::ZERO);
assert_eq!(result.outputs[0].vaultId, B256::ZERO);
assert_eq!(result.inputs[1].vaultId, B256::from(known_vault_id));
assert_ne!(result.outputs[1].vaultId, B256::ZERO);
}

#[tokio::test]
async fn test_into_add_order_call() {
let local_evm = LocalEvm::new_with_tokens(2).await;
Expand Down
Loading