refactor: rename unbingingepoch to unbondingPeriod

ExocoreNetwork · May 30, 2024 · 3df137e · 3df137e
1 parent 3366e38
commit 3df137e
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 475 deletions.
diff --git a/precompiles/avs/abi.json b/precompiles/avs/abi.json
@@ -33,7 +33,7 @@
 			},
 			{
 				"internalType": "uint64",
-				"name": "unbondingEpochs",
+				"name": "unbondingPeriod",
 				"type": "uint64"
 			}
 		],

diff --git a/precompiles/avs/avs.sol b/precompiles/avs/avs.sol
@@ -20,7 +20,7 @@ interface IAVSManager {
         string[] memory assetID,
         uint64 action,
         uint64 minimumDelegation,
-        uint64 unbondingEpochs
+        uint64 unbondingPeriod
     ) external returns (bool success);
 
 

diff --git a/precompiles/avs/types.go b/precompiles/avs/types.go
@@ -65,11 +65,11 @@ func (p Precompile) GetAVSParamsFromInputs(_ sdk.Context, args []interface{}) (*
 	}
 	avsParams.MinimumDelegation = minimumDelegation
 
-	unbondingEpochs, ok := args[6].(uint64)
+	unbondingPeriod, ok := args[6].(uint64)
 	if !ok || (action != avstypes.RegisterAction && action != avstypes.DeRegisterAction) {
-		return nil, xerrors.Errorf(exocmn.ErrContractInputParaOrType, 6, "uint64", unbondingEpochs)
+		return nil, xerrors.Errorf(exocmn.ErrContractInputParaOrType, 6, "uint64", unbondingPeriod)
 	}
-	avsParams.UnbondingEpochs = unbondingEpochs
+	avsParams.UnbondingPeriod = unbondingPeriod
 
 	return avsParams, nil
 }
diff --git a/precompiles/avsTask/task_test.go b/precompiles/avsTask/task_test.go
@@ -54,7 +54,7 @@ func (s *TaskPrecompileTestSuite) TestRunRegTaskinfo() {
 		SlashAddr:          slashAddress,
 		AvsOwnerAddress:    avsOwnerAddress,
 		AssetId:            assetID,
-		AvsUnbondingEpochs: uint32(7),
+		AvsUnbondingPeriod: uint32(7),
 		MinimumDelegation:  sdk.NewIntFromUint64(10),
 		AvsEpoch:           nil,
 		OperatorAddress:    nil,

diff --git a/proto/exocore/avs/tx.proto b/proto/exocore/avs/tx.proto
@@ -21,7 +21,7 @@ message AVSInfo {
   // asset_basic_info is all the basic asset information of the avs.
   repeated string asset_id = 5;
   // unbonding duration of avs.
-  uint32 avs_unbonding_epochs = 6;
+  uint32 avs_unbonding_period = 6;
   // the operator minimum delegation amount.
   string minimum_delegation = 7
   [
@@ -34,19 +34,6 @@ message AVSInfo {
   // registered operator of avs
   repeated string operator_address = 9;
 }
-//  The information of OperatorBindingAVSInfo in opt-in avs
-message OperatorBindingAVSInfo {
-  // name of Operator
-  string name = 1;
-  // address of Operator
-  string operator_address = 2;
-  // publicKey of Operator
-  string bls_public_key =3 ;
-  // reg flag
-  bool is_registered =4;
-  // status of operator
-  string status = 5;
-}
 
 // EpochInfo defines the message interface containing the relevant informations aboutt
 // an epoch.

diff --git a/x/avs/keeper/avs_test.go b/x/avs/keeper/avs_test.go
@@ -20,7 +20,7 @@ func (suite *AVSTestSuite) TestAVS() {
 		SlashAddr:          slashAddress,
 		AvsOwnerAddress:    avsOwnerAddress,
 		AssetId:            assetID,
-		AvsUnbondingEpochs: uint32(7),
+		AvsUnbondingPeriod: uint32(7),
 		MinimumDelegation:  sdk.NewIntFromUint64(10),
 		AvsEpoch:           nil,
 		OperatorAddress:    nil,
@@ -48,7 +48,7 @@ func (suite *AVSTestSuite) TestAVSInfoUpdate_Register() {
 		AvsOwnerAddress:   avsOwnerAddress,
 		AssetID:           assetID,
 		MinimumDelegation: uint64(10),
-		UnbondingEpochs:   uint64(7),
+		UnbondingPeriod:   uint64(7),
 		SlashContractAddr: slashAddress,
 		OperatorAddress:   nil,
 	}
@@ -79,7 +79,7 @@ func (suite *AVSTestSuite) TestAVSInfoUpdate_DeRegister() {
 		AvsOwnerAddress:   avsOwnerAddress,
 		AssetID:           assetID,
 		MinimumDelegation: uint64(10),
-		UnbondingEpochs:   uint64(7),
+		UnbondingPeriod:   uint64(7),
 		SlashContractAddr: slashAddress,
 		OperatorAddress:   nil,
 	}
@@ -147,7 +147,7 @@ func (suite *AVSTestSuite) TestAVSInfoUpdateWithOperator_Register() {
 		AvsOwnerAddress:   avsOwnerAddress,
 		AssetID:           assetID,
 		MinimumDelegation: uint64(10),
-		UnbondingEpochs:   uint64(7),
+		UnbondingPeriod:   uint64(7),
 		SlashContractAddr: slashAddress,
 		OperatorAddress:   nil,
 	}

diff --git a/x/avs/keeper/keeper.go b/x/avs/keeper/keeper.go
@@ -60,8 +60,8 @@ func (k Keeper) AVSInfoUpdate(ctx sdk.Context, params *AVSRegisterOrDeregisterPa
 		SlashAddr:          params.SlashContractAddr,
 		AvsOwnerAddress:    params.AvsOwnerAddress,
 		AssetId:            params.AssetID,
-		AvsUnbondingEpochs: uint32(params.MinimumDelegation),
-		MinimumDelegation:  sdk.NewIntFromUint64(params.UnbondingEpochs),
+		MinimumDelegation:  sdk.NewIntFromUint64(params.MinimumDelegation),
+		AvsUnbondingPeriod: uint32(params.UnbondingPeriod),
 		AvsEpoch:           nil,
 		OperatorAddress:    nil,
 	}
@@ -73,8 +73,8 @@ func (k Keeper) AVSInfoUpdate(ctx sdk.Context, params *AVSRegisterOrDeregisterPa
 		return errorsmod.Wrap(types.ErrUnregisterNonExistent, fmt.Sprintf("the error input arg is:%s", avsInfo))
 	}
 
-	//TODO:if avs DeRegisterAction check UnbondingEpochs
-	// if avsInfo.Info.AvsUnbondingEpochs < currenUnbondingEpoch - regUnbondingEpoch {
+	//TODO:if avs DeRegisterAction check UnbondingPeriod
+	// if avsInfo.Info.AvsUnbondingPeriod < currenUnbondingPeriod - regUnbondingPeriod  {
 	//	return errorsmod.Wrap(err, fmt.Sprintf("not qualified to deregister %s", avsInfo))
 	//}
 	return k.DeleteAVSInfo(ctx, params.AvsAddress)

diff --git a/x/avs/keeper/params.go b/x/avs/keeper/params.go
@@ -39,7 +39,7 @@ type AVSRegisterOrDeregisterParams struct {
 	AssetID         []string
 
 	MinimumDelegation uint64
-	UnbondingEpochs   uint64
+	UnbondingPeriod   uint64
 	SlashContractAddr string
 	OperatorAddress   []string
 }