11package allocations
22
33import (
4+ "context"
45 "fmt"
56 "math/big"
67 "sort"
@@ -132,7 +133,7 @@ func showAction(cCtx *cli.Context, p utils.Prompter) error {
132133 }
133134
134135 /*
135- 5. Get the operator scaled shares for all strategies
136+ 5. Get the operator shares for all strategies
136137 */
137138 operatorDelegatedSharesMap := make (map [string ]* big.Int )
138139 shares , err := elReader .GetOperatorShares (ctx , config .operatorAddress , config .strategyAddresses )
@@ -144,24 +145,43 @@ func showAction(cCtx *cli.Context, p utils.Prompter) error {
144145 }
145146
146147 /*
147- 6. Using all of the above, calculate SlashableMagnitudeHolders object
148- for displaying the allocation state of the operator
148+ 6. Using all of the above, get Slashable Shares for the operator
149+ */
150+ slashableSharesMap , err := getSlashableShares (
151+ ctx ,
152+ config .operatorAddress ,
153+ registeredOperatorSets ,
154+ config .strategyAddresses ,
155+ elReader ,
156+ )
157+ if err != nil {
158+ return eigenSdkUtils .WrapError ("failed to get slashable shares" , err )
159+ }
160+
161+ /*
162+ 7. Using all of the above, calculate SlashableMagnitudeHolders object
163+ for displaying the allocation state of the operator
149164 */
150165 slashableMagnitudeHolders := make (SlashableMagnitudeHolders , 0 )
151166 dergisteredOpsets := make (DeregsiteredOperatorSets , 0 )
152167 for strategy , allocations := range allAllocations {
153168 logger .Debugf ("Strategy: %s, Allocations: %v" , strategy , allocations )
154169 strategyShares := operatorDelegatedSharesMap [strategy ]
170+ totalMagnitude := totalMagnitudeMap [strategy ]
155171 for _ , alloc := range allocations {
156- currentShares , currentSharesPercentage := getSharesFromMagnitude (
157- strategyShares ,
158- alloc .CurrentMagnitude .Uint64 (),
159- )
172+ currentShares := slashableSharesMap [gethcommon .HexToAddress (strategy )][getUniqueKey (alloc .AvsAddress , alloc .OperatorSetId )]
173+ currentSharesPercentage := getSharePercentage (currentShares , strategyShares )
174+
160175 newMagnitudeBigInt := big .NewInt (0 )
161176 if alloc .PendingDiff .Cmp (big .NewInt (0 )) != 0 {
162177 newMagnitudeBigInt = big .NewInt (0 ).Add (alloc .CurrentMagnitude , alloc .PendingDiff )
163178 }
164- newShares , newSharesPercentage := getSharesFromMagnitude (strategyShares , newMagnitudeBigInt .Uint64 ())
179+
180+ newShares , newSharesPercentage := getSharesFromMagnitude (
181+ strategyShares ,
182+ newMagnitudeBigInt .Uint64 (),
183+ totalMagnitude ,
184+ )
165185
166186 // Check if the operator set is not registered and add it to the unregistered list
167187 // Then skip the rest of the loop
@@ -235,36 +255,65 @@ func showAction(cCtx *cli.Context, p utils.Prompter) error {
235255 return nil
236256}
237257
238- func getSharesFromMagnitude (totalScaledShare * big.Int , magnitude uint64 ) (* big.Int , * big.Float ) {
258+ func getSharePercentage (shares * big.Int , totalShares * big.Int ) * big.Float {
259+ percentageShares := big .NewInt (1 )
260+ percentageShares = percentageShares .Mul (shares , big .NewInt (100 ))
261+ percentageSharesFloat := new (
262+ big.Float ,
263+ ).Quo (new (big.Float ).SetInt (percentageShares ), new (big.Float ).SetInt (totalShares ))
264+ return percentageSharesFloat
265+ }
266+
267+ func getSlashableShares (
268+ ctx context.Context ,
269+ operatorAddress gethcommon.Address ,
270+ opSets []allocationmanager.OperatorSet ,
271+ strategyAddresses []gethcommon.Address ,
272+ reader elChainReader ,
273+ ) (map [gethcommon.Address ]map [string ]* big.Int , error ) {
274+ result := make (map [gethcommon.Address ]map [string ]* big.Int )
275+ for _ , opSet := range opSets {
276+ slashableSharesMap , err := reader .GetSlashableShares (ctx , operatorAddress , opSet , strategyAddresses )
277+ if err != nil {
278+ return nil , err
279+ }
239280
281+ for strat , shares := range slashableSharesMap {
282+ if _ , ok := result [strat ]; ! ok {
283+ result [strat ] = make (map [string ]* big.Int )
284+ }
285+ result [strat ][getUniqueKey (opSet .Avs , opSet .Id )] = shares
286+ }
287+ }
288+ return result , nil
289+ }
290+
291+ func getSharesFromMagnitude (totalShare * big.Int , magnitude uint64 , totalMagnitude uint64 ) (* big.Int , * big.Float ) {
240292 /*
241- * shares = totalScaledShare * magnitude / PrecisionFactor
242- * percentageShares = (shares / totalScaledShare ) * 100
293+ * shares = totalShare * magnitude / totalMagnitude
294+ * percentageShares = (shares / totalShare ) * 100
243295 */
244296 // Check for zero magnitude or totalScaledShare to avoid divide-by-zero errors
245- if magnitude == 0 || totalScaledShare .Cmp (big .NewInt (0 )) == 0 {
297+ if magnitude == 0 || totalShare .Cmp (big .NewInt (0 )) == 0 {
246298 return big .NewInt (0 ), big .NewFloat (0 )
247299 }
248300
249- slashableMagBigInt := big .NewInt (1 )
250- slashableMagBigInt = slashableMagBigInt .SetUint64 (magnitude )
251-
252- scaledOpShares := big .NewInt (1 )
253- scaledOpShares = scaledOpShares .Set (totalScaledShare )
254- scaledOpShares = scaledOpShares .Div (scaledOpShares , PrecisionFactor )
255- shares := scaledOpShares .Mul (scaledOpShares , slashableMagBigInt )
301+ opShares := big .NewInt (1 )
302+ opShares = opShares .Set (totalShare )
303+ shares := opShares .Mul (opShares , big .NewInt (int64 (magnitude )))
304+ shares = shares .Div (shares , big .NewInt (int64 (totalMagnitude )))
256305
257306 percentageShares := big .NewInt (1 )
258- percentageShares = percentageShares .Mul (scaledOpShares , big .NewInt (100 ))
307+ percentageShares = percentageShares .Mul (opShares , big .NewInt (100 ))
259308 percentageSharesFloat := new (
260309 big.Float ,
261- ).Quo (new (big.Float ).SetInt (percentageShares ), new (big.Float ).SetInt (totalScaledShare ))
310+ ).Quo (new (big.Float ).SetInt (percentageShares ), new (big.Float ).SetInt (totalShare ))
262311
263312 return shares , percentageSharesFloat
264313}
265314
266- func getUniqueKey (strategyAddress gethcommon.Address , opSetId uint32 ) string {
267- return fmt .Sprintf ("%s-%d" , strategyAddress .String (), opSetId )
315+ func getUniqueKey (avsAddress gethcommon.Address , opSetId uint32 ) string {
316+ return fmt .Sprintf ("%s-%d" , avsAddress .String (), opSetId )
268317}
269318
270319func readAndValidateShowConfig (cCtx * cli.Context , logger * logging.Logger ) (* showConfig , error ) {
0 commit comments