diff --git a/precompiles/avs/IAVSManager.sol b/precompiles/avs/IAVSManager.sol index b32a75bcd..273806423 100644 --- a/precompiles/avs/IAVSManager.sol +++ b/precompiles/avs/IAVSManager.sol @@ -31,7 +31,7 @@ interface IAVSManager { event ChallengeInitiated( string sender, bytes taskHash, uint64 taskID, bytes taskResponseHash, string operatorAddress ); - event PublicKeyRegistered(string sender, string name); + event PublicKeyRegistered(string sender, string avsAddr); event TaskSubmittedByOperator( address indexed taskContractAddress, uint64 indexed taskId, @@ -154,13 +154,13 @@ interface IAVSManager { /// @dev Called by the avs manager service register an operator as the owner of a BLS public key. /// @param sender The external address for calling this method. - /// @param name the name of public keys + /// @param avsAddr The address of AVS. /// @param pubKey the public keys of the operator /// @param pubkeyRegistrationSignature the public keys of the operator /// @param pubkeyRegistrationMessageHash the public keys of the operator function registerBLSPublicKey( address sender, - string calldata name, + address avsAddr, bytes calldata pubKey, bytes calldata pubkeyRegistrationSignature, bytes calldata pubkeyRegistrationMessageHash @@ -187,7 +187,7 @@ interface IAVSManager { /// QUERIES /// @dev Returns the pubkey and pubkey hash of an operator /// @param operator is the operator for whom the key is being registered - function getRegisteredPubkey(address operator) external view returns (bytes memory pubkey); + function getRegisteredPubkey(address operator,address avsAddr) external view returns (bytes memory pubkey); /// @dev Returns the operators of all opt-in in the current avs /// @param avsAddress avs address diff --git a/precompiles/avs/abi.json b/precompiles/avs/abi.json index 374277525..9510a8d11 100644 --- a/precompiles/avs/abi.json +++ b/precompiles/avs/abi.json @@ -161,7 +161,7 @@ { "indexed": false, "internalType": "string", - "name": "name", + "name": "avsAddr", "type": "string" } ], @@ -509,6 +509,11 @@ "internalType": "address", "name": "operator", "type": "address" + }, + { + "internalType": "address", + "name": "avsAddr", + "type": "address" } ], "name": "getRegisteredPubkey", @@ -696,9 +701,9 @@ "type": "address" }, { - "internalType": "string", - "name": "name", - "type": "string" + "internalType": "address", + "name": "avsAddr", + "type": "address" }, { "internalType": "bytes", diff --git a/precompiles/avs/events.go b/precompiles/avs/events.go index 0bf1a5234..605008d35 100644 --- a/precompiles/avs/events.go +++ b/precompiles/avs/events.go @@ -249,7 +249,7 @@ func (p Precompile) EmitPublicKeyRegistered(ctx sdk.Context, stateDB vm.StateDB, arguments := p.ABI.Events[EventTypePublicKeyRegistered].Inputs return p.emitEvent(ctx, stateDB, EventTypePublicKeyRegistered, arguments, params.OperatorAddress.String(), - params.Name) + params.AvsAddr) } func (p Precompile) EmitTaskSubmittedByOperator(ctx sdk.Context, stateDB vm.StateDB, params *avstypes.TaskResultParams) error { diff --git a/precompiles/avs/query.go b/precompiles/avs/query.go index c90103bb6..c24e9d3eb 100644 --- a/precompiles/avs/query.go +++ b/precompiles/avs/query.go @@ -42,8 +42,12 @@ func (p Precompile) GetRegisteredPubkey( if !ok || addr == (common.Address{}) { return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 0, "common.Address", addr) } + avsAddr, ok := args[1].(common.Address) + if !ok { + return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 1, "common.Address", avsAddr) + } var accAddr sdk.AccAddress = addr[:] - blsPubKeyInfo, err := p.avsKeeper.GetOperatorPubKey(ctx, accAddr.String()) + blsPubKeyInfo, err := p.avsKeeper.GetOperatorPubKey(ctx, accAddr.String(), avsAddr.String()) if err != nil { if errors.Is(err, avstype.ErrNoKeyInTheStore) { return method.Outputs.Pack([]byte{}) diff --git a/precompiles/avs/query_test.go b/precompiles/avs/query_test.go index 4b151c810..eaf085694 100644 --- a/precompiles/avs/query_test.go +++ b/precompiles/avs/query_test.go @@ -332,9 +332,9 @@ func (suite *AVSManagerPrecompileSuite) TestGetRegisteredPubkey() { suite.prepareOperator(operatorAddr.String()) blsPub := &avstype.BlsPubKeyInfo{ - Operator: operatorAddr.String(), - PubKey: publicKey.Marshal(), - Name: "", + Operator: operatorAddr.String(), + PubKey: publicKey.Marshal(), + AvsAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", } err = suite.App.AVSManagerKeeper.SetOperatorPubKey(suite.Ctx, blsPub) suite.NoError(err) @@ -346,6 +346,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetRegisteredPubkey() { setUp() return []interface{}{ addr, + common.HexToAddress("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"), } }, func(bz []byte) { diff --git a/precompiles/avs/tx.go b/precompiles/avs/tx.go index 6a2044224..98c6b1de4 100644 --- a/precompiles/avs/tx.go +++ b/precompiles/avs/tx.go @@ -290,11 +290,11 @@ func (p Precompile) RegisterBLSPublicKey( return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 0, "common.Address", callerAddress) } blsParams.OperatorAddress = callerAddress[:] - name, ok := args[1].(string) - if !ok || name == "" { - return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 1, "string", name) + avsAddr, ok := args[1].(common.Address) + if !ok || (avsAddr == common.Address{}) { + return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 1, "common.Address", avsAddr) } - blsParams.Name = name + blsParams.AvsAddr = avsAddr pubkeyBz, ok := args[2].([]byte) if !ok { diff --git a/proto/exocore/avs/v1/tx.proto b/proto/exocore/avs/v1/tx.proto index 89c0dfb0d..e3ff8eaa4 100644 --- a/proto/exocore/avs/v1/tx.proto +++ b/proto/exocore/avs/v1/tx.proto @@ -151,8 +151,8 @@ message OperatorActivePowerInfo { message BlsPubKeyInfo { // operator address string operator = 1; - // the name of public keys - string name = 2; + // avs_address is the address of avs as a hex string + string avs_address = 2; // the bls public keys of the operator bytes pub_key = 3; } diff --git a/x/avs/keeper/bls_test.go b/x/avs/keeper/bls_test.go index 8aad1181c..54c7676d2 100644 --- a/x/avs/keeper/bls_test.go +++ b/x/avs/keeper/bls_test.go @@ -19,15 +19,15 @@ func (suite *AVSTestSuite) TestOperator_pubkey() { publicKey := privateKey.PublicKey() blsPub := &types.BlsPubKeyInfo{ - Operator: operatorAddr, - PubKey: publicKey.Marshal(), - Name: "", + Operator: operatorAddr, + PubKey: publicKey.Marshal(), + AvsAddress: suite.avsAddress.String(), } fmt.Println("pubkey:", hex.EncodeToString(publicKey.Marshal())) err = suite.App.AVSManagerKeeper.SetOperatorPubKey(suite.Ctx, blsPub) suite.NoError(err) - pub, err := suite.App.AVSManagerKeeper.GetOperatorPubKey(suite.Ctx, operatorAddr) + pub, err := suite.App.AVSManagerKeeper.GetOperatorPubKey(suite.Ctx, operatorAddr, suite.avsAddress.String()) suite.NoError(err) suite.Equal(publicKey.Marshal(), pub.PubKey) diff --git a/x/avs/keeper/keeper.go b/x/avs/keeper/keeper.go index 6a29a4da1..7f25ddad0 100644 --- a/x/avs/keeper/keeper.go +++ b/x/avs/keeper/keeper.go @@ -286,13 +286,13 @@ func (k Keeper) RegisterBLSPublicKey(ctx sdk.Context, params *types.BlsParams) e return errorsmod.Wrap(types.ErrSigNotMatchPubKey, fmt.Sprintf("the operator is :%s", params.OperatorAddress)) } - if k.IsExistPubKey(ctx, params.OperatorAddress.String()) { + if k.IsExistPubKey(ctx, params.OperatorAddress.String(), params.AvsAddr.String()) { return errorsmod.Wrap(types.ErrAlreadyExists, fmt.Sprintf("the operator is :%s", params.OperatorAddress)) } bls := &types.BlsPubKeyInfo{ - Name: params.Name, - Operator: strings.ToLower(params.OperatorAddress.String()), - PubKey: params.PubKey, + AvsAddress: params.AvsAddr.String(), + Operator: strings.ToLower(params.OperatorAddress.String()), + PubKey: params.PubKey, } return k.SetOperatorPubKey(ctx, bls) } @@ -489,7 +489,11 @@ func (k Keeper) SubmitTaskResult(ctx sdk.Context, addr string, info *types.TaskR ) } // check operator bls pubkey - keyInfo, err := k.GetOperatorPubKey(ctx, info.OperatorAddress) + avsInfo := k.GetAVSInfoByTaskAddress(ctx, info.TaskContractAddress) + if avsInfo.AvsAddress == "" { + return errorsmod.Wrap(types.ErrUnregisterNonExistent, fmt.Sprintf("the taskaddr is :%s", info.TaskContractAddress)) + } + keyInfo, err := k.GetOperatorPubKey(ctx, info.OperatorAddress, avsInfo.AvsAddress) if err != nil || keyInfo.PubKey == nil { return errorsmod.Wrap( types.ErrPubKeyIsNotExists, @@ -517,10 +521,6 @@ func (k Keeper) SubmitTaskResult(ctx sdk.Context, addr string, info *types.TaskR // If submitted in the first phase, in order to avoid plagiarism by other operators, // TaskResponse and TaskResponseHash must be null values // At the same time, it must be submitted within the response deadline in the first phase - avsInfo := k.GetAVSInfoByTaskAddress(ctx, info.TaskContractAddress) - if avsInfo.AvsAddress == "" { - return errorsmod.Wrap(types.ErrUnregisterNonExistent, fmt.Sprintf("the taskaddr is :%s", info.TaskContractAddress)) - } epoch, found := k.epochsKeeper.GetEpochInfo(ctx, avsInfo.EpochIdentifier) if !found { return errorsmod.Wrap(types.ErrEpochNotFound, fmt.Sprintf("epoch info not found %s", diff --git a/x/avs/keeper/multi_operator_submit_task_test.go b/x/avs/keeper/multi_operator_submit_task_test.go index 513312705..97f99d741 100644 --- a/x/avs/keeper/multi_operator_submit_task_test.go +++ b/x/avs/keeper/multi_operator_submit_task_test.go @@ -128,9 +128,9 @@ func (suite *AVSTestSuite) prepareMulOperatorubkey() { suite.Require().NoError(err) publicKey := privateKey.PublicKey() blsPub := &avstypes.BlsPubKeyInfo{ - Operator: operatorAddress, - PubKey: publicKey.Marshal(), - Name: "", + Operator: operatorAddress, + PubKey: publicKey.Marshal(), + AvsAddress: "", } err = suite.App.AVSManagerKeeper.SetOperatorPubKey(suite.Ctx, blsPub) suite.Require().NoError(err) diff --git a/x/avs/keeper/submit_task_test.go b/x/avs/keeper/submit_task_test.go index 9ca552040..aea218a23 100644 --- a/x/avs/keeper/submit_task_test.go +++ b/x/avs/keeper/submit_task_test.go @@ -111,9 +111,9 @@ func (suite *AVSTestSuite) prepareOperatorubkey() { suite.blsKey = privateKey publicKey := privateKey.PublicKey() blsPub := &avstypes.BlsPubKeyInfo{ - Operator: suite.operatorAddr.String(), - PubKey: publicKey.Marshal(), - Name: "", + Operator: suite.operatorAddr.String(), + PubKey: publicKey.Marshal(), + AvsAddress: "", } err = suite.App.AVSManagerKeeper.SetOperatorPubKey(suite.Ctx, blsPub) diff --git a/x/avs/keeper/task.go b/x/avs/keeper/task.go index 6fd31b26b..8eea2e2a9 100644 --- a/x/avs/keeper/task.go +++ b/x/avs/keeper/task.go @@ -65,24 +65,25 @@ func (k *Keeper) SetOperatorPubKey(ctx sdk.Context, pub *types.BlsPubKeyInfo) (e return types.ErrInvalidAddr } store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixOperatePub) + infoKey := assetstype.GetJoinedStoreKey(strings.ToLower(operatorAddress.String()), strings.ToLower(pub.AvsAddress)) bz := k.cdc.MustMarshal(pub) - store.Set(operatorAddress, bz) + store.Set(infoKey, bz) return nil } -func (k *Keeper) GetOperatorPubKey(ctx sdk.Context, addr string) (pub *types.BlsPubKeyInfo, err error) { +func (k *Keeper) GetOperatorPubKey(ctx sdk.Context, addr, avsAddr string) (pub *types.BlsPubKeyInfo, err error) { opAccAddr, err := sdk.AccAddressFromBech32(addr) if err != nil { return nil, errorsmod.Wrap(err, "GetOperatorPubKey: error occurred when parsing account address from Bech32: "+addr) } store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixOperatePub) - // key := common.HexToAddress(incentive.Contract) - isExist := store.Has(opAccAddr) + infoKey := assetstype.GetJoinedStoreKey(strings.ToLower(opAccAddr.String()), strings.ToLower(avsAddr)) + isExist := store.Has(infoKey) if !isExist { return nil, errorsmod.Wrap(types.ErrNoKeyInTheStore, fmt.Sprintf("GetOperatorPubKey: public key not found for address %s", opAccAddr)) } - value := store.Get(opAccAddr) + value := store.Get(infoKey) ret := types.BlsPubKeyInfo{} k.cdc.MustUnmarshal(value, &ret) return &ret, nil @@ -116,10 +117,15 @@ func (k *Keeper) GetAllBlsPubKeys(ctx sdk.Context) ([]types.BlsPubKeyInfo, error return pubKeys, nil } -func (k *Keeper) IsExistPubKey(ctx sdk.Context, addr string) bool { - opAccAddr, _ := sdk.AccAddressFromBech32(addr) +func (k *Keeper) IsExistPubKey(ctx sdk.Context, operator, avs string) bool { + opAccAddr, err := sdk.AccAddressFromBech32(operator) + if err != nil { + return false + } store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixOperatePub) - return store.Has(opAccAddr) + infoKey := assetstype.GetJoinedStoreKey(strings.ToLower(opAccAddr.String()), strings.ToLower(avs)) + + return store.Has(infoKey) } // IterateTaskAVSInfo iterate through task diff --git a/x/avs/types/tx.pb.go b/x/avs/types/tx.pb.go index 31baaf5f6..9b7be2901 100644 --- a/x/avs/types/tx.pb.go +++ b/x/avs/types/tx.pb.go @@ -681,8 +681,8 @@ func (m *OperatorActivePowerInfo) GetOperatorAddr() string { type BlsPubKeyInfo struct { // operator address Operator string `protobuf:"bytes,1,opt,name=operator,proto3" json:"operator,omitempty"` - // the name of public keys - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + // avs_address is the address of avs as a hex string + AvsAddress string `protobuf:"bytes,2,opt,name=avs_address,json=avsAddress,proto3" json:"avs_address,omitempty"` // the bls public keys of the operator PubKey []byte `protobuf:"bytes,3,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"` } @@ -727,9 +727,9 @@ func (m *BlsPubKeyInfo) GetOperator() string { return "" } -func (m *BlsPubKeyInfo) GetName() string { +func (m *BlsPubKeyInfo) GetAvsAddress() string { if m != nil { - return m.Name + return m.AvsAddress } return "" } @@ -1242,120 +1242,120 @@ func init() { func init() { proto.RegisterFile("exocore/avs/v1/tx.proto", fileDescriptor_ef1ed06249b07d86) } var fileDescriptor_ef1ed06249b07d86 = []byte{ - // 1806 bytes of a gzipped FileDescriptorProto + // 1805 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x4a, 0xd4, 0xbf, 0x47, 0x8a, 0x5a, 0x8d, 0xe8, 0x70, 0x43, 0xb7, 0x24, 0xb1, 0xae, + 0x15, 0xd7, 0x4a, 0xd4, 0xbf, 0x47, 0x8a, 0x5a, 0x8d, 0xe4, 0x70, 0x4d, 0xb7, 0x24, 0xb1, 0xae, 0x1d, 0x59, 0x8e, 0x49, 0x5b, 0x29, 0x0a, 0xc3, 0x3d, 0x49, 0x96, 0x92, 0x10, 0xa9, 0x2d, 0x62, - 0x29, 0xa7, 0x45, 0x7b, 0x58, 0x0c, 0xb9, 0x23, 0x72, 0x21, 0x72, 0x87, 0xdd, 0x19, 0x52, 0x76, + 0x29, 0xa7, 0x40, 0x7b, 0x58, 0x0c, 0xb9, 0x23, 0x72, 0x21, 0x72, 0x87, 0xdd, 0x19, 0x52, 0x76, 0x0f, 0x45, 0xe1, 0x4b, 0x03, 0xa1, 0x28, 0x5a, 0xe4, 0x6c, 0x20, 0x40, 0x8f, 0x45, 0x01, 0xa3, 0xc8, 0xa5, 0x40, 0x3f, 0x40, 0x8e, 0x41, 0x7a, 0x29, 0x7a, 0x30, 0x0a, 0xb9, 0x80, 0xdb, 0x7e, - 0x8a, 0x62, 0xde, 0xce, 0x52, 0x5c, 0x52, 0xb2, 0xeb, 0xe6, 0xd0, 0x5c, 0xac, 0x9d, 0xf7, 0x7b, - 0xef, 0xcd, 0x7b, 0x6f, 0xde, 0xfb, 0xcd, 0x98, 0x90, 0x67, 0x8f, 0x78, 0x8b, 0x87, 0xac, 0x4a, - 0x87, 0xa2, 0x3a, 0xbc, 0x5d, 0x95, 0x8f, 0x2a, 0xfd, 0x90, 0x4b, 0x4e, 0xb2, 0x1a, 0xa8, 0xd0, - 0xa1, 0xa8, 0x0c, 0x6f, 0x17, 0xd6, 0x68, 0xcf, 0x0f, 0x78, 0x15, 0xff, 0x8d, 0x54, 0x0a, 0xf9, - 0x16, 0x17, 0x3d, 0x2e, 0xaa, 0x3d, 0xd1, 0x56, 0xa6, 0x3d, 0xd1, 0xd6, 0xc0, 0xdb, 0x11, 0xe0, - 0xe2, 0xaa, 0x1a, 0x2d, 0x34, 0x94, 0x6b, 0xf3, 0x36, 0x8f, 0xe4, 0xea, 0x4b, 0x4b, 0xbf, 0xd5, - 0xe6, 0xbc, 0xdd, 0x65, 0x55, 0xda, 0xf7, 0xab, 0x34, 0x08, 0xb8, 0xa4, 0xd2, 0xe7, 0x81, 0xb6, - 0xb1, 0xff, 0xbd, 0x08, 0x8b, 0xdb, 0x1f, 0x37, 0x6a, 0xc1, 0x21, 0x27, 0x04, 0x52, 0x01, 0xed, - 0x31, 0xcb, 0x28, 0x1b, 0x1b, 0xcb, 0x0e, 0x7e, 0x93, 0x12, 0xa4, 0xe9, 0x50, 0xb8, 0xd4, 0xf3, - 0x42, 0x26, 0x84, 0x35, 0x8b, 0x10, 0xd0, 0xa1, 0xd8, 0x8e, 0x24, 0x64, 0x03, 0xcc, 0x9e, 0x1f, - 0xb8, 0x42, 0xd2, 0x23, 0xe6, 0xd2, 0x1e, 0x1f, 0x04, 0xd2, 0x9a, 0x2b, 0x1b, 0x1b, 0x29, 0x27, - 0xdb, 0xf3, 0x83, 0x86, 0x12, 0x6f, 0xa3, 0x94, 0x5c, 0x86, 0x65, 0x49, 0xc5, 0x11, 0xfa, 0xb2, - 0x52, 0xe8, 0x68, 0x49, 0x09, 0x94, 0x27, 0xf2, 0x6d, 0x00, 0xd1, 0xa5, 0xa2, 0x13, 0xa1, 0xf3, - 0x88, 0x2e, 0xa3, 0x04, 0xe1, 0x12, 0xa4, 0x43, 0x76, 0x4c, 0x43, 0x2f, 0xc2, 0x17, 0xa2, 0x30, - 0x22, 0x11, 0x2a, 0x6c, 0xc2, 0x9a, 0x8a, 0x93, 0x1f, 0x07, 0x2c, 0x1c, 0x45, 0xbb, 0x58, 0x9e, - 0xdb, 0x58, 0x76, 0x56, 0xe9, 0x50, 0xec, 0x2b, 0x79, 0x1c, 0xf2, 0x75, 0x58, 0xa6, 0x42, 0x30, - 0xe9, 0xfa, 0x9e, 0xb0, 0x96, 0x94, 0xce, 0x4e, 0xe6, 0xf4, 0x79, 0x69, 0x69, 0x5b, 0x09, 0x6b, - 0xbb, 0xc2, 0x59, 0x42, 0xb8, 0xe6, 0x09, 0x72, 0x0b, 0x72, 0xca, 0xed, 0x20, 0x68, 0xf2, 0xc0, - 0xf3, 0x83, 0xb6, 0xdb, 0x67, 0xa1, 0xcf, 0x3d, 0x6b, 0x19, 0x33, 0x24, 0x74, 0x28, 0x1e, 0xc6, - 0x50, 0x1d, 0x11, 0x52, 0x81, 0x75, 0xac, 0x07, 0xeb, 0x1e, 0xba, 0x1e, 0xeb, 0xb2, 0x36, 0x96, - 0xdb, 0x02, 0x34, 0x58, 0x53, 0x25, 0x61, 0xdd, 0xc3, 0xdd, 0x11, 0x40, 0xae, 0x83, 0xc9, 0xfa, - 0xbc, 0xd5, 0x71, 0x7d, 0x8f, 0x05, 0xd2, 0x3f, 0xf4, 0x59, 0x68, 0xa5, 0x31, 0xbd, 0x55, 0x94, - 0xd7, 0x46, 0x62, 0x52, 0x85, 0x9c, 0x72, 0xcd, 0xfb, 0xd2, 0xc5, 0x3f, 0x2c, 0xa4, 0x92, 0x87, - 0xc2, 0xca, 0x8c, 0x7c, 0xef, 0xf7, 0x65, 0x2d, 0xd8, 0x8f, 0x01, 0xf2, 0x1e, 0xbc, 0xa5, 0x0c, - 0x24, 0x97, 0xb4, 0x9b, 0x3c, 0xa1, 0x15, 0x34, 0x51, 0x91, 0x1e, 0x28, 0x70, 0xfc, 0x98, 0xae, - 0x42, 0x56, 0x48, 0x1a, 0x4a, 0x95, 0x2d, 0x46, 0x60, 0x65, 0x51, 0x79, 0x25, 0x96, 0xee, 0x29, - 0x21, 0x79, 0x1b, 0x96, 0x5a, 0x1d, 0xea, 0x07, 0xae, 0xef, 0x59, 0xab, 0x18, 0xef, 0x22, 0xae, - 0x6b, 0x1e, 0xb9, 0x0f, 0xaa, 0x41, 0xdc, 0xe8, 0x74, 0x2c, 0x53, 0x81, 0x3b, 0x95, 0x2f, 0x9e, - 0x97, 0x66, 0xfe, 0xf6, 0xbc, 0x74, 0xad, 0xed, 0xcb, 0xce, 0xa0, 0x59, 0x69, 0xf1, 0x9e, 0x6e, - 0x5e, 0xfd, 0xe7, 0xa6, 0xf0, 0x8e, 0xaa, 0xf2, 0x71, 0x9f, 0x89, 0xca, 0x2e, 0x6b, 0x39, 0xcb, - 0x74, 0x28, 0x1c, 0x74, 0x40, 0x3e, 0x02, 0xb5, 0x70, 0xb1, 0x19, 0xac, 0xb5, 0xff, 0xc9, 0xdb, - 0x12, 0x1d, 0x8a, 0x86, 0xb2, 0x27, 0x3f, 0x87, 0x52, 0x74, 0xf6, 0x71, 0x3b, 0x61, 0xd2, 0x51, - 0xa2, 0x6e, 0x93, 0x0a, 0x5f, 0x58, 0xa4, 0x3c, 0xb7, 0x91, 0xde, 0xba, 0x53, 0x49, 0x0e, 0x69, - 0x45, 0x4f, 0x49, 0x05, 0xbb, 0x24, 0x0a, 0x2d, 0xaa, 0x18, 0xd6, 0x63, 0x47, 0x99, 0xee, 0x05, - 0x32, 0x7c, 0xec, 0x5c, 0xa6, 0x17, 0x6b, 0x90, 0x1b, 0xb0, 0x76, 0xdc, 0xf1, 0x25, 0xeb, 0xfa, - 0x42, 0x8e, 0xfa, 0x74, 0x1d, 0xfb, 0xd4, 0x1c, 0x01, 0xba, 0x51, 0x0b, 0x0f, 0xa0, 0xfc, 0xba, - 0xdd, 0x88, 0x09, 0x73, 0x47, 0xec, 0xb1, 0x9e, 0x59, 0xf5, 0x49, 0x72, 0x30, 0x3f, 0xa4, 0xdd, - 0x01, 0xc3, 0x61, 0x9d, 0x73, 0xa2, 0xc5, 0xdd, 0xd9, 0x3b, 0x86, 0x1d, 0x42, 0x36, 0x6e, 0x8e, - 0x86, 0xa4, 0x72, 0xa0, 0x46, 0xc1, 0x8c, 0xfb, 0x68, 0x14, 0x4d, 0xe4, 0x6a, 0x35, 0x96, 0xc7, - 0x53, 0xf3, 0x16, 0x2c, 0x08, 0x34, 0xd2, 0x24, 0xa0, 0x57, 0x6a, 0x72, 0xfb, 0x21, 0xe7, 0x87, - 0xae, 0x47, 0x25, 0xc5, 0xd1, 0xcf, 0x38, 0xcb, 0x28, 0xd9, 0xa5, 0x92, 0xda, 0xff, 0x32, 0xc0, - 0x8c, 0xe2, 0xc7, 0x03, 0xa8, 0x2b, 0x80, 0xe4, 0x61, 0x11, 0xa9, 0xc0, 0xf7, 0xf4, 0x6e, 0x0b, - 0x6a, 0x59, 0xf3, 0xc8, 0x16, 0x5c, 0x42, 0xa0, 0xc5, 0x03, 0x19, 0xd2, 0x96, 0x9c, 0x20, 0x9e, - 0x75, 0x05, 0xde, 0xd3, 0x58, 0x1c, 0x58, 0x11, 0x80, 0xb6, 0xdb, 0xa1, 0x1a, 0x28, 0x1e, 0x62, - 0x00, 0x8a, 0xa1, 0x46, 0x92, 0x49, 0x0a, 0x4b, 0x4d, 0x51, 0xd8, 0x07, 0x30, 0x4a, 0xd6, 0xd5, - 0x29, 0xce, 0x63, 0x0f, 0x14, 0x27, 0x7b, 0x20, 0x59, 0x3d, 0x27, 0xcb, 0x13, 0x6b, 0xfb, 0xd9, - 0x02, 0x2c, 0x1d, 0xa8, 0x44, 0x14, 0x9b, 0x5e, 0x98, 0x8a, 0x71, 0x71, 0x2a, 0x31, 0x03, 0xcf, - 0x8e, 0x31, 0x30, 0x81, 0x54, 0x47, 0x75, 0x7e, 0x54, 0x59, 0xfc, 0x1e, 0xaf, 0x5f, 0x0a, 0x87, - 0x33, 0xae, 0xdf, 0x2d, 0xc8, 0x21, 0x10, 0x32, 0xd1, 0xe7, 0x81, 0x60, 0x31, 0x5f, 0xcd, 0x47, - 0x7c, 0xa5, 0x30, 0x47, 0x43, 0x9a, 0xaf, 0xbe, 0x07, 0x79, 0xb4, 0x50, 0x89, 0xfb, 0x42, 0xfa, - 0x2d, 0xda, 0x8d, 0x8d, 0x16, 0xd0, 0x08, 0xb3, 0x68, 0x9c, 0xa1, 0xda, 0x6e, 0x94, 0x5e, 0x87, - 0x76, 0xbb, 0x2c, 0x68, 0x8f, 0xb6, 0x5a, 0x8c, 0xa8, 0x05, 0xd3, 0x8b, 0x31, 0x6d, 0x73, 0x1b, - 0x72, 0xb2, 0x13, 0x32, 0xd1, 0xe1, 0x5d, 0x4f, 0xa9, 0xb7, 0x58, 0x20, 0x69, 0x9b, 0x59, 0x4b, - 0xda, 0x24, 0xc6, 0xea, 0x23, 0xe8, 0x1c, 0x36, 0x5a, 0x3e, 0x8f, 0x8d, 0xae, 0x83, 0x49, 0x5b, - 0x72, 0x40, 0xbb, 0xee, 0xc8, 0x89, 0xa6, 0xdc, 0xd5, 0x48, 0x7e, 0x10, 0x8b, 0xd5, 0x85, 0x35, - 0xc5, 0xa0, 0x69, 0x1c, 0xc0, 0x2c, 0x4f, 0xd2, 0xe7, 0x75, 0x30, 0x85, 0xdf, 0x0e, 0x98, 0x97, - 0xe0, 0x5a, 0xbc, 0x52, 0x22, 0xf9, 0x99, 0x6a, 0x05, 0xd6, 0x03, 0xee, 0x4e, 0x69, 0xaf, 0xa0, - 0xf6, 0x5a, 0xc0, 0x1b, 0x13, 0xfa, 0xb7, 0x20, 0xc7, 0xc2, 0x70, 0xda, 0x20, 0x8b, 0x06, 0x84, - 0x85, 0xe1, 0xa4, 0xc5, 0x23, 0x30, 0xb1, 0xde, 0x11, 0x99, 0xf7, 0xf9, 0x31, 0x0b, 0x23, 0xde, - 0xdd, 0x79, 0xf0, 0x66, 0x64, 0x78, 0xfa, 0xbc, 0x94, 0x55, 0x4d, 0x8a, 0xc4, 0x5f, 0x57, 0x7e, - 0xbe, 0xfa, 0xfc, 0x26, 0xe8, 0x87, 0x84, 0x22, 0xcb, 0xac, 0x4c, 0xa0, 0xe4, 0x27, 0x70, 0xe9, - 0x8c, 0x23, 0x5a, 0xd2, 0x1f, 0x32, 0xbd, 0xbd, 0x62, 0xf6, 0xf4, 0xd6, 0x3b, 0x17, 0x0d, 0xc9, - 0x36, 0xea, 0xa2, 0x8f, 0x1f, 0xf8, 0x42, 0x3a, 0xeb, 0x7c, 0x1a, 0xb0, 0x43, 0xc8, 0x5f, 0xa0, - 0x4f, 0x7e, 0x08, 0x23, 0x8b, 0x68, 0x43, 0x57, 0x71, 0xa3, 0x65, 0xe0, 0x68, 0xfe, 0x37, 0xbb, - 0xaa, 0x31, 0x74, 0xd6, 0x62, 0x1f, 0x23, 0xc7, 0xf6, 0x1f, 0x8d, 0x73, 0x37, 0xc5, 0xa9, 0xbd, - 0x02, 0x2b, 0x09, 0x42, 0xd4, 0xd3, 0x9a, 0x19, 0x67, 0x43, 0x12, 0x42, 0x26, 0x51, 0x08, 0x1c, - 0xd7, 0x9d, 0xfd, 0x37, 0x3e, 0x87, 0x55, 0xf5, 0x16, 0x18, 0x8b, 0x60, 0xe2, 0x20, 0xd2, 0x74, - 0xac, 0x50, 0x3f, 0x82, 0x95, 0x9d, 0xae, 0xa8, 0x0f, 0x9a, 0x1f, 0xb1, 0xc7, 0x18, 0x69, 0x01, - 0x96, 0xe2, 0xa0, 0x74, 0x90, 0xa3, 0xf5, 0xb9, 0x3c, 0x92, 0x87, 0xc5, 0xfe, 0xa0, 0xe9, 0xaa, - 0xcb, 0x22, 0xa2, 0x92, 0x85, 0x3e, 0x3a, 0xb3, 0xff, 0x64, 0x00, 0x71, 0x58, 0xdb, 0x17, 0x92, - 0x85, 0xdb, 0x1f, 0x37, 0x0e, 0x90, 0x23, 0x7e, 0x4a, 0xbe, 0x0f, 0x99, 0xc3, 0x90, 0xf7, 0x92, - 0xb4, 0xb5, 0x63, 0x7d, 0xf5, 0xf9, 0xcd, 0x9c, 0x8e, 0x51, 0xb3, 0x56, 0x43, 0x86, 0x7e, 0xd0, - 0x76, 0xd2, 0x4a, 0x3b, 0x26, 0xb2, 0x77, 0x21, 0xa5, 0xba, 0x08, 0x03, 0x48, 0x6f, 0x59, 0x93, - 0x87, 0x15, 0x93, 0xa4, 0x83, 0x5a, 0x77, 0xef, 0x7c, 0xf2, 0x59, 0x69, 0xe6, 0x9f, 0x9f, 0x95, - 0x66, 0x9e, 0xbc, 0x7c, 0xb6, 0x99, 0x7e, 0xff, 0xcc, 0xcf, 0xc9, 0xcb, 0x67, 0x9b, 0x97, 0xc7, - 0x8a, 0x77, 0x30, 0xc6, 0x99, 0xca, 0xde, 0x7e, 0x1b, 0xf2, 0x53, 0xa1, 0x47, 0xf4, 0x66, 0xff, - 0xca, 0x80, 0xec, 0x18, 0xf6, 0xb5, 0x53, 0xba, 0x01, 0x29, 0x3f, 0x38, 0xe4, 0x3a, 0xa5, 0xfc, - 0x05, 0xcf, 0x03, 0x07, 0x95, 0xee, 0x9a, 0x93, 0x99, 0xd8, 0xbf, 0x35, 0x60, 0x3d, 0x11, 0x4e, - 0x14, 0xe6, 0xff, 0x35, 0xa6, 0x5f, 0x1b, 0x60, 0xee, 0xb2, 0x6f, 0x50, 0x91, 0x3e, 0x35, 0xe0, - 0xd2, 0x44, 0x40, 0xdf, 0x80, 0x32, 0xfd, 0x61, 0x16, 0xb2, 0xba, 0xb5, 0x06, 0x5d, 0xec, 0xbb, - 0x37, 0x79, 0x37, 0xbd, 0x0b, 0x24, 0x79, 0x25, 0xe3, 0x6d, 0x1e, 0x4d, 0xa6, 0x39, 0x7e, 0x21, - 0x7f, 0xa8, 0x6e, 0xf6, 0x2b, 0xb0, 0x92, 0xd0, 0xd6, 0xb3, 0x9a, 0x19, 0x57, 0x54, 0x4a, 0xcd, - 0xae, 0xc0, 0xdb, 0x83, 0xca, 0x41, 0xc8, 0xf0, 0x11, 0x90, 0x71, 0x32, 0xcd, 0xae, 0x68, 0xc4, - 0xb2, 0x8b, 0xdf, 0x1f, 0xf3, 0x17, 0xbf, 0x3f, 0xc6, 0xde, 0x15, 0x0b, 0x89, 0x77, 0xc5, 0x0d, - 0x98, 0xef, 0x77, 0xa8, 0x60, 0x78, 0xbb, 0x67, 0xb7, 0x2e, 0x4d, 0x96, 0xb0, 0xae, 0x40, 0x27, - 0xd2, 0xb1, 0xff, 0x6c, 0xc0, 0x7a, 0x63, 0xd0, 0xec, 0xf9, 0xf2, 0xac, 0x6a, 0x5f, 0xbb, 0xb3, - 0xb6, 0x12, 0x67, 0x58, 0x3c, 0x8f, 0x51, 0xce, 0xce, 0x47, 0x1f, 0xe5, 0x77, 0x5f, 0xc5, 0x2b, - 0xf9, 0x31, 0x5e, 0x89, 0x6f, 0x03, 0xe4, 0x94, 0x02, 0x58, 0xd3, 0xd1, 0x47, 0x95, 0xdf, 0xfc, - 0xa5, 0x01, 0xf3, 0x98, 0xab, 0x7a, 0xc8, 0xd7, 0x3f, 0xdc, 0x6e, 0xec, 0xb9, 0x0f, 0x1f, 0x34, - 0xea, 0x7b, 0xf7, 0x6a, 0xef, 0xd7, 0xf6, 0x76, 0xcd, 0x99, 0x42, 0xee, 0xe4, 0x69, 0xd9, 0x44, - 0x8d, 0x87, 0x81, 0xe8, 0xb3, 0x96, 0xfa, 0x9f, 0x9b, 0xa7, 0x0e, 0x2c, 0x52, 0xae, 0x3b, 0x7b, - 0xf5, 0x6d, 0x67, 0xcf, 0x34, 0x0a, 0xe6, 0xc9, 0xd3, 0x72, 0x06, 0x15, 0xeb, 0x21, 0xeb, 0xd3, - 0x90, 0x91, 0x6b, 0xb0, 0x1a, 0x29, 0xed, 0xee, 0xbb, 0xf7, 0xf6, 0xef, 0xdf, 0xaf, 0x1d, 0x98, - 0xb3, 0x85, 0xb5, 0x93, 0xa7, 0xe5, 0x15, 0x54, 0xdb, 0xe5, 0xf7, 0x78, 0xaf, 0xe7, 0xcb, 0x42, - 0xea, 0x93, 0xdf, 0x15, 0x67, 0xb6, 0x7e, 0x9f, 0x82, 0xb9, 0xfb, 0xa2, 0x4d, 0x7e, 0x06, 0xe9, - 0xb1, 0x79, 0x21, 0x53, 0x85, 0x49, 0x4e, 0x77, 0xe1, 0xca, 0x2b, 0x71, 0x4d, 0x9d, 0xd7, 0x9e, - 0xfc, 0xe5, 0x1f, 0x9f, 0xce, 0x96, 0xed, 0x62, 0x75, 0xea, 0x17, 0x8c, 0xea, 0xf8, 0x66, 0x4f, - 0x0c, 0x58, 0x49, 0x8c, 0x2b, 0x29, 0x4f, 0xba, 0x9f, 0xa4, 0x97, 0xc2, 0xd5, 0xd7, 0x68, 0xe8, - 0x10, 0x36, 0x30, 0x04, 0xdb, 0x2e, 0x9f, 0x13, 0x42, 0x72, 0xcb, 0x13, 0x03, 0x56, 0x27, 0xee, - 0x00, 0x62, 0xbf, 0x22, 0x4b, 0x7d, 0xbf, 0x15, 0xde, 0x79, 0xad, 0x8e, 0x0e, 0x65, 0x13, 0x43, - 0xf9, 0x8e, 0x6d, 0xbf, 0xba, 0x1a, 0xb8, 0xb1, 0x62, 0xd4, 0xc9, 0xe6, 0x21, 0x53, 0x35, 0x3f, - 0x67, 0x38, 0x0a, 0x1b, 0xaf, 0x57, 0xd2, 0xf1, 0xdc, 0xc0, 0x78, 0xae, 0xda, 0x57, 0xce, 0x89, - 0x67, 0xd2, 0xa8, 0x30, 0xff, 0x8b, 0x97, 0xcf, 0x36, 0x8d, 0x9d, 0x0f, 0xbe, 0x38, 0x2d, 0x1a, - 0x5f, 0x9e, 0x16, 0x8d, 0xbf, 0x9f, 0x16, 0x8d, 0xdf, 0xbc, 0x28, 0xce, 0x7c, 0xf9, 0xa2, 0x38, - 0xf3, 0xd7, 0x17, 0xc5, 0x99, 0x1f, 0xdf, 0x1c, 0x7b, 0xad, 0xec, 0x45, 0xfe, 0x1e, 0x30, 0x79, - 0xcc, 0xc3, 0xa3, 0x91, 0xfb, 0x47, 0xb8, 0x01, 0x3e, 0x5c, 0x9a, 0x0b, 0xf8, 0xb3, 0xd1, 0x7b, - 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x64, 0x12, 0x7a, 0xae, 0xdc, 0x12, 0x00, 0x00, + 0x8a, 0x62, 0xde, 0xce, 0x52, 0x5c, 0x52, 0xb2, 0xea, 0xe6, 0x10, 0x5f, 0xac, 0x9d, 0xf7, 0x7b, + 0xef, 0xcd, 0x7b, 0x6f, 0xde, 0xfb, 0xcd, 0x98, 0x90, 0x63, 0x8f, 0x79, 0x93, 0x87, 0xac, 0x42, + 0x07, 0xa2, 0x32, 0xb8, 0x53, 0x91, 0x8f, 0xcb, 0xbd, 0x90, 0x4b, 0x4e, 0xb2, 0x1a, 0x28, 0xd3, + 0x81, 0x28, 0x0f, 0xee, 0xe4, 0x57, 0x68, 0xd7, 0x0f, 0x78, 0x05, 0xff, 0x8d, 0x54, 0xf2, 0xb9, + 0x26, 0x17, 0x5d, 0x2e, 0x2a, 0x5d, 0xd1, 0x52, 0xa6, 0x5d, 0xd1, 0xd2, 0xc0, 0xe5, 0x08, 0x70, + 0x71, 0x55, 0x89, 0x16, 0x1a, 0x5a, 0x6b, 0xf1, 0x16, 0x8f, 0xe4, 0xea, 0x4b, 0x4b, 0xbf, 0xd3, + 0xe2, 0xbc, 0xd5, 0x61, 0x15, 0xda, 0xf3, 0x2b, 0x34, 0x08, 0xb8, 0xa4, 0xd2, 0xe7, 0x81, 0xb6, + 0xb1, 0xff, 0x33, 0x0f, 0xf3, 0x5b, 0x9f, 0xd4, 0xab, 0xc1, 0x01, 0x27, 0x04, 0x52, 0x01, 0xed, + 0x32, 0xcb, 0x28, 0x19, 0xeb, 0x8b, 0x0e, 0x7e, 0x93, 0x22, 0xa4, 0xe9, 0x40, 0xb8, 0xd4, 0xf3, + 0x42, 0x26, 0x84, 0x35, 0x8d, 0x10, 0xd0, 0x81, 0xd8, 0x8a, 0x24, 0x64, 0x1d, 0xcc, 0xae, 0x1f, + 0xb8, 0x42, 0xd2, 0x43, 0xe6, 0xd2, 0x2e, 0xef, 0x07, 0xd2, 0x9a, 0x29, 0x19, 0xeb, 0x29, 0x27, + 0xdb, 0xf5, 0x83, 0xba, 0x12, 0x6f, 0xa1, 0x94, 0x5c, 0x81, 0x45, 0x49, 0xc5, 0x21, 0xfa, 0xb2, + 0x52, 0xe8, 0x68, 0x41, 0x09, 0x94, 0x27, 0xf2, 0x5d, 0x00, 0xd1, 0xa1, 0xa2, 0x1d, 0xa1, 0xb3, + 0x88, 0x2e, 0xa2, 0x04, 0xe1, 0x22, 0xa4, 0x43, 0x76, 0x44, 0x43, 0x2f, 0xc2, 0xe7, 0xa2, 0x30, + 0x22, 0x11, 0x2a, 0x6c, 0xc0, 0x8a, 0x8a, 0x93, 0x1f, 0x05, 0x2c, 0x1c, 0x46, 0x3b, 0x5f, 0x9a, + 0x59, 0x5f, 0x74, 0x96, 0xe9, 0x40, 0xec, 0x29, 0x79, 0x1c, 0xf2, 0x0d, 0x58, 0xa4, 0x42, 0x30, + 0xe9, 0xfa, 0x9e, 0xb0, 0x16, 0x94, 0xce, 0x76, 0xe6, 0xe4, 0x45, 0x71, 0x61, 0x4b, 0x09, 0xab, + 0x3b, 0xc2, 0x59, 0x40, 0xb8, 0xea, 0x09, 0x72, 0x1b, 0xd6, 0x94, 0xdb, 0x7e, 0xd0, 0xe0, 0x81, + 0xe7, 0x07, 0x2d, 0xb7, 0xc7, 0x42, 0x9f, 0x7b, 0xd6, 0x22, 0x66, 0x48, 0xe8, 0x40, 0x3c, 0x8a, + 0xa1, 0x1a, 0x22, 0xa4, 0x0c, 0xab, 0x58, 0x0f, 0xd6, 0x39, 0x70, 0x3d, 0xd6, 0x61, 0x2d, 0x2c, + 0xb7, 0x05, 0x68, 0xb0, 0xa2, 0x4a, 0xc2, 0x3a, 0x07, 0x3b, 0x43, 0x80, 0xdc, 0x00, 0x93, 0xf5, + 0x78, 0xb3, 0xed, 0xfa, 0x1e, 0x0b, 0xa4, 0x7f, 0xe0, 0xb3, 0xd0, 0x4a, 0x63, 0x7a, 0xcb, 0x28, + 0xaf, 0x0e, 0xc5, 0xa4, 0x02, 0x6b, 0xca, 0x35, 0xef, 0x49, 0x17, 0xff, 0xb0, 0x90, 0x4a, 0x1e, + 0x0a, 0x2b, 0x33, 0xf4, 0xbd, 0xd7, 0x93, 0xd5, 0x60, 0x2f, 0x06, 0xc8, 0xfb, 0xf0, 0x8e, 0x32, + 0x90, 0x5c, 0xd2, 0x4e, 0xf2, 0x84, 0x96, 0xd0, 0x44, 0x45, 0xba, 0xaf, 0xc0, 0xd1, 0x63, 0xba, + 0x06, 0x59, 0x21, 0x69, 0x28, 0x55, 0xb6, 0x18, 0x81, 0x95, 0x45, 0xe5, 0xa5, 0x58, 0xba, 0xab, + 0x84, 0xe4, 0x32, 0x2c, 0x34, 0xdb, 0xd4, 0x0f, 0x5c, 0xdf, 0xb3, 0x96, 0x31, 0xde, 0x79, 0x5c, + 0x57, 0x3d, 0xf2, 0x00, 0x54, 0x83, 0xb8, 0xd1, 0xe9, 0x58, 0xa6, 0x02, 0xb7, 0xcb, 0x5f, 0xbe, + 0x28, 0x4e, 0xfd, 0xfd, 0x45, 0xf1, 0x7a, 0xcb, 0x97, 0xed, 0x7e, 0xa3, 0xdc, 0xe4, 0x5d, 0xdd, + 0xbc, 0xfa, 0xcf, 0x2d, 0xe1, 0x1d, 0x56, 0xe4, 0x93, 0x1e, 0x13, 0xe5, 0x1d, 0xd6, 0x74, 0x16, + 0xe9, 0x40, 0x38, 0xe8, 0x80, 0x7c, 0x0c, 0x6a, 0xe1, 0x62, 0x33, 0x58, 0x2b, 0xff, 0x97, 0xb7, + 0x05, 0x3a, 0x10, 0x75, 0x65, 0x4f, 0x7e, 0x01, 0xc5, 0xe8, 0xec, 0xe3, 0x76, 0xc2, 0xa4, 0xa3, + 0x44, 0xdd, 0x06, 0x15, 0xbe, 0xb0, 0x48, 0x69, 0x66, 0x3d, 0xbd, 0x79, 0xb7, 0x9c, 0x1c, 0xd2, + 0xb2, 0x9e, 0x92, 0x32, 0x76, 0x49, 0x14, 0x5a, 0x54, 0x31, 0xac, 0xc7, 0xb6, 0x32, 0xdd, 0x0d, + 0x64, 0xf8, 0xc4, 0xb9, 0x42, 0xcf, 0xd7, 0x20, 0x37, 0x61, 0xe5, 0xa8, 0xed, 0x4b, 0xd6, 0xf1, + 0x85, 0x1c, 0xf6, 0xe9, 0x2a, 0xf6, 0xa9, 0x39, 0x04, 0x74, 0xa3, 0xe6, 0x1f, 0x42, 0xe9, 0xa2, + 0xdd, 0x88, 0x09, 0x33, 0x87, 0xec, 0x89, 0x9e, 0x59, 0xf5, 0x49, 0xd6, 0x60, 0x76, 0x40, 0x3b, + 0x7d, 0x86, 0xc3, 0x3a, 0xe3, 0x44, 0x8b, 0x7b, 0xd3, 0x77, 0x0d, 0x3b, 0x84, 0x6c, 0xdc, 0x1c, + 0x75, 0x49, 0x65, 0x5f, 0x8d, 0x82, 0x19, 0xf7, 0xd1, 0x30, 0x9a, 0xc8, 0xd5, 0x72, 0x2c, 0x8f, + 0xa7, 0xe6, 0x1d, 0x98, 0x13, 0x68, 0xa4, 0x49, 0x40, 0xaf, 0xd4, 0xe4, 0xf6, 0x42, 0xce, 0x0f, + 0x5c, 0x8f, 0x4a, 0x8a, 0xa3, 0x9f, 0x71, 0x16, 0x51, 0xb2, 0x43, 0x25, 0xb5, 0xff, 0x6d, 0x80, + 0x19, 0xc5, 0x8f, 0x07, 0x50, 0x53, 0x00, 0xc9, 0xc1, 0x3c, 0x52, 0x81, 0xef, 0xe9, 0xdd, 0xe6, + 0xd4, 0xb2, 0xea, 0x91, 0x4d, 0xb8, 0x84, 0x40, 0x93, 0x07, 0x32, 0xa4, 0x4d, 0x39, 0x46, 0x3c, + 0xab, 0x0a, 0xbc, 0xaf, 0xb1, 0x38, 0xb0, 0x02, 0x00, 0x6d, 0xb5, 0x42, 0x35, 0x50, 0x3c, 0xc4, + 0x00, 0x14, 0x43, 0x0d, 0x25, 0xe3, 0x14, 0x96, 0x9a, 0xa0, 0xb0, 0x0f, 0x61, 0x98, 0xac, 0xab, + 0x53, 0x9c, 0xc5, 0x1e, 0x28, 0x8c, 0xf7, 0x40, 0xb2, 0x7a, 0x4e, 0x96, 0x27, 0xd6, 0xf6, 0xf3, + 0x39, 0x58, 0xd8, 0x57, 0x89, 0x28, 0x36, 0x3d, 0x37, 0x15, 0xe3, 0xfc, 0x54, 0x62, 0x06, 0x9e, + 0x1e, 0x61, 0x60, 0x02, 0xa9, 0xb6, 0xea, 0xfc, 0xa8, 0xb2, 0xf8, 0x3d, 0x5a, 0xbf, 0x14, 0x0e, + 0x67, 0x5c, 0xbf, 0xdb, 0xb0, 0x86, 0x40, 0xc8, 0x44, 0x8f, 0x07, 0x82, 0xc5, 0x7c, 0x35, 0x1b, + 0xf1, 0x95, 0xc2, 0x1c, 0x0d, 0x69, 0xbe, 0xfa, 0x01, 0xe4, 0xd0, 0x42, 0x25, 0xee, 0x0b, 0xe9, + 0x37, 0x69, 0x27, 0x36, 0x9a, 0x43, 0x23, 0xcc, 0xa2, 0x7e, 0x8a, 0x6a, 0xbb, 0x61, 0x7a, 0x6d, + 0xda, 0xe9, 0xb0, 0xa0, 0x35, 0xdc, 0x6a, 0x3e, 0xa2, 0x16, 0x4c, 0x2f, 0xc6, 0xb4, 0xcd, 0x1d, + 0x58, 0x93, 0xed, 0x90, 0x89, 0x36, 0xef, 0x78, 0x4a, 0xbd, 0xc9, 0x02, 0x49, 0x5b, 0xcc, 0x5a, + 0xd0, 0x26, 0x31, 0x56, 0x1b, 0x42, 0x67, 0xb0, 0xd1, 0xe2, 0x59, 0x6c, 0x74, 0x03, 0x4c, 0xda, + 0x94, 0x7d, 0xda, 0x71, 0x87, 0x4e, 0x34, 0xe5, 0x2e, 0x47, 0xf2, 0xfd, 0x58, 0xac, 0x2e, 0xac, + 0x09, 0x06, 0x4d, 0xe3, 0x00, 0x66, 0x79, 0x92, 0x3e, 0x6f, 0x80, 0x29, 0xfc, 0x56, 0xc0, 0xbc, + 0x04, 0xd7, 0xe2, 0x95, 0x12, 0xc9, 0x4f, 0x55, 0xcb, 0xb0, 0x1a, 0x70, 0x77, 0x42, 0x7b, 0x09, + 0xb5, 0x57, 0x02, 0x5e, 0x1f, 0xd3, 0xbf, 0x0d, 0x6b, 0x2c, 0x0c, 0x27, 0x0d, 0xb2, 0x68, 0x40, + 0x58, 0x18, 0x8e, 0x5b, 0x3c, 0x06, 0x13, 0xeb, 0x1d, 0x91, 0x79, 0x8f, 0x1f, 0xb1, 0x30, 0xe2, + 0xdd, 0xed, 0x87, 0x6f, 0x46, 0x86, 0x27, 0x2f, 0x8a, 0x59, 0xd5, 0xa4, 0x48, 0xfc, 0x35, 0xe5, + 0xe7, 0xeb, 0x2f, 0x6e, 0x81, 0x7e, 0x48, 0x28, 0xb2, 0xcc, 0xca, 0x04, 0x4a, 0x7e, 0x0a, 0x97, + 0x4e, 0x39, 0xa2, 0x29, 0xfd, 0x01, 0xd3, 0xdb, 0x2b, 0x66, 0x4f, 0x6f, 0xbe, 0x7b, 0xde, 0x90, + 0x6c, 0xa1, 0x2e, 0xfa, 0xf8, 0x91, 0x2f, 0xa4, 0xb3, 0xca, 0x27, 0x01, 0x3b, 0x84, 0xdc, 0x39, + 0xfa, 0xe4, 0xc7, 0x30, 0xb4, 0x88, 0x36, 0x74, 0x15, 0x37, 0x5a, 0x06, 0x8e, 0xe6, 0xff, 0xb2, + 0xab, 0x1a, 0x43, 0x67, 0x25, 0xf6, 0x31, 0x74, 0x6c, 0xff, 0xc9, 0x38, 0x73, 0x53, 0x9c, 0xda, + 0xab, 0xb0, 0x94, 0x20, 0x44, 0x3d, 0xad, 0x99, 0x51, 0x36, 0x24, 0x21, 0x64, 0x12, 0x85, 0xc0, + 0x71, 0xdd, 0xde, 0x7b, 0xe3, 0x73, 0x58, 0x56, 0x6f, 0x81, 0x91, 0x08, 0xc6, 0x0e, 0x22, 0x4d, + 0x47, 0x0a, 0xc5, 0x60, 0x69, 0xbb, 0x23, 0x6a, 0xfd, 0xc6, 0xc7, 0xec, 0x09, 0x46, 0x9a, 0x87, + 0x85, 0x38, 0x28, 0x1d, 0xe4, 0x70, 0x7d, 0xf1, 0xab, 0x2d, 0x07, 0xf3, 0xbd, 0x7e, 0xc3, 0x55, + 0x37, 0x47, 0xc4, 0x2b, 0x73, 0x3d, 0xf4, 0x6c, 0xff, 0xd9, 0x00, 0xe2, 0xb0, 0x96, 0x2f, 0x24, + 0x0b, 0xb7, 0x3e, 0xa9, 0xef, 0x23, 0x61, 0xfc, 0x8c, 0xfc, 0x10, 0x32, 0x07, 0x21, 0xef, 0x26, + 0x39, 0x6c, 0xdb, 0xfa, 0xfa, 0x8b, 0x5b, 0x6b, 0x3a, 0x60, 0xed, 0xb9, 0x2e, 0x43, 0x3f, 0x68, + 0x39, 0x69, 0xa5, 0x1d, 0x6f, 0xf6, 0x1e, 0xa4, 0x54, 0x4b, 0x61, 0x18, 0xe9, 0x4d, 0x6b, 0xfc, + 0xe4, 0x62, 0xc6, 0x74, 0x50, 0xeb, 0xde, 0xdd, 0x4f, 0x3f, 0x2f, 0x4e, 0xfd, 0xeb, 0xf3, 0xe2, + 0xd4, 0xd3, 0x57, 0xcf, 0x37, 0xd2, 0x1f, 0x9c, 0xfa, 0x39, 0x7e, 0xf5, 0x7c, 0xe3, 0xca, 0x48, + 0x25, 0xf7, 0x47, 0x08, 0x54, 0xd9, 0xdb, 0x97, 0x21, 0x37, 0x11, 0x7a, 0xc4, 0x75, 0xf6, 0xaf, + 0x0d, 0xc8, 0x8e, 0x60, 0xdf, 0x38, 0xa5, 0x9b, 0x90, 0xf2, 0x83, 0x03, 0xae, 0x53, 0xca, 0x9d, + 0xf3, 0x56, 0x70, 0x50, 0xe9, 0x9e, 0x39, 0x9e, 0x89, 0xfd, 0x3b, 0x03, 0x56, 0x13, 0xe1, 0x44, + 0x61, 0x7e, 0xab, 0x31, 0xfd, 0xc6, 0x00, 0x73, 0x87, 0xbd, 0x45, 0x45, 0xfa, 0xcc, 0x80, 0x4b, + 0x63, 0x01, 0xbd, 0x05, 0x65, 0xfa, 0xe3, 0x34, 0x64, 0x75, 0x6b, 0xf5, 0x3b, 0xd8, 0x77, 0x6f, + 0xf2, 0x88, 0x7a, 0x0f, 0x48, 0xf2, 0x7e, 0xc6, 0xab, 0x3d, 0x9a, 0x4f, 0x73, 0xf4, 0x76, 0xfe, + 0x48, 0x5d, 0xf3, 0x57, 0x61, 0x29, 0xa1, 0xad, 0x67, 0x35, 0x33, 0xaa, 0xa8, 0x94, 0x1a, 0x1d, + 0x81, 0x57, 0x09, 0x95, 0xfd, 0x90, 0xe1, 0x8b, 0x20, 0xe3, 0x64, 0x1a, 0x1d, 0x51, 0x8f, 0x65, + 0xe7, 0x3f, 0x46, 0x66, 0xcf, 0x7f, 0x8c, 0x8c, 0x3c, 0x32, 0xe6, 0x12, 0x8f, 0x8c, 0x9b, 0x30, + 0xdb, 0x6b, 0x53, 0xc1, 0xf0, 0xaa, 0xcf, 0x6e, 0x5e, 0x1a, 0x2f, 0x61, 0x4d, 0x81, 0x4e, 0xa4, + 0x63, 0xff, 0xc5, 0x80, 0xd5, 0x7a, 0xbf, 0xd1, 0xf5, 0xe5, 0x69, 0xd5, 0xbe, 0x71, 0x67, 0x6d, + 0x26, 0xce, 0xb0, 0x70, 0x16, 0xa3, 0x9c, 0x9e, 0x8f, 0x3e, 0xca, 0xef, 0xbf, 0x8e, 0x57, 0x72, + 0x23, 0xbc, 0x12, 0x5f, 0x0d, 0xc8, 0x29, 0x79, 0xb0, 0x26, 0xa3, 0x8f, 0x2a, 0xbf, 0xf1, 0x2b, + 0x03, 0x66, 0x31, 0x57, 0xf5, 0xaa, 0xaf, 0x7d, 0xb4, 0x55, 0xdf, 0x75, 0x1f, 0x3d, 0xac, 0xd7, + 0x76, 0xef, 0x57, 0x3f, 0xa8, 0xee, 0xee, 0x98, 0x53, 0xf9, 0xb5, 0xe3, 0x67, 0x25, 0x13, 0x35, + 0x1e, 0x05, 0xa2, 0xc7, 0x9a, 0xea, 0xbf, 0x71, 0x9e, 0x3a, 0xb0, 0x48, 0xb9, 0xe6, 0xec, 0xd6, + 0xb6, 0x9c, 0x5d, 0xd3, 0xc8, 0x9b, 0xc7, 0xcf, 0x4a, 0x19, 0x54, 0xac, 0x85, 0xac, 0x47, 0x43, + 0x46, 0xae, 0xc3, 0x72, 0xa4, 0xb4, 0xb3, 0xe7, 0xde, 0xdf, 0x7b, 0xf0, 0xa0, 0xba, 0x6f, 0x4e, + 0xe7, 0x57, 0x8e, 0x9f, 0x95, 0x96, 0x50, 0x6d, 0x87, 0xdf, 0xe7, 0xdd, 0xae, 0x2f, 0xf3, 0xa9, + 0x4f, 0x7f, 0x5f, 0x98, 0xda, 0xfc, 0x43, 0x0a, 0x66, 0x1e, 0x88, 0x16, 0xf9, 0x39, 0xa4, 0x47, + 0xe6, 0x85, 0x4c, 0x14, 0x26, 0x39, 0xdd, 0xf9, 0xab, 0xaf, 0xc5, 0x35, 0x75, 0x5e, 0x7f, 0xfa, + 0xd7, 0x7f, 0x7e, 0x36, 0x5d, 0xb2, 0x0b, 0x95, 0x89, 0x9f, 0x33, 0x2a, 0xa3, 0x9b, 0x3d, 0x35, + 0x60, 0x29, 0x31, 0xae, 0xa4, 0x34, 0xee, 0x7e, 0x9c, 0x5e, 0xf2, 0xd7, 0x2e, 0xd0, 0xd0, 0x21, + 0xac, 0x63, 0x08, 0xb6, 0x5d, 0x3a, 0x23, 0x84, 0xe4, 0x96, 0xc7, 0x06, 0x2c, 0x8f, 0xdd, 0x01, + 0xc4, 0x7e, 0x4d, 0x96, 0xfa, 0x7e, 0xcb, 0xbf, 0x7b, 0xa1, 0x8e, 0x0e, 0x65, 0x03, 0x43, 0xf9, + 0x9e, 0x6d, 0xbf, 0xbe, 0x1a, 0xb8, 0xb1, 0x62, 0xd4, 0xf1, 0xe6, 0x21, 0x13, 0x35, 0x3f, 0x63, + 0x38, 0xf2, 0xeb, 0x17, 0x2b, 0xe9, 0x78, 0x6e, 0x62, 0x3c, 0xd7, 0xec, 0xab, 0x67, 0xc4, 0x33, + 0x6e, 0x94, 0x9f, 0xfd, 0xe5, 0xab, 0xe7, 0x1b, 0xc6, 0xf6, 0x87, 0x5f, 0x9e, 0x14, 0x8c, 0xaf, + 0x4e, 0x0a, 0xc6, 0x3f, 0x4e, 0x0a, 0xc6, 0x6f, 0x5f, 0x16, 0xa6, 0xbe, 0x7a, 0x59, 0x98, 0xfa, + 0xdb, 0xcb, 0xc2, 0xd4, 0x4f, 0x6e, 0x8d, 0x3c, 0x5d, 0x76, 0x23, 0x7f, 0x0f, 0x99, 0x3c, 0xe2, + 0xe1, 0xe1, 0xd0, 0xfd, 0x63, 0xdc, 0x00, 0x5f, 0x31, 0x8d, 0x39, 0xfc, 0x0d, 0xe9, 0xfd, 0xff, + 0x06, 0x00, 0x00, 0xff, 0xff, 0x55, 0xfe, 0x57, 0xb0, 0xe9, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2080,10 +2080,10 @@ func (m *BlsPubKeyInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } - if len(m.Name) > 0 { - i -= len(m.Name) - copy(dAtA[i:], m.Name) - i = encodeVarintTx(dAtA, i, uint64(len(m.Name))) + if len(m.AvsAddress) > 0 { + i -= len(m.AvsAddress) + copy(dAtA[i:], m.AvsAddress) + i = encodeVarintTx(dAtA, i, uint64(len(m.AvsAddress))) i-- dAtA[i] = 0x12 } @@ -2723,7 +2723,7 @@ func (m *BlsPubKeyInfo) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Name) + l = len(m.AvsAddress) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -4662,7 +4662,7 @@ func (m *BlsPubKeyInfo) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AvsAddress", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4690,7 +4690,7 @@ func (m *BlsPubKeyInfo) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Name = string(dAtA[iNdEx:postIndex]) + m.AvsAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { diff --git a/x/avs/types/utils.go b/x/avs/types/utils.go index 35e6fde5b..d987874e4 100644 --- a/x/avs/types/utils.go +++ b/x/avs/types/utils.go @@ -40,7 +40,7 @@ type TaskInfoParams struct { } type BlsParams struct { OperatorAddress sdk.AccAddress - Name string + AvsAddr common.Address PubKey []byte PubkeyRegistrationSignature []byte PubkeyRegistrationMessageHash []byte