Merge pull request #742 from iotaledger/feat/derived-target-rewards

derive target rewards
iotaledger · Feb 16, 2024 · 3ace6e7 · 3ace6e7
2 parents 744b947 + 3d6a6c8
commit 3ace6e7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/iotaledger/inx-app v1.0.0-rc.3.0.20240214181534-9a393ea95057
 	github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240214181217-a6dd0abaab8d
 	github.com/iotaledger/iota-crypto-demo v0.0.0-20231208171603-786bb32fdb00
-	github.com/iotaledger/iota.go/v4 v4.0.0-20240214180848-ff6a4bb7bc41
+	github.com/iotaledger/iota.go/v4 v4.0.0-20240215154216-92b1c8ba1c57
 	github.com/labstack/echo/v4 v4.11.4
 	github.com/labstack/gommon v0.4.2
 	github.com/libp2p/go-libp2p v0.32.2

diff --git a/go.sum b/go.sum
@@ -309,8 +309,8 @@ github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240214181217-a6dd0abaab8d h1:S9VWiJ
 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240214181217-a6dd0abaab8d/go.mod h1:F69nogeefy6epbuj1Bk132mL9ZZMP0bp2V0eHNnehNM=
 github.com/iotaledger/iota-crypto-demo v0.0.0-20231208171603-786bb32fdb00 h1:j5udgLtSN6wQgFI9vnhkdJsqsVdJmwtoc0yOmT/Ila4=
 github.com/iotaledger/iota-crypto-demo v0.0.0-20231208171603-786bb32fdb00/go.mod h1:gt+URx7DZu414nZME7jtGgxR4DVTSnNa1jF2trTUTZ0=
-github.com/iotaledger/iota.go/v4 v4.0.0-20240214180848-ff6a4bb7bc41 h1:vhB52blViIuGCozUMts7DL24Sh5SmuycjwKXgncdPKs=
-github.com/iotaledger/iota.go/v4 v4.0.0-20240214180848-ff6a4bb7bc41/go.mod h1:C0sa6gQvtBQdAcSa7AME4Tu7E9MhkrKAxjUAHUBK9u0=
+github.com/iotaledger/iota.go/v4 v4.0.0-20240215154216-92b1c8ba1c57 h1:REuK/w32eA00KKyttJoLBcoifMN+FGbLOL9bbjGXASM=
+github.com/iotaledger/iota.go/v4 v4.0.0-20240215154216-92b1c8ba1c57/go.mod h1:C0sa6gQvtBQdAcSa7AME4Tu7E9MhkrKAxjUAHUBK9u0=
 github.com/ipfs/boxo v0.17.0 h1:fVXAb12dNbraCX1Cdid5BB6Kl62gVLNVA+e0EYMqAU0=
 github.com/ipfs/boxo v0.17.0/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=

diff --git a/pkg/protocol/sybilprotection/sybilprotectionv1/performance/testsuite_test.go b/pkg/protocol/sybilprotection/sybilprotectionv1/performance/testsuite_test.go
@@ -44,7 +44,7 @@ func NewTestSuite(t *testing.T) *TestSuite {
 			iotago.NewV3SnapshotProtocolParameters(
 				iotago.WithTimeProviderOptions(0, time.Now().Unix(), 10, 3),
 				iotago.WithLivenessOptions(5, 5, 1, 2, 3),
-				iotago.WithRewardsOptions(8, 8, 11, 2, 1, 5),
+				iotago.WithRewardsOptions(8, 11, 2, 5),
 			),
 		),
 	}

diff --git a/pkg/tests/validator_test.go b/pkg/tests/validator_test.go
@@ -31,7 +31,7 @@ func setupValidatorTestsuite(t *testing.T, walletOpts ...options.Option[testsuit
 			iotago.WithStakingOptions(1, validationBlocksPerSlot, 1),
 			// Pick larger values for ManaShareCoefficient and DecayBalancingConstant for more precision in the calculations.
 			// Pick a small retention period so we can test rewards expiry.
-			iotago.WithRewardsOptions(8, 8, 11, 200, 200, 5),
+			iotago.WithRewardsOptions(8, 11, 200, 5),
 			// Pick Increase/Decrease threshold in accordance with sanity checks (necessary because we changed slot duration).
 			iotago.WithCongestionControlOptions(1, 0, 0, 400_000, 300_000, 100_000, 1000, 100),
 			iotago.WithTimeProviderOptions(

diff --git a/tools/gendoc/go.mod b/tools/gendoc/go.mod
@@ -71,7 +71,7 @@ require (
 	github.com/iotaledger/inx-app v1.0.0-rc.3.0.20240214181534-9a393ea95057 // indirect
 	github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240214181217-a6dd0abaab8d // indirect
 	github.com/iotaledger/iota-crypto-demo v0.0.0-20231208171603-786bb32fdb00 // indirect
-	github.com/iotaledger/iota.go/v4 v4.0.0-20240214180848-ff6a4bb7bc41 // indirect
+	github.com/iotaledger/iota.go/v4 v4.0.0-20240215154216-92b1c8ba1c57 // indirect
 	github.com/ipfs/boxo v0.17.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
 	github.com/ipfs/go-datastore v0.6.0 // indirect

diff --git a/tools/gendoc/go.sum b/tools/gendoc/go.sum
@@ -313,8 +313,8 @@ github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240214181217-a6dd0abaab8d h1:S9VWiJ
 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240214181217-a6dd0abaab8d/go.mod h1:F69nogeefy6epbuj1Bk132mL9ZZMP0bp2V0eHNnehNM=
 github.com/iotaledger/iota-crypto-demo v0.0.0-20231208171603-786bb32fdb00 h1:j5udgLtSN6wQgFI9vnhkdJsqsVdJmwtoc0yOmT/Ila4=
 github.com/iotaledger/iota-crypto-demo v0.0.0-20231208171603-786bb32fdb00/go.mod h1:gt+URx7DZu414nZME7jtGgxR4DVTSnNa1jF2trTUTZ0=
-github.com/iotaledger/iota.go/v4 v4.0.0-20240214180848-ff6a4bb7bc41 h1:vhB52blViIuGCozUMts7DL24Sh5SmuycjwKXgncdPKs=
-github.com/iotaledger/iota.go/v4 v4.0.0-20240214180848-ff6a4bb7bc41/go.mod h1:C0sa6gQvtBQdAcSa7AME4Tu7E9MhkrKAxjUAHUBK9u0=
+github.com/iotaledger/iota.go/v4 v4.0.0-20240215154216-92b1c8ba1c57 h1:REuK/w32eA00KKyttJoLBcoifMN+FGbLOL9bbjGXASM=
+github.com/iotaledger/iota.go/v4 v4.0.0-20240215154216-92b1c8ba1c57/go.mod h1:C0sa6gQvtBQdAcSa7AME4Tu7E9MhkrKAxjUAHUBK9u0=
 github.com/ipfs/boxo v0.17.0 h1:fVXAb12dNbraCX1Cdid5BB6Kl62gVLNVA+e0EYMqAU0=
 github.com/ipfs/boxo v0.17.0/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=