Skip to content

feat: Implemented Configurable Fee Model (Per-Escrow & Token-Specific Fees) to close #93 #130

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
Cedarich merged 4 commits into from
Mar 3, 2026
Merged

feat: Implemented Configurable Fee Model (Per-Escrow & Token-Specific Fees) to close #93 #130

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
6177db4
feat: Implemented Configurable Fee Model (Per-Escrow & Token-Specific…
Oluwaseyi89 Feb 26, 2026
13e5649
feat: resolved merge conflict and fmt errors
Oluwaseyi89 Mar 2, 2026
b980308
feat: resolved clippy errors
Oluwaseyi89 Mar 2, 2026
04ff39b
feat: resolved bugs causing panic and ensured all tests passed
Oluwaseyi89 Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
514 changes: 514 additions & 0 deletions apps/onchain/src/fee_tests.rs
View file
Open in desktop

Large diffs are not rendered by default.

328 changes: 289 additions & 39 deletions apps/onchain/src/lib.rs
View file
Open in desktop

Large diffs are not rendered by default.

602 changes: 602 additions & 0 deletions apps/onchain/src/test.rs
View file
Open in desktop

Large diffs are not rendered by default.

2,853 changes: 2,853 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_cancel_escrow_uses_token_fee_override.1.json
View file
Open in desktop

Large diffs are not rendered by default.

3,172 changes: 3,172 additions & 0 deletions .../onchain/test_snapshots/fee_tests/test_fee_precedence_escrow_over_token_and_global.1.json
View file
Open in desktop

Large diffs are not rendered by default.

800 changes: 800 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_max_fee_10000_bps_valid.1.json
View file
Open in desktop

Large diffs are not rendered by default.

2,725 changes: 2,725 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_refund_expired_uses_escrow_fee_override.1.json
View file
Open in desktop

Large diffs are not rendered by default.

3,338 changes: 3,338 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_release_milestone_uses_escrow_fee_override.1.json
View file
Open in desktop

Large diffs are not rendered by default.

2,928 changes: 2,928 additions & 0 deletions ...onchain/test_snapshots/fee_tests/test_release_milestone_uses_global_fee_by_default.1.json
View file
Open in desktop

Large diffs are not rendered by default.

3,133 changes: 3,133 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_release_milestone_uses_token_fee_override.1.json
View file
Open in desktop

Large diffs are not rendered by default.

415 changes: 415 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_set_escrow_fee_invalid_fee_too_high.1.json
View file
Open in desktop

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_set_escrow_fee_valid.1.json
View file
Open in desktop

Large diffs are not rendered by default.

727 changes: 727 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_set_token_fee_invalid_fee_too_high.1.json
View file
Open in desktop

Large diffs are not rendered by default.

800 changes: 800 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_set_token_fee_valid.1.json
View file
Open in desktop

Large diffs are not rendered by default.

2,584 changes: 2,584 additions & 0 deletions apps/onchain/test_snapshots/fee_tests/test_zero_fee_valid.1.json
View file
Open in desktop

Large diffs are not rendered by default.

163 changes: 163 additions & 0 deletions apps/onchain/test_snapshots/test/test_admin_resolves_dispute_to_depositor.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1958,6 +1958,117 @@
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "0000000000000000000000000000000000000000000000000000000000000001",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_call"
},
{
"bytes": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739"
},
{
"symbol": "balance"
}
],
"data": {
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_return"
},
{
"symbol": "balance"
}
],
"data": {
"i128": {
"hi": 0,
"lo": 5000
}
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "0000000000000000000000000000000000000000000000000000000000000001",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_call"
},
{
"bytes": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739"
},
{
"symbol": "allowance"
}
],
"data": {
"vec": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
},
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
}
]
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_return"
},
{
"symbol": "allowance"
}
],
"data": {
"i128": {
"hi": 0,
"lo": 5000
}
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
Expand Down Expand Up @@ -2217,6 +2328,58 @@
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "0000000000000000000000000000000000000000000000000000000000000001",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_call"
},
{
"bytes": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739"
},
{
"symbol": "balance"
}
],
"data": {
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_return"
},
{
"symbol": "balance"
}
],
"data": {
"i128": {
"hi": 0,
"lo": 5000
}
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
Expand Down
163 changes: 163 additions & 0 deletions apps/onchain/test_snapshots/test/test_admin_resolves_dispute_to_recipient.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2031,6 +2031,117 @@
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "0000000000000000000000000000000000000000000000000000000000000001",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_call"
},
{
"bytes": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739"
},
{
"symbol": "balance"
}
],
"data": {
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_return"
},
{
"symbol": "balance"
}
],
"data": {
"i128": {
"hi": 0,
"lo": 10000
}
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "0000000000000000000000000000000000000000000000000000000000000001",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_call"
},
{
"bytes": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739"
},
{
"symbol": "allowance"
}
],
"data": {
"vec": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
},
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
}
]
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_return"
},
{
"symbol": "allowance"
}
],
"data": {
"i128": {
"hi": 0,
"lo": 10000
}
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
Expand Down Expand Up @@ -2290,6 +2401,58 @@
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "0000000000000000000000000000000000000000000000000000000000000001",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_call"
},
{
"bytes": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739"
},
{
"symbol": "balance"
}
],
"data": {
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
"contract_id": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739",
"type_": "diagnostic",
"body": {
"v0": {
"topics": [
{
"symbol": "fn_return"
},
{
"symbol": "balance"
}
],
"data": {
"i128": {
"hi": 0,
"lo": 10000
}
}
}
}
},
"failed_call": false
},
{
"event": {
"ext": "v0",
Expand Down
Loading