diff --git a/src/common/abi/IEthVault.json b/src/common/abi/IEthVault.json index fbc3728e..6e036fa3 100644 --- a/src/common/abi/IEthVault.json +++ b/src/common/abi/IEthVault.json @@ -136,6 +136,31 @@ "name": "FeeRecipientUpdated", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "receiver", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "shares", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "assets", + "type": "uint256" + } + ], + "name": "FeeSharesMinted", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -425,13 +450,39 @@ "type": "function" }, { - "inputs": [], - "name": "canUpdateExitQueue", + "inputs": [ + { + "internalType": "address", + "name": "receiver", + "type": "address" + }, + { + "internalType": "uint256", + "name": "positionTicket", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "exitQueueIndex", + "type": "uint256" + } + ], + "name": "calculateExitedAssets", "outputs": [ { - "internalType": "bool", - "name": "", - "type": "bool" + "internalType": "uint256", + "name": "leftShares", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "claimedShares", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "claimedAssets", + "type": "uint256" } ], "stateMutability": "view", @@ -641,6 +692,19 @@ "stateMutability": "payable", "type": "function" }, + { + "inputs": [], + "name": "isStateUpdateRequired", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "keysManager", @@ -705,7 +769,7 @@ }, { "internalType": "uint256", - "name": "assets", + "name": "osTokenShares", "type": "uint256" }, { @@ -718,7 +782,7 @@ "outputs": [ { "internalType": "uint256", - "name": "shares", + "name": "assets", "type": "uint256" } ], @@ -781,9 +845,9 @@ "name": "queuedShares", "outputs": [ { - "internalType": "uint96", + "internalType": "uint128", "name": "", - "type": "uint96" + "type": "uint128" } ], "stateMutability": "view", @@ -858,6 +922,11 @@ "name": "validatorsRegistryRoot", "type": "bytes32" }, + { + "internalType": "uint256", + "name": "deadline", + "type": "uint256" + }, { "internalType": "bytes", "name": "validators", @@ -898,6 +967,11 @@ "name": "validatorsRegistryRoot", "type": "bytes32" }, + { + "internalType": "uint256", + "name": "deadline", + "type": "uint256" + }, { "internalType": "bytes", "name": "validators", diff --git a/src/common/abi/IKeeper.json b/src/common/abi/IKeeper.json index 7bf6204e..6a3249b2 100644 --- a/src/common/abi/IKeeper.json +++ b/src/common/abi/IKeeper.json @@ -222,6 +222,11 @@ "name": "validatorsRegistryRoot", "type": "bytes32" }, + { + "internalType": "uint256", + "name": "deadline", + "type": "uint256" + }, { "internalType": "bytes", "name": "validators", diff --git a/src/config/networks.py b/src/config/networks.py index 736b84f0..45583e94 100644 --- a/src/config/networks.py +++ b/src/config/networks.py @@ -61,9 +61,9 @@ class NetworkConfig: ), VALIDATORS_REGISTRY_GENESIS_BLOCK=BlockNumber(4367321), KEEPER_CONTRACT_ADDRESS=Web3.to_checksum_address( - '0xb39CEBd50642389ceE6C058C2134e53417ce053a' + '0x893ceb1cF23475defE3747670EbE4b40e629c6fD' ), - KEEPER_GENESIS_BLOCK=BlockNumber(9290253), + KEEPER_GENESIS_BLOCK=BlockNumber(9583358), GENESIS_VALIDATORS_ROOT=Bytes32( Web3.to_bytes( hexstr=HexStr('0x043db0d9a83813551ee2f33450d23797757d430911a9320530ad8a0eabc43efb')