From ac9186384ca90c96849bbf3c155087245eec44f2 Mon Sep 17 00:00:00 2001 From: Dmitri Tsumak Date: Mon, 18 Mar 2024 13:43:32 +0200 Subject: [PATCH] Fix incorrect calculateExitedAssets interface outputs --- abi/IEthBlocklistErc20Vault.json | 6 +++--- abi/IEthBlocklistVault.json | 6 +++--- abi/IEthErc20Vault.json | 6 +++--- abi/IEthFoxVault.json | 6 +++--- abi/IEthGenesisVault.json | 6 +++--- abi/IEthPrivErc20Vault.json | 6 +++--- abi/IEthPrivVault.json | 6 +++--- abi/IEthVault.json | 6 +++--- abi/IVaultEnterExit.json | 6 +++--- abi/IVaultEthStaking.json | 6 +++--- abi/IVaultOsToken.json | 6 +++--- abi/IVaultToken.json | 6 +++--- contracts/interfaces/IVaultEnterExit.sol | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/abi/IEthBlocklistErc20Vault.json b/abi/IEthBlocklistErc20Vault.json index 072c01e1..7e33b6d8 100644 --- a/abi/IEthBlocklistErc20Vault.json +++ b/abi/IEthBlocklistErc20Vault.json @@ -712,17 +712,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IEthBlocklistVault.json b/abi/IEthBlocklistVault.json index 3c0d4df8..d15eaa96 100644 --- a/abi/IEthBlocklistVault.json +++ b/abi/IEthBlocklistVault.json @@ -582,17 +582,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IEthErc20Vault.json b/abi/IEthErc20Vault.json index aa1ff233..d582bf55 100644 --- a/abi/IEthErc20Vault.json +++ b/abi/IEthErc20Vault.json @@ -636,17 +636,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IEthFoxVault.json b/abi/IEthFoxVault.json index dad4d020..91220f71 100644 --- a/abi/IEthFoxVault.json +++ b/abi/IEthFoxVault.json @@ -471,17 +471,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IEthGenesisVault.json b/abi/IEthGenesisVault.json index 441f361b..fd94b983 100644 --- a/abi/IEthGenesisVault.json +++ b/abi/IEthGenesisVault.json @@ -569,17 +569,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IEthPrivErc20Vault.json b/abi/IEthPrivErc20Vault.json index 8c40441f..5af925c6 100644 --- a/abi/IEthPrivErc20Vault.json +++ b/abi/IEthPrivErc20Vault.json @@ -680,17 +680,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IEthPrivVault.json b/abi/IEthPrivVault.json index eba6fdc6..d0dd07d1 100644 --- a/abi/IEthPrivVault.json +++ b/abi/IEthPrivVault.json @@ -550,17 +550,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IEthVault.json b/abi/IEthVault.json index de74fcaa..291b3c09 100644 --- a/abi/IEthVault.json +++ b/abi/IEthVault.json @@ -506,17 +506,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IVaultEnterExit.json b/abi/IVaultEnterExit.json index d513a237..e54a9f86 100644 --- a/abi/IVaultEnterExit.json +++ b/abi/IVaultEnterExit.json @@ -288,17 +288,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IVaultEthStaking.json b/abi/IVaultEthStaking.json index 76ae7f82..f45b61b8 100644 --- a/abi/IVaultEthStaking.json +++ b/abi/IVaultEthStaking.json @@ -339,17 +339,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IVaultOsToken.json b/abi/IVaultOsToken.json index c0f42b08..1976d14a 100644 --- a/abi/IVaultOsToken.json +++ b/abi/IVaultOsToken.json @@ -455,17 +455,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/abi/IVaultToken.json b/abi/IVaultToken.json index a3e6bb4e..822fbcc0 100644 --- a/abi/IVaultToken.json +++ b/abi/IVaultToken.json @@ -418,17 +418,17 @@ "outputs": [ { "internalType": "uint256", - "name": "leftShares", + "name": "leftTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedShares", + "name": "exitedTickets", "type": "uint256" }, { "internalType": "uint256", - "name": "claimedAssets", + "name": "exitedAssets", "type": "uint256" } ], diff --git a/contracts/interfaces/IVaultEnterExit.sol b/contracts/interfaces/IVaultEnterExit.sol index 8eff2cba..2c400024 100644 --- a/contracts/interfaces/IVaultEnterExit.sol +++ b/contracts/interfaces/IVaultEnterExit.sol @@ -104,16 +104,16 @@ interface IVaultEnterExit is IVaultState { * @param timestamp The timestamp when the assets entered the exit queue * @param exitQueueIndex The exit queue index at which the shares were burned. * It can be looked up by calling `getExitQueueIndex`. Only relevant for V1 positions, otherwise pass 0. - * @return leftShares The number of shares that are still in the queue - * @return claimedShares The number of claimed shares - * @return claimedAssets The number of claimed assets + * @return leftTickets The number of tickets left in the queue + * @return exitedTickets The number of tickets that have already exited + * @return exitedAssets The number of assets that can be claimed */ function calculateExitedAssets( address receiver, uint256 positionTicket, uint256 timestamp, uint256 exitQueueIndex - ) external view returns (uint256 leftShares, uint256 claimedShares, uint256 claimedAssets); + ) external view returns (uint256 leftTickets, uint256 exitedTickets, uint256 exitedAssets); /** * @notice Claims assets that were withdrawn by the Vault. It can be called only after the `enterExitQueue` call by the `receiver`.