moved network SWC address getter/setter to protocol dao settings

rocket-pool · Mar 1, 2021 · fb20418 · fb20418
1 parent eb77374
commit fb20418
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 88 deletions.
diff --git a/dao/protocol/dao.go b/dao/protocol/dao.go
@@ -6,6 +6,7 @@ import (
     "sync"
 
     "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/rocketpool-go/rocketpool"
@@ -41,6 +42,20 @@ func BootstrapUint(rp *rocketpool.RocketPool, contractName, settingPath string,
 }
 
 
+// Bootstrap an address setting
+func BootstrapAddress(rp *rocketpool.RocketPool, contractName, settingPath string, value common.Address, opts *bind.TransactOpts) (*types.Receipt, error) {
+    rocketDAOProtocol, err := getRocketDAOProtocol(rp)
+    if err != nil {
+        return nil, err
+    }
+    txReceipt, err := rocketDAOProtocol.Transact(opts, "bootstrapSettingAddress", contractName, settingPath, value)
+    if err != nil {
+        return nil, fmt.Errorf("Could not bootstrap protocol setting %s.%s: %w", contractName, settingPath, err)
+    }
+    return txReceipt, nil
+}
+
+
 // Bootstrap a rewards claimer
 func BootstrapClaimer(rp *rocketpool.RocketPool, contractName string, amount float64, opts *bind.TransactOpts) (*types.Receipt, error) {
     rocketDAOProtocol, err := getRocketDAOProtocol(rp)

diff --git a/network/withdrawal.go b/network/withdrawal.go
diff --git a/settings/protocol/network.go b/settings/protocol/network.go
@@ -6,6 +6,7 @@ import (
     "sync"
 
     "github.com/ethereum/go-ethereum/accounts/abi/bind"
+    "github.com/ethereum/go-ethereum/common"
     "github.com/ethereum/go-ethereum/core/types"
 
     protocoldao "github.com/rocket-pool/rocketpool-go/dao/protocol"
@@ -205,6 +206,23 @@ func BootstrapTargetRethCollateralRate(rp *rocketpool.RocketPool, value float64,
 }
 
 
+// The eth2 system withdrawal contract address
+func GetSystemWithdrawalContractAddress(rp *rocketpool.RocketPool, opts *bind.CallOpts) (common.Address, error) {
+    networkSettingsContract, err := getNetworkSettingsContract(rp)
+    if err != nil {
+        return common.Address{}, err
+    }
+    value := new(common.Address)
+    if err := networkSettingsContract.Call(opts, value, "getSystemWithdrawalContractAddress"); err != nil {
+        return common.Address{}, fmt.Errorf("Could not get system withdrawal contract address: %w", err)
+    }
+    return *value, nil
+}
+func BootstrapSystemWithdrawalContractAddress(rp *rocketpool.RocketPool, value common.Address, opts *bind.TransactOpts) (*types.Receipt, error) {
+    return protocoldao.BootstrapAddress(rp, NetworkSettingsContractName, "network.withdrawal.contract.address", value, opts)
+}
+
+
 // Get contracts
 var networkSettingsContractLock sync.Mutex
 func getNetworkSettingsContract(rp *rocketpool.RocketPool) (*rocketpool.Contract, error) {

diff --git a/tests/minipool/contract_test.go b/tests/minipool/contract_test.go
@@ -366,7 +366,7 @@ func TestWithdrawValidatorBalance(t *testing.T) {
     if _, err := minipool.SubmitMinipoolWithdrawable(rp, mp.Address, eth.EthToWei(32), eth.EthToWei(32), trustedNodeAccount.GetTransactor()); err != nil { t.Fatal(err) }
 
     // Set SWC address
-    if _, err := network.SetSystemWithdrawalContractAddress(rp, swcAccount.Address, ownerAccount.GetTransactor()); err != nil { t.Fatal(err) }
+    if _, err := protocol.BootstrapSystemWithdrawalContractAddress(rp, swcAccount.Address, ownerAccount.GetTransactor()); err != nil { t.Fatal(err) }
 
     // Get & check initial minipool validator balance withdrawn status
     if validatorBalanceWithdrawn, err := mp.GetValidatorBalanceWithdrawn(nil); err != nil {

diff --git a/tests/network/withdrawal_test.go b/tests/network/withdrawal_test.go
diff --git a/tests/settings/protocol/network_test.go b/tests/settings/protocol/network_test.go
@@ -1,8 +1,10 @@
 package protocol
 
 import (
+    "bytes"
     "testing"
 
+    "github.com/ethereum/go-ethereum/common"
     "github.com/rocket-pool/rocketpool-go/settings/protocol"
     "github.com/rocket-pool/rocketpool-go/utils/eth"
 
@@ -126,5 +128,15 @@ func TestNetworkSettings(t *testing.T) {
         t.Error("Incorrect target rETH collateral rate value")
     }
 
+    // Set & get system withdrawal contract address
+    swcAddress := common.HexToAddress("0x1111111111111111111111111111111111111111")
+    if _, err := protocol.BootstrapSystemWithdrawalContractAddress(rp, swcAddress, ownerAccount.GetTransactor()); err != nil {
+        t.Error(err)
+    } else if value, err := protocol.GetSystemWithdrawalContractAddress(rp, nil); err != nil {
+        t.Error(err)
+    } else if !bytes.Equal(value.Bytes(), swcAddress.Bytes()) {
+        t.Error("Incorrect system withdrawal contract address")
+    }
+
 }
 
diff --git a/tests/tokens/neth_test.go b/tests/tokens/neth_test.go
@@ -5,7 +5,7 @@ import (
 
     "github.com/ethereum/go-ethereum/common"
 
-    "github.com/rocket-pool/rocketpool-go/network"
+    "github.com/rocket-pool/rocketpool-go/settings/protocol"
     "github.com/rocket-pool/rocketpool-go/tokens"
     "github.com/rocket-pool/rocketpool-go/utils/eth"
 
@@ -127,7 +127,7 @@ func TestBurnNETH(t *testing.T) {
     if err != nil { t.Fatal(err) }
 
     // Set SWC address
-    if _, err := network.SetSystemWithdrawalContractAddress(rp, swcAccount.Address, ownerAccount.GetTransactor()); err != nil { t.Fatal(err) }
+    if _, err := protocol.BootstrapSystemWithdrawalContractAddress(rp, swcAccount.Address, ownerAccount.GetTransactor()); err != nil { t.Fatal(err) }
 
     // Withdraw minipool validator balance
     opts := swcAccount.GetTransactor()