Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove earning receiver address #184

Merged
merged 3 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/Layr-Labs/eigenlayer-contracts v0.3.0-holesky-rewards
github.com/Layr-Labs/eigenlayer-rewards-proofs v0.2.9
github.com/Layr-Labs/eigenpod-proofs-generation v0.0.14-stable.0.20240730152248-5c11a259293e
github.com/Layr-Labs/eigensdk-go v0.1.10-0.20240730214828-67787e959b72
github.com/Layr-Labs/eigensdk-go v0.1.10-0.20240806213237-f9be5dc855c8
github.com/blang/semver/v4 v4.0.0
github.com/consensys/gnark-crypto v0.12.1
github.com/ethereum/go-ethereum v1.14.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ github.com/Layr-Labs/eigenlayer-rewards-proofs v0.2.9 h1:ahO1P23KLLcBChXs/n5bqik
github.com/Layr-Labs/eigenlayer-rewards-proofs v0.2.9/go.mod h1:xqqlbOAuApoPi+NgnqJB5JtTY05V+8IpP/4JZEctUAw=
github.com/Layr-Labs/eigenpod-proofs-generation v0.0.14-stable.0.20240730152248-5c11a259293e h1:DvW0/kWHV9mZsbH2KOjEHKTSIONNPUj6X05FJvUohy4=
github.com/Layr-Labs/eigenpod-proofs-generation v0.0.14-stable.0.20240730152248-5c11a259293e/go.mod h1:T7tYN8bTdca2pkMnz9G2+ZwXYWw5gWqQUIu4KLgC/vM=
github.com/Layr-Labs/eigensdk-go v0.1.10-0.20240730214828-67787e959b72 h1:krZ1dl1LG1+jQenIpHDg293epaomxPeQdKMTpcridSw=
github.com/Layr-Labs/eigensdk-go v0.1.10-0.20240730214828-67787e959b72/go.mod h1:XcLVDtlB1vOPj63D236b451+SC75B8gwgkpNhYHSxNs=
github.com/Layr-Labs/eigensdk-go v0.1.10-0.20240806213237-f9be5dc855c8 h1:Yu9Fhlriq0zB5zo9yS8vN5CvLpydhVwHxLWjAuIetP0=
github.com/Layr-Labs/eigensdk-go v0.1.10-0.20240806213237-f9be5dc855c8/go.mod h1:XcLVDtlB1vOPj63D236b451+SC75B8gwgkpNhYHSxNs=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8=
Expand Down
14 changes: 0 additions & 14 deletions pkg/operator/config/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,6 @@ func promptOperatorInfo(config *types.OperatorConfig, p utils.Prompter) (types.O
// TODO(madhur): Remove this once we have the feature working and want to prompt users for this address
config.Operator.DelegationApproverAddress = eigensdkTypes.ZeroAddress

// Prompt and set earnings address
earningsAddress, err := p.InputString(
"Enter your earnings address (default to your operator address):",
config.Operator.Address,
"",
func(s string) error {
return validateAddressIsNonZeroAndValid(s)
},
)
if err != nil {
return types.OperatorConfig{}, err
}
config.Operator.EarningsReceiverAddress = earningsAddress

// Prompt for eth node
rpcUrl, err := p.InputString("Enter your ETH rpc url:", "http://localhost:8545", "",
func(s string) error { return nil },
Expand Down
3 changes: 0 additions & 3 deletions pkg/operator/config/operator-config-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ operator:
# This is the standard Ethereum address format (ex: 0x6a8c0D554a694899041E52a91B4EC3Ff23d8aBD5) of your operator
# which is the ecdsa key you created or imported using EigenLayer CLI
address:
# This is the standard Ethereum address format (ex: 0x6a8c0D554a694899041E52a91B4EC3Ff23d8aBD5)
# This is the address where your operator will receive earnings. This could be same as operator address
earnings_receiver_address:
# This is the standard Ethereum address format (0x...)
# This is the address which operator will use to approve delegation requests from stakers.
# if set, this address must sign and approve new delegation from Stakers to this Operator
Expand Down
1 change: 0 additions & 1 deletion pkg/operator/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ func printOperatorDetails(operator eigensdkTypes.Operator) {
fmt.Println()
fmt.Println("--------------------------- Operator Details ---------------------------")
fmt.Printf("Address: %s\n", operator.Address)
fmt.Printf("Earnings Receiver Address: %s\n", operator.EarningsReceiverAddress)
fmt.Printf("Delegation Approver Address: %s\n", operator.DelegationApproverAddress)
fmt.Printf("Staker Opt Out Window Blocks: %d\n", operator.StakerOptOutWindowBlocks)
fmt.Println("------------------------------------------------------------------------")
Expand Down
1 change: 0 additions & 1 deletion tests/keystore/operator-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
operator:
address: 0xcaB1b44dd1f1C265405878Ac1179cd94D0dBA634
earnings_receiver_address: 0xcaB1b44dd1f1C265405878Ac1179cd94D0dBA634
delegation_approver_address: 0xcaB1b44dd1f1C265405878Ac1179cd94D0dBA634
staker_opt_out_window_blocks: 0
metadata_url: https://madhur-test-public.s3.us-east-2.amazonaws.com/metadata.json
Expand Down
1 change: 0 additions & 1 deletion tests/web3signer/operator-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
operator:
address: 0x7dbc809c1ec153d45ffb0c75fb4fded68e34699e
earnings_receiver_address: 0x7dbc809c1ec153d45ffb0c75fb4fded68e34699e
delegation_approver_address: 0xcaB1b44dd1f1C265405878Ac1179cd94D0dBA634
staker_opt_out_window_blocks: 0
metadata_url: https://madhur-test-public.s3.us-east-2.amazonaws.com/metadata.json
Expand Down
Loading