Skip to content

Dev #70

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 19 commits into from
Sep 16, 2025
Merged

Dev #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c23aee7
feat: unify order retrieval into getOrders() and filter zero amounts
matteoettam09 Sep 12, 2025
f62a456
fix: orchestrator to execution adapter API
matteoettam09 Sep 12, 2025
e404a21
feat: slippage tolerant buy executions
matteoettam09 Sep 15, 2025
4186020
feat: updateBufferAmount
matteoettam09 Sep 15, 2025
77daa3e
feat: internalStatesOrchestrator.updateBufferAmount(deltaBufferAmount)
matteoettam09 Sep 15, 2025
a860853
fix: erc4626 selling adapter
matteoettam09 Sep 15, 2025
7eb4867
feat: vault states update phase
matteoettam09 Sep 15, 2025
70394d7
feat: vault states update phase
matteoettam09 Sep 15, 2025
9465b5e
chore: TODOs
matteoettam09 Sep 15, 2025
7a2f3a2
fix: internal state orchestrator responsible for vault states management
matteoettam09 Sep 15, 2025
decdf10
feat: process deposit/redeem requests after state update
matteoettam09 Sep 15, 2025
d082d72
chore: update watermark with states
matteoettam09 Sep 15, 2025
1d5f5ba
feat: update vault states
matteoettam09 Sep 15, 2025
c583877
fix: cicd
matteoettam09 Sep 16, 2025
295ab5d
fix: redeem after sell to ensure solvency
matteoettam09 Sep 16, 2025
d96da7d
docs: orchestrator description
matteoettam09 Sep 16, 2025
c1c5cac
docs: function name
matteoettam09 Sep 16, 2025
ef4fec4
fix: avoid fulfilling redeem in iso
matteoettam09 Sep 16, 2025
2401e31
Merge branch 'dev' of github.com:OrionFinanceAI/protocol into dev
matteoettam09 Sep 16, 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
4 changes: 2 additions & 2 deletions artifacts/contracts/OrionConfig.sol/OrionConfig.json
View file
Open in desktop

Large diffs are not rendered by default.

39 changes: 33 additions & 6 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/EncryptedVaultFactory.sol/EncryptedVaultFactory.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.

30 changes: 26 additions & 4 deletions artifacts/contracts/interfaces/IExecutionAdapter.sol/IExecutionAdapter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,23 @@
},
{
"internalType": "uint256",
"name": "amount",
"name": "sharesAmount",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "maxUnderlyingAmount",
"type": "uint256"
}
],
"name": "buy",
"outputs": [],
"outputs": [
{
"internalType": "uint256",
"name": "executionUnderlyingAmount",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
Expand All @@ -30,12 +41,23 @@
},
{
"internalType": "uint256",
"name": "amount",
"name": "sharesAmount",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "minUnderlyingAmount",
"type": "uint256"
}
],
"name": "sell",
"outputs": [],
"outputs": [
{
"internalType": "uint256",
"name": "executionUnderlyingAmount",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
"type": "function"
}
Expand Down
77 changes: 65 additions & 12 deletions ...facts/contracts/interfaces/IInternalStateOrchestrator.sol/IInternalStateOrchestrator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,35 +91,75 @@
},
{
"inputs": [],
"name": "getBuyingOrders",
"name": "getOrders",
"outputs": [
{
"internalType": "address[]",
"name": "",
"name": "sellingTokens",
"type": "address[]"
},
{
"internalType": "uint256[]",
"name": "",
"name": "sellingAmounts",
"type": "uint256[]"
},
{
"internalType": "address[]",
"name": "buyingTokens",
"type": "address[]"
},
{
"internalType": "uint256[]",
"name": "buyingAmounts",
"type": "uint256[]"
},
{
"internalType": "uint256[]",
"name": "sellingEstimatedUnderlyingAmounts",
"type": "uint256[]"
},
{
"internalType": "uint256[]",
"name": "buyingEstimatedUnderlyingAmounts",
"type": "uint256[]"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getSellingOrders",
"inputs": [
{
"internalType": "address",
"name": "token",
"type": "address"
}
],
"name": "getPriceOf",
"outputs": [
{
"internalType": "address[]",
"name": "",
"type": "address[]"
},
"internalType": "uint256",
"name": "price",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256[]",
"name": "",
"type": "uint256[]"
"internalType": "address",
"name": "vault",
"type": "address"
}
],
"name": "getVaultTotalAssetsForFulfillRedeem",
"outputs": [
{
"internalType": "uint256",
"name": "totalAssets",
"type": "uint256"
}
],
"stateMutability": "view",
Expand Down Expand Up @@ -177,6 +217,19 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "int256",
"name": "deltaAmount",
"type": "int256"
}
],
"name": "updateBufferAmount",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
Expand Down
52 changes: 43 additions & 9 deletions artifacts/contracts/interfaces/IOrionEncryptedVault.sol/IOrionEncryptedVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,35 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "assets",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "pointInTimeTotalAssets",
"type": "uint256"
},
{
"internalType": "enum Math.Rounding",
"name": "rounding",
"type": "uint8"
}
],
"name": "convertToSharesWithPITTotalAssets",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "curator",
Expand Down Expand Up @@ -625,14 +654,26 @@
"type": "function"
},
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "depositTotalAssets",
"type": "uint256"
}
],
"name": "fulfillDeposit",
Comment thread
matteoettam09 marked this conversation as resolved.
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "redeemTotalAssets",
"type": "uint256"
}
],
"name": "fulfillRedeem",
"outputs": [],
"stateMutability": "nonpayable",
Expand Down Expand Up @@ -1128,13 +1169,6 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "updateHighWaterMark",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
Expand Down
52 changes: 43 additions & 9 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 @@ -532,6 +532,35 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "assets",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "pointInTimeTotalAssets",
"type": "uint256"
},
{
"internalType": "enum Math.Rounding",
"name": "rounding",
"type": "uint8"
}
],
"name": "convertToSharesWithPITTotalAssets",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "curator",
Expand Down Expand Up @@ -602,14 +631,26 @@
"type": "function"
},
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "depositTotalAssets",
"type": "uint256"
}
],
"name": "fulfillDeposit",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
Comment thread
matteoettam09 marked this conversation as resolved.
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "redeemTotalAssets",
"type": "uint256"
}
],
"name": "fulfillRedeem",
"outputs": [],
"stateMutability": "nonpayable",
Expand Down Expand Up @@ -1087,13 +1128,6 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "updateHighWaterMark",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
Expand Down
52 changes: 43 additions & 9 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 @@ -532,6 +532,35 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "assets",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "pointInTimeTotalAssets",
"type": "uint256"
},
{
"internalType": "enum Math.Rounding",
"name": "rounding",
"type": "uint8"
}
],
"name": "convertToSharesWithPITTotalAssets",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "curator",
Expand Down Expand Up @@ -602,14 +631,26 @@
"type": "function"
},
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "depositTotalAssets",
"type": "uint256"
}
],
"name": "fulfillDeposit",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
Comment thread
matteoettam09 marked this conversation as resolved.
{
"inputs": [],
"inputs": [
{
"internalType": "uint256",
"name": "redeemTotalAssets",
"type": "uint256"
}
],
"name": "fulfillRedeem",
"outputs": [],
"stateMutability": "nonpayable",
Expand Down Expand Up @@ -1026,13 +1067,6 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "updateHighWaterMark",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
Expand Down
Loading