Vanja/feat/remove queued weight (#120)

* Remove queued weight

* Update staker contract

Author: vanja-vechain

cmd/txsimulation/validators/GetValidators.sol

@@ -54,9 +54,7 @@ contract GetValidators {
         uint256[] memory, // delegatorsStake
         uint256[] memory, // validatorQueuedStakes
         uint256[] memory, // totalQueuedStakes
-        uint256[] memory, // totalQueuedWeights
-        uint256[] memory, // totalExitingStakes
-        uint256[] memory  // totalExitingWeights
+        uint256[] memory // totalExitingStakes
     ) {
         address[1000] memory idBuffer;
         uint count = 0;
@@ -94,10 +92,8 @@ contract GetValidators {
 
         uint256[] memory validatorQueuedStakes = new uint256[](count);
         uint256[] memory totalQueuedStakes = new uint256[](count);
-        uint256[] memory totalQueuedWeights = new uint256[](count);
 
         uint256[] memory totalExitingStakes = new uint256[](count);
-        uint256[] memory totalExitingWeights = new uint256[](count);
 
 
         for (uint i = 0; i < count; i++) {
@@ -136,15 +132,12 @@ contract GetValidators {
                 uint256 lockedStake,
                 ,
                 uint256 totalQueuedStake,
-                uint256 queuedWeight,
                 uint256 exitingStake,
-                uint256 exitingWeight
+
             ) = STAKER.getValidationTotals(validatorId);
             delegatorsStake[i] = lockedStake- validatorStake;
             totalQueuedStakes[i] = totalQueuedStake;
-            totalQueuedWeights[i] = queuedWeight;
             totalExitingStakes[i] = exitingStake;
-            totalExitingWeights[i] = exitingWeight;
         }
 
 
@@ -163,9 +156,7 @@ contract GetValidators {
             delegatorsStake,
             validatorQueuedStakes,
             totalQueuedStakes,
-            totalQueuedWeights,
-            totalExitingStakes,
-            totalExitingWeights
+            totalExitingStakes
         );
     }
 }

cmd/txsimulation/validators/compiled/GetValidators.abi

@@ -1 +1 @@
-[{"inputs":[],"name":"getValidators","outputs":[{"internalType":"address[]","name":"","type":"address[]"},{"internalType":"address[]","name":"","type":"address[]"},{"internalType":"uint8[]","name":"","type":"uint8[]"},{"internalType":"bool[]","name":"","type":"bool[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"queuedStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"stakerBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalBurned","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]
+[{"inputs":[],"name":"getValidators","outputs":[{"internalType":"address[]","name":"","type":"address[]"},{"internalType":"address[]","name":"","type":"address[]"},{"internalType":"uint8[]","name":"","type":"uint8[]"},{"internalType":"bool[]","name":"","type":"bool[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint32[]","name":"","type":"uint32[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"queuedStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"stakerBalance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalBurned","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]

cmd/txsimulation/validators/compiled/GetValidators.bin

@@ -1 +1 @@
-6080806040523461001657610da2908161001c8239f35b600080fdfe6103e080604052600436101561001457600080fd5b60003560e01c90816318160ddd14610ba35750806355ab96ba14610b805780638b0e9f3f14610af8578063b7ab4db514610130578063d89135cd146100eb5763e8e1a8b81461006257600080fd5b346100d25760003660031901126100d257604051631d1c351760e31b8152602081600481655374616b65725afa80156100df576000906100a8575b602090604051908152f35b506020813d82116100d7575b816100c160209383610c90565b810103126100d2576020905161009d565b600080fd5b3d91506100b4565b6040513d6000823e3d90fd5b346100d25760003660031901126100d25760405163d89135cd60e01b815260208160048165456e657267795afa80156100df576000906100a857602090604051908152f35b346100d25760003660031901126100d257604051806101c052617d009081810181811067ffffffffffffffff821117610ae25760405236903760006103c0526040516335c660d760e21b8152602081600481655374616b65725afa9081156100df57600091610aa8575b505b6001600160a01b0316801561023e57806101bc6103c0516101c051610cc6565b52604051906355b9f18b60e11b82526004820152602081602481655374616b65725afa9081156100df57600091610204575b506101fb6103c051610cee565b6103c05261019c565b90506020813d602011610236575b8161021f60209383610c90565b810103126100d25761023090610cb2565b816101ee565b3d9150610212565b60405163ebe3a06960e01b8152602081600481655374616b65725afa9081156100df57600091610a6e575b505b6001600160a01b0316801561030d578061028b6103c0516101c051610cc6565b52604051906355b9f18b60e11b82526004820152602081602481655374616b65725afa9081156100df576000916102d3575b506102ca6103c051610cee565b6103c05261026b565b90506020813d602011610305575b816102ee60209383610c90565b810103126100d2576102ff90610cb2565b816102bd565b3d91506102e1565b6103196103c051610d15565b6101a0526103296103c051610d15565b6102205261034961033c6103c051610cfd565b6040518061032052610c90565b6103c0516103205152601f19806103626103c051610cfd565b0136602061032051013761038861037b6103c051610cfd565b6040518061020052610c90565b6103c051610200515261039d6103c051610cfd565b013660206102005101376103b36103c051610d15565b6102a0526103c36103c051610d15565b6101e0526103d36103c051610d15565b610180526103e36103c051610d15565b610340526103f36103c051610d15565b6080526104026103c051610d15565b610240526104126103c051610d15565b610260526104226103c051610d15565b610300526104326103c051610d15565b610100526104426103c051610d15565b610140526104526103c051610d15565b6102c0526104626103c051610d15565b610380526104726103c051610d15565b60c05260006102e0525b6103c0516102e05190811015610823576101c0516001600160a01b03916104a291610cc6565b5116806104b56102e0516101a051610d47565b526040516327cd4de160e01b81526004810182905260c081602481655374616b65725afa80156100df57600080610280526000806000926000946107a8575b63ffffffff955061050b6102e05161022051610d47565b6001600160a01b039091169052610280516102e0516102405161052e9190610d47565b5261053f6102e05161026051610d47565b526105506102e05161010051610d47565b5260ff6105636102e05161032051610d47565b91169052816105786102e0516102a051610d47565b91168091521461058e6102e05161020051610d47565b52604051630d4f10ad60e11b815260048101829052608081602481655374616b65725afa9081156100df57600080600092600094610743575b5063ffffffff6105dd6102e0516101e051610d47565b9116905263ffffffff6105f66102e05161018051610d47565b9116905263ffffffff61060f6102e05161034051610d47565b9116905263ffffffff6106276102e051608051610d47565b91169052604051906301be83c360e51b8252600482015260c081602481655374616b65725afa9081156100df576000806000916000936000956106f2575b506102805181039081116106dc576106836102e05161030051610d47565b526106946102e05161014051610d47565b526106a56102e0516102c051610d47565b526106b66102e05161038051610d47565b526106c66102e05160c051610d47565b526106d36102e051610cee565b6102e05261047c565b634e487b7160e01b600052601160045260246000fd5b94505050505060c0813d60c01161073b575b8161071160c09383610c90565b810103126100d257805160408201516060830151608084015160a090940151939290919085610665565b3d9150610704565b93505050506080813d6080116107a0575b8161076160809383610c90565b810103126100d25761077281610d5b565b61077e60208301610d5b565b91610797606061079060408401610d5b565b9201610d5b565b929091856105c7565b3d9150610754565b505050505060c0813d60c01161081b575b816107c660c09383610c90565b810103126100d2576107d781610cb2565b602082015190604083015160608401518060e05260808501519160ff831683036100d25761080c60a063ffffffff9701610d5b565b939461028052909192936104f4565b3d91506107b9565b61022060405180610120525261085b61084661022061012051016101a051610be5565b61012051602081830391015261022051610be5565b6101205160408183039101528060a05260206103205151918281520160a05260206103205101906000915b818310610a4f576101205160608160a0510391015260a0518061016052610200515190816103a05252602060a0510161016052602061020051016103605260005b6103a0518110156108fd5760019061036051511515610160515260206101605101610160526020610360510161036052016108c7565b610120516080816101605103910152610a2b610a156109ff6109e96109d36109bd6109a761099161097c61096761095261093d610160516102a051610c22565b6101205160a08183039101526101e051610c22565b6101205160c081830391015261018051610c22565b6101205160e081830391015261034051610c22565b61012051610100818303910152608051610c22565b6101205161012081830391015261024051610c5c565b6101205161014081830391015261026051610c5c565b6101205161016081830391015261030051610c5c565b6101205161018081830391015261010051610c5c565b610120516101a081830391015261014051610c5c565b610120516101c08183039101526102c051610c5c565b610120516101e081830391015261038051610c5c565b61012051610200818303910152610a48610120519160c051610c5c565b0361012051f35b60208160ff600193511660a051528160a0510160a05201920191610886565b90506020813d602011610aa0575b81610a8960209383610c90565b810103126100d257610a9a90610cb2565b81610269565b3d9150610a7c565b90506020813d602011610ada575b81610ac360209383610c90565b810103126100d257610ad490610cb2565b8161019a565b3d9150610ab6565b634e487b7160e01b600052604160045260246000fd5b346100d25760003660031901126100d25760408051638b0e9f3f60e01b81529081600481655374616b65725afa80156100df57600090600090610b46575b6040809350519182526020820152f35b50506040813d604011610b78575b81610b6160409383610c90565b810103126100d25780602060409251910151610b36565b3d9150610b54565b346100d25760003660031901126100d2576020655374616b657231604051908152f35b346100d25760003660031901126100d2576318160ddd60e01b815260208160048165456e657267795afa80156100df576000906100a857602090604051908152f35b90815180825260208080930193019160005b828110610c05575050505090565b83516001600160a01b031685529381019392810192600101610bf7565b90815180825260208080930193019160005b828110610c42575050505090565b835163ffffffff1685529381019392810192600101610c34565b90815180825260208080930193019160005b828110610c7c575050505090565b835185529381019392810192600101610c6e565b90601f8019910116810190811067ffffffffffffffff821117610ae257604052565b51906001600160a01b03821682036100d257565b906103e8811015610cd85760051b0190565b634e487b7160e01b600052603260045260246000fd5b60001981146106dc5760010190565b67ffffffffffffffff8111610ae25760051b60200190565b90610d1f82610cfd565b610d2c6040519182610c90565b8281528092610d3d601f1991610cfd565b0190602036910137565b8051821015610cd85760209160051b010190565b519063ffffffff821682036100d25756fea2646970667358221220e82226ba99b7ea7fc846bf9fabc3383ea154c9af4585a0974e555ddaff24724864736f6c63430008140033
+6080806040523461001657610c5e908161001c8239f35b600080fdfe6102a080604052600436101561001457600080fd5b60003560e01c90816318160ddd14610a5f5750806355ab96ba14610a3c5780638b0e9f3f146109b4578063b7ab4db514610130578063d89135cd146100eb5763e8e1a8b81461006257600080fd5b346100d25760003660031901126100d257604051631d1c351760e31b8152602081600481655374616b65725afa80156100df576000906100a8575b602090604051908152f35b506020813d82116100d7575b816100c160209383610b4c565b810103126100d2576020905161009d565b600080fd5b3d91506100b4565b6040513d6000823e3d90fd5b346100d25760003660031901126100d25760405163d89135cd60e01b815260208160048165456e657267795afa80156100df576000906100a857602090604051908152f35b346100d25760003660031901126100d257604051617d0080820182811067ffffffffffffffff82111761099e576040523682376040516335c660d760e21b8152600090602081600481655374616b65725afa9081156100df57600091610964575b505b6001600160a01b0316801561022a57806101ad8385610b82565b52604051906355b9f18b60e11b82526004820152602081602481655374616b65725afa80156100df576000906101ef575b6101e9915091610baa565b90610193565b506020813d602011610222575b8161020960209383610b4c565b810103126100d25761021d6101e991610b6e565b6101de565b3d91506101fc565b5060405163ebe3a06960e01b8152602081600481655374616b65725afa9081156100df5760009161092a575b505b6001600160a01b031680156102ef57806102728385610b82565b52604051906355b9f18b60e11b82526004820152602081602481655374616b65725afa80156100df576000906102b4575b6102ae915091610baa565b90610258565b506020813d6020116102e7575b816102ce60209383610b4c565b810103126100d2576102e26102ae91610b6e565b6102a3565b3d91506102c1565b50906102fa82610bd1565b6101805261030782610bd1565b6102605261031482610bb9565b906103226040519283610b4c565b828252601f198061033285610bb9565b0136602085013761035161034585610bb9565b6040518060c052610b4c565b8360c0515261035f84610bb9565b0136602060c051013761037183610bd1565b9261037b81610bd1565b60805261038781610bd1565b6102805261039481610bd1565b610100526103a181610bd1565b610200526103ae81610bd1565b610220526103bb81610bd1565b610120526103c881610bd1565b60a0526103d481610bd1565b610240526103e181610bd1565b60e0526103ed81610bd1565b6101c0526000610160525b610160518181101561075b576001600160a01b03906104179084610b82565b51168061042a6101605161018051610c03565b526040516327cd4de160e01b81526004810182905260c081602481655374616b65725afa80156100df576000806101e0526000806000926000946106df575b63ffffffff95506104806101605161026051610c03565b6001600160a01b0390911690526101e05161016051610220516104a39190610c03565b526104b46101605161012051610c03565b526104c56101605161024051610c03565b5260ff6104d56101605189610c03565b91169052816104e76101605189610c03565b9116809152146104fc6101605160c051610c03565b52604051630d4f10ad60e11b815260048101829052608081602481655374616b65725afa9081156100df5760008060009260009461067a575b5063ffffffff61054a61016051608051610c03565b9116905263ffffffff6105636101605161028051610c03565b9116905263ffffffff61057c6101605161010051610c03565b9116905263ffffffff6105956101605161020051610c03565b91169052604051906301be83c360e51b8252600482015260a081602481655374616b65725afa9081156100df5760008091600093610638575b506101e0518103908111610622576105eb6101605160a051610c03565b526105fb6101605160e051610c03565b5261060c610160516101c051610c03565b5261061961016051610baa565b610160526103f8565b634e487b7160e01b600052601160045260246000fd5b9250505060a0813d60a011610672575b8161065560a09383610b4c565b810103126100d257805160408201516060909201519190876105ce565b3d9150610648565b93505050506080813d6080116106d7575b8161069860809383610b4c565b810103126100d2576106a981610c17565b6106b560208301610c17565b916106ce60606106c760408401610c17565b9201610c17565b92909189610535565b3d915061068b565b505050505060c0813d60c011610753575b816106fd60c09383610b4c565b810103126100d25761070e81610b6e565b60208201519060408301516060840151806101a05260808501519160ff831683036100d25761074460a063ffffffff9701610c17565b93946101e05290919293610469565b3d91506106f0565b838561079461077f60405180610140526101e0809152610140510161018051610aa1565b61014051602081830391015261026051610aa1565b6101405160408183039101526020808451928381520193019060005b81811061091157505050610140516060818403910152602060c05151928381520191602060c051019060005b8181106108f9576108d46108bf6108a961089461087e61086861085261083d6108286108148e8e610140516080818403910152610ade565b6101405160a0818303910152608051610ade565b6101405160c081830391015261028051610ade565b6101405160e081830391015261010051610ade565b6101405161010081830391015261020051610ade565b6101405161012081830391015261022051610b18565b6101405161014081830391015261012051610b18565b6101405161016081830391015260a051610b18565b6101405161018081830391015261024051610b18565b610140516101a081830391015260e051610b18565b610140516101c08183039101526108f261014051916101c051610b18565b0361014051f35b825115158552602094850194909201916001016107dc565b825160ff168552602094850194909201916001016107b0565b90506020813d60201161095c575b8161094560209383610b4c565b810103126100d25761095690610b6e565b83610256565b3d9150610938565b90506020813d602011610996575b8161097f60209383610b4c565b810103126100d25761099090610b6e565b83610191565b3d9150610972565b634e487b7160e01b600052604160045260246000fd5b346100d25760003660031901126100d25760408051638b0e9f3f60e01b81529081600481655374616b65725afa80156100df57600090600090610a02575b6040809350519182526020820152f35b50506040813d604011610a34575b81610a1d60409383610b4c565b810103126100d257806020604092519101516109f2565b3d9150610a10565b346100d25760003660031901126100d2576020655374616b657231604051908152f35b346100d25760003660031901126100d2576318160ddd60e01b815260208160048165456e657267795afa80156100df576000906100a857602090604051908152f35b90815180825260208080930193019160005b828110610ac1575050505090565b83516001600160a01b031685529381019392810192600101610ab3565b90815180825260208080930193019160005b828110610afe575050505090565b835163ffffffff1685529381019392810192600101610af0565b90815180825260208080930193019160005b828110610b38575050505090565b835185529381019392810192600101610b2a565b90601f8019910116810190811067ffffffffffffffff82111761099e57604052565b51906001600160a01b03821682036100d257565b906103e8811015610b945760051b0190565b634e487b7160e01b600052603260045260246000fd5b60001981146106225760010190565b67ffffffffffffffff811161099e5760051b60200190565b90610bdb82610bb9565b610be86040519182610b4c565b8281528092610bf9601f1991610bb9565b0190602036910137565b8051821015610b945760209160051b010190565b519063ffffffff821682036100d25756fea2646970667358221220fd9e38c7d65061b7baa4f5222edfefa82f1d369245ffea037890b087a0016ab264736f6c63430008140033