fix: read price oracle address from contract

Author: sbackend123

pkg/config/chain.go

@@ -21,13 +21,12 @@ type ChainConfig struct {
 	SwarmTokenSymbol       string
 
 	// Addresses.
-	StakingAddress               common.Address
-	PostageStampAddress          common.Address
-	RedistributionAddress        common.Address
-	IncentivesPriceOracleAddress common.Address // storage-incentives PriceOracle (postage / stake commitment)
-	SwapPriceOracleAddress       common.Address // Swap swear and swindle (S3) Contracts
-	CurrentFactoryAddress        common.Address
-	TokenContractAddress         common.Address
+	StakingAddress         common.Address
+	PostageStampAddress    common.Address
+	RedistributionAddress  common.Address
+	SwapPriceOracleAddress common.Address // Swap swear and swindle (S3) Contracts
+	CurrentFactoryAddress  common.Address
+	TokenContractAddress   common.Address
 
 	// ABIs.
 	StakingABI        string
@@ -60,13 +59,12 @@ var (
 		NativeTokenSymbol:      "ETH",
 		SwarmTokenSymbol:       "sBZZ",
 
-		StakingAddress:               common.HexToAddress(abi.TestnetStakingAddress),
-		PostageStampAddress:          common.HexToAddress(abi.TestnetPostageStampAddress),
-		RedistributionAddress:        common.HexToAddress(abi.TestnetRedistributionAddress),
-		IncentivesPriceOracleAddress: common.HexToAddress(abi.TestnetPriceOracleAddress),
-		SwapPriceOracleAddress:       common.HexToAddress("0x1814e9b3951Df0CB8e12b2bB99c5594514588936"),
-		CurrentFactoryAddress:        common.HexToAddress("0x0fF044F6bB4F684a5A149B46D7eC03ea659F98A1"),
-		TokenContractAddress:         common.HexToAddress(abi.TestnetBzzTokenAddress),
+		StakingAddress:         common.HexToAddress(abi.TestnetStakingAddress),
+		PostageStampAddress:    common.HexToAddress(abi.TestnetPostageStampAddress),
+		RedistributionAddress:  common.HexToAddress(abi.TestnetRedistributionAddress),
+		SwapPriceOracleAddress: common.HexToAddress("0x1814e9b3951Df0CB8e12b2bB99c5594514588936"),
+		CurrentFactoryAddress:  common.HexToAddress("0x0fF044F6bB4F684a5A149B46D7eC03ea659F98A1"),
+		TokenContractAddress:   common.HexToAddress(abi.TestnetBzzTokenAddress),
 
 		StakingABI:        abi.TestnetStakingABI,
 		PostageStampABI:   abi.TestnetPostageStampABI,
@@ -84,13 +82,12 @@ var (
 		NativeTokenSymbol:      "xDAI",
 		SwarmTokenSymbol:       "xBZZ",
 
-		StakingAddress:               common.HexToAddress(abi.MainnetStakingAddress),
-		PostageStampAddress:          common.HexToAddress(abi.MainnetPostageStampAddress),
-		RedistributionAddress:        common.HexToAddress(abi.MainnetRedistributionAddress),
-		IncentivesPriceOracleAddress: common.HexToAddress(abi.MainnetPriceOracleAddress),
-		SwapPriceOracleAddress:       common.HexToAddress("0xA57A50a831B31c904A770edBCb706E03afCdbd94"),
-		CurrentFactoryAddress:        common.HexToAddress("0xc2d5a532cf69aa9a1378737d8ccdef884b6e7420"),
-		TokenContractAddress:         common.HexToAddress(abi.MainnetBzzTokenAddress),
+		StakingAddress:         common.HexToAddress(abi.MainnetStakingAddress),
+		PostageStampAddress:    common.HexToAddress(abi.MainnetPostageStampAddress),
+		RedistributionAddress:  common.HexToAddress(abi.MainnetRedistributionAddress),
+		SwapPriceOracleAddress: common.HexToAddress("0xA57A50a831B31c904A770edBCb706E03afCdbd94"),
+		CurrentFactoryAddress:  common.HexToAddress("0xc2d5a532cf69aa9a1378737d8ccdef884b6e7420"),
+		TokenContractAddress:   common.HexToAddress(abi.MainnetBzzTokenAddress),
 
 		StakingABI:        abi.MainnetStakingABI,
 		PostageStampABI:   abi.MainnetPostageStampABI,

pkg/node/node.go

@@ -1224,7 +1224,16 @@ func NewBee(
 		stakingContractAddress = common.HexToAddress(o.StakingContractAddress)
 	}
 
-	stakingContract := staking.New(overlayEthAddress, stakingContractAddress, abiutil.MustParseABI(chainCfg.StakingABI), bzzTokenAddress, transactionService, common.BytesToHash(nonce), contractGasLimit, uint8(o.ReserveCapacityDoubling), chainCfg.IncentivesPriceOracleAddress)
+	stakingContractABI := abiutil.MustParseABI(chainCfg.StakingABI)
+	var stakingPriceOracleAddress common.Address
+	if chainEnabled {
+		stakingPriceOracleAddress, err = staking.GetPriceOracleAddress(ctx, stakingContractAddress, stakingContractABI, transactionService)
+		if err != nil {
+			return nil, fmt.Errorf("get staking price oracle address: %w", err)
+		}
+	}
+
+	stakingContract := staking.New(overlayEthAddress, stakingContractAddress, stakingContractABI, bzzTokenAddress, transactionService, common.BytesToHash(nonce), contractGasLimit, uint8(o.ReserveCapacityDoubling), stakingPriceOracleAddress)
 
 	if chainEnabled {
 

pkg/storageincentives/staking/contract.go

@@ -105,6 +105,36 @@ func New(
 	}
 }
 
+// GetPriceOracleAddress returns the price oracle configured by the staking contract.
+func GetPriceOracleAddress(ctx context.Context, stakingAddress common.Address, stakingABI abi.ABI, transactionService transaction.Service) (common.Address, error) {
+	callData, err := stakingABI.Pack("OracleContract")
+	if err != nil {
+		return common.Address{}, err
+	}
+
+	result, err := transactionService.Call(ctx, &transaction.TxRequest{
+		To:   &stakingAddress,
+		Data: callData,
+	})
+	if err != nil {
+		return common.Address{}, err
+	}
+
+	results, err := stakingABI.Unpack("OracleContract", result)
+	if err != nil {
+		return common.Address{}, err
+	}
+	if len(results) == 0 {
+		return common.Address{}, ErrUnexpectedLength
+	}
+
+	oracleAddress, ok := results[0].(common.Address)
+	if !ok {
+		return common.Address{}, fmt.Errorf("unexpected oracle address type %T", results[0])
+	}
+	return oracleAddress, nil
+}
+
 func (c *contract) DepositStake(ctx context.Context, stakedAmount *big.Int) (common.Hash, error) {
 	minDeposit, err := c.GetMinDeposit(ctx)
 	if err != nil {
@@ -194,13 +224,11 @@ func (c *contract) GetMinDeposit(ctx context.Context) (*big.Int, error) {
 
 // calculateMinDeposit returns the minimum additional deposit in PLUR that manageStake will accept according to contract.
 func calculateMinDeposit(potential, committed *big.Int, price uint32, height uint8) *big.Int {
-	minAdd := new(big.Int)
+	minAdd := big.NewInt(1)
 
-	// potential stake should be at least MIN_STAKE * 2^height.
-	// minAdd = max(0, minTotal - potential).
-	minTotal := new(big.Int).Lsh(new(big.Int).Set(MinimumStakeAmount), uint(height))
-	if gap := new(big.Int).Sub(minTotal, potential); gap.Sign() > 0 {
-		minAdd.Set(gap)
+	// The contract applies the minimum stake floor only when creating a stake.
+	if potential.Sign() == 0 {
+		minAdd.Lsh(new(big.Int).Set(MinimumStakeAmount), uint(height))
 	}
 
 	if price != 0 && committed.Sign() > 0 {
@@ -214,11 +242,6 @@ func calculateMinDeposit(potential, committed *big.Int, price uint32, height uin
 		}
 	}
 
-	// floors and commitment already satisfied.
-	// DepositStake still needs a positive addAmount; 1 PLUR is enough.
-	if minAdd.Sign() == 0 {
-		return big.NewInt(1)
-	}
 	return minAdd
 }
 

pkg/storageincentives/staking/contract_test.go

@@ -93,6 +93,14 @@ func TestCalculateMinDeposit(t *testing.T) {
 			height:    1,
 			want:      new(big.Int).Mul(committedAtMin, big.NewInt(2)),
 		},
+		{
+			name:      "existing slashed stake does not restore initial floor",
+			potential: new(big.Int).Div(minStake, big.NewInt(10)),
+			committed: committedAtMin,
+			price:     100,
+			height:    0,
+			want:      big.NewInt(1),
+		},
 	}
 
 	for _, tc := range tests {