Skip to content

fix: no more optimistic and double counting across epochs #106

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
matteoettam09 merged 5 commits into from
Nov 19, 2025
Merged

fix: no more optimistic and double counting across epochs #106

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
38b5328
fix: no more optimistic and double counting across epochs along with …
ojasarora77 Nov 18, 2025
3ab4a4f
Merge branch 'main' into issue-20
matteoettam09 Nov 19, 2025
ea89368
fix: unused variables
matteoettam09 Nov 19, 2025
6b82826
feat: configurable maxFulfillBatchSize
matteoettam09 Nov 19, 2025
f3b0904
feat: stateful pendingLPstates
matteoettam09 Nov 19, 2025
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
43 changes: 41 additions & 2 deletions artifacts/contracts/OrionConfig.sol/OrionConfig.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...ts/execution/OrionAssetERC4626ExecutionAdapter.sol/OrionAssetERC4626ExecutionAdapter.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions artifacts/contracts/factories/TransparentVaultFactory.sol/TransparentVaultFactory.json
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions artifacts/contracts/interfaces/IOrionConfig.sol/IOrionConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,19 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "maxFulfillBatchSize",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "minDepositAmount",
Expand Down Expand Up @@ -482,6 +495,19 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "size",
"type": "uint256"
}
],
"name": "setMaxFulfillBatchSize",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
Expand Down
16 changes: 14 additions & 2 deletions artifacts/contracts/interfaces/IOrionTransparentVault.sol/IOrionTransparentVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,13 @@
"type": "function"
},
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "fulfillBatchSize",
"type": "uint256"
}
],
"name": "pendingDeposit",
"outputs": [
{
Expand All @@ -847,7 +853,13 @@
"type": "function"
},
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "fulfillBatchSize",
"type": "uint256"
}
],
"name": "pendingRedeem",
"outputs": [
{
Expand Down
16 changes: 14 additions & 2 deletions artifacts/contracts/interfaces/IOrionVault.sol/IOrionVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,13 @@
"type": "function"
},
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "fulfillBatchSize",
"type": "uint256"
}
],
"name": "pendingDeposit",
"outputs": [
{
Expand All @@ -811,7 +817,13 @@
"type": "function"
},
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "fulfillBatchSize",
"type": "uint256"
}
],
"name": "pendingRedeem",
"outputs": [
{
Expand Down
17 changes: 15 additions & 2 deletions artifacts/contracts/libraries/EventsLib.sol/EventsLib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,19 @@
"name": "InternalStateProcessed",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "uint256",
"name": "maxFulfillBatchSize",
"type": "uint256"
}
],
"name": "MaxFulfillBatchSizeUpdated",
"type": "event"
},
{
"anonymous": false,
"inputs": [
Expand Down Expand Up @@ -323,8 +336,8 @@
"type": "event"
}
],
"bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212207a8a2ee69932aafdeb08db93ab50287087b7b67e4ed585d9b44fbcf118deaf0864736f6c634300081c0033",
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212207a8a2ee69932aafdeb08db93ab50287087b7b67e4ed585d9b44fbcf118deaf0864736f6c634300081c0033",
"bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212205f1a0ecf0ca5e586054e4b14ffaf40b756f90c8fff80159a6c464e5799d322ce64736f6c634300081c0033",
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212205f1a0ecf0ca5e586054e4b14ffaf40b756f90c8fff80159a6c464e5799d322ce64736f6c634300081c0033",
"linkReferences": {},
"deployedLinkReferences": {}
}
4 changes: 2 additions & 2 deletions ...ts/contracts/orchestrators/InternalStatesOrchestrator.sol/InternalStatesOrchestrator.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions artifacts/contracts/orchestrators/LiquidityOrchestrator.sol/LiquidityOrchestrator.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...acts/contracts/price/OrionAssetERC4626PriceAdapter.sol/OrionAssetERC4626PriceAdapter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
"type": "function"
}
],
"bytecode": "0x608060405234801561000f575f5ffd5b5060405161065138038061065183398101604081905261002e91610182565b6001600160a01b0381166100555760405163d92e233d60e01b815260040160405180910390fd5b5f80546001600160a01b0319166001600160a01b03831690811790915560408051631c56369f60e21b81529051637158da7c916004808201926020929091908290030181865afa1580156100ab573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906100cf9190610182565b600180546001600160a01b0319166001600160a01b039290921691821790556040805163313ce56760e01b8152905163313ce567916004808201926020929091908290030181865afa158015610127573d5f5f3e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061014b91906101a4565b600160146101000a81548160ff021916908360ff160217905550506101c4565b6001600160a01b038116811461017f575f5ffd5b50565b5f60208284031215610192575f5ffd5b815161019d8161016b565b9392505050565b5f602082840312156101b4575f5ffd5b815160ff8116811461019d575f5ffd5b610480806101d15f395ff3fe608060405234801561000f575f5ffd5b5060043610610055575f3560e01c80636ab8bdef146100595780637158da7c1461006e57806372279ba11461009757806379502c55146100c15780639a32c207146100d3575b5f5ffd5b61006c6100673660046102bb565b6100f9565b005b600154610081906001600160a01b031681565b60405161008e91906102dd565b60405180910390f35b6100aa6100a53660046102bb565b6101b0565b6040805192835260ff90911660208301520161008e565b5f54610081906001600160a01b031681565b6001546100e790600160a01b900460ff1681565b60405160ff909116815260200161008e565b806001600160a01b03166338d52e0f6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610153575060408051601f3d908101601f19168201909252610150918101906102f1565b60015b61017b5780604051633283c86d60e21b815260040161017291906102dd565b60405180910390fd5b6001546001600160a01b038281169116146101ab5781604051633283c86d60e21b815260040161017291906102dd565b505b50565b5f5f5f836001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101ef573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610213919061030c565b90505f61022182600a610425565b6040516303d1689d60e11b8152600481018290529091505f906001600160a01b038716906307a2d13a90602401602060405180830381865afa158015610269573d5f5f3e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061028d9190610433565b6001549097600160a01b90910460ff169650945050505050565b6001600160a01b03811681146101ad575f5ffd5b5f602082840312156102cb575f5ffd5b81356102d6816102a7565b9392505050565b6001600160a01b0391909116815260200190565b5f60208284031215610301575f5ffd5b81516102d6816102a7565b5f6020828403121561031c575f5ffd5b815160ff811681146102d6575f5ffd5b634e487b7160e01b5f52601160045260245ffd5b6001815b600184111561037b5780850481111561035f5761035f61032c565b600184161561036d57908102905b60019390931c928002610344565b935093915050565b5f826103915750600161041f565b8161039d57505f61041f565b81600181146103b357600281146103bd576103d9565b600191505061041f565b60ff8411156103ce576103ce61032c565b50506001821b61041f565b5060208310610133831016604e8410600b84101617156103fc575081810a61041f565b6104085f198484610340565b805f190482111561041b5761041b61032c565b0290505b92915050565b5f6102d660ff841683610383565b5f60208284031215610443575f5ffd5b505191905056fea2646970667358221220c915475a3787be3f327b79d53e7725755cafc5da6410d3a0b77ea83bde6becf164736f6c634300081c0033",
"deployedBytecode": "0x608060405234801561000f575f5ffd5b5060043610610055575f3560e01c80636ab8bdef146100595780637158da7c1461006e57806372279ba11461009757806379502c55146100c15780639a32c207146100d3575b5f5ffd5b61006c6100673660046102bb565b6100f9565b005b600154610081906001600160a01b031681565b60405161008e91906102dd565b60405180910390f35b6100aa6100a53660046102bb565b6101b0565b6040805192835260ff90911660208301520161008e565b5f54610081906001600160a01b031681565b6001546100e790600160a01b900460ff1681565b60405160ff909116815260200161008e565b806001600160a01b03166338d52e0f6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610153575060408051601f3d908101601f19168201909252610150918101906102f1565b60015b61017b5780604051633283c86d60e21b815260040161017291906102dd565b60405180910390fd5b6001546001600160a01b038281169116146101ab5781604051633283c86d60e21b815260040161017291906102dd565b505b50565b5f5f5f836001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101ef573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610213919061030c565b90505f61022182600a610425565b6040516303d1689d60e11b8152600481018290529091505f906001600160a01b038716906307a2d13a90602401602060405180830381865afa158015610269573d5f5f3e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061028d9190610433565b6001549097600160a01b90910460ff169650945050505050565b6001600160a01b03811681146101ad575f5ffd5b5f602082840312156102cb575f5ffd5b81356102d6816102a7565b9392505050565b6001600160a01b0391909116815260200190565b5f60208284031215610301575f5ffd5b81516102d6816102a7565b5f6020828403121561031c575f5ffd5b815160ff811681146102d6575f5ffd5b634e487b7160e01b5f52601160045260245ffd5b6001815b600184111561037b5780850481111561035f5761035f61032c565b600184161561036d57908102905b60019390931c928002610344565b935093915050565b5f826103915750600161041f565b8161039d57505f61041f565b81600181146103b357600281146103bd576103d9565b600191505061041f565b60ff8411156103ce576103ce61032c565b50506001821b61041f565b5060208310610133831016604e8410600b84101617156103fc575081810a61041f565b6104085f198484610340565b805f190482111561041b5761041b61032c565b0290505b92915050565b5f6102d660ff841683610383565b5f60208284031215610443575f5ffd5b505191905056fea2646970667358221220c915475a3787be3f327b79d53e7725755cafc5da6410d3a0b77ea83bde6becf164736f6c634300081c0033",
"bytecode": "0x608060405234801561000f575f5ffd5b5060405161065138038061065183398101604081905261002e91610182565b6001600160a01b0381166100555760405163d92e233d60e01b815260040160405180910390fd5b5f80546001600160a01b0319166001600160a01b03831690811790915560408051631c56369f60e21b81529051637158da7c916004808201926020929091908290030181865afa1580156100ab573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906100cf9190610182565b600180546001600160a01b0319166001600160a01b039290921691821790556040805163313ce56760e01b8152905163313ce567916004808201926020929091908290030181865afa158015610127573d5f5f3e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061014b91906101a4565b600160146101000a81548160ff021916908360ff160217905550506101c4565b6001600160a01b038116811461017f575f5ffd5b50565b5f60208284031215610192575f5ffd5b815161019d8161016b565b9392505050565b5f602082840312156101b4575f5ffd5b815160ff8116811461019d575f5ffd5b610480806101d15f395ff3fe608060405234801561000f575f5ffd5b5060043610610055575f3560e01c80636ab8bdef146100595780637158da7c1461006e57806372279ba11461009757806379502c55146100c15780639a32c207146100d3575b5f5ffd5b61006c6100673660046102bb565b6100f9565b005b600154610081906001600160a01b031681565b60405161008e91906102dd565b60405180910390f35b6100aa6100a53660046102bb565b6101b0565b6040805192835260ff90911660208301520161008e565b5f54610081906001600160a01b031681565b6001546100e790600160a01b900460ff1681565b60405160ff909116815260200161008e565b806001600160a01b03166338d52e0f6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610153575060408051601f3d908101601f19168201909252610150918101906102f1565b60015b61017b5780604051633283c86d60e21b815260040161017291906102dd565b60405180910390fd5b6001546001600160a01b038281169116146101ab5781604051633283c86d60e21b815260040161017291906102dd565b505b50565b5f5f5f836001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101ef573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610213919061030c565b90505f61022182600a610425565b6040516303d1689d60e11b8152600481018290529091505f906001600160a01b038716906307a2d13a90602401602060405180830381865afa158015610269573d5f5f3e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061028d9190610433565b6001549097600160a01b90910460ff169650945050505050565b6001600160a01b03811681146101ad575f5ffd5b5f602082840312156102cb575f5ffd5b81356102d6816102a7565b9392505050565b6001600160a01b0391909116815260200190565b5f60208284031215610301575f5ffd5b81516102d6816102a7565b5f6020828403121561031c575f5ffd5b815160ff811681146102d6575f5ffd5b634e487b7160e01b5f52601160045260245ffd5b6001815b600184111561037b5780850481111561035f5761035f61032c565b600184161561036d57908102905b60019390931c928002610344565b935093915050565b5f826103915750600161041f565b8161039d57505f61041f565b81600181146103b357600281146103bd576103d9565b600191505061041f565b60ff8411156103ce576103ce61032c565b50506001821b61041f565b5060208310610133831016604e8410600b84101617156103fc575081810a61041f565b6104085f198484610340565b805f190482111561041b5761041b61032c565b0290505b92915050565b5f6102d660ff841683610383565b5f60208284031215610443575f5ffd5b505191905056fea264697066735822122065c2efcdcea4250cbac9117f7c1f68fc786f92d1cb83cf1bf5d7a2e3548b621064736f6c634300081c0033",
"deployedBytecode": "0x608060405234801561000f575f5ffd5b5060043610610055575f3560e01c80636ab8bdef146100595780637158da7c1461006e57806372279ba11461009757806379502c55146100c15780639a32c207146100d3575b5f5ffd5b61006c6100673660046102bb565b6100f9565b005b600154610081906001600160a01b031681565b60405161008e91906102dd565b60405180910390f35b6100aa6100a53660046102bb565b6101b0565b6040805192835260ff90911660208301520161008e565b5f54610081906001600160a01b031681565b6001546100e790600160a01b900460ff1681565b60405160ff909116815260200161008e565b806001600160a01b03166338d52e0f6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015610153575060408051601f3d908101601f19168201909252610150918101906102f1565b60015b61017b5780604051633283c86d60e21b815260040161017291906102dd565b60405180910390fd5b6001546001600160a01b038281169116146101ab5781604051633283c86d60e21b815260040161017291906102dd565b505b50565b5f5f5f836001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101ef573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610213919061030c565b90505f61022182600a610425565b6040516303d1689d60e11b8152600481018290529091505f906001600160a01b038716906307a2d13a90602401602060405180830381865afa158015610269573d5f5f3e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061028d9190610433565b6001549097600160a01b90910460ff169650945050505050565b6001600160a01b03811681146101ad575f5ffd5b5f602082840312156102cb575f5ffd5b81356102d6816102a7565b9392505050565b6001600160a01b0391909116815260200190565b5f60208284031215610301575f5ffd5b81516102d6816102a7565b5f6020828403121561031c575f5ffd5b815160ff811681146102d6575f5ffd5b634e487b7160e01b5f52601160045260245ffd5b6001815b600184111561037b5780850481111561035f5761035f61032c565b600184161561036d57908102905b60019390931c928002610344565b935093915050565b5f826103915750600161041f565b8161039d57505f61041f565b81600181146103b357600281146103bd576103d9565b600191505061041f565b60ff8411156103ce576103ce61032c565b50506001821b61041f565b5060208310610133831016604e8410600b84101617156103fc575081810a61041f565b6104085f198484610340565b805f190482111561041b5761041b61032c565b0290505b92915050565b5f6102d660ff841683610383565b5f60208284031215610443575f5ffd5b505191905056fea264697066735822122065c2efcdcea4250cbac9117f7c1f68fc786f92d1cb83cf1bf5d7a2e3548b621064736f6c634300081c0033",
"linkReferences": {},
"deployedLinkReferences": {}
}
Loading