diff --git a/Makefile b/Makefile index 5de7d163b..4df4a072d 100644 --- a/Makefile +++ b/Makefile @@ -210,3 +210,7 @@ test: clean: rm -rf ${BUILD_DIR} docker buildx rm smartnode-builder + +.PHONY: fmt +fmt: + go run golang.org/x/tools/cmd/goimports@v0.44.0 -local github.com/rocket-pool/smartnode -w . diff --git a/bindings/dao/claim.go b/bindings/dao/claim.go index 80ee6e7a6..4bac1c2fe 100644 --- a/bindings/dao/claim.go +++ b/bindings/dao/claim.go @@ -5,6 +5,7 @@ import ( "sync" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/dao/protocol/proposal.go b/bindings/dao/protocol/proposal.go index a3537cd83..f5c7600fa 100644 --- a/bindings/dao/protocol/proposal.go +++ b/bindings/dao/protocol/proposal.go @@ -13,11 +13,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" strutils "github.com/rocket-pool/smartnode/bindings/utils/strings" - "golang.org/x/sync/errgroup" ) // Settings diff --git a/bindings/dao/protocol/proposals.go b/bindings/dao/protocol/proposals.go index 2acd57bd7..849908c5b 100644 --- a/bindings/dao/protocol/proposals.go +++ b/bindings/dao/protocol/proposals.go @@ -9,6 +9,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" ) diff --git a/bindings/dao/protocol/verify.go b/bindings/dao/protocol/verify.go index 83836c724..aa4f296d3 100755 --- a/bindings/dao/protocol/verify.go +++ b/bindings/dao/protocol/verify.go @@ -10,11 +10,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/bindings/utils/multicall" - "golang.org/x/sync/errgroup" ) const ( diff --git a/bindings/dao/security/actions.go b/bindings/dao/security/actions.go index 4e23ffd46..f84378c60 100644 --- a/bindings/dao/security/actions.go +++ b/bindings/dao/security/actions.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/dao/security/proposals.go b/bindings/dao/security/proposals.go index 964a44625..f4a2a2d28 100644 --- a/bindings/dao/security/proposals.go +++ b/bindings/dao/security/proposals.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/dao/security/security.go b/bindings/dao/security/security.go index d8f139164..6cfada614 100644 --- a/bindings/dao/security/security.go +++ b/bindings/dao/security/security.go @@ -7,9 +7,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/strings" - "golang.org/x/sync/errgroup" ) // Settings diff --git a/bindings/dao/upgrades/details.go b/bindings/dao/upgrades/details.go index 901443150..740b7b73e 100644 --- a/bindings/dao/upgrades/details.go +++ b/bindings/dao/upgrades/details.go @@ -5,9 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "golang.org/x/sync/errgroup" ) // Settings diff --git a/bindings/deposit/deposit-pool.go b/bindings/deposit/deposit-pool.go index 583e5fbdc..41f65bd82 100644 --- a/bindings/deposit/deposit-pool.go +++ b/bindings/deposit/deposit-pool.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/legacy/v1.0.0/utils/address_generation.go b/bindings/legacy/v1.0.0/utils/address_generation.go index f4da1d121..8589d4041 100644 --- a/bindings/legacy/v1.0.0/utils/address_generation.go +++ b/bindings/legacy/v1.0.0/utils/address_generation.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + "github.com/rocket-pool/smartnode/bindings/legacy/v1.0.0/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" diff --git a/bindings/legacy/v1.1.0/utils/address_generation.go b/bindings/legacy/v1.1.0/utils/address_generation.go index 22d27307d..3f3e865ed 100644 --- a/bindings/legacy/v1.1.0/utils/address_generation.go +++ b/bindings/legacy/v1.1.0/utils/address_generation.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + v110_minipool "github.com/rocket-pool/smartnode/bindings/legacy/v1.1.0/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" diff --git a/bindings/legacy/v1.3.1/node/deposit.go b/bindings/legacy/v1.3.1/node/deposit.go index 48c77234a..94465af64 100644 --- a/bindings/legacy/v1.3.1/node/deposit.go +++ b/bindings/legacy/v1.3.1/node/deposit.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/bindings/legacy/v1.3.1/node/staking.go b/bindings/legacy/v1.3.1/node/staking.go index 4f64ce98b..4c0f21f21 100644 --- a/bindings/legacy/v1.3.1/node/staking.go +++ b/bindings/legacy/v1.3.1/node/staking.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/legacy/v1.3.1/rewards/distributor-mainnet.go b/bindings/legacy/v1.3.1/rewards/distributor-mainnet.go index ff0e4c829..71e3644a2 100644 --- a/bindings/legacy/v1.3.1/rewards/distributor-mainnet.go +++ b/bindings/legacy/v1.3.1/rewards/distributor-mainnet.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/megapool/beacon-state-verifier.go b/bindings/megapool/beacon-state-verifier.go index ec6b3eb2c..00f314def 100644 --- a/bindings/megapool/beacon-state-verifier.go +++ b/bindings/megapool/beacon-state-verifier.go @@ -6,6 +6,7 @@ import ( "sync" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/megapool/factory.go b/bindings/megapool/factory.go index 40f7649ef..2408ec224 100644 --- a/bindings/megapool/factory.go +++ b/bindings/megapool/factory.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/megapool/megapool-contract.go b/bindings/megapool/megapool-contract.go index 0c814bc96..e8e91f0aa 100644 --- a/bindings/megapool/megapool-contract.go +++ b/bindings/megapool/megapool-contract.go @@ -10,9 +10,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "golang.org/x/sync/errgroup" ) type SlotProof struct { diff --git a/bindings/megapool/megapool-interface.go b/bindings/megapool/megapool-interface.go index d5941d2bb..20bca5746 100644 --- a/bindings/megapool/megapool-interface.go +++ b/bindings/megapool/megapool-interface.go @@ -5,6 +5,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" ) diff --git a/bindings/megapool/megapool-manager.go b/bindings/megapool/megapool-manager.go index d3fd7e16d..fa4f215d8 100644 --- a/bindings/megapool/megapool-manager.go +++ b/bindings/megapool/megapool-manager.go @@ -10,6 +10,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/megapool/megapool-penalties.go b/bindings/megapool/megapool-penalties.go index 54e6cace7..4c78aab7f 100644 --- a/bindings/megapool/megapool-penalties.go +++ b/bindings/megapool/megapool-penalties.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/megapool/megapool-proxy.go b/bindings/megapool/megapool-proxy.go index aec878cdc..495eef65e 100644 --- a/bindings/megapool/megapool-proxy.go +++ b/bindings/megapool/megapool-proxy.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/minipool/minipool-constructor.go b/bindings/minipool/minipool-constructor.go index 8ce75d03f..26ba289e3 100644 --- a/bindings/minipool/minipool-constructor.go +++ b/bindings/minipool/minipool-constructor.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/minipool/minipool-interface.go b/bindings/minipool/minipool-interface.go index 5c904d501..ce3be6462 100644 --- a/bindings/minipool/minipool-interface.go +++ b/bindings/minipool/minipool-interface.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" ) diff --git a/bindings/network/revenues.go b/bindings/network/revenues.go index cf4bea432..a4cbf3f86 100644 --- a/bindings/network/revenues.go +++ b/bindings/network/revenues.go @@ -6,6 +6,7 @@ import ( "sync" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/network/voting.go b/bindings/network/voting.go index 110d14e2e..2a8be66c1 100644 --- a/bindings/network/voting.go +++ b/bindings/network/voting.go @@ -7,11 +7,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/multicall" - "golang.org/x/sync/errgroup" ) const ( diff --git a/bindings/rewards/distributor-mainnet.go b/bindings/rewards/distributor-mainnet.go index b8743fb2e..c35cb82f2 100644 --- a/bindings/rewards/distributor-mainnet.go +++ b/bindings/rewards/distributor-mainnet.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" ) diff --git a/bindings/settings/protocol/proposals.go b/bindings/settings/protocol/proposals.go index a4d676ba8..2a158033d 100644 --- a/bindings/settings/protocol/proposals.go +++ b/bindings/settings/protocol/proposals.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" diff --git a/bindings/settings/protocol/security.go b/bindings/settings/protocol/security.go index 8939bb63e..8d524f4d4 100644 --- a/bindings/settings/protocol/security.go +++ b/bindings/settings/protocol/security.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" diff --git a/bindings/storage/address-queue-storage.go b/bindings/storage/address-queue-storage.go index 90a4bda75..386fa5d9e 100644 --- a/bindings/storage/address-queue-storage.go +++ b/bindings/storage/address-queue-storage.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/storage/linked-list-storage.go b/bindings/storage/linked-list-storage.go index de884f729..e10647a0a 100644 --- a/bindings/storage/linked-list-storage.go +++ b/bindings/storage/linked-list-storage.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/storage/rocket-storage.go b/bindings/storage/rocket-storage.go index e5e161bbb..56270a533 100644 --- a/bindings/storage/rocket-storage.go +++ b/bindings/storage/rocket-storage.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/types/dao.go b/bindings/types/dao.go index 3876cebbf..eb7aef5b4 100644 --- a/bindings/types/dao.go +++ b/bindings/types/dao.go @@ -5,6 +5,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/utils/json" ) diff --git a/bindings/utils/deposit_retrieval.go b/bindings/utils/deposit_retrieval.go index d8fcbd5b1..597429155 100644 --- a/bindings/utils/deposit_retrieval.go +++ b/bindings/utils/deposit_retrieval.go @@ -10,6 +10,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/bindings/utils/eth/erc20.go b/bindings/utils/eth/erc20.go index e5b09a7ae..21d7d8ece 100644 --- a/bindings/utils/eth/erc20.go +++ b/bindings/utils/eth/erc20.go @@ -9,6 +9,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/utils/eth/logs.go b/bindings/utils/eth/logs.go index 0e135edd5..28c4297f9 100644 --- a/bindings/utils/eth/logs.go +++ b/bindings/utils/eth/logs.go @@ -9,6 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/storage" ) diff --git a/bindings/utils/eth/transactions.go b/bindings/utils/eth/transactions.go index 711ae5ab4..f5f9f4041 100644 --- a/bindings/utils/eth/transactions.go +++ b/bindings/utils/eth/transactions.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/utils/multicall/balances.go b/bindings/utils/multicall/balances.go index 942615d3b..0e0b22522 100644 --- a/bindings/utils/multicall/balances.go +++ b/bindings/utils/multicall/balances.go @@ -10,8 +10,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/rocketpool" "golang.org/x/sync/errgroup" + + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) const ( diff --git a/bindings/utils/multicall/multicaller.go b/bindings/utils/multicall/multicaller.go index 42e7b5ff2..498e194d0 100644 --- a/bindings/utils/multicall/multicaller.go +++ b/bindings/utils/multicall/multicaller.go @@ -13,6 +13,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/bindings/utils/state/contracts.go b/bindings/utils/state/contracts.go index 2cc1d3758..9c2b693e8 100644 --- a/bindings/utils/state/contracts.go +++ b/bindings/utils/state/contracts.go @@ -9,6 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/hashicorp/go-version" + "github.com/rocket-pool/smartnode/bindings/deposit" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/multicall" diff --git a/bindings/utils/state/megapool.go b/bindings/utils/state/megapool.go index 064eaf7d8..fd79f1133 100644 --- a/bindings/utils/state/megapool.go +++ b/bindings/utils/state/megapool.go @@ -6,10 +6,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/multicall" - "golang.org/x/sync/errgroup" ) const ( diff --git a/bindings/utils/state/minipool.go b/bindings/utils/state/minipool.go index 0426a1f23..b1ec119d2 100644 --- a/bindings/utils/state/minipool.go +++ b/bindings/utils/state/minipool.go @@ -8,11 +8,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/multicall" - "golang.org/x/sync/errgroup" ) const ( diff --git a/bindings/utils/state/network.go b/bindings/utils/state/network.go index 0c74fd6b3..cccecdeff 100644 --- a/bindings/utils/state/network.go +++ b/bindings/utils/state/network.go @@ -7,11 +7,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/bindings/utils/multicall" - "golang.org/x/sync/errgroup" ) const ( diff --git a/bindings/utils/state/node.go b/bindings/utils/state/node.go index 08cd838d1..7c218c40a 100644 --- a/bindings/utils/state/node.go +++ b/bindings/utils/state/node.go @@ -8,12 +8,13 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/multicall" - "golang.org/x/sync/errgroup" ) const ( diff --git a/bindings/utils/state/odao.go b/bindings/utils/state/odao.go index ea8cdf3ff..c8de7dc14 100644 --- a/bindings/utils/state/odao.go +++ b/bindings/utils/state/odao.go @@ -7,10 +7,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/multicall" - "golang.org/x/sync/errgroup" ) const ( diff --git a/bindings/utils/state/pdao.go b/bindings/utils/state/pdao.go index 0ec899c12..498537eb2 100644 --- a/bindings/utils/state/pdao.go +++ b/bindings/utils/state/pdao.go @@ -7,11 +7,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/multicall" - "golang.org/x/sync/errgroup" ) const ( diff --git a/bindings/utils/version-checker.go b/bindings/utils/version-checker.go index ae4826948..9a4418791 100644 --- a/bindings/utils/version-checker.go +++ b/bindings/utils/version-checker.go @@ -5,6 +5,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/hashicorp/go-version" + "github.com/rocket-pool/smartnode/bindings/deposit" "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/node" diff --git a/bindings/utils/wait.go b/bindings/utils/wait.go index f68ae61d9..c5d104d0f 100644 --- a/bindings/utils/wait.go +++ b/bindings/utils/wait.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/rocketpool-cli/claims/claim-all.go b/rocketpool-cli/claims/claim-all.go index a989e14bd..7f0288ee7 100644 --- a/rocketpool-cli/claims/claim-all.go +++ b/rocketpool-cli/claims/claim-all.go @@ -8,6 +8,7 @@ import ( "strings" "github.com/ethereum/go-ethereum/common" + rocketpoolapi "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/rocketpool-cli/megapool/deposit.go b/rocketpool-cli/megapool/deposit.go index 5a420a969..d0f7eb696 100644 --- a/rocketpool-cli/megapool/deposit.go +++ b/rocketpool-cli/megapool/deposit.go @@ -5,9 +5,10 @@ import ( "math/big" "strconv" - "github.com/rocket-pool/smartnode/bindings/utils/eth" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/utils/eth" + "github.com/rocket-pool/smartnode/shared/services/gas" "github.com/rocket-pool/smartnode/shared/services/rocketpool" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool-cli/minipool/close.go b/rocketpool-cli/minipool/close.go index 9ce67a153..a8a5e0ded 100644 --- a/rocketpool-cli/minipool/close.go +++ b/rocketpool-cli/minipool/close.go @@ -6,6 +6,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" + rocketpoolapi "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/rocketpool-cli/minipool/distribute.go b/rocketpool-cli/minipool/distribute.go index deebe4076..a0f758235 100644 --- a/rocketpool-cli/minipool/distribute.go +++ b/rocketpool-cli/minipool/distribute.go @@ -7,6 +7,7 @@ import ( "sort" "github.com/ethereum/go-ethereum/common" + rocketpoolapi "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/rocketpool-cli/minipool/exit.go b/rocketpool-cli/minipool/exit.go index d6e64acc5..b5e69580d 100644 --- a/rocketpool-cli/minipool/exit.go +++ b/rocketpool-cli/minipool/exit.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services/rocketpool" diff --git a/rocketpool-cli/minipool/import-key.go b/rocketpool-cli/minipool/import-key.go index de7fa25a8..2b077e412 100644 --- a/rocketpool-cli/minipool/import-key.go +++ b/rocketpool-cli/minipool/import-key.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/rocketpool-cli/wallet" "github.com/rocket-pool/smartnode/shared/services/rocketpool" "github.com/rocket-pool/smartnode/shared/utils/cli/color" diff --git a/rocketpool-cli/minipool/refund.go b/rocketpool-cli/minipool/refund.go index 4d561ada5..1d84ec6dd 100644 --- a/rocketpool-cli/minipool/refund.go +++ b/rocketpool-cli/minipool/refund.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + rocketpoolapi "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/rocketpool-cli/minipool/rescue-dissolved.go b/rocketpool-cli/minipool/rescue-dissolved.go index f9d203071..a31ffd2df 100644 --- a/rocketpool-cli/minipool/rescue-dissolved.go +++ b/rocketpool-cli/minipool/rescue-dissolved.go @@ -7,6 +7,7 @@ import ( "strconv" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/rocketpool-cli/minipool/set-withdrawal-creds.go b/rocketpool-cli/minipool/set-withdrawal-creds.go index ed07e3dab..d817392ac 100644 --- a/rocketpool-cli/minipool/set-withdrawal-creds.go +++ b/rocketpool-cli/minipool/set-withdrawal-creds.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/rocketpool-cli/wallet" "github.com/rocket-pool/smartnode/shared/services/rocketpool" ) diff --git a/rocketpool-cli/minipool/stake.go b/rocketpool-cli/minipool/stake.go index d9de9925e..969984f2b 100644 --- a/rocketpool-cli/minipool/stake.go +++ b/rocketpool-cli/minipool/stake.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + rocketpoolapi "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services/gas" diff --git a/rocketpool-cli/minipool/status.go b/rocketpool-cli/minipool/status.go index 01b93f3bd..9e4dfbe18 100644 --- a/rocketpool-cli/minipool/status.go +++ b/rocketpool-cli/minipool/status.go @@ -5,6 +5,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/rocketpool-cli/network/dao-proposals.go b/rocketpool-cli/network/dao-proposals.go index 2beb1b853..7b1ee5abc 100644 --- a/rocketpool-cli/network/dao-proposals.go +++ b/rocketpool-cli/network/dao-proposals.go @@ -7,6 +7,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/shared/services/rocketpool" cliutils "github.com/rocket-pool/smartnode/shared/utils/cli" diff --git a/rocketpool-cli/node/claim-rewards.go b/rocketpool-cli/node/claim-rewards.go index 15ca8ffe0..10184a9d8 100644 --- a/rocketpool-cli/node/claim-rewards.go +++ b/rocketpool-cli/node/claim-rewards.go @@ -8,6 +8,7 @@ import ( "strings" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/shared/services/gas" diff --git a/rocketpool-cli/node/send-message.go b/rocketpool-cli/node/send-message.go index 51a25c754..351db74e4 100644 --- a/rocketpool-cli/node/send-message.go +++ b/rocketpool-cli/node/send-message.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/shared/services/gas" "github.com/rocket-pool/smartnode/shared/services/rocketpool" cliutils "github.com/rocket-pool/smartnode/shared/utils/cli" diff --git a/rocketpool-cli/node/status.go b/rocketpool-cli/node/status.go index 8e2887623..62a1eb9a9 100644 --- a/rocketpool-cli/node/status.go +++ b/rocketpool-cli/node/status.go @@ -9,6 +9,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/addons/rescue_node" diff --git a/rocketpool-cli/odao/execute-upgrade.go b/rocketpool-cli/odao/execute-upgrade.go index 323402b57..24cbb0e23 100644 --- a/rocketpool-cli/odao/execute-upgrade.go +++ b/rocketpool-cli/odao/execute-upgrade.go @@ -6,6 +6,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/upgrades" rocketpoolapi "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" diff --git a/rocketpool-cli/odao/penalise-megapool.go b/rocketpool-cli/odao/penalise-megapool.go index 8275ce59c..e9f50688d 100644 --- a/rocketpool-cli/odao/penalise-megapool.go +++ b/rocketpool-cli/odao/penalise-megapool.go @@ -6,6 +6,7 @@ import ( "strconv" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/shared/services/gas" "github.com/rocket-pool/smartnode/shared/services/rocketpool" diff --git a/rocketpool-cli/odao/propose-kick.go b/rocketpool-cli/odao/propose-kick.go index 0cf0ae63a..8bbb7d024 100644 --- a/rocketpool-cli/odao/propose-kick.go +++ b/rocketpool-cli/odao/propose-kick.go @@ -7,6 +7,7 @@ import ( "strconv" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/rocketpool-cli/pdao/kick-sc.go b/rocketpool-cli/pdao/kick-sc.go index d8d8d03ca..8d400faef 100644 --- a/rocketpool-cli/pdao/kick-sc.go +++ b/rocketpool-cli/pdao/kick-sc.go @@ -7,6 +7,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/shared/services/gas" "github.com/rocket-pool/smartnode/shared/services/rocketpool" cliutils "github.com/rocket-pool/smartnode/shared/utils/cli" diff --git a/rocketpool-cli/pdao/replace-sc.go b/rocketpool-cli/pdao/replace-sc.go index 37496737a..e7f2bd6b7 100644 --- a/rocketpool-cli/pdao/replace-sc.go +++ b/rocketpool-cli/pdao/replace-sc.go @@ -5,6 +5,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/shared/services/gas" "github.com/rocket-pool/smartnode/shared/services/rocketpool" cliutils "github.com/rocket-pool/smartnode/shared/utils/cli" diff --git a/rocketpool-cli/pdao/set-signalling-address.go b/rocketpool-cli/pdao/set-signalling-address.go index 839d11704..0e41ff48c 100644 --- a/rocketpool-cli/pdao/set-signalling-address.go +++ b/rocketpool-cli/pdao/set-signalling-address.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/shared/services/gas" "github.com/rocket-pool/smartnode/shared/services/rocketpool" cliutils "github.com/rocket-pool/smartnode/shared/utils/cli" diff --git a/rocketpool-cli/service/config/addon-gww.go b/rocketpool-cli/service/config/addon-gww.go index 684c1ac41..391854d2f 100644 --- a/rocketpool-cli/service/config/addon-gww.go +++ b/rocketpool-cli/service/config/addon-gww.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" "github.com/rocket-pool/smartnode/shared/types/addons" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" diff --git a/rocketpool-cli/service/config/addon-rescuenode.go b/rocketpool-cli/service/config/addon-rescuenode.go index 4634fe690..6d055359b 100644 --- a/rocketpool-cli/service/config/addon-rescuenode.go +++ b/rocketpool-cli/service/config/addon-rescuenode.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" "github.com/rocket-pool/smartnode/shared/types/addons" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" diff --git a/rocketpool-cli/service/config/addons.go b/rocketpool-cli/service/config/addons.go index 19214e88b..21d71b64a 100644 --- a/rocketpool-cli/service/config/addons.go +++ b/rocketpool-cli/service/config/addons.go @@ -3,6 +3,7 @@ package config import ( "github.com/gdamore/tcell/v2" "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" ) diff --git a/rocketpool-cli/service/config/config-form.go b/rocketpool-cli/service/config/config-form.go index f6ccc1a36..677221aa2 100644 --- a/rocketpool-cli/service/config/config-form.go +++ b/rocketpool-cli/service/config/config-form.go @@ -7,6 +7,7 @@ import ( "github.com/gdamore/tcell/v2" "github.com/rivo/tview" + cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/main-display.go b/rocketpool-cli/service/config/main-display.go index dfb21b924..31e3b67ae 100644 --- a/rocketpool-cli/service/config/main-display.go +++ b/rocketpool-cli/service/config/main-display.go @@ -5,6 +5,7 @@ import ( "github.com/gdamore/tcell/v2" "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared" "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" diff --git a/rocketpool-cli/service/config/review-native-page.go b/rocketpool-cli/service/config/review-native-page.go index 124dc28bf..3f5bb1c6c 100644 --- a/rocketpool-cli/service/config/review-native-page.go +++ b/rocketpool-cli/service/config/review-native-page.go @@ -6,6 +6,7 @@ import ( "github.com/gdamore/tcell/v2" "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/review-page.go b/rocketpool-cli/service/config/review-page.go index 9350a4783..e6bb2bcdf 100644 --- a/rocketpool-cli/service/config/review-page.go +++ b/rocketpool-cli/service/config/review-page.go @@ -6,6 +6,7 @@ import ( "github.com/gdamore/tcell/v2" "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared" "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" diff --git a/rocketpool-cli/service/config/settings-alerting.go b/rocketpool-cli/service/config/settings-alerting.go index 36dabdef7..e3e8cbb2d 100644 --- a/rocketpool-cli/service/config/settings-alerting.go +++ b/rocketpool-cli/service/config/settings-alerting.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" ) diff --git a/rocketpool-cli/service/config/settings-commit-boost.go b/rocketpool-cli/service/config/settings-commit-boost.go index ccb2e9f55..c55718838 100644 --- a/rocketpool-cli/service/config/settings-commit-boost.go +++ b/rocketpool-cli/service/config/settings-commit-boost.go @@ -2,6 +2,7 @@ package config import ( "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/settings-fallback.go b/rocketpool-cli/service/config/settings-fallback.go index 089959e08..6fc55c23e 100644 --- a/rocketpool-cli/service/config/settings-fallback.go +++ b/rocketpool-cli/service/config/settings-fallback.go @@ -2,6 +2,7 @@ package config import ( "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/settings-metrics.go b/rocketpool-cli/service/config/settings-metrics.go index cc59d327a..6f20177fc 100644 --- a/rocketpool-cli/service/config/settings-metrics.go +++ b/rocketpool-cli/service/config/settings-metrics.go @@ -2,6 +2,7 @@ package config import ( "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/settings-mev-boost.go b/rocketpool-cli/service/config/settings-mev-boost.go index b1cdd6534..5db65d5b5 100644 --- a/rocketpool-cli/service/config/settings-mev-boost.go +++ b/rocketpool-cli/service/config/settings-mev-boost.go @@ -2,6 +2,7 @@ package config import ( "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/settings-native-fallback.go b/rocketpool-cli/service/config/settings-native-fallback.go index 6a12dd516..9aecba0df 100644 --- a/rocketpool-cli/service/config/settings-native-fallback.go +++ b/rocketpool-cli/service/config/settings-native-fallback.go @@ -2,6 +2,7 @@ package config import ( "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" ) diff --git a/rocketpool-cli/service/config/settings-native-metrics.go b/rocketpool-cli/service/config/settings-native-metrics.go index 143e3502d..5780891a5 100644 --- a/rocketpool-cli/service/config/settings-native-metrics.go +++ b/rocketpool-cli/service/config/settings-native-metrics.go @@ -2,6 +2,7 @@ package config import ( "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/services/config" ) diff --git a/rocketpool-cli/service/config/settings-smartnode.go b/rocketpool-cli/service/config/settings-smartnode.go index 9b3fc72d4..10472b053 100644 --- a/rocketpool-cli/service/config/settings-smartnode.go +++ b/rocketpool-cli/service/config/settings-smartnode.go @@ -2,6 +2,7 @@ package config import ( "github.com/gdamore/tcell/v2" + "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/standard-layout.go b/rocketpool-cli/service/config/standard-layout.go index cf28d4748..84c149770 100644 --- a/rocketpool-cli/service/config/standard-layout.go +++ b/rocketpool-cli/service/config/standard-layout.go @@ -6,6 +6,7 @@ import ( "github.com/gdamore/tcell/v2" "github.com/rivo/tview" + cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/step-finished.go b/rocketpool-cli/service/config/step-finished.go index c126c8379..550eaac12 100644 --- a/rocketpool-cli/service/config/step-finished.go +++ b/rocketpool-cli/service/config/step-finished.go @@ -4,6 +4,7 @@ import ( "strings" "github.com/rivo/tview" + cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/step-local-cc.go b/rocketpool-cli/service/config/step-local-cc.go index 813a586a9..0704a618c 100644 --- a/rocketpool-cli/service/config/step-local-cc.go +++ b/rocketpool-cli/service/config/step-local-cc.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/pbnjay/memory" + cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/config/step-native-finished.go b/rocketpool-cli/service/config/step-native-finished.go index b93d79f73..42fdddbbf 100644 --- a/rocketpool-cli/service/config/step-native-finished.go +++ b/rocketpool-cli/service/config/step-native-finished.go @@ -4,6 +4,7 @@ import ( "strings" "github.com/rivo/tview" + "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/rocketpool-cli/service/service.go b/rocketpool-cli/service/service.go index 73695ea0d..f316a017e 100644 --- a/rocketpool-cli/service/service.go +++ b/rocketpool-cli/service/service.go @@ -14,6 +14,8 @@ import ( "gopkg.in/yaml.v2" "github.com/dustin/go-humanize" + "github.com/shirou/gopsutil/v3/disk" + cliconfig "github.com/rocket-pool/smartnode/rocketpool-cli/service/config" "github.com/rocket-pool/smartnode/shared" "github.com/rocket-pool/smartnode/shared/services/config" @@ -22,7 +24,6 @@ import ( cliutils "github.com/rocket-pool/smartnode/shared/utils/cli" "github.com/rocket-pool/smartnode/shared/utils/cli/color" "github.com/rocket-pool/smartnode/shared/utils/cli/prompt" - "github.com/shirou/gopsutil/v3/disk" ) // Settings diff --git a/rocketpool-cli/wallet/end-masquerade.go b/rocketpool-cli/wallet/end-masquerade.go index 3884a8060..71fc4bcb6 100644 --- a/rocketpool-cli/wallet/end-masquerade.go +++ b/rocketpool-cli/wallet/end-masquerade.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/shared/services/rocketpool" "github.com/rocket-pool/smartnode/shared/utils/cli/color" "github.com/rocket-pool/smartnode/shared/utils/cli/prompt" diff --git a/rocketpool/api/auction/bid-lot.go b/rocketpool/api/auction/bid-lot.go index 5ae03bee1..a8b9bf6be 100644 --- a/rocketpool/api/auction/bid-lot.go +++ b/rocketpool/api/auction/bid-lot.go @@ -4,11 +4,12 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/auction" - "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/auction" + "github.com/rocket-pool/smartnode/bindings/settings/protocol" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/auction/claim-lot.go b/rocketpool/api/auction/claim-lot.go index f17aff909..397e01eee 100644 --- a/rocketpool/api/auction/claim-lot.go +++ b/rocketpool/api/auction/claim-lot.go @@ -4,10 +4,11 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/auction" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/auction" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/auction/create-lot.go b/rocketpool/api/auction/create-lot.go index f0dfaa5bf..0bcfc945d 100644 --- a/rocketpool/api/auction/create-lot.go +++ b/rocketpool/api/auction/create-lot.go @@ -2,11 +2,12 @@ package auction import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/auction" - "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/auction" + "github.com/rocket-pool/smartnode/bindings/settings/protocol" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/auction/recover-lot.go b/rocketpool/api/auction/recover-lot.go index 396e467b9..de8c3e875 100644 --- a/rocketpool/api/auction/recover-lot.go +++ b/rocketpool/api/auction/recover-lot.go @@ -4,10 +4,11 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/auction" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/auction" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/auction/status.go b/rocketpool/api/auction/status.go index 0e58dea03..e2ddb3cbe 100644 --- a/rocketpool/api/auction/status.go +++ b/rocketpool/api/auction/status.go @@ -1,10 +1,11 @@ package auction import ( - "github.com/rocket-pool/smartnode/bindings/auction" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/auction" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/auction/utils.go b/rocketpool/api/auction/utils.go index 2e984f311..bea9ee13e 100644 --- a/rocketpool/api/auction/utils.go +++ b/rocketpool/api/auction/utils.go @@ -5,12 +5,13 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/auction" "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/debug/validators.go b/rocketpool/api/debug/validators.go index a97695510..923bf2766 100644 --- a/rocketpool/api/debug/validators.go +++ b/rocketpool/api/debug/validators.go @@ -8,6 +8,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" @@ -16,8 +19,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/utils/eth2" "github.com/rocket-pool/smartnode/shared/utils/rp" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" ) const MinipoolBalanceDetailsBatchSize = 20 diff --git a/rocketpool/api/megapool/claim-refunds.go b/rocketpool/api/megapool/claim-refunds.go index 356876510..f79a05f76 100644 --- a/rocketpool/api/megapool/claim-refunds.go +++ b/rocketpool/api/megapool/claim-refunds.go @@ -4,9 +4,10 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/megapool/delegate.go b/rocketpool/api/megapool/delegate.go index 75aa56892..8cc327a3a 100644 --- a/rocketpool/api/megapool/delegate.go +++ b/rocketpool/api/megapool/delegate.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canDelegateUpgrade(c *cli.Command, megapoolAddress common.Address) (*api.MegapoolCanDelegateUpgradeResponse, error) { diff --git a/rocketpool/api/megapool/dissolve-validator.go b/rocketpool/api/megapool/dissolve-validator.go index de6d40e8b..f6cd06957 100644 --- a/rocketpool/api/megapool/dissolve-validator.go +++ b/rocketpool/api/megapool/dissolve-validator.go @@ -2,10 +2,11 @@ package megapool import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canDissolveValidator(c *cli.Command, validatorId uint32) (*api.CanDissolveValidatorResponse, error) { diff --git a/rocketpool/api/megapool/dissolve-with-proof.go b/rocketpool/api/megapool/dissolve-with-proof.go index 34f360f42..02d5515b3 100644 --- a/rocketpool/api/megapool/dissolve-with-proof.go +++ b/rocketpool/api/megapool/dissolve-with-proof.go @@ -5,11 +5,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canDissolveWithProof(c *cli.Command, validatorId uint32) (*api.CanDissolveWithProofResponse, error) { diff --git a/rocketpool/api/megapool/distribute.go b/rocketpool/api/megapool/distribute.go index f2de45f57..37c4d05ae 100644 --- a/rocketpool/api/megapool/distribute.go +++ b/rocketpool/api/megapool/distribute.go @@ -2,10 +2,11 @@ package megapool import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canDistributeMegapool(c *cli.Command) (*api.CanDistributeMegapoolResponse, error) { diff --git a/rocketpool/api/megapool/exit-queue.go b/rocketpool/api/megapool/exit-queue.go index 213993749..82b047856 100644 --- a/rocketpool/api/megapool/exit-queue.go +++ b/rocketpool/api/megapool/exit-queue.go @@ -2,10 +2,11 @@ package megapool import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canExitQueue(c *cli.Command, validatorIndex uint32) (*api.CanExitQueueResponse, error) { diff --git a/rocketpool/api/megapool/exit-validator.go b/rocketpool/api/megapool/exit-validator.go index d3bc6cf18..5a2e87800 100644 --- a/rocketpool/api/megapool/exit-validator.go +++ b/rocketpool/api/megapool/exit-validator.go @@ -1,13 +1,14 @@ package megapool import ( + "github.com/urfave/cli/v3" + eth2types "github.com/wealdtech/go-eth2-types/v2" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" "github.com/rocket-pool/smartnode/shared/utils/validator" - "github.com/urfave/cli/v3" - eth2types "github.com/wealdtech/go-eth2-types/v2" ) func canExitValidator(c *cli.Command, validatorId uint32) (*api.CanExitValidatorResponse, error) { diff --git a/rocketpool/api/megapool/new-validator-bond.go b/rocketpool/api/megapool/new-validator-bond.go index 221a8f92d..8d3e8e780 100644 --- a/rocketpool/api/megapool/new-validator-bond.go +++ b/rocketpool/api/megapool/new-validator-bond.go @@ -3,9 +3,10 @@ package megapool import ( "fmt" - "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/megapool/notify-final-balance.go b/rocketpool/api/megapool/notify-final-balance.go index dc1cbacb9..99e92cf43 100644 --- a/rocketpool/api/megapool/notify-final-balance.go +++ b/rocketpool/api/megapool/notify-final-balance.go @@ -5,12 +5,13 @@ import ( "strconv" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" - "github.com/urfave/cli/v3" ) func canNotifyFinalBalance(c *cli.Command, validatorId uint32, withdrawalSlot uint64) (*api.CanNotifyFinalBalanceResponse, error) { diff --git a/rocketpool/api/megapool/notify-validator-exit.go b/rocketpool/api/megapool/notify-validator-exit.go index 064bb3189..77afdf2c8 100644 --- a/rocketpool/api/megapool/notify-validator-exit.go +++ b/rocketpool/api/megapool/notify-validator-exit.go @@ -2,11 +2,12 @@ package megapool import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canNotifyValidatorExit(c *cli.Command, validatorId uint32) (*api.CanNotifyValidatorExitResponse, error) { diff --git a/rocketpool/api/megapool/reduce-bond.go b/rocketpool/api/megapool/reduce-bond.go index 745b0ea4b..8de93fd04 100644 --- a/rocketpool/api/megapool/reduce-bond.go +++ b/rocketpool/api/megapool/reduce-bond.go @@ -4,9 +4,10 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/megapool/repay-debt.go b/rocketpool/api/megapool/repay-debt.go index 259880aae..0d0bbb825 100644 --- a/rocketpool/api/megapool/repay-debt.go +++ b/rocketpool/api/megapool/repay-debt.go @@ -6,9 +6,10 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/megapool/stake.go b/rocketpool/api/megapool/stake.go index 290d0f237..098a5ebec 100644 --- a/rocketpool/api/megapool/stake.go +++ b/rocketpool/api/megapool/stake.go @@ -4,9 +4,10 @@ import ( "strings" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/megapool/status.go b/rocketpool/api/megapool/status.go index 5dbe9f5f0..24d3459f6 100644 --- a/rocketpool/api/megapool/status.go +++ b/rocketpool/api/megapool/status.go @@ -6,11 +6,12 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func getStatus(c *cli.Command, finalizedState bool) (*api.MegapoolStatusResponse, error) { diff --git a/rocketpool/api/minipool/change-withdrawal-creds.go b/rocketpool/api/minipool/change-withdrawal-creds.go index 1bae19bda..9164edcf9 100644 --- a/rocketpool/api/minipool/change-withdrawal-creds.go +++ b/rocketpool/api/minipool/change-withdrawal-creds.go @@ -5,12 +5,13 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/minipool" - "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" eth2types "github.com/wealdtech/go-eth2-types/v2" util "github.com/wealdtech/go-eth2-util" + "github.com/rocket-pool/smartnode/bindings/minipool" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/minipool/close.go b/rocketpool/api/minipool/close.go index 70f8e23cb..670080c9e 100644 --- a/rocketpool/api/minipool/close.go +++ b/rocketpool/api/minipool/close.go @@ -7,13 +7,14 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/rocketpool/api/minipool/delegate.go b/rocketpool/api/minipool/delegate.go index 39461ad3e..726420d19 100644 --- a/rocketpool/api/minipool/delegate.go +++ b/rocketpool/api/minipool/delegate.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/minipool/dissolve.go b/rocketpool/api/minipool/dissolve.go index 722ae98c8..f7c248c25 100644 --- a/rocketpool/api/minipool/dissolve.go +++ b/rocketpool/api/minipool/dissolve.go @@ -3,9 +3,10 @@ package minipool import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/minipool/distribute.go b/rocketpool/api/minipool/distribute.go index 9520e69c2..d1e5b270b 100644 --- a/rocketpool/api/minipool/distribute.go +++ b/rocketpool/api/minipool/distribute.go @@ -7,11 +7,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/minipool/exit.go b/rocketpool/api/minipool/exit.go index 6aa7f963a..2b3d67c72 100644 --- a/rocketpool/api/minipool/exit.go +++ b/rocketpool/api/minipool/exit.go @@ -2,11 +2,12 @@ package minipool import ( "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/minipool" - "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" eth2types "github.com/wealdtech/go-eth2-types/v2" + "github.com/rocket-pool/smartnode/bindings/minipool" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" "github.com/rocket-pool/smartnode/shared/utils/validator" diff --git a/rocketpool/api/minipool/import-key.go b/rocketpool/api/minipool/import-key.go index 599ebbc42..02d1f76af 100644 --- a/rocketpool/api/minipool/import-key.go +++ b/rocketpool/api/minipool/import-key.go @@ -5,11 +5,12 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/minipool" - "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" eth2types "github.com/wealdtech/go-eth2-types/v2" + "github.com/rocket-pool/smartnode/bindings/minipool" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" "github.com/rocket-pool/smartnode/shared/utils/validator" diff --git a/rocketpool/api/minipool/promote.go b/rocketpool/api/minipool/promote.go index c9299f991..07a4e82bb 100644 --- a/rocketpool/api/minipool/promote.go +++ b/rocketpool/api/minipool/promote.go @@ -7,9 +7,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/settings/trustednode" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/minipool/refund.go b/rocketpool/api/minipool/refund.go index 78f7ce15b..8dc1312c5 100644 --- a/rocketpool/api/minipool/refund.go +++ b/rocketpool/api/minipool/refund.go @@ -5,9 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/minipool/rescue-dissolved.go b/rocketpool/api/minipool/rescue-dissolved.go index 99b527d75..c6224cb41 100644 --- a/rocketpool/api/minipool/rescue-dissolved.go +++ b/rocketpool/api/minipool/rescue-dissolved.go @@ -7,12 +7,13 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/rocketpool/api/minipool/stake.go b/rocketpool/api/minipool/stake.go index 72a2337a9..48e42e4c1 100644 --- a/rocketpool/api/minipool/stake.go +++ b/rocketpool/api/minipool/stake.go @@ -7,9 +7,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/settings/trustednode" - "github.com/urfave/cli/v3" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services" diff --git a/rocketpool/api/minipool/utils.go b/rocketpool/api/minipool/utils.go index 5de8e92f2..66b757321 100644 --- a/rocketpool/api/minipool/utils.go +++ b/rocketpool/api/minipool/utils.go @@ -8,6 +8,8 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/settings/protocol" @@ -15,7 +17,6 @@ import ( "github.com/rocket-pool/smartnode/bindings/tokens" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/network/dao-proposals.go b/rocketpool/api/network/dao-proposals.go index b18c78472..193b256ad 100644 --- a/rocketpool/api/network/dao-proposals.go +++ b/rocketpool/api/network/dao-proposals.go @@ -6,6 +6,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/wealdtech/go-ens/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/rocketpool/api/pdao" @@ -13,9 +17,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/proposals" "github.com/rocket-pool/smartnode/shared/types/api" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" - "github.com/urfave/cli/v3" - "github.com/wealdtech/go-ens/v3" - "golang.org/x/sync/errgroup" ) func getActiveDAOProposals(c *cli.Command) (*api.NetworkDAOProposalsResponse, error) { diff --git a/rocketpool/api/network/delegate.go b/rocketpool/api/network/delegate.go index 12bf27f8c..b59239146 100644 --- a/rocketpool/api/network/delegate.go +++ b/rocketpool/api/network/delegate.go @@ -1,9 +1,10 @@ package network import ( + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) // Get the latest delegate contract address diff --git a/rocketpool/api/network/download-rewards.go b/rocketpool/api/network/download-rewards.go index 1499236c5..8abb1c14b 100644 --- a/rocketpool/api/network/download-rewards.go +++ b/rocketpool/api/network/download-rewards.go @@ -3,10 +3,11 @@ package network import ( "fmt" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/rewards" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func downloadRewardsFile(c *cli.Command, interval uint64) (*api.DownloadRewardsFileResponse, error) { diff --git a/rocketpool/api/network/generate-tree.go b/rocketpool/api/network/generate-tree.go index aa71ec414..76e3bc5d2 100644 --- a/rocketpool/api/network/generate-tree.go +++ b/rocketpool/api/network/generate-tree.go @@ -5,10 +5,11 @@ import ( "os" "github.com/fatih/color" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/config" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) const ( diff --git a/rocketpool/api/network/node-fee.go b/rocketpool/api/network/node-fee.go index c6ad0668f..3c4d077c4 100644 --- a/rocketpool/api/network/node-fee.go +++ b/rocketpool/api/network/node-fee.go @@ -1,11 +1,12 @@ package network import ( - "github.com/rocket-pool/smartnode/bindings/network" - "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/network" + "github.com/rocket-pool/smartnode/bindings/settings/protocol" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/network/rpl-price.go b/rocketpool/api/network/rpl-price.go index 49f35e9dd..8fc9b78c9 100644 --- a/rocketpool/api/network/rpl-price.go +++ b/rocketpool/api/network/rpl-price.go @@ -3,10 +3,11 @@ package network import ( "math/big" - "github.com/rocket-pool/smartnode/bindings/network" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/network" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/network/stats.go b/rocketpool/api/network/stats.go index c71a6a8cc..ed74ef071 100644 --- a/rocketpool/api/network/stats.go +++ b/rocketpool/api/network/stats.go @@ -5,6 +5,9 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/deposit" "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/network" @@ -12,8 +15,6 @@ import ( "github.com/rocket-pool/smartnode/bindings/tokens" "github.com/rocket-pool/smartnode/bindings/utils/eth" rpstate "github.com/rocket-pool/smartnode/bindings/utils/state" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/network/timezones.go b/rocketpool/api/network/timezones.go index 318136156..1237d71db 100644 --- a/rocketpool/api/network/timezones.go +++ b/rocketpool/api/network/timezones.go @@ -4,9 +4,10 @@ import ( "math/big" "time" - "github.com/rocket-pool/smartnode/bindings/node" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/balances.go b/rocketpool/api/node/balances.go index 4a356b01d..15fa7cc12 100644 --- a/rocketpool/api/node/balances.go +++ b/rocketpool/api/node/balances.go @@ -4,9 +4,10 @@ import ( "context" "fmt" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func getNodeEthBalance(c *cli.Command) (*api.NodeEthBalanceResponse, error) { diff --git a/rocketpool/api/node/burn.go b/rocketpool/api/node/burn.go index 4937376bb..e003f5406 100644 --- a/rocketpool/api/node/burn.go +++ b/rocketpool/api/node/burn.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/tokens" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/tokens" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/check-collateral.go b/rocketpool/api/node/check-collateral.go index 2a6f94040..4f032aa51 100644 --- a/rocketpool/api/node/check-collateral.go +++ b/rocketpool/api/node/check-collateral.go @@ -3,10 +3,11 @@ package node import ( "math/big" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" rputils "github.com/rocket-pool/smartnode/shared/utils/rp" - "github.com/urfave/cli/v3" ) func checkCollateral(c *cli.Command) (*api.CheckCollateralResponse, error) { diff --git a/rocketpool/api/node/create-vacant-minipool.go b/rocketpool/api/node/create-vacant-minipool.go index a156e282a..8e56151e7 100644 --- a/rocketpool/api/node/create-vacant-minipool.go +++ b/rocketpool/api/node/create-vacant-minipool.go @@ -8,6 +8,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/settings/protocol" @@ -18,8 +21,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/types/api" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" ) func canCreateVacantMinipool(c *cli.Command, amountWei *big.Int, minNodeFee float64, salt *big.Int, pubkey rptypes.ValidatorPubkey) (*api.CanCreateVacantMinipoolResponse, error) { diff --git a/rocketpool/api/node/deposit.go b/rocketpool/api/node/deposit.go index 2cbfd982d..663f2a712 100644 --- a/rocketpool/api/node/deposit.go +++ b/rocketpool/api/node/deposit.go @@ -10,22 +10,24 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/signing" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/deposit" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/rocket-pool/smartnode/bindings/settings/trustednode" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" prdeposit "github.com/prysmaticlabs/prysm/v5/contracts/deposit" ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1" + eth2types "github.com/wealdtech/go-eth2-types/v2" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/types/api" "github.com/rocket-pool/smartnode/shared/utils/validator" - eth2types "github.com/wealdtech/go-eth2-types/v2" ) const ( diff --git a/rocketpool/api/node/distributor.go b/rocketpool/api/node/distributor.go index 0063db488..c12831b88 100644 --- a/rocketpool/api/node/distributor.go +++ b/rocketpool/api/node/distributor.go @@ -6,11 +6,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/node" - "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/bindings/utils/eth" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/ens-name.go b/rocketpool/api/node/ens-name.go index 5797b96c2..9d2162d38 100644 --- a/rocketpool/api/node/ens-name.go +++ b/rocketpool/api/node/ens-name.go @@ -4,10 +4,11 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/shared/services" - "github.com/rocket-pool/smartnode/shared/types/api" "github.com/urfave/cli/v3" ens "github.com/wealdtech/go-ens/v3" + + "github.com/rocket-pool/smartnode/shared/services" + "github.com/rocket-pool/smartnode/shared/types/api" ) func resolveEnsName(c *cli.Command, name string) (*api.ResolveEnsNameResponse, error) { diff --git a/rocketpool/api/node/express-ticket.go b/rocketpool/api/node/express-ticket.go index bcc1a6d2b..f4138c6ba 100644 --- a/rocketpool/api/node/express-ticket.go +++ b/rocketpool/api/node/express-ticket.go @@ -3,10 +3,11 @@ package node import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func getExpressTicketCount(c *cli.Command) (*api.GetExpressTicketCountResponse, error) { diff --git a/rocketpool/api/node/get-bond-requirement.go b/rocketpool/api/node/get-bond-requirement.go index a09376747..716024750 100644 --- a/rocketpool/api/node/get-bond-requirement.go +++ b/rocketpool/api/node/get-bond-requirement.go @@ -3,10 +3,11 @@ package node import ( "math/big" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func getBondRequirement(c *cli.Command, numValidators uint64) (*api.GetBondRequirementResponse, error) { diff --git a/rocketpool/api/node/primary-withdrawal-address.go b/rocketpool/api/node/primary-withdrawal-address.go index 046f0a20b..5681f2543 100644 --- a/rocketpool/api/node/primary-withdrawal-address.go +++ b/rocketpool/api/node/primary-withdrawal-address.go @@ -5,9 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/storage" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/storage" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/register.go b/rocketpool/api/node/register.go index 83fdf5c70..dddd55d9a 100644 --- a/rocketpool/api/node/register.go +++ b/rocketpool/api/node/register.go @@ -3,11 +3,12 @@ package node import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/node" - "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/bindings/settings/protocol" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/rewards.go b/rocketpool/api/node/rewards.go index 4ca15d9c8..12c0851ac 100644 --- a/rocketpool/api/node/rewards.go +++ b/rocketpool/api/node/rewards.go @@ -7,6 +7,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/node" diff --git a/rocketpool/api/node/routes.go b/rocketpool/api/node/routes.go index b832f36dd..154a35bb1 100644 --- a/rocketpool/api/node/routes.go +++ b/rocketpool/api/node/routes.go @@ -8,9 +8,10 @@ import ( "strconv" "github.com/ethereum/go-ethereum/common" - rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" + rptypes "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" apiutils "github.com/rocket-pool/smartnode/shared/utils/api" ) diff --git a/rocketpool/api/node/rpl-withdrawal-address.go b/rocketpool/api/node/rpl-withdrawal-address.go index 20ac60b5e..e6084b156 100644 --- a/rocketpool/api/node/rpl-withdrawal-address.go +++ b/rocketpool/api/node/rpl-withdrawal-address.go @@ -5,11 +5,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/storage" "github.com/rocket-pool/smartnode/shared/services" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/send-message.go b/rocketpool/api/node/send-message.go index 5d114e834..305371425 100644 --- a/rocketpool/api/node/send-message.go +++ b/rocketpool/api/node/send-message.go @@ -7,9 +7,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canSendMessage(c *cli.Command, address common.Address, message []byte) (*api.CanNodeSendMessageResponse, error) { diff --git a/rocketpool/api/node/send.go b/rocketpool/api/node/send.go index 663481176..beb3c97c9 100644 --- a/rocketpool/api/node/send.go +++ b/rocketpool/api/node/send.go @@ -9,9 +9,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/tokens" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/node/set-rpl-lock-allowed.go b/rocketpool/api/node/set-rpl-lock-allowed.go index 35947dde8..1cb64317d 100644 --- a/rocketpool/api/node/set-rpl-lock-allowed.go +++ b/rocketpool/api/node/set-rpl-lock-allowed.go @@ -3,9 +3,10 @@ package node import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/node" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/set-stake-rpl-for-allowed.go b/rocketpool/api/node/set-stake-rpl-for-allowed.go index ddf6fdb62..87b50d68d 100644 --- a/rocketpool/api/node/set-stake-rpl-for-allowed.go +++ b/rocketpool/api/node/set-stake-rpl-for-allowed.go @@ -3,9 +3,10 @@ package node import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/node" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/set-timezone.go b/rocketpool/api/node/set-timezone.go index 520b40ff1..be785870b 100644 --- a/rocketpool/api/node/set-timezone.go +++ b/rocketpool/api/node/set-timezone.go @@ -5,9 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/node" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/smoothing-pool.go b/rocketpool/api/node/smoothing-pool.go index 16c6d4e95..26cc234f7 100644 --- a/rocketpool/api/node/smoothing-pool.go +++ b/rocketpool/api/node/smoothing-pool.go @@ -6,6 +6,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rewards" rocketpoolapi "github.com/rocket-pool/smartnode/bindings/rocketpool" @@ -13,7 +15,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/rocketpool" "github.com/rocket-pool/smartnode/shared/types/api" "github.com/rocket-pool/smartnode/shared/utils/validator" - "github.com/urfave/cli/v3" ) func getSmoothingPoolRegistrationStatus(c *cli.Command) (*api.GetSmoothingPoolRegistrationStatusResponse, error) { diff --git a/rocketpool/api/node/stake-rpl.go b/rocketpool/api/node/stake-rpl.go index 6ed4fc8a9..5064e214c 100644 --- a/rocketpool/api/node/stake-rpl.go +++ b/rocketpool/api/node/stake-rpl.go @@ -6,10 +6,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/tokens" "github.com/rocket-pool/smartnode/bindings/utils" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/node/status.go b/rocketpool/api/node/status.go index bc9e1344f..04ee6458c 100644 --- a/rocketpool/api/node/status.go +++ b/rocketpool/api/node/status.go @@ -9,6 +9,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/minipool" @@ -19,8 +22,6 @@ import ( "github.com/rocket-pool/smartnode/bindings/tokens" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" mp "github.com/rocket-pool/smartnode/rocketpool/api/minipool" "github.com/rocket-pool/smartnode/rocketpool/api/pdao" diff --git a/rocketpool/api/node/swap-rpl.go b/rocketpool/api/node/swap-rpl.go index 668dc439d..75095e15e 100644 --- a/rocketpool/api/node/swap-rpl.go +++ b/rocketpool/api/node/swap-rpl.go @@ -5,9 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/tokens" "github.com/rocket-pool/smartnode/bindings/utils" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/node/unstake-rpl.go b/rocketpool/api/node/unstake-rpl.go index 01f762923..5957e5aa8 100644 --- a/rocketpool/api/node/unstake-rpl.go +++ b/rocketpool/api/node/unstake-rpl.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/node" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/utils.go b/rocketpool/api/node/utils.go index be63a04c3..fcc9a0e4e 100644 --- a/rocketpool/api/node/utils.go +++ b/rocketpool/api/node/utils.go @@ -5,10 +5,11 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" - "golang.org/x/sync/errgroup" ) // Settings diff --git a/rocketpool/api/node/withdraw-credit.go b/rocketpool/api/node/withdraw-credit.go index 42c07e83b..2541f2f84 100644 --- a/rocketpool/api/node/withdraw-credit.go +++ b/rocketpool/api/node/withdraw-credit.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/node" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/withdraw-eth.go b/rocketpool/api/node/withdraw-eth.go index 1dfc2bffb..a937b5298 100644 --- a/rocketpool/api/node/withdraw-eth.go +++ b/rocketpool/api/node/withdraw-eth.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/node" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/withdraw-legacy-rpl.go b/rocketpool/api/node/withdraw-legacy-rpl.go index 90f1e5605..fbd158e1c 100644 --- a/rocketpool/api/node/withdraw-legacy-rpl.go +++ b/rocketpool/api/node/withdraw-legacy-rpl.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/node" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/node/withdraw-rpl.go b/rocketpool/api/node/withdraw-rpl.go index bbe42eb05..3268f7caf 100644 --- a/rocketpool/api/node/withdraw-rpl.go +++ b/rocketpool/api/node/withdraw-rpl.go @@ -7,11 +7,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + node131 "github.com/rocket-pool/smartnode/bindings/legacy/v1.3.1/node" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/settings/protocol" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/odao/cancel-proposal.go b/rocketpool/api/odao/cancel-proposal.go index 6441fafc5..9a105d2d0 100644 --- a/rocketpool/api/odao/cancel-proposal.go +++ b/rocketpool/api/odao/cancel-proposal.go @@ -5,11 +5,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/dao/trustednode" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/odao/execute-proposal.go b/rocketpool/api/odao/execute-proposal.go index 06f28ccb0..7998e023c 100644 --- a/rocketpool/api/odao/execute-proposal.go +++ b/rocketpool/api/odao/execute-proposal.go @@ -3,11 +3,12 @@ package odao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/dao/trustednode" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/odao/get-settings.go b/rocketpool/api/odao/get-settings.go index d07a4c4c9..a0239d30f 100644 --- a/rocketpool/api/odao/get-settings.go +++ b/rocketpool/api/odao/get-settings.go @@ -3,9 +3,10 @@ package odao import ( "fmt" - "github.com/rocket-pool/smartnode/bindings/settings/trustednode" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/settings/trustednode" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/odao/join.go b/rocketpool/api/odao/join.go index 19714fb9d..f6d03800d 100644 --- a/rocketpool/api/odao/join.go +++ b/rocketpool/api/odao/join.go @@ -5,12 +5,13 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + tndao "github.com/rocket-pool/smartnode/bindings/dao/trustednode" tnsettings "github.com/rocket-pool/smartnode/bindings/settings/trustednode" "github.com/rocket-pool/smartnode/bindings/tokens" "github.com/rocket-pool/smartnode/bindings/utils" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/odao/leave.go b/rocketpool/api/odao/leave.go index 7df193387..7e9c17b50 100644 --- a/rocketpool/api/odao/leave.go +++ b/rocketpool/api/odao/leave.go @@ -3,10 +3,11 @@ package odao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/odao/members.go b/rocketpool/api/odao/members.go index 074b35ddf..be12a4d8d 100644 --- a/rocketpool/api/odao/members.go +++ b/rocketpool/api/odao/members.go @@ -1,9 +1,10 @@ package odao import ( - "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/odao/penalise-megapool.go b/rocketpool/api/odao/penalise-megapool.go index a066cf56f..1022671bf 100644 --- a/rocketpool/api/odao/penalise-megapool.go +++ b/rocketpool/api/odao/penalise-megapool.go @@ -5,9 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/odao/proposals.go b/rocketpool/api/odao/proposals.go index f5b40bc2b..425afdf87 100644 --- a/rocketpool/api/odao/proposals.go +++ b/rocketpool/api/odao/proposals.go @@ -1,9 +1,10 @@ package odao import ( - "github.com/rocket-pool/smartnode/bindings/dao" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/odao/propose-invite.go b/rocketpool/api/odao/propose-invite.go index c7ab81adb..0cdacee49 100644 --- a/rocketpool/api/odao/propose-invite.go +++ b/rocketpool/api/odao/propose-invite.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/odao/propose-kick.go b/rocketpool/api/odao/propose-kick.go index 3cc3fcc00..d97e3e552 100644 --- a/rocketpool/api/odao/propose-kick.go +++ b/rocketpool/api/odao/propose-kick.go @@ -6,11 +6,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/dao/trustednode" - "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" + "github.com/rocket-pool/smartnode/bindings/utils/eth" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" "github.com/rocket-pool/smartnode/shared/utils/math" diff --git a/rocketpool/api/odao/propose-leave.go b/rocketpool/api/odao/propose-leave.go index 3d192cad7..56bd1ed8b 100644 --- a/rocketpool/api/odao/propose-leave.go +++ b/rocketpool/api/odao/propose-leave.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/odao/propose-settings.go b/rocketpool/api/odao/propose-settings.go index 6a6479318..48be67a2f 100644 --- a/rocketpool/api/odao/propose-settings.go +++ b/rocketpool/api/odao/propose-settings.go @@ -5,9 +5,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/settings/trustednode" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/wallet" diff --git a/rocketpool/api/odao/status.go b/rocketpool/api/odao/status.go index 92df3ad2b..1c77134af 100644 --- a/rocketpool/api/odao/status.go +++ b/rocketpool/api/odao/status.go @@ -1,11 +1,12 @@ package odao import ( - "github.com/rocket-pool/smartnode/bindings/dao/trustednode" - rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" + rptypes "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/odao/utils.go b/rocketpool/api/odao/utils.go index 27ae6817f..80bbbe7e9 100644 --- a/rocketpool/api/odao/utils.go +++ b/rocketpool/api/odao/utils.go @@ -4,12 +4,13 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" tndao "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/rocketpool" tnsettings "github.com/rocket-pool/smartnode/bindings/settings/trustednode" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "golang.org/x/sync/errgroup" ) // Settings diff --git a/rocketpool/api/odao/vote-proposal.go b/rocketpool/api/odao/vote-proposal.go index 2c5845b66..a9ff0ed21 100644 --- a/rocketpool/api/odao/vote-proposal.go +++ b/rocketpool/api/odao/vote-proposal.go @@ -3,11 +3,12 @@ package odao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/dao/trustednode" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/pdao/claim-bonds.go b/rocketpool/api/pdao/claim-bonds.go index 1a67ce908..42686a5ee 100644 --- a/rocketpool/api/pdao/claim-bonds.go +++ b/rocketpool/api/pdao/claim-bonds.go @@ -3,11 +3,12 @@ package pdao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/pdao/claimable-bonds.go b/rocketpool/api/pdao/claimable-bonds.go index 4e56fadca..e9ec43ed3 100644 --- a/rocketpool/api/pdao/claimable-bonds.go +++ b/rocketpool/api/pdao/claimable-bonds.go @@ -6,13 +6,15 @@ import ( "sort" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/state" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) type challengeInfo struct { diff --git a/rocketpool/api/pdao/defeat-proposal.go b/rocketpool/api/pdao/defeat-proposal.go index 7cc643f7a..e3bf39463 100644 --- a/rocketpool/api/pdao/defeat-proposal.go +++ b/rocketpool/api/pdao/defeat-proposal.go @@ -5,11 +5,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/dao/protocol" - "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/pdao/execute-proposal.go b/rocketpool/api/pdao/execute-proposal.go index ee47e014d..5397f0b54 100644 --- a/rocketpool/api/pdao/execute-proposal.go +++ b/rocketpool/api/pdao/execute-proposal.go @@ -3,11 +3,12 @@ package pdao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/dao/protocol" - rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" + rptypes "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/pdao/finalize-proposal.go b/rocketpool/api/pdao/finalize-proposal.go index 6161137e7..b8e78b4e5 100644 --- a/rocketpool/api/pdao/finalize-proposal.go +++ b/rocketpool/api/pdao/finalize-proposal.go @@ -3,11 +3,12 @@ package pdao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/dao/protocol" - "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/pdao/get-settings.go b/rocketpool/api/pdao/get-settings.go index daeeed4d8..d06ca6d31 100644 --- a/rocketpool/api/pdao/get-settings.go +++ b/rocketpool/api/pdao/get-settings.go @@ -3,10 +3,11 @@ package pdao import ( "time" - "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/settings/protocol" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/pdao/invite-security.go b/rocketpool/api/pdao/invite-security.go index 16aa70813..94ddb1547 100644 --- a/rocketpool/api/pdao/invite-security.go +++ b/rocketpool/api/pdao/invite-security.go @@ -5,13 +5,14 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/dao/security" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" ) func canProposeInviteToSecurityCouncil(c *cli.Command, id string, address common.Address) (*api.PDAOCanProposeInviteToSecurityCouncilResponse, error) { diff --git a/rocketpool/api/pdao/kick-multi-security.go b/rocketpool/api/pdao/kick-multi-security.go index 365b99f7d..7e5376c88 100644 --- a/rocketpool/api/pdao/kick-multi-security.go +++ b/rocketpool/api/pdao/kick-multi-security.go @@ -3,10 +3,11 @@ package pdao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canProposeKickMultiFromSecurityCouncil(c *cli.Command, addresses []common.Address) (*api.PDAOCanProposeKickMultiFromSecurityCouncilResponse, error) { diff --git a/rocketpool/api/pdao/kick-security.go b/rocketpool/api/pdao/kick-security.go index 4c0fcd257..b56c67822 100644 --- a/rocketpool/api/pdao/kick-security.go +++ b/rocketpool/api/pdao/kick-security.go @@ -5,11 +5,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canProposeKickFromSecurityCouncil(c *cli.Command, address common.Address) (*api.PDAOCanProposeKickFromSecurityCouncilResponse, error) { diff --git a/rocketpool/api/pdao/one-time-spend.go b/rocketpool/api/pdao/one-time-spend.go index 47c25259f..62ec378c4 100644 --- a/rocketpool/api/pdao/one-time-spend.go +++ b/rocketpool/api/pdao/one-time-spend.go @@ -5,11 +5,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canProposeOneTimeSpend(c *cli.Command, invoiceID string, recipient common.Address, amount *big.Int, customMessage string) (*api.PDAOCanProposeOneTimeSpendResponse, error) { diff --git a/rocketpool/api/pdao/override-vote.go b/rocketpool/api/pdao/override-vote.go index f684db8bf..885d021ef 100644 --- a/rocketpool/api/pdao/override-vote.go +++ b/rocketpool/api/pdao/override-vote.go @@ -3,11 +3,12 @@ package pdao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/pdao/percentages.go b/rocketpool/api/pdao/percentages.go index 4e8c7fdd9..1b0c2e831 100644 --- a/rocketpool/api/pdao/percentages.go +++ b/rocketpool/api/pdao/percentages.go @@ -6,13 +6,14 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" rpnode "github.com/rocket-pool/smartnode/bindings/node" psettings "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func getRewardsPercentages(c *cli.Command) (*api.PDAOGetRewardsPercentagesResponse, error) { diff --git a/rocketpool/api/pdao/proposals.go b/rocketpool/api/pdao/proposals.go index a675af4f1..4cd092a2a 100644 --- a/rocketpool/api/pdao/proposals.go +++ b/rocketpool/api/pdao/proposals.go @@ -2,13 +2,14 @@ package pdao import ( "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" ) // Settings diff --git a/rocketpool/api/pdao/propose-settings.go b/rocketpool/api/pdao/propose-settings.go index b12ae1434..79db09544 100644 --- a/rocketpool/api/pdao/propose-settings.go +++ b/rocketpool/api/pdao/propose-settings.go @@ -6,16 +6,18 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + protocol131 "github.com/rocket-pool/smartnode/bindings/legacy/v1.3.1/protocol" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" cliutils "github.com/rocket-pool/smartnode/shared/utils/cli" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" ) func canProposeSetting(c *cli.Command, contractName string, settingName string, value string) (*api.CanProposePDAOSettingResponse, error) { diff --git a/rocketpool/api/pdao/recurring-spend.go b/rocketpool/api/pdao/recurring-spend.go index 1430d1efb..ce1828a5e 100644 --- a/rocketpool/api/pdao/recurring-spend.go +++ b/rocketpool/api/pdao/recurring-spend.go @@ -6,11 +6,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canProposeRecurringSpend(c *cli.Command, contractName string, recipient common.Address, amountPerPeriod *big.Int, periodLength time.Duration, startTime time.Time, numberOfPeriods uint64, customMessage string) (*api.PDAOCanProposeRecurringSpendResponse, error) { diff --git a/rocketpool/api/pdao/replace-security.go b/rocketpool/api/pdao/replace-security.go index 047b2dd4e..dc4168d88 100644 --- a/rocketpool/api/pdao/replace-security.go +++ b/rocketpool/api/pdao/replace-security.go @@ -5,12 +5,13 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/dao/security" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canProposeReplaceMemberOfSecurityCouncil(c *cli.Command, existingMemberAddress common.Address, newMemberID string, newMemberAddress common.Address) (*api.PDAOCanProposeReplaceMemberOfSecurityCouncilResponse, error) { diff --git a/rocketpool/api/pdao/set-allow-list.go b/rocketpool/api/pdao/set-allow-list.go index dfc867104..8aad33db0 100644 --- a/rocketpool/api/pdao/set-allow-list.go +++ b/rocketpool/api/pdao/set-allow-list.go @@ -3,11 +3,12 @@ package pdao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canProposeAllowListedControllers(c *cli.Command, addressList []common.Address) (*api.PDAOACanProposeAllowListedControllersResponse, error) { diff --git a/rocketpool/api/pdao/set-snapshot-address.go b/rocketpool/api/pdao/set-snapshot-address.go index a0f1a677e..356910d11 100644 --- a/rocketpool/api/pdao/set-snapshot-address.go +++ b/rocketpool/api/pdao/set-snapshot-address.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/contracts" diff --git a/rocketpool/api/pdao/update-recurring-spend.go b/rocketpool/api/pdao/update-recurring-spend.go index 77a2916df..38c888240 100644 --- a/rocketpool/api/pdao/update-recurring-spend.go +++ b/rocketpool/api/pdao/update-recurring-spend.go @@ -6,11 +6,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func canProposeRecurringSpendUpdate(c *cli.Command, contractName string, recipient common.Address, amountPerPeriod *big.Int, periodLength time.Duration, numberOfPeriods uint64, customMessage string) (*api.PDAOCanProposeRecurringSpendResponse, error) { diff --git a/rocketpool/api/pdao/vote-proposal.go b/rocketpool/api/pdao/vote-proposal.go index a6eb235fe..2cd79196e 100644 --- a/rocketpool/api/pdao/vote-proposal.go +++ b/rocketpool/api/pdao/vote-proposal.go @@ -3,11 +3,12 @@ package pdao import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/dao/protocol" - "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/proposals" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/queue/assign-deposits.go b/rocketpool/api/queue/assign-deposits.go index 69c9496d1..74a793014 100644 --- a/rocketpool/api/queue/assign-deposits.go +++ b/rocketpool/api/queue/assign-deposits.go @@ -4,11 +4,12 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/deposit" - "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/deposit" + "github.com/rocket-pool/smartnode/bindings/settings/protocol" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/queue/process.go b/rocketpool/api/queue/process.go index 89a270041..7df0ce64f 100644 --- a/rocketpool/api/queue/process.go +++ b/rocketpool/api/queue/process.go @@ -4,11 +4,12 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/deposit" - "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/deposit" + "github.com/rocket-pool/smartnode/bindings/settings/protocol" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/queue/queue-length.go b/rocketpool/api/queue/queue-length.go index 92cd02a11..6578b0ef7 100644 --- a/rocketpool/api/queue/queue-length.go +++ b/rocketpool/api/queue/queue-length.go @@ -1,12 +1,13 @@ package queue import ( + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/deposit" "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" ) func getQueueDetails(c *cli.Command) (*api.GetQueueDetailsResponse, error) { diff --git a/rocketpool/api/queue/status.go b/rocketpool/api/queue/status.go index fad1582a7..6ef210ecb 100644 --- a/rocketpool/api/queue/status.go +++ b/rocketpool/api/queue/status.go @@ -1,11 +1,12 @@ package queue import ( - "github.com/rocket-pool/smartnode/bindings/deposit" - "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/deposit" + "github.com/rocket-pool/smartnode/bindings/minipool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/security/cancel-proposal.go b/rocketpool/api/security/cancel-proposal.go index b2d2c44a6..3b752a695 100644 --- a/rocketpool/api/security/cancel-proposal.go +++ b/rocketpool/api/security/cancel-proposal.go @@ -5,11 +5,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/dao/security" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/security/execute-proposal.go b/rocketpool/api/security/execute-proposal.go index a26109600..1b5b0ecdf 100644 --- a/rocketpool/api/security/execute-proposal.go +++ b/rocketpool/api/security/execute-proposal.go @@ -3,11 +3,12 @@ package security import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/dao/security" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/security/join.go b/rocketpool/api/security/join.go index 0f935e932..38c30b7a0 100644 --- a/rocketpool/api/security/join.go +++ b/rocketpool/api/security/join.go @@ -3,10 +3,11 @@ package security import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/dao/security" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/security" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/security/leave.go b/rocketpool/api/security/leave.go index 8db9737c1..9e9bba263 100644 --- a/rocketpool/api/security/leave.go +++ b/rocketpool/api/security/leave.go @@ -3,10 +3,11 @@ package security import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/dao/security" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/security" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/security/proposals.go b/rocketpool/api/security/proposals.go index c2d166d05..0d38c6927 100644 --- a/rocketpool/api/security/proposals.go +++ b/rocketpool/api/security/proposals.go @@ -1,9 +1,10 @@ package security import ( - "github.com/rocket-pool/smartnode/bindings/dao" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/security/propose-leave.go b/rocketpool/api/security/propose-leave.go index bc4fe3061..605c042ca 100644 --- a/rocketpool/api/security/propose-leave.go +++ b/rocketpool/api/security/propose-leave.go @@ -3,9 +3,10 @@ package security import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/rocket-pool/smartnode/bindings/dao/security" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/security" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/security/propose-settings.go b/rocketpool/api/security/propose-settings.go index 3b44f2871..6edee9a0b 100644 --- a/rocketpool/api/security/propose-settings.go +++ b/rocketpool/api/security/propose-settings.go @@ -5,13 +5,14 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/rocket-pool/smartnode/bindings/settings/security" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" cliutils "github.com/rocket-pool/smartnode/shared/utils/cli" - "github.com/urfave/cli/v3" ) func canProposeSetting(c *cli.Command, contractName string, settingName string, value string) (*api.SecurityCanProposeSettingResponse, error) { diff --git a/rocketpool/api/security/status.go b/rocketpool/api/security/status.go index 1c8270445..0b7993925 100644 --- a/rocketpool/api/security/status.go +++ b/rocketpool/api/security/status.go @@ -1,11 +1,12 @@ package security import ( - "github.com/rocket-pool/smartnode/bindings/dao/security" - rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/security" + rptypes "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/security/utils.go b/rocketpool/api/security/utils.go index f65b6902a..6f3fb8a24 100644 --- a/rocketpool/api/security/utils.go +++ b/rocketpool/api/security/utils.go @@ -4,12 +4,13 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/dao/security" "github.com/rocket-pool/smartnode/bindings/rocketpool" psettings "github.com/rocket-pool/smartnode/bindings/settings/protocol" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "golang.org/x/sync/errgroup" ) // Settings diff --git a/rocketpool/api/security/vote-proposal.go b/rocketpool/api/security/vote-proposal.go index 5195c6fd4..960dea5ff 100644 --- a/rocketpool/api/security/vote-proposal.go +++ b/rocketpool/api/security/vote-proposal.go @@ -3,11 +3,12 @@ package security import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/dao/security" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/service/gas.go b/rocketpool/api/service/gas.go index 957b4c642..00f9ce2da 100644 --- a/rocketpool/api/service/gas.go +++ b/rocketpool/api/service/gas.go @@ -3,9 +3,10 @@ package service import ( "context" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func getGasPriceFromLatestBlock(c *cli.Command) (*api.GasPriceFromLatestBlockResponse, error) { diff --git a/rocketpool/api/service/restart-vc.go b/rocketpool/api/service/restart-vc.go index aa81051cf..26d595cac 100644 --- a/rocketpool/api/service/restart-vc.go +++ b/rocketpool/api/service/restart-vc.go @@ -3,10 +3,11 @@ package service import ( "fmt" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" "github.com/rocket-pool/smartnode/shared/utils/validator" - "github.com/urfave/cli/v3" ) // Restarts the Validator client diff --git a/rocketpool/api/upgrade/execute-upgrade.go b/rocketpool/api/upgrade/execute-upgrade.go index dde15a35f..5d84a6722 100644 --- a/rocketpool/api/upgrade/execute-upgrade.go +++ b/rocketpool/api/upgrade/execute-upgrade.go @@ -3,11 +3,12 @@ package upgrade import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/dao/upgrades" rptypes "github.com/rocket-pool/smartnode/bindings/types" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/upgrade/list.go b/rocketpool/api/upgrade/list.go index d1a482fb8..ffb615642 100644 --- a/rocketpool/api/upgrade/list.go +++ b/rocketpool/api/upgrade/list.go @@ -1,9 +1,10 @@ package upgrade import ( + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/upgrades" "github.com/rocket-pool/smartnode/shared/services" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/rocketpool/api/wallet/end-masquerade.go b/rocketpool/api/wallet/end-masquerade.go index 3bd963b6c..df606e7a7 100644 --- a/rocketpool/api/wallet/end-masquerade.go +++ b/rocketpool/api/wallet/end-masquerade.go @@ -3,9 +3,10 @@ package wallet import ( "fmt" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func endMasquerade(c *cli.Command) (*api.EndMasqueradeResponse, error) { diff --git a/rocketpool/api/wallet/ens-name.go b/rocketpool/api/wallet/ens-name.go index 6dc147ca7..cc5fd370e 100644 --- a/rocketpool/api/wallet/ens-name.go +++ b/rocketpool/api/wallet/ens-name.go @@ -4,11 +4,12 @@ import ( "fmt" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + ens "github.com/wealdtech/go-ens/v3" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" - ens "github.com/wealdtech/go-ens/v3" ) const ( diff --git a/rocketpool/api/wallet/masquerade.go b/rocketpool/api/wallet/masquerade.go index 531f66405..f3286fdef 100644 --- a/rocketpool/api/wallet/masquerade.go +++ b/rocketpool/api/wallet/masquerade.go @@ -4,9 +4,10 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/types/api" - "github.com/urfave/cli/v3" ) func masquerade(c *cli.Command, address common.Address) (*api.MasqueradeResponse, error) { diff --git a/rocketpool/api/wallet/recover.go b/rocketpool/api/wallet/recover.go index 7c1e938b0..b50f4d202 100644 --- a/rocketpool/api/wallet/recover.go +++ b/rocketpool/api/wallet/recover.go @@ -5,9 +5,10 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rocketpool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/api/wallet/test.go b/rocketpool/api/wallet/test.go index f8bb981b5..651cfa1b2 100644 --- a/rocketpool/api/wallet/test.go +++ b/rocketpool/api/wallet/test.go @@ -4,9 +4,10 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rocketpool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/types/api" diff --git a/rocketpool/node/collectors/beacon-collector.go b/rocketpool/node/collectors/beacon-collector.go index 6f9ced526..cdda8f536 100644 --- a/rocketpool/node/collectors/beacon-collector.go +++ b/rocketpool/node/collectors/beacon-collector.go @@ -5,11 +5,13 @@ import ( "strconv" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/prometheus/client_golang/prometheus" - "github.com/rocket-pool/smartnode/bindings/rocketpool" "golang.org/x/sync/errgroup" + + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) // Represents the collector for the beaconchain metrics diff --git a/rocketpool/node/collectors/demand-collector.go b/rocketpool/node/collectors/demand-collector.go index 7e9d1c956..c6eda8046 100644 --- a/rocketpool/node/collectors/demand-collector.go +++ b/rocketpool/node/collectors/demand-collector.go @@ -2,6 +2,7 @@ package collectors import ( "github.com/prometheus/client_golang/prometheus" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" ) diff --git a/rocketpool/node/collectors/governance-collector.go b/rocketpool/node/collectors/governance-collector.go index f6fff4077..2b23a05f8 100644 --- a/rocketpool/node/collectors/governance-collector.go +++ b/rocketpool/node/collectors/governance-collector.go @@ -4,10 +4,11 @@ import ( "fmt" "github.com/prometheus/client_golang/prometheus" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" - "golang.org/x/sync/errgroup" ) // Represents the collector for onchain governance metrics diff --git a/rocketpool/node/collectors/node-collector.go b/rocketpool/node/collectors/node-collector.go index f76f3015e..208a2522a 100644 --- a/rocketpool/node/collectors/node-collector.go +++ b/rocketpool/node/collectors/node-collector.go @@ -11,6 +11,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/deposit" "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" @@ -20,7 +22,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/config" rprewards "github.com/rocket-pool/smartnode/shared/services/rewards" "github.com/rocket-pool/smartnode/shared/utils/eth2" - "golang.org/x/sync/errgroup" ) // Represents the collector for the user's node diff --git a/rocketpool/node/collectors/odao-collector.go b/rocketpool/node/collectors/odao-collector.go index c7c1863cd..3edac3f87 100644 --- a/rocketpool/node/collectors/odao-collector.go +++ b/rocketpool/node/collectors/odao-collector.go @@ -2,6 +2,7 @@ package collectors import ( "github.com/prometheus/client_golang/prometheus" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/rocketpool/node/collectors/performance-collector.go b/rocketpool/node/collectors/performance-collector.go index 9a4954ec3..9c38b0e26 100644 --- a/rocketpool/node/collectors/performance-collector.go +++ b/rocketpool/node/collectors/performance-collector.go @@ -2,6 +2,7 @@ package collectors import ( "github.com/prometheus/client_golang/prometheus" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" ) diff --git a/rocketpool/node/collectors/rpl-collector.go b/rocketpool/node/collectors/rpl-collector.go index a9bee3939..e19f792e4 100644 --- a/rocketpool/node/collectors/rpl-collector.go +++ b/rocketpool/node/collectors/rpl-collector.go @@ -2,6 +2,7 @@ package collectors import ( "github.com/prometheus/client_golang/prometheus" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/shared/services/config" diff --git a/rocketpool/node/collectors/smoothing-pool-collector.go b/rocketpool/node/collectors/smoothing-pool-collector.go index 7e3f8e737..4a9c8cd5e 100644 --- a/rocketpool/node/collectors/smoothing-pool-collector.go +++ b/rocketpool/node/collectors/smoothing-pool-collector.go @@ -2,6 +2,7 @@ package collectors import ( "github.com/prometheus/client_golang/prometheus" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/shared/services" diff --git a/rocketpool/node/collectors/snapshot-collector.go b/rocketpool/node/collectors/snapshot-collector.go index 1dc651c8c..7e5482291 100644 --- a/rocketpool/node/collectors/snapshot-collector.go +++ b/rocketpool/node/collectors/snapshot-collector.go @@ -8,6 +8,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" @@ -17,7 +19,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/contracts" "github.com/rocket-pool/smartnode/shared/services/proposals" "github.com/rocket-pool/smartnode/shared/types/api" - "golang.org/x/sync/errgroup" ) // Time to wait to make new Snapshot API calls diff --git a/rocketpool/node/collectors/supply-collector.go b/rocketpool/node/collectors/supply-collector.go index 55d59bd69..b2f3c3212 100644 --- a/rocketpool/node/collectors/supply-collector.go +++ b/rocketpool/node/collectors/supply-collector.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rocketpool" - "golang.org/x/sync/errgroup" ) // Represents the collector for the Supply metrics diff --git a/rocketpool/node/collectors/trusted-node-collector.go b/rocketpool/node/collectors/trusted-node-collector.go index b9db2a0cd..9388d1c8b 100644 --- a/rocketpool/node/collectors/trusted-node-collector.go +++ b/rocketpool/node/collectors/trusted-node-collector.go @@ -10,6 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/rocketpool" @@ -18,7 +20,6 @@ import ( "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/config" - "golang.org/x/sync/errgroup" ) // Represents the collector for the user's trusted node diff --git a/rocketpool/node/defend-challenge-exit.go b/rocketpool/node/defend-challenge-exit.go index f7578b704..ed557848c 100644 --- a/rocketpool/node/defend-challenge-exit.go +++ b/rocketpool/node/defend-challenge-exit.go @@ -6,11 +6,12 @@ import ( "github.com/docker/docker/client" "github.com/ethereum/go-ethereum/accounts/abi/bind" coretypes "github.com/ethereum/go-ethereum/core/types" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/rocketpool/node/defend-pdao-props.go b/rocketpool/node/defend-pdao-props.go index 7d0329ebc..815c17830 100644 --- a/rocketpool/node/defend-pdao-props.go +++ b/rocketpool/node/defend-pdao-props.go @@ -7,6 +7,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" @@ -20,7 +22,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/utils/api" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) type defendableProposal struct { diff --git a/rocketpool/node/distribute-minipools.go b/rocketpool/node/distribute-minipools.go index 2dc9577a7..241954804 100644 --- a/rocketpool/node/distribute-minipools.go +++ b/rocketpool/node/distribute-minipools.go @@ -7,12 +7,13 @@ import ( "github.com/docker/docker/client" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" rpstate "github.com/rocket-pool/smartnode/bindings/utils/state" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/alerting" diff --git a/rocketpool/node/download-reward-trees.go b/rocketpool/node/download-reward-trees.go index c9851188a..e5f0b5a5f 100644 --- a/rocketpool/node/download-reward-trees.go +++ b/rocketpool/node/download-reward-trees.go @@ -5,9 +5,10 @@ import ( "os" "github.com/docker/docker/client" - "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rocketpool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/config" diff --git a/rocketpool/node/manage-fee-recipient.go b/rocketpool/node/manage-fee-recipient.go index 6d52e79f4..f4fceddde 100644 --- a/rocketpool/node/manage-fee-recipient.go +++ b/rocketpool/node/manage-fee-recipient.go @@ -5,9 +5,10 @@ import ( "github.com/docker/docker/client" "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rocketpool" + "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/alerting" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/rocketpool/node/metrics-exporter.go b/rocketpool/node/metrics-exporter.go index 8cab237ec..c2e650c33 100644 --- a/rocketpool/node/metrics-exporter.go +++ b/rocketpool/node/metrics-exporter.go @@ -11,10 +11,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/rocketpool/node/collectors" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) func runMetricsServer(ctx context.Context, c *cli.Command, logger log.ColorLogger, stateLocker *collectors.StateLocker) error { diff --git a/rocketpool/node/notify-final-balance.go b/rocketpool/node/notify-final-balance.go index 621a1e47d..02c235c44 100644 --- a/rocketpool/node/notify-final-balance.go +++ b/rocketpool/node/notify-final-balance.go @@ -7,10 +7,11 @@ import ( "github.com/docker/docker/client" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/rocketpool/node/notify-validator-exit.go b/rocketpool/node/notify-validator-exit.go index 23f660c90..938e1e0b4 100644 --- a/rocketpool/node/notify-validator-exit.go +++ b/rocketpool/node/notify-validator-exit.go @@ -6,11 +6,12 @@ import ( "github.com/docker/docker/client" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/rocketpool/node/prestake-megapool-validator.go b/rocketpool/node/prestake-megapool-validator.go index 8f5c26c3e..10cf97668 100644 --- a/rocketpool/node/prestake-megapool-validator.go +++ b/rocketpool/node/prestake-megapool-validator.go @@ -8,11 +8,12 @@ import ( "github.com/docker/docker/client" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/deposit" "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/config" diff --git a/rocketpool/node/provision-express-tickets.go b/rocketpool/node/provision-express-tickets.go index 0954cdeff..efd4a10a7 100644 --- a/rocketpool/node/provision-express-tickets.go +++ b/rocketpool/node/provision-express-tickets.go @@ -5,10 +5,11 @@ import ( "github.com/docker/docker/client" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/config" diff --git a/rocketpool/node/set-latest-delegate.go b/rocketpool/node/set-latest-delegate.go index 2341a1f99..7c3644486 100644 --- a/rocketpool/node/set-latest-delegate.go +++ b/rocketpool/node/set-latest-delegate.go @@ -8,12 +8,13 @@ import ( "github.com/docker/docker/client" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" rpstate "github.com/rocket-pool/smartnode/bindings/utils/state" "github.com/rocket-pool/smartnode/shared/services/alerting" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/rocketpool/node/stake-megapool-validator.go b/rocketpool/node/stake-megapool-validator.go index d63c359af..6b93d2b11 100644 --- a/rocketpool/node/stake-megapool-validator.go +++ b/rocketpool/node/stake-megapool-validator.go @@ -6,11 +6,12 @@ import ( "github.com/docker/docker/client" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/rocketpool/node/verify-pdao-props.go b/rocketpool/node/verify-pdao-props.go index 0d4f2c09f..efc449206 100644 --- a/rocketpool/node/verify-pdao-props.go +++ b/rocketpool/node/verify-pdao-props.go @@ -7,6 +7,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" @@ -20,7 +22,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/utils/api" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) type challenge struct { diff --git a/rocketpool/watchtower/challenge-exit.go b/rocketpool/watchtower/challenge-exit.go index 17afe7886..e2fb7d3fe 100644 --- a/rocketpool/watchtower/challenge-exit.go +++ b/rocketpool/watchtower/challenge-exit.go @@ -4,6 +4,8 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/settings/protocol" @@ -16,7 +18,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/utils/api" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) type challengeValidatorsExiting struct { diff --git a/rocketpool/watchtower/check-solo-migrations.go b/rocketpool/watchtower/check-solo-migrations.go index 8ed2e041e..c69ec038f 100644 --- a/rocketpool/watchtower/check-solo-migrations.go +++ b/rocketpool/watchtower/check-solo-migrations.go @@ -9,6 +9,8 @@ import ( "github.com/rocket-pool/smartnode/rocketpool/watchtower/collectors" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" @@ -21,7 +23,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/utils/api" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) const ( diff --git a/rocketpool/watchtower/dissolve-invalid-credentials.go b/rocketpool/watchtower/dissolve-invalid-credentials.go index b36c55d24..4023176cb 100644 --- a/rocketpool/watchtower/dissolve-invalid-credentials.go +++ b/rocketpool/watchtower/dissolve-invalid-credentials.go @@ -3,6 +3,8 @@ package watchtower import ( "bytes" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" @@ -14,7 +16,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/utils/api" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) // Dissolve timed out minipools task diff --git a/rocketpool/watchtower/dissolve-timed-out-megapool-validators.go b/rocketpool/watchtower/dissolve-timed-out-megapool-validators.go index b6e12d28e..a6a36f14d 100644 --- a/rocketpool/watchtower/dissolve-timed-out-megapool-validators.go +++ b/rocketpool/watchtower/dissolve-timed-out-megapool-validators.go @@ -4,6 +4,8 @@ import ( "fmt" "time" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/settings/protocol" @@ -15,7 +17,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/utils/api" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) // Dissolve timed out megapool validators task diff --git a/rocketpool/watchtower/dissolve-timed-out-minipools.go b/rocketpool/watchtower/dissolve-timed-out-minipools.go index fe5ab8f3a..510fcb097 100644 --- a/rocketpool/watchtower/dissolve-timed-out-minipools.go +++ b/rocketpool/watchtower/dissolve-timed-out-minipools.go @@ -6,11 +6,12 @@ import ( "time" "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/rocketpool/watchtower/utils" "github.com/rocket-pool/smartnode/shared/services" diff --git a/rocketpool/watchtower/finalize-pdao-proposals.go b/rocketpool/watchtower/finalize-pdao-proposals.go index 0cdddb851..cdf61b2e0 100644 --- a/rocketpool/watchtower/finalize-pdao-proposals.go +++ b/rocketpool/watchtower/finalize-pdao-proposals.go @@ -3,11 +3,12 @@ package watchtower import ( "fmt" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/rocketpool/watchtower/utils" "github.com/rocket-pool/smartnode/shared/services" diff --git a/rocketpool/watchtower/generate-rewards-tree.go b/rocketpool/watchtower/generate-rewards-tree.go index b4b9c073b..27832d9cc 100644 --- a/rocketpool/watchtower/generate-rewards-tree.go +++ b/rocketpool/watchtower/generate-rewards-tree.go @@ -14,6 +14,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rewards" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services" @@ -22,7 +24,6 @@ import ( rprewards "github.com/rocket-pool/smartnode/shared/services/rewards" "github.com/rocket-pool/smartnode/shared/services/state" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) // Generate rewards Merkle Tree task diff --git a/rocketpool/watchtower/metrics-exporter.go b/rocketpool/watchtower/metrics-exporter.go index bc7692f3d..abe2a5711 100644 --- a/rocketpool/watchtower/metrics-exporter.go +++ b/rocketpool/watchtower/metrics-exporter.go @@ -8,10 +8,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/rocketpool/watchtower/collectors" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) func runMetricsServer(c *cli.Command, logger log.ColorLogger, scrubCollector *collectors.ScrubCollector, bondReductionCollector *collectors.BondReductionCollector, soloMigrationCollector *collectors.SoloMigrationCollector) error { diff --git a/rocketpool/watchtower/respond-challenges.go b/rocketpool/watchtower/respond-challenges.go index 976f3a141..8fac3c09d 100644 --- a/rocketpool/watchtower/respond-challenges.go +++ b/rocketpool/watchtower/respond-challenges.go @@ -3,10 +3,11 @@ package watchtower import ( "fmt" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/rocketpool/watchtower/utils" "github.com/rocket-pool/smartnode/shared/services" diff --git a/rocketpool/watchtower/submit-network-balances.go b/rocketpool/watchtower/submit-network-balances.go index 7f5d872f0..61fa5cd68 100644 --- a/rocketpool/watchtower/submit-network-balances.go +++ b/rocketpool/watchtower/submit-network-balances.go @@ -12,14 +12,15 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" rpstate "github.com/rocket-pool/smartnode/bindings/utils/state" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/rocket-pool/smartnode/rocketpool/watchtower/utils" diff --git a/rocketpool/watchtower/submit-network-balances_test.go b/rocketpool/watchtower/submit-network-balances_test.go index 1916b2e57..3de5170b5 100644 --- a/rocketpool/watchtower/submit-network-balances_test.go +++ b/rocketpool/watchtower/submit-network-balances_test.go @@ -12,6 +12,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/rocket-pool/smartnode/bindings/rocketpool" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" diff --git a/rocketpool/watchtower/submit-rewards-tree-stateless.go b/rocketpool/watchtower/submit-rewards-tree-stateless.go index a1b2f5475..2f4a8f5bc 100644 --- a/rocketpool/watchtower/submit-rewards-tree-stateless.go +++ b/rocketpool/watchtower/submit-rewards-tree-stateless.go @@ -15,6 +15,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rewards" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/tokens" @@ -31,7 +33,6 @@ import ( "github.com/rocket-pool/smartnode/shared/utils/eth1" hexutil "github.com/rocket-pool/smartnode/shared/utils/hex" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) // Submit rewards Merkle Tree task diff --git a/rocketpool/watchtower/submit-rpl-price.go b/rocketpool/watchtower/submit-rpl-price.go index 5e176ef48..264a092a0 100644 --- a/rocketpool/watchtower/submit-rpl-price.go +++ b/rocketpool/watchtower/submit-rpl-price.go @@ -16,11 +16,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/rocketpool/watchtower/utils" "github.com/rocket-pool/smartnode/shared/services" diff --git a/rocketpool/watchtower/submit-scrub-minipools.go b/rocketpool/watchtower/submit-scrub-minipools.go index 644913c8a..5c5ed9175 100644 --- a/rocketpool/watchtower/submit-scrub-minipools.go +++ b/rocketpool/watchtower/submit-scrub-minipools.go @@ -11,15 +11,18 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/signing" prdeposit "github.com/prysmaticlabs/prysm/v5/contracts/deposit" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" rputils "github.com/rocket-pool/smartnode/bindings/utils" "github.com/rocket-pool/smartnode/bindings/utils/eth" rpstate "github.com/rocket-pool/smartnode/bindings/utils/state" - "github.com/urfave/cli/v3" ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1" + eth2types "github.com/wealdtech/go-eth2-types/v2" + "github.com/rocket-pool/smartnode/rocketpool/watchtower/collectors" "github.com/rocket-pool/smartnode/rocketpool/watchtower/utils" "github.com/rocket-pool/smartnode/shared/services" @@ -29,7 +32,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/utils/api" "github.com/rocket-pool/smartnode/shared/utils/log" - eth2types "github.com/wealdtech/go-eth2-types/v2" ) // Settings diff --git a/rocketpool/watchtower/utils/utils.go b/rocketpool/watchtower/utils/utils.go index c3e80c5f9..ebe055e87 100644 --- a/rocketpool/watchtower/utils/utils.go +++ b/rocketpool/watchtower/utils/utils.go @@ -8,6 +8,7 @@ import ( "time" "github.com/ethereum/go-ethereum/core/types" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/config" diff --git a/shared/services/alerting/alerting.go b/shared/services/alerting/alerting.go index a8612560b..e3e9a3b91 100644 --- a/shared/services/alerting/alerting.go +++ b/shared/services/alerting/alerting.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/go-openapi/strfmt" + apiclient "github.com/rocket-pool/smartnode/shared/services/alerting/alertmanager/client" apialert "github.com/rocket-pool/smartnode/shared/services/alerting/alertmanager/client/alert" "github.com/rocket-pool/smartnode/shared/services/alerting/alertmanager/models" diff --git a/shared/services/bc-manager.go b/shared/services/bc-manager.go index cd37eca68..a5902e9a0 100644 --- a/shared/services/bc-manager.go +++ b/shared/services/bc-manager.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/fatih/color" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/beacon/client" diff --git a/shared/services/beacon/client.go b/shared/services/beacon/client.go index 2bfb5a260..d3a543b1e 100644 --- a/shared/services/beacon/client.go +++ b/shared/services/beacon/client.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/prysmaticlabs/go-bitfield" + "github.com/rocket-pool/smartnode/bindings/types" ) diff --git a/shared/services/beacon/client/std-http-client.go b/shared/services/beacon/client/std-http-client.go index 476a5fd57..11e03cbc8 100644 --- a/shared/services/beacon/client/std-http-client.go +++ b/shared/services/beacon/client/std-http-client.go @@ -18,10 +18,11 @@ import ( "github.com/goccy/go-json" "github.com/prysmaticlabs/go-bitfield" "github.com/prysmaticlabs/prysm/v5/crypto/bls" - "github.com/rocket-pool/smartnode/bindings/types" eth2types "github.com/wealdtech/go-eth2-types/v2" "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/utils/eth2" hexutil "github.com/rocket-pool/smartnode/shared/utils/hex" diff --git a/shared/services/config/nethermind-params.go b/shared/services/config/nethermind-params.go index ea414f0f9..650a842d0 100644 --- a/shared/services/config/nethermind-params.go +++ b/shared/services/config/nethermind-params.go @@ -4,6 +4,7 @@ import ( "runtime" "github.com/pbnjay/memory" + "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/shared/services/config/reth-params.go b/shared/services/config/reth-params.go index 593461bdb..978ef433b 100644 --- a/shared/services/config/reth-params.go +++ b/shared/services/config/reth-params.go @@ -4,6 +4,7 @@ import ( "runtime" "github.com/pbnjay/memory" + "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/shared/services/config/rocket-pool-config.go b/shared/services/config/rocket-pool-config.go index 97cbc070d..08854ec00 100644 --- a/shared/services/config/rocket-pool-config.go +++ b/shared/services/config/rocket-pool-config.go @@ -14,6 +14,8 @@ import ( "github.com/alessio/shellescape" externalip "github.com/glendc/go-external-ip" "github.com/pbnjay/memory" + "gopkg.in/yaml.v2" + "github.com/rocket-pool/smartnode/addons" "github.com/rocket-pool/smartnode/addons/rescue_node" "github.com/rocket-pool/smartnode/shared" @@ -21,7 +23,6 @@ import ( addontypes "github.com/rocket-pool/smartnode/shared/types/addons" "github.com/rocket-pool/smartnode/shared/types/config" "github.com/rocket-pool/smartnode/shared/utils/cli/prompt" - "gopkg.in/yaml.v2" ) // Constants diff --git a/shared/services/config/smartnode-config.go b/shared/services/config/smartnode-config.go index 7bdf18405..65b35a4ed 100644 --- a/shared/services/config/smartnode-config.go +++ b/shared/services/config/smartnode-config.go @@ -6,6 +6,7 @@ import ( "strings" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/shared" "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/shared/services/config/teku-config.go b/shared/services/config/teku-config.go index 47e3c87fa..e0e8af159 100644 --- a/shared/services/config/teku-config.go +++ b/shared/services/config/teku-config.go @@ -2,6 +2,7 @@ package config import ( "github.com/pbnjay/memory" + "github.com/rocket-pool/smartnode/shared/types/config" ) diff --git a/shared/services/ec-manager.go b/shared/services/ec-manager.go index 1f46cb947..82b72017e 100644 --- a/shared/services/ec-manager.go +++ b/shared/services/ec-manager.go @@ -13,6 +13,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/fatih/color" + "github.com/rocket-pool/smartnode/shared/services/config" "github.com/rocket-pool/smartnode/shared/types/api" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" diff --git a/shared/services/gas/etherchain/etherchain.go b/shared/services/gas/etherchain/etherchain.go index 96a1124d1..067fda010 100644 --- a/shared/services/gas/etherchain/etherchain.go +++ b/shared/services/gas/etherchain/etherchain.go @@ -7,6 +7,7 @@ import ( "net/http" "github.com/goccy/go-json" + "github.com/rocket-pool/smartnode/shared/services/config" ) diff --git a/shared/services/megapools.go b/shared/services/megapools.go index b415232eb..46e432777 100644 --- a/shared/services/megapools.go +++ b/shared/services/megapools.go @@ -15,6 +15,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ssz "github.com/ferranbt/fastssz" + "github.com/urfave/cli/v3" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/node" @@ -30,8 +33,6 @@ import ( "github.com/rocket-pool/smartnode/shared/types/eth2" "github.com/rocket-pool/smartnode/shared/types/eth2/fork/fulu" "github.com/rocket-pool/smartnode/shared/types/eth2/generic" - "github.com/urfave/cli/v3" - "golang.org/x/sync/errgroup" ) const MAX_WITHDRAWAL_SLOT_DISTANCE = 144000 // 20 days. diff --git a/shared/services/megapools_test.go b/shared/services/megapools_test.go index 40e621835..5c975e246 100644 --- a/shared/services/megapools_test.go +++ b/shared/services/megapools_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/shared/services/proposals/network-tree-manager.go b/shared/services/proposals/network-tree-manager.go index 55e21dad4..b0c5f8eb7 100644 --- a/shared/services/proposals/network-tree-manager.go +++ b/shared/services/proposals/network-tree-manager.go @@ -9,6 +9,7 @@ import ( "github.com/blang/semver/v4" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" diff --git a/shared/services/proposals/node-tree-manager.go b/shared/services/proposals/node-tree-manager.go index 1a517bf5e..58c5126b6 100644 --- a/shared/services/proposals/node-tree-manager.go +++ b/shared/services/proposals/node-tree-manager.go @@ -9,6 +9,7 @@ import ( "github.com/blang/semver/v4" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services/config" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" diff --git a/shared/services/proposals/proposal-manager.go b/shared/services/proposals/proposal-manager.go index 71829e5af..e128f48d1 100644 --- a/shared/services/proposals/proposal-manager.go +++ b/shared/services/proposals/proposal-manager.go @@ -5,6 +5,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" diff --git a/shared/services/proposals/vi-snapshot-manager.go b/shared/services/proposals/vi-snapshot-manager.go index 0ec7f9803..c2d94b779 100644 --- a/shared/services/proposals/vi-snapshot-manager.go +++ b/shared/services/proposals/vi-snapshot-manager.go @@ -11,6 +11,7 @@ import ( "github.com/blang/semver/v4" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" diff --git a/shared/services/proposals/voting-tree.go b/shared/services/proposals/voting-tree.go index 0e1b06b80..a9ccdcfa1 100755 --- a/shared/services/proposals/voting-tree.go +++ b/shared/services/proposals/voting-tree.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" diff --git a/shared/services/requirements.go b/shared/services/requirements.go index c3be4384a..bc706f0e9 100644 --- a/shared/services/requirements.go +++ b/shared/services/requirements.go @@ -9,13 +9,14 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/dao/security" "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services/alerting" "github.com/rocket-pool/smartnode/shared/services/config" - "github.com/urfave/cli/v3" ) // Settings diff --git a/shared/services/rewards/execution-client.go b/shared/services/rewards/execution-client.go index 3e4d4892f..92fff23ad 100644 --- a/shared/services/rewards/execution-client.go +++ b/shared/services/rewards/execution-client.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" + rewards131 "github.com/rocket-pool/smartnode/bindings/legacy/v1.3.1/rewards" "github.com/rocket-pool/smartnode/bindings/rewards" "github.com/rocket-pool/smartnode/bindings/rocketpool" diff --git a/shared/services/rewards/files.go b/shared/services/rewards/files.go index 54ff0290f..780d62ee3 100644 --- a/shared/services/rewards/files.go +++ b/shared/services/rewards/files.go @@ -7,6 +7,7 @@ import ( "github.com/ipfs/go-cid" "github.com/klauspost/compress/zstd" + "github.com/rocket-pool/smartnode/shared/services/config" ) diff --git a/shared/services/rewards/generator-impl-v11.go b/shared/services/rewards/generator-impl-v11.go index f67da8589..fe426946e 100644 --- a/shared/services/rewards/generator-impl-v11.go +++ b/shared/services/rewards/generator-impl-v11.go @@ -12,6 +12,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ipfs/go-cid" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/rewards" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" @@ -23,7 +25,6 @@ import ( sszbig "github.com/rocket-pool/smartnode/shared/services/rewards/ssz_types/big" "github.com/rocket-pool/smartnode/shared/services/state" "github.com/rocket-pool/smartnode/shared/utils/log" - "golang.org/x/sync/errgroup" ) // Implementation for tree generator ruleset v9 diff --git a/shared/services/rewards/generator-impl-v9-v10.go b/shared/services/rewards/generator-impl-v9-v10.go index 2aef4d57e..cb6b59d1f 100644 --- a/shared/services/rewards/generator-impl-v9-v10.go +++ b/shared/services/rewards/generator-impl-v9-v10.go @@ -12,6 +12,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ipfs/go-cid" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/rewards" rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" @@ -22,7 +24,6 @@ import ( sszbig "github.com/rocket-pool/smartnode/shared/services/rewards/ssz_types/big" "github.com/rocket-pool/smartnode/shared/services/state" "github.com/rocket-pool/smartnode/shared/utils/log" - "golang.org/x/sync/errgroup" ) // Implementation for tree generator ruleset v9 diff --git a/shared/services/rewards/generator.go b/shared/services/rewards/generator.go index 5b716c7da..09840ce8a 100644 --- a/shared/services/rewards/generator.go +++ b/shared/services/rewards/generator.go @@ -9,6 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ipfs/go-cid" + "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/config" "github.com/rocket-pool/smartnode/shared/services/state" diff --git a/shared/services/rewards/mock_v11_test.go b/shared/services/rewards/mock_v11_test.go index 66e2d2a5c..44214d456 100644 --- a/shared/services/rewards/mock_v11_test.go +++ b/shared/services/rewards/mock_v11_test.go @@ -13,6 +13,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/fatih/color" + rptypes "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/shared/services/rewards/performance-file-v1.go b/shared/services/rewards/performance-file-v1.go index 5abfdbcdc..3b99b182c 100644 --- a/shared/services/rewards/performance-file-v1.go +++ b/shared/services/rewards/performance-file-v1.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/goccy/go-json" + "github.com/rocket-pool/smartnode/bindings/types" ) diff --git a/shared/services/rewards/rewards-file-v1.go b/shared/services/rewards/rewards-file-v1.go index 1d20dc838..9bcb63018 100644 --- a/shared/services/rewards/rewards-file-v1.go +++ b/shared/services/rewards/rewards-file-v1.go @@ -8,10 +8,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/goccy/go-json" - "github.com/rocket-pool/smartnode/bindings/types" - "github.com/rocket-pool/smartnode/bindings/utils/eth" "github.com/wealdtech/go-merkletree" "github.com/wealdtech/go-merkletree/keccak256" + + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/bindings/utils/eth" ) type MinipoolPerformanceFile_v1 struct { diff --git a/shared/services/rewards/rewards-file-v2.go b/shared/services/rewards/rewards-file-v2.go index 6b0572fec..7972ac2af 100644 --- a/shared/services/rewards/rewards-file-v2.go +++ b/shared/services/rewards/rewards-file-v2.go @@ -8,9 +8,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/goccy/go-json" - "github.com/rocket-pool/smartnode/bindings/types" "github.com/wealdtech/go-merkletree" "github.com/wealdtech/go-merkletree/keccak256" + + "github.com/rocket-pool/smartnode/bindings/types" ) type MinipoolPerformanceFile_v2 struct { diff --git a/shared/services/rewards/rewards-file-v3.go b/shared/services/rewards/rewards-file-v3.go index fa204ec30..1f265e63d 100644 --- a/shared/services/rewards/rewards-file-v3.go +++ b/shared/services/rewards/rewards-file-v3.go @@ -8,9 +8,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/goccy/go-json" - "github.com/rocket-pool/smartnode/shared/services/rewards/ssz_types" "github.com/wealdtech/go-merkletree" "github.com/wealdtech/go-merkletree/keccak256" + + "github.com/rocket-pool/smartnode/shared/services/rewards/ssz_types" ) // JSON struct for a complete rewards file diff --git a/shared/services/rewards/ssz_types/rewards-file-v4.go b/shared/services/rewards/ssz_types/rewards-file-v4.go index 4b519fad2..2dca33d25 100644 --- a/shared/services/rewards/ssz_types/rewards-file-v4.go +++ b/shared/services/rewards/ssz_types/rewards-file-v4.go @@ -13,9 +13,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/holiman/uint256" - "github.com/rocket-pool/smartnode/shared/services/rewards/ssz_types/big" "github.com/wealdtech/go-merkletree" "github.com/wealdtech/go-merkletree/keccak256" + + "github.com/rocket-pool/smartnode/shared/services/rewards/ssz_types/big" ) type Format = uint diff --git a/shared/services/rewards/ssz_types/rewards-file-v5.go b/shared/services/rewards/ssz_types/rewards-file-v5.go index 457ebc0b2..b00367858 100644 --- a/shared/services/rewards/ssz_types/rewards-file-v5.go +++ b/shared/services/rewards/ssz_types/rewards-file-v5.go @@ -13,9 +13,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/holiman/uint256" - "github.com/rocket-pool/smartnode/shared/services/rewards/ssz_types/big" "github.com/wealdtech/go-merkletree" "github.com/wealdtech/go-merkletree/keccak256" + + "github.com/rocket-pool/smartnode/shared/services/rewards/ssz_types/big" ) var Magicv2 = [4]byte{0x52, 0x50, 0x52, 0x55} diff --git a/shared/services/rewards/test/assets/assets.go b/shared/services/rewards/test/assets/assets.go index cccc371a6..0c36b292d 100644 --- a/shared/services/rewards/test/assets/assets.go +++ b/shared/services/rewards/test/assets/assets.go @@ -10,6 +10,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rewards" "github.com/rocket-pool/smartnode/shared/services/state" ) diff --git a/shared/services/rewards/test/beacon.go b/shared/services/rewards/test/beacon.go index bad02be15..620b5d229 100644 --- a/shared/services/rewards/test/beacon.go +++ b/shared/services/rewards/test/beacon.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/prysmaticlabs/go-bitfield" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/state" diff --git a/shared/services/rewards/test/mock.go b/shared/services/rewards/test/mock.go index f4c51c4fc..3bc207d4d 100644 --- a/shared/services/rewards/test/mock.go +++ b/shared/services/rewards/test/mock.go @@ -8,6 +8,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/megapool" rprewards "github.com/rocket-pool/smartnode/bindings/rewards" "github.com/rocket-pool/smartnode/bindings/types" diff --git a/shared/services/rewards/test/rocketpool.go b/shared/services/rewards/test/rocketpool.go index d95ad93f8..4058e6fc8 100644 --- a/shared/services/rewards/test/rocketpool.go +++ b/shared/services/rewards/test/rocketpool.go @@ -9,6 +9,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/rocket-pool/smartnode/bindings/rewards" "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/shared/services/rewards/types.go b/shared/services/rewards/types.go index 4ee70c1d2..a934b54f2 100644 --- a/shared/services/rewards/types.go +++ b/shared/services/rewards/types.go @@ -10,12 +10,13 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" + "github.com/wealdtech/go-merkletree" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/rewards" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/rewards/ssz_types" - "github.com/wealdtech/go-merkletree" ) const ( diff --git a/shared/services/rewards/utils.go b/shared/services/rewards/utils.go index b41d66a3c..64541c75c 100644 --- a/shared/services/rewards/utils.go +++ b/shared/services/rewards/utils.go @@ -17,6 +17,7 @@ import ( "github.com/goccy/go-json" "github.com/klauspost/compress/zstd" "github.com/mitchellh/go-homedir" + "github.com/rocket-pool/smartnode/bindings/rewards" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services/beacon" diff --git a/shared/services/rocketpool/api.go b/shared/services/rocketpool/api.go index ccc80b24e..5eddcf8a5 100644 --- a/shared/services/rocketpool/api.go +++ b/shared/services/rocketpool/api.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/goccy/go-json" + "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/shared/services/rocketpool/auction.go b/shared/services/rocketpool/auction.go index 12f0aa5c5..23547252f 100644 --- a/shared/services/rocketpool/auction.go +++ b/shared/services/rocketpool/auction.go @@ -6,6 +6,7 @@ import ( "net/url" "github.com/goccy/go-json" + "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/shared/services/rocketpool/client.go b/shared/services/rocketpool/client.go index 5d5ef8b21..806dd2708 100644 --- a/shared/services/rocketpool/client.go +++ b/shared/services/rocketpool/client.go @@ -27,6 +27,7 @@ import ( "github.com/alessio/shellescape" "github.com/blang/semver/v4" "github.com/mitchellh/go-homedir" + "github.com/rocket-pool/smartnode/addons/graffiti_wall_writer" "github.com/rocket-pool/smartnode/shared/services/config" "github.com/rocket-pool/smartnode/shared/services/rocketpool/assets" diff --git a/shared/services/rocketpool/fee-recipient.go b/shared/services/rocketpool/fee-recipient.go index f786f646e..c7069bbc6 100644 --- a/shared/services/rocketpool/fee-recipient.go +++ b/shared/services/rocketpool/fee-recipient.go @@ -12,9 +12,10 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/services/config" - "golang.org/x/sync/errgroup" ) // Config diff --git a/shared/services/rocketpool/gas.go b/shared/services/rocketpool/gas.go index 0b8d8e3d9..2a9086862 100644 --- a/shared/services/rocketpool/gas.go +++ b/shared/services/rocketpool/gas.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/goccy/go-json" + "github.com/rocket-pool/smartnode/shared/types/api" "github.com/rocket-pool/smartnode/shared/utils/cli/color" ) diff --git a/shared/services/rocketpool/megapool.go b/shared/services/rocketpool/megapool.go index b78f5c324..403569268 100644 --- a/shared/services/rocketpool/megapool.go +++ b/shared/services/rocketpool/megapool.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/goccy/go-json" + "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/shared/services/rocketpool/network.go b/shared/services/rocketpool/network.go index 175462a35..72b246842 100644 --- a/shared/services/rocketpool/network.go +++ b/shared/services/rocketpool/network.go @@ -6,6 +6,7 @@ import ( "net/url" "github.com/goccy/go-json" + "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/shared/services/rocketpool/security.go b/shared/services/rocketpool/security.go index 47bfa84e7..45bc9c2c8 100644 --- a/shared/services/rocketpool/security.go +++ b/shared/services/rocketpool/security.go @@ -5,6 +5,7 @@ import ( "net/url" "github.com/goccy/go-json" + "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/shared/services/rocketpool/upgrades.go b/shared/services/rocketpool/upgrades.go index 3c8491f34..b4ab7c53d 100644 --- a/shared/services/rocketpool/upgrades.go +++ b/shared/services/rocketpool/upgrades.go @@ -6,6 +6,7 @@ import ( "strconv" "github.com/goccy/go-json" + "github.com/rocket-pool/smartnode/shared/types/api" ) diff --git a/shared/services/services.go b/shared/services/services.go index 28bffe210..e76bf2a73 100644 --- a/shared/services/services.go +++ b/shared/services/services.go @@ -13,10 +13,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" rpSettings "github.com/rocket-pool/smartnode/shared/services/rocketpool" - "github.com/urfave/cli/v3" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/config" diff --git a/shared/services/state/cli/cli.go b/shared/services/state/cli/cli.go index 971712cca..df496d55e 100644 --- a/shared/services/state/cli/cli.go +++ b/shared/services/state/cli/cli.go @@ -7,6 +7,7 @@ import ( "os" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/beacon/client" diff --git a/shared/services/state/manager.go b/shared/services/state/manager.go index ab217cc01..a67502105 100644 --- a/shared/services/state/manager.go +++ b/shared/services/state/manager.go @@ -6,6 +6,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/config" diff --git a/shared/services/state/network-state.go b/shared/services/state/network-state.go index a0c55ee3e..984360908 100644 --- a/shared/services/state/network-state.go +++ b/shared/services/state/network-state.go @@ -8,13 +8,14 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/bindings/utils/eth" rpstate "github.com/rocket-pool/smartnode/bindings/utils/state" "github.com/rocket-pool/smartnode/shared/services/beacon" - "golang.org/x/sync/errgroup" ) const ( diff --git a/shared/services/state/network-state_test.go b/shared/services/state/network-state_test.go index 14fdfb29b..434ccb8a8 100644 --- a/shared/services/state/network-state_test.go +++ b/shared/services/state/network-state_test.go @@ -7,6 +7,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/types" diff --git a/shared/services/wallet/keystore/keystore.go b/shared/services/wallet/keystore/keystore.go index 123cf8353..e533c25ab 100644 --- a/shared/services/wallet/keystore/keystore.go +++ b/shared/services/wallet/keystore/keystore.go @@ -1,9 +1,10 @@ package keystore import ( - "github.com/rocket-pool/smartnode/bindings/types" "github.com/sethvargo/go-password/password" eth2types "github.com/wealdtech/go-eth2-types/v2" + + "github.com/rocket-pool/smartnode/bindings/types" ) // Generates a random password diff --git a/shared/services/wallet/keystore/lighthouse/keystore.go b/shared/services/wallet/keystore/lighthouse/keystore.go index f992514ec..f0602a0eb 100644 --- a/shared/services/wallet/keystore/lighthouse/keystore.go +++ b/shared/services/wallet/keystore/lighthouse/keystore.go @@ -7,10 +7,11 @@ import ( "github.com/goccy/go-json" "github.com/google/uuid" - "github.com/rocket-pool/smartnode/bindings/types" eth2types "github.com/wealdtech/go-eth2-types/v2" eth2ks "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services/passwords" keystore "github.com/rocket-pool/smartnode/shared/services/wallet/keystore" hexutil "github.com/rocket-pool/smartnode/shared/utils/hex" diff --git a/shared/services/wallet/keystore/lodestar/keystore.go b/shared/services/wallet/keystore/lodestar/keystore.go index 3cb128c06..f8729ea81 100644 --- a/shared/services/wallet/keystore/lodestar/keystore.go +++ b/shared/services/wallet/keystore/lodestar/keystore.go @@ -7,10 +7,11 @@ import ( "github.com/goccy/go-json" "github.com/google/uuid" - "github.com/rocket-pool/smartnode/bindings/types" eth2types "github.com/wealdtech/go-eth2-types/v2" eth2ks "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services/passwords" keystore "github.com/rocket-pool/smartnode/shared/services/wallet/keystore" hexutil "github.com/rocket-pool/smartnode/shared/utils/hex" diff --git a/shared/services/wallet/keystore/nimbus/keystore.go b/shared/services/wallet/keystore/nimbus/keystore.go index 864a4576e..76ea19d9a 100644 --- a/shared/services/wallet/keystore/nimbus/keystore.go +++ b/shared/services/wallet/keystore/nimbus/keystore.go @@ -7,10 +7,11 @@ import ( "github.com/goccy/go-json" "github.com/google/uuid" - "github.com/rocket-pool/smartnode/bindings/types" eth2types "github.com/wealdtech/go-eth2-types/v2" eth2ks "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services/passwords" keystore "github.com/rocket-pool/smartnode/shared/services/wallet/keystore" hexutil "github.com/rocket-pool/smartnode/shared/utils/hex" diff --git a/shared/services/wallet/keystore/prysm/keystore.go b/shared/services/wallet/keystore/prysm/keystore.go index 1410ea0e4..bf0501260 100644 --- a/shared/services/wallet/keystore/prysm/keystore.go +++ b/shared/services/wallet/keystore/prysm/keystore.go @@ -9,11 +9,12 @@ import ( "github.com/goccy/go-json" "github.com/google/uuid" - "github.com/rocket-pool/smartnode/bindings/types" - rpkeystore "github.com/rocket-pool/smartnode/shared/services/wallet/keystore" eth2types "github.com/wealdtech/go-eth2-types/v2" eth2ks "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" + "github.com/rocket-pool/smartnode/bindings/types" + rpkeystore "github.com/rocket-pool/smartnode/shared/services/wallet/keystore" + "github.com/rocket-pool/smartnode/shared/services/passwords" ) diff --git a/shared/services/wallet/keystore/teku/keystore.go b/shared/services/wallet/keystore/teku/keystore.go index ca1361184..23516edf9 100644 --- a/shared/services/wallet/keystore/teku/keystore.go +++ b/shared/services/wallet/keystore/teku/keystore.go @@ -7,10 +7,11 @@ import ( "github.com/goccy/go-json" "github.com/google/uuid" - "github.com/rocket-pool/smartnode/bindings/types" eth2types "github.com/wealdtech/go-eth2-types/v2" eth2ks "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/services/passwords" keystore "github.com/rocket-pool/smartnode/shared/services/wallet/keystore" hexutil "github.com/rocket-pool/smartnode/shared/utils/hex" diff --git a/shared/services/wallet/masquerade-validator.go b/shared/services/wallet/masquerade-validator.go index 3bb746abb..e5c464948 100644 --- a/shared/services/wallet/masquerade-validator.go +++ b/shared/services/wallet/masquerade-validator.go @@ -1,8 +1,9 @@ package wallet import ( - "github.com/rocket-pool/smartnode/bindings/types" eth2types "github.com/wealdtech/go-eth2-types/v2" + + "github.com/rocket-pool/smartnode/bindings/types" ) // Get the number of validator keys recorded in the wallet diff --git a/shared/services/wallet/masquerade-wallet.go b/shared/services/wallet/masquerade-wallet.go index e99e4cf64..628bfb4c3 100644 --- a/shared/services/wallet/masquerade-wallet.go +++ b/shared/services/wallet/masquerade-wallet.go @@ -12,9 +12,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/goccy/go-json" + eth2ks "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" + "github.com/rocket-pool/smartnode/shared/services/passwords" "github.com/rocket-pool/smartnode/shared/services/wallet/keystore" - eth2ks "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" ) var ErrIsMasquerading = errors.New("The node is currently masquerading. Use the command 'rocketpool wallet end-masquerade' to restore the node wallet, if one is loaded.") diff --git a/shared/services/wallet/validator.go b/shared/services/wallet/validator.go index 2a908f51f..8146d529e 100644 --- a/shared/services/wallet/validator.go +++ b/shared/services/wallet/validator.go @@ -7,10 +7,11 @@ import ( "os" "strings" - "github.com/rocket-pool/smartnode/bindings/types" - "github.com/rocket-pool/smartnode/shared/utils/validator" eth2types "github.com/wealdtech/go-eth2-types/v2" eth2util "github.com/wealdtech/go-eth2-util" + + "github.com/rocket-pool/smartnode/bindings/types" + "github.com/rocket-pool/smartnode/shared/utils/validator" ) // Config diff --git a/shared/types/api/megapool.go b/shared/types/api/megapool.go index 7965422d1..bfefdbd61 100644 --- a/shared/types/api/megapool.go +++ b/shared/types/api/megapool.go @@ -5,6 +5,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/network" "github.com/rocket-pool/smartnode/bindings/rocketpool" diff --git a/shared/types/api/odao.go b/shared/types/api/odao.go index 7d618644f..3c2d36dd5 100644 --- a/shared/types/api/odao.go +++ b/shared/types/api/odao.go @@ -4,6 +4,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao" tn "github.com/rocket-pool/smartnode/bindings/dao/trustednode" "github.com/rocket-pool/smartnode/bindings/rocketpool" diff --git a/shared/types/api/pdao.go b/shared/types/api/pdao.go index 9fb08516c..d078ba1de 100644 --- a/shared/types/api/pdao.go +++ b/shared/types/api/pdao.go @@ -5,6 +5,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/protocol" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" diff --git a/shared/types/api/queue.go b/shared/types/api/queue.go index 07ae73daf..c438a2150 100644 --- a/shared/types/api/queue.go +++ b/shared/types/api/queue.go @@ -4,6 +4,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/shared/types/api/security.go b/shared/types/api/security.go index f06f868f5..35ba1d958 100644 --- a/shared/types/api/security.go +++ b/shared/types/api/security.go @@ -2,6 +2,7 @@ package api import ( "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao" "github.com/rocket-pool/smartnode/bindings/dao/security" "github.com/rocket-pool/smartnode/bindings/rocketpool" diff --git a/shared/types/api/upgrades.go b/shared/types/api/upgrades.go index 7a0985528..641209457 100644 --- a/shared/types/api/upgrades.go +++ b/shared/types/api/upgrades.go @@ -2,6 +2,7 @@ package api import ( "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/dao/upgrades" "github.com/rocket-pool/smartnode/bindings/rocketpool" ) diff --git a/shared/types/api/wallet.go b/shared/types/api/wallet.go index bc1f51f84..976689f22 100644 --- a/shared/types/api/wallet.go +++ b/shared/types/api/wallet.go @@ -3,6 +3,7 @@ package api import ( "github.com/ethereum/go-ethereum/common" "github.com/google/uuid" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" ) diff --git a/shared/types/eth2/fork/deneb/block_deneb_encoding.go b/shared/types/eth2/fork/deneb/block_deneb_encoding.go index a4f9b804b..5c96558a7 100644 --- a/shared/types/eth2/fork/deneb/block_deneb_encoding.go +++ b/shared/types/eth2/fork/deneb/block_deneb_encoding.go @@ -5,6 +5,7 @@ package deneb import ( ssz "github.com/ferranbt/fastssz" + "github.com/rocket-pool/smartnode/shared/types/eth2/generic" ) diff --git a/shared/types/eth2/fork/deneb/state_deneb_encoding.go b/shared/types/eth2/fork/deneb/state_deneb_encoding.go index 7c3e389f4..28e7a7e2f 100644 --- a/shared/types/eth2/fork/deneb/state_deneb_encoding.go +++ b/shared/types/eth2/fork/deneb/state_deneb_encoding.go @@ -5,6 +5,7 @@ package deneb import ( ssz "github.com/ferranbt/fastssz" + "github.com/rocket-pool/smartnode/shared/types/eth2/generic" ) diff --git a/shared/types/eth2/fork/electra/block_electra.go b/shared/types/eth2/fork/electra/block_electra.go index ad5aa999a..ff1b3b25f 100644 --- a/shared/types/eth2/fork/electra/block_electra.go +++ b/shared/types/eth2/fork/electra/block_electra.go @@ -2,6 +2,7 @@ package electra import ( "github.com/prysmaticlabs/go-bitfield" + "github.com/rocket-pool/smartnode/shared/types/eth2/generic" ) diff --git a/shared/types/eth2/fork/electra/block_electra_encoding.go b/shared/types/eth2/fork/electra/block_electra_encoding.go index 9f5cf6cef..e46ca29fd 100644 --- a/shared/types/eth2/fork/electra/block_electra_encoding.go +++ b/shared/types/eth2/fork/electra/block_electra_encoding.go @@ -5,6 +5,7 @@ package electra import ( ssz "github.com/ferranbt/fastssz" + "github.com/rocket-pool/smartnode/shared/types/eth2/generic" ) diff --git a/shared/types/eth2/fork/electra/state_electra_encoding.go b/shared/types/eth2/fork/electra/state_electra_encoding.go index 2c615399d..3d6a07445 100644 --- a/shared/types/eth2/fork/electra/state_electra_encoding.go +++ b/shared/types/eth2/fork/electra/state_electra_encoding.go @@ -5,6 +5,7 @@ package electra import ( ssz "github.com/ferranbt/fastssz" + "github.com/rocket-pool/smartnode/shared/types/eth2/generic" ) diff --git a/shared/types/eth2/fork/fulu/block_fulu.go b/shared/types/eth2/fork/fulu/block_fulu.go index f023d006a..8b64c92b8 100644 --- a/shared/types/eth2/fork/fulu/block_fulu.go +++ b/shared/types/eth2/fork/fulu/block_fulu.go @@ -2,6 +2,7 @@ package fulu import ( "github.com/prysmaticlabs/go-bitfield" + "github.com/rocket-pool/smartnode/shared/types/eth2/generic" ) diff --git a/shared/types/eth2/fork/fulu/block_fulu_encoding.go b/shared/types/eth2/fork/fulu/block_fulu_encoding.go index ee31c508b..be3316a3f 100644 --- a/shared/types/eth2/fork/fulu/block_fulu_encoding.go +++ b/shared/types/eth2/fork/fulu/block_fulu_encoding.go @@ -5,6 +5,7 @@ package fulu import ( ssz "github.com/ferranbt/fastssz" + "github.com/rocket-pool/smartnode/shared/types/eth2/generic" ) diff --git a/shared/types/eth2/fork/fulu/state_fulu_encoding.go b/shared/types/eth2/fork/fulu/state_fulu_encoding.go index 629154eb7..d6eacec78 100644 --- a/shared/types/eth2/fork/fulu/state_fulu_encoding.go +++ b/shared/types/eth2/fork/fulu/state_fulu_encoding.go @@ -5,6 +5,7 @@ package fulu import ( ssz "github.com/ferranbt/fastssz" + "github.com/rocket-pool/smartnode/shared/types/eth2/generic" ) diff --git a/shared/utils/api/utils.go b/shared/utils/api/utils.go index b893c8e2b..0c06248fb 100644 --- a/shared/utils/api/utils.go +++ b/shared/utils/api/utils.go @@ -9,6 +9,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/settings/protocol" "github.com/rocket-pool/smartnode/bindings/utils" diff --git a/shared/utils/cli/utils.go b/shared/utils/cli/utils.go index 7d731caae..ec45accf5 100644 --- a/shared/utils/cli/utils.go +++ b/shared/utils/cli/utils.go @@ -6,10 +6,11 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/shared/services/rocketpool" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" "github.com/rocket-pool/smartnode/shared/utils/cli/color" - "github.com/urfave/cli/v3" ) const TimeFormat = "2006-01-02, 15:04 -0700 MST" diff --git a/shared/utils/eth1/eth1.go b/shared/utils/eth1/eth1.go index c7edf738a..84e381877 100644 --- a/shared/utils/eth1/eth1.go +++ b/shared/utils/eth1/eth1.go @@ -7,6 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services" "github.com/rocket-pool/smartnode/shared/services/config" diff --git a/shared/utils/eth2/eth2.go b/shared/utils/eth2/eth2.go index 55a84c593..4accbaad9 100644 --- a/shared/utils/eth2/eth2.go +++ b/shared/utils/eth2/eth2.go @@ -5,6 +5,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" @@ -13,7 +15,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/state" rputils "github.com/rocket-pool/smartnode/shared/utils/rp" - "golang.org/x/sync/errgroup" ) // Settings diff --git a/shared/utils/rp/config.go b/shared/utils/rp/config.go index fc0711adf..7680fc776 100644 --- a/shared/utils/rp/config.go +++ b/shared/utils/rp/config.go @@ -8,8 +8,9 @@ import ( "path/filepath" "github.com/alessio/shellescape" - "github.com/rocket-pool/smartnode/shared/services/config" "gopkg.in/yaml.v2" + + "github.com/rocket-pool/smartnode/shared/services/config" ) const ( diff --git a/shared/utils/rp/fee-recipient.go b/shared/utils/rp/fee-recipient.go index eea7029da..af14a3d4c 100644 --- a/shared/utils/rp/fee-recipient.go +++ b/shared/utils/rp/fee-recipient.go @@ -6,11 +6,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/state" - "golang.org/x/sync/errgroup" ) type FeeRecipientInfo struct { diff --git a/shared/utils/rp/minipools.go b/shared/utils/rp/minipools.go index a6c28c1a0..9d4739878 100644 --- a/shared/utils/rp/minipools.go +++ b/shared/utils/rp/minipools.go @@ -5,10 +5,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "golang.org/x/sync/errgroup" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/types" - "golang.org/x/sync/errgroup" "github.com/rocket-pool/smartnode/shared/services/beacon" ) diff --git a/shared/utils/rp/node.go b/shared/utils/rp/node.go index 459f725a8..ed88c2931 100644 --- a/shared/utils/rp/node.go +++ b/shared/utils/rp/node.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/node" "github.com/rocket-pool/smartnode/bindings/rocketpool" diff --git a/shared/utils/validator/deposit-data.go b/shared/utils/validator/deposit-data.go index 98c4a2152..bce66e378 100644 --- a/shared/utils/validator/deposit-data.go +++ b/shared/utils/validator/deposit-data.go @@ -2,9 +2,10 @@ package validator import ( "github.com/ethereum/go-ethereum/common" - "github.com/rocket-pool/smartnode/shared/types/eth2/generic" eth2types "github.com/wealdtech/go-eth2-types/v2" + "github.com/rocket-pool/smartnode/shared/types/eth2/generic" + "github.com/rocket-pool/smartnode/shared/services/beacon" ) diff --git a/shared/utils/validator/fee-recipient.go b/shared/utils/validator/fee-recipient.go index 0da8e88a5..6781cd45d 100644 --- a/shared/utils/validator/fee-recipient.go +++ b/shared/utils/validator/fee-recipient.go @@ -11,6 +11,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" + "github.com/rocket-pool/smartnode/shared/services/beacon" "github.com/rocket-pool/smartnode/shared/services/config" "github.com/rocket-pool/smartnode/shared/utils/log" diff --git a/shared/utils/validator/set-withdrawal-creds.go b/shared/utils/validator/set-withdrawal-creds.go index 2579d3b8b..bb691648c 100644 --- a/shared/utils/validator/set-withdrawal-creds.go +++ b/shared/utils/validator/set-withdrawal-creds.go @@ -6,9 +6,10 @@ import ( "strings" "github.com/ethereum/go-ethereum/common" + eth2types "github.com/wealdtech/go-eth2-types/v2" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/types/eth2/generic" - eth2types "github.com/wealdtech/go-eth2-types/v2" ) // Get the withdrawal private key for a validator based on its mnemonic, index, and path diff --git a/shared/utils/validator/voluntary-exit.go b/shared/utils/validator/voluntary-exit.go index 69b466453..cbe347156 100644 --- a/shared/utils/validator/voluntary-exit.go +++ b/shared/utils/validator/voluntary-exit.go @@ -4,9 +4,10 @@ import ( "fmt" "strconv" + eth2types "github.com/wealdtech/go-eth2-types/v2" + "github.com/rocket-pool/smartnode/bindings/types" "github.com/rocket-pool/smartnode/shared/types/eth2/generic" - eth2types "github.com/wealdtech/go-eth2-types/v2" ) // Get a voluntary exit message signature for a given validator key and index diff --git a/shared/utils/wallet/recover-keys.go b/shared/utils/wallet/recover-keys.go index 5a454d707..25bc4d20f 100644 --- a/shared/utils/wallet/recover-keys.go +++ b/shared/utils/wallet/recover-keys.go @@ -9,6 +9,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/goccy/go-json" + "github.com/urfave/cli/v3" + eth2types "github.com/wealdtech/go-eth2-types/v2" + eth2ks "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" + "gopkg.in/yaml.v2" + "github.com/rocket-pool/smartnode/bindings/megapool" "github.com/rocket-pool/smartnode/bindings/minipool" "github.com/rocket-pool/smartnode/bindings/rocketpool" @@ -19,10 +24,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/wallet" "github.com/rocket-pool/smartnode/shared/types/api" hexutils "github.com/rocket-pool/smartnode/shared/utils/hex" - "github.com/urfave/cli/v3" - eth2types "github.com/wealdtech/go-eth2-types/v2" - eth2ks "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4" - "gopkg.in/yaml.v2" ) const ( diff --git a/treegen/main.go b/treegen/main.go index f65643ade..bbff0d4ac 100644 --- a/treegen/main.go +++ b/treegen/main.go @@ -8,8 +8,9 @@ import ( "runtime/pprof" "github.com/felixge/fgprof" - "github.com/rocket-pool/smartnode/shared/utils/cli/color" "github.com/urfave/cli/v3" + + "github.com/rocket-pool/smartnode/shared/utils/cli/color" ) const ( diff --git a/treegen/tree-gen.go b/treegen/tree-gen.go index 015958749..8932eb68a 100644 --- a/treegen/tree-gen.go +++ b/treegen/tree-gen.go @@ -16,6 +16,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/fatih/color" + "github.com/urfave/cli/v3" + "github.com/rocket-pool/smartnode/bindings/rewards" "github.com/rocket-pool/smartnode/bindings/rocketpool" "github.com/rocket-pool/smartnode/bindings/utils/eth" @@ -27,7 +29,6 @@ import ( "github.com/rocket-pool/smartnode/shared/services/state" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config" "github.com/rocket-pool/smartnode/shared/utils/log" - "github.com/urfave/cli/v3" ) const ( diff --git a/treegen/voting-power.go b/treegen/voting-power.go index 13837e08a..ddef4b987 100644 --- a/treegen/voting-power.go +++ b/treegen/voting-power.go @@ -5,6 +5,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/rocket-pool/smartnode/shared/services/rewards" "github.com/rocket-pool/smartnode/shared/services/state" cfgtypes "github.com/rocket-pool/smartnode/shared/types/config"