Skip to content

feat: implement multi-contract indexing and sanitize core architecture #148

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
mikewheeleer merged 5 commits into from
Apr 1, 2026
Merged

feat: implement multi-contract indexing and sanitize core architecture #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5c080a
feat: implement multi-contract indexing and sanitize core architecture
jerrygeorge360 Mar 27, 2026
54dbe54
lint format
jerrygeorge360 Mar 27, 2026
295b5ce
Merge branch 'main' into feature/contracts-20-multi-contract-indexing…
jerrygeorge360 Mar 29, 2026
898b113
bug/syntax error
jerrygeorge360 Mar 29, 2026
5111c0a
Merge branch 'main' into feature/contracts-20-multi-contract-indexing…
mikewheeleer Apr 1, 2026
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
32 changes: 20 additions & 12 deletions contracts/escrow/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ fn test_create_contract() {
#[test]
fn test_create_contract_with_arbiter() {
let env = Env::default();
env.mock_all_auths();
let contract_id = env.register(Escrow, ());
let client = EscrowClient::new(&env, &contract_id);

Expand All @@ -63,6 +64,7 @@ fn test_create_contract_with_arbiter() {
#[should_panic(expected = "At least one milestone required")]
fn test_create_contract_no_milestones() {
let env = Env::default();
env.mock_all_auths();
let contract_id = env.register(Escrow, ());
let client = EscrowClient::new(&env, &contract_id);

Expand Down Expand Up @@ -127,6 +129,7 @@ fn test_create_contract_negative_amount() {
#[test]
fn test_deposit_funds() {
let env = Env::default();
env.mock_all_auths();
let contract_id = env.register(Escrow, ());
let client = EscrowClient::new(&env, &contract_id);

Expand Down Expand Up @@ -157,6 +160,7 @@ fn test_deposit_funds() {
#[should_panic(expected = "Deposit amount must equal total milestone amounts")]
fn test_deposit_funds_wrong_amount() {
let env = Env::default();
env.mock_all_auths();
let contract_id = env.register(Escrow, ());
let client = EscrowClient::new(&env, &contract_id);

Expand Down Expand Up @@ -246,6 +250,7 @@ fn test_approve_milestone_release_unauthorized() {
let env = Env::default();
let contract_id = env.register(Escrow, ());
let client = EscrowClient::new(&env, &contract_id);
env.mock_all_auths();

let client_addr = Address::generate(&env);
let freelancer_addr = Address::generate(&env);
Expand Down Expand Up @@ -425,6 +430,7 @@ fn test_release_milestone_already_released() {
// Use 2 milestones so releasing the first one doesn't set status to Completed
let milestones = vec![&env, 1000_0000000_i128, 2000_0000000_i128];

env.mock_all_auths();
// Create contract
client.create_contract(
&client_addr,
Expand All @@ -437,14 +443,14 @@ fn test_release_milestone_already_released() {
);

env.mock_all_auths();
client.deposit_funds(&1, &client_addr, &3000_0000000);
client.approve_milestone_release(&1, &client_addr, &0);
client.deposit_funds(&0, &client_addr, &3000_0000000);
client.approve_milestone_release(&0, &client_addr, &0);

let result = client.release_milestone(&1, &client_addr, &0);
let result = client.release_milestone(&0, &client_addr, &0);
assert!(result);

// Try to release again — should panic with "Milestone already released"
client.release_milestone(&1, &client_addr, &0);
client.release_milestone(&0, &client_addr, &0);
}

#[test]
Expand All @@ -458,6 +464,7 @@ fn test_release_milestone_multi_sig() {
let arbiter_addr = Address::generate(&env);
let milestones = vec![&env, 1000_0000000_i128];

env.mock_all_auths();
// Create contract
client.create_contract(
&client_addr,
Expand All @@ -470,10 +477,10 @@ fn test_release_milestone_multi_sig() {
);

env.mock_all_auths();
client.deposit_funds(&1, &client_addr, &1000_0000000);
client.approve_milestone_release(&1, &client_addr, &0);
client.deposit_funds(&0, &client_addr, &1000_0000000);
client.approve_milestone_release(&0, &client_addr, &0);

let result = client.release_milestone(&1, &client_addr, &0);
let result = client.release_milestone(&0, &client_addr, &0);
assert!(result);
}

Expand All @@ -487,6 +494,7 @@ fn test_contract_completion_all_milestones_released() {
let freelancer_addr = Address::generate(&env);
let milestones = vec![&env, 1000_0000000_i128, 2000_0000000_i128];

env.mock_all_auths();
// Create contract
client.create_contract(
&client_addr,
Expand All @@ -499,13 +507,13 @@ fn test_contract_completion_all_milestones_released() {
);

env.mock_all_auths();
client.deposit_funds(&1, &client_addr, &3000_0000000);
client.deposit_funds(&0, &client_addr, &3000_0000000);

client.approve_milestone_release(&1, &client_addr, &0);
client.release_milestone(&1, &client_addr, &0);
client.approve_milestone_release(&0, &client_addr, &0);
client.release_milestone(&0, &client_addr, &0);

client.approve_milestone_release(&1, &client_addr, &1);
client.release_milestone(&1, &client_addr, &1);
client.approve_milestone_release(&0, &client_addr, &1);
client.release_milestone(&0, &client_addr, &1);

// All milestones should be released and contract completed
// Note: In a real implementation, we would check the contract status
Expand Down
74 changes: 71 additions & 3 deletions contracts/escrow/test_snapshots/test/test_approve_milestone_release_already_approved.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,43 @@
"nonce": 0
},
"auth": [
[],
[],
[
[
"CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
{
"function": {
"contract_fn": {
"contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"function_name": "create_contract",
"args": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
},
"void",
{
"vec": [
{
"i128": {
"hi": 0,
"lo": 10000000000
}
}
]
},
{
"u32": 0
}
]
}
},
"sub_invocations": []
}
]
],
[
[
"CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
Expand All @@ -16,7 +51,7 @@
"function_name": "deposit_funds",
"args": [
{
"u32": 1
"u32": 0
},
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
Expand Down Expand Up @@ -44,7 +79,7 @@
"function_name": "approve_milestone_release",
"args": [
{
"u32": 1
"u32": 0
},
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
Expand Down Expand Up @@ -309,6 +344,39 @@
6311999
]
],
[
{
"contract_data": {
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
"key": {
"ledger_key_nonce": {
"nonce": 1033654523790656264
}
},
"durability": "temporary"
}
},
[
{
"last_modified_ledger_seq": 0,
"data": {
"contract_data": {
"ext": "v0",
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
"key": {
"ledger_key_nonce": {
"nonce": 1033654523790656264
}
},
"durability": "temporary",
"val": "void"
}
},
"ext": "v0"
},
6311999
]
],
[
{
"contract_data": {
Expand Down
43 changes: 40 additions & 3 deletions ...racts/escrow/test_snapshots/test/test_approve_milestone_release_client_and_arbiter.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,45 @@
"nonce": 0
},
"auth": [
[],
[],
[
[
"CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
{
"function": {
"contract_fn": {
"contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"function_name": "create_contract",
"args": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
},
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
},
{
"vec": [
{
"i128": {
"hi": 0,
"lo": 10000000000
}
}
]
},
{
"u32": 2
}
]
}
},
"sub_invocations": []
}
]
],
[
[
"CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
Expand All @@ -16,7 +53,7 @@
"function_name": "deposit_funds",
"args": [
{
"u32": 1
"u32": 0
},
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
Expand Down Expand Up @@ -44,7 +81,7 @@
"function_name": "approve_milestone_release",
"args": [
{
"u32": 1
"u32": 0
},
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
Expand Down
Loading
Loading