Skip to content

Commit 8840c8d

Browse files
shrimalmadhurshrimalmadhur
committed
add some tests
1 parent c9129fd commit 8840c8d

File tree

6 files changed

+332
-37
lines changed

6 files changed

+332
-37
lines changed

‎pkg/operator/allocations/initializedelay.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func initializeDelayAction(cCtx *cli.Context, p utils.Prompter) error {
5050
return eigenSdkUtils.WrapError("failed to create new eth client", err)
5151
}
5252

53-
// Temp to test modify allocations
53+
// Temp to test modify Allocations
5454
config.avsDirectoryAddress = gethcommon.HexToAddress("0x8BffE5a668DB26bc5Ce8dC9C0096fB634747b62A")
5555

5656
if config.broadcast {

‎pkg/operator/allocations/testdata/allocations1.csv‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
avs_address,operator_set_id,strategy_address,bips
2+
0x2222AAC0C980Cc029624b7ff55B88Bc6F63C538f,1,0x49989b32351Eb9b8ab2d5623cF22E7F7C23e5630,2000
3+
0x2222AAC0C980Cc029624b7ff55B88Bc6F63C538f,3,0x49989b32351Eb9b8ab2d5623cF22E7F7C23e5630,1000
4+
0x111116fE4F8C2f83E3eB2318F090557b7CD0BF76,4,0x232326fE4F8C2f83E3eB2318F090557b7CD02222,3000
5+
0x111116fE4F8C2f83E3eB2318F090557b7CD0BF76,5,0x545456fE4F8C2f83E3eB2318F090557b7CD04567,4000

‎pkg/operator/allocations/testdata/allocations_duplicate.csv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
avs_address,operator_set_id,strategy_address,bips
2+
0x2222AAC0C980Cc029624b7ff55B88Bc6F63C538f,1,0x49989b32351Eb9b8ab2d5623cF22E7F7C23e5630,2000
3+
0x2222AAC0C980Cc029624b7ff55B88Bc6F63C538f,3,0x49989b32351Eb9b8ab2d5623cF22E7F7C23e5630,1000
4+
0x111116fE4F8C2f83E3eB2318F090557b7CD0BF76,4,0x232326fE4F8C2f83E3eB2318F090557b7CD02222,3000
5+
0x111116fE4F8C2f83E3eB2318F090557b7CD0BF76,5,0x545456fE4F8C2f83E3eB2318F090557b7CD04567,4000
6+
0x111116fE4F8C2f83E3eB2318F090557b7CD0BF76,5,0x545456fE4F8C2f83E3eB2318F090557b7CD04567,5000

‎pkg/operator/allocations/types.go‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ import (
1111
gethcommon "github.com/ethereum/go-ethereum/common"
1212
)
1313

14-
type bulkModifyAllocations struct {
15-
allocations []contractIAVSDirectory.IAVSDirectoryMagnitudeAllocation
16-
allocatableMagnitudes map[gethcommon.Address]uint64
14+
type BulkModifyAllocations struct {
15+
Allocations []contractIAVSDirectory.IAVSDirectoryMagnitudeAllocation
16+
AllocatableMagnitudes map[gethcommon.Address]uint64
1717
}
1818

19-
func (b *bulkModifyAllocations) Print() {
20-
for _, a := range b.allocations {
19+
func (b *BulkModifyAllocations) Print() {
20+
for _, a := range b.Allocations {
2121
fmt.Printf(
2222
"Strategy: %s, Expected Total Magnitude: %d, Allocatable Magnitude %d\n",
2323
a.Strategy.Hex(),
2424
a.ExpectedTotalMagnitude,
25-
b.allocatableMagnitudes[a.Strategy],
25+
b.AllocatableMagnitudes[a.Strategy],
2626
)
2727
for i, opSet := range a.OperatorSets {
2828
fmt.Printf(
@@ -37,21 +37,20 @@ func (b *bulkModifyAllocations) Print() {
3737
}
3838

3939
type updateConfig struct {
40-
network string
41-
rpcUrl string
42-
environment string
43-
chainID *big.Int
44-
output string
45-
outputType string
46-
broadcast bool
47-
operatorAddress gethcommon.Address
48-
avsAddress gethcommon.Address
49-
strategyAddress gethcommon.Address
50-
operatorSetId uint32
51-
bipsToAllocate uint64
52-
bulkModifyAllocations *bulkModifyAllocations
53-
signerConfig *types.SignerConfig
54-
csvFilePath string
40+
network string
41+
rpcUrl string
42+
environment string
43+
chainID *big.Int
44+
output string
45+
outputType string
46+
broadcast bool
47+
operatorAddress gethcommon.Address
48+
avsAddress gethcommon.Address
49+
strategyAddress gethcommon.Address
50+
operatorSetId uint32
51+
bipsToAllocate uint64
52+
signerConfig *types.SignerConfig
53+
csvFilePath string
5554
}
5655

5756
type allocation struct {

‎pkg/operator/allocations/update.go‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func updateAllocations(cCtx *cli.Context, p utils.Prompter) error {
9494

9595
allocationsToUpdate, err := generateAllocationsParams(ctx, elReader, config, logger)
9696
if err != nil {
97-
return eigenSdkUtils.WrapError("failed to generate allocations params", err)
97+
return eigenSdkUtils.WrapError("failed to generate Allocations params", err)
9898
}
9999

100100
if config.broadcast {
@@ -120,7 +120,7 @@ func updateAllocations(cCtx *cli.Context, p utils.Prompter) error {
120120
receipt, err := eLWriter.ModifyAllocations(
121121
ctx,
122122
config.operatorAddress,
123-
allocationsToUpdate.allocations,
123+
allocationsToUpdate.Allocations,
124124
contractIAVSDirectory.ISignatureUtilsSignatureWithSaltAndExpiry{
125125
Expiry: big.NewInt(0),
126126
},
@@ -143,14 +143,14 @@ func updateAllocations(cCtx *cli.Context, p utils.Prompter) error {
143143
// to claim. So we hardcode the gas limit to 150_000 so that we can
144144
// create unsigned tx without gas limit estimation from contract bindings
145145
if common.IsSmartContractAddress(config.operatorAddress, ethClient) {
146-
// Claimer is a smart contract
146+
// address is a smart contract
147147
noSendTxOpts.GasLimit = 150_000
148148
}
149149

150150
unsignedTx, err := contractBindings.AvsDirectory.ModifyAllocations(
151151
noSendTxOpts,
152152
config.operatorAddress,
153-
allocationsToUpdate.allocations,
153+
allocationsToUpdate.Allocations,
154154
contractIAVSDirectory.ISignatureUtilsSignatureWithSaltAndExpiry{
155155
Expiry: big.NewInt(0),
156156
})
@@ -211,7 +211,7 @@ func generateAllocationsParams(
211211
elReader elChainReader,
212212
config *updateConfig,
213213
logger logging.Logger,
214-
) (*bulkModifyAllocations, error) {
214+
) (*BulkModifyAllocations, error) {
215215
allocations := make([]contractIAVSDirectory.IAVSDirectoryMagnitudeAllocation, 0)
216216
var allocatableMagnitudes map[gethcommon.Address]uint64
217217

@@ -257,9 +257,9 @@ func generateAllocationsParams(
257257
}
258258
}
259259

260-
return &bulkModifyAllocations{
261-
allocations: allocations,
262-
allocatableMagnitudes: allocatableMagnitudes,
260+
return &BulkModifyAllocations{
261+
Allocations: allocations,
262+
AllocatableMagnitudes: allocatableMagnitudes,
263263
}, nil
264264
}
265265

@@ -272,19 +272,47 @@ func computeAllocations(
272272
if err != nil {
273273
return nil, nil, eigenSdkUtils.WrapError("failed to parse allocations csv", err)
274274
}
275+
276+
err = validateDataFromCSV(allocations)
277+
if err != nil {
278+
return nil, nil, eigenSdkUtils.WrapError("failed to validate data from csv", err)
279+
}
280+
275281
strategies := getUniqueStrategies(allocations)
276282
strategyTotalMagnitudes, err := parallelGetMagnitudes(strategies, operatorAddress, elReader)
277283
if err != nil {
278284
return nil, nil, eigenSdkUtils.WrapError("failed to get total magnitudes", err)
279285
}
286+
280287
allocatableMagnitudePerStrategy, err := parallelGetAllocatableMagnitudes(strategies, operatorAddress, elReader)
281288
if err != nil {
282289
return nil, nil, eigenSdkUtils.WrapError("failed to get allocatable magnitudes", err)
283290
}
291+
284292
magnitudeAllocations := convertAllocationsToMagnitudeAllocations(allocations, strategyTotalMagnitudes)
285293
return magnitudeAllocations, allocatableMagnitudePerStrategy, nil
286294
}
287295

296+
func validateDataFromCSV(allocations []allocation) error {
297+
// check for duplicated (avs_address,operator_set_id,strategy_address)
298+
tuples := make(map[string]struct{})
299+
300+
for _, alloc := range allocations {
301+
tuple := fmt.Sprintf("%s_%d_%s", alloc.AvsAddress.Hex(), alloc.OperatorSetId, alloc.StrategyAddress.Hex())
302+
if _, exists := tuples[tuple]; exists {
303+
return fmt.Errorf(
304+
"duplicate combination found: avs_address=%s, operator_set_id=%d, strategy_address=%s",
305+
alloc.AvsAddress.Hex(),
306+
alloc.OperatorSetId,
307+
alloc.StrategyAddress.Hex(),
308+
)
309+
}
310+
tuples[tuple] = struct{}{}
311+
}
312+
313+
return nil
314+
}
315+
288316
func parallelGetAllocatableMagnitudes(
289317
strategies []gethcommon.Address,
290318
operatorAddress gethcommon.Address,
@@ -451,7 +479,6 @@ func readAndValidateUpdateFlags(cCtx *cli.Context, logger logging.Logger) (*upda
451479
logger.Debugf("Failed to get signer config: %s", err)
452480
}
453481

454-
// TODO(shrimalmadhur): Read bulk modify allocations
455482
csvFilePath := cCtx.String(flags.CSVFileFlag.Name)
456483
chainId := utils.NetworkNameToChainId(network)
457484

0 commit comments

Comments
 (0)