refactor(renterd): gouging base units

SiaFoundation · Sep 13, 2024 · 6785a19 · 6785a19
1 parent efadc9f
commit 6785a19
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/.changeset/tender-dragons-relax.md b/.changeset/tender-dragons-relax.md
@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The configuration now internally uses the updated gouging base units.
diff --git a/apps/renterd/contexts/config/resources.ts b/apps/renterd/contexts/config/resources.ts
@@ -118,11 +118,9 @@ export function firstTimeGougingData({
   return {
     ...gouging,
     maxStoragePrice: averages.settings.storage_price,
-    maxDownloadPrice: new BigNumber(averages.settings.download_price)
-      .times(TBToBytes(1))
-      .toString(),
-    maxUploadPrice: new BigNumber(averages.settings.upload_price)
-      .times(TBToBytes(1))
-      .toString(),
+    maxDownloadPrice: new BigNumber(
+      averages.settings.download_price
+    ).toString(),
+    maxUploadPrice: new BigNumber(averages.settings.upload_price).toString(),
   }
 }
diff --git a/apps/renterd/contexts/config/transform.spec.ts b/apps/renterd/contexts/config/transform.spec.ts
@@ -353,10 +353,10 @@ describe('tansforms', () => {
         foobar: 'value',
         hostBlockHeightLeeway: 4,
         maxContractPrice: '20000000000000000000000000',
-        maxDownloadPrice: '1004310000000000000000000000',
+        maxDownloadPrice: '1004310000000000',
         maxRPCPrice: '99970619000000000000000000',
         maxStoragePrice: '210531181019',
-        maxUploadPrice: '1000232323000000000000000000',
+        maxUploadPrice: '1000232323000000',
         minAccountExpiry: 86400000000000,
         minMaxEphemeralAccountBalance: '1000000000000000000000000',
         minPriceTableValidity: 300000000000,
@@ -573,10 +573,10 @@ function buildAllResponses() {
     gouging: {
       hostBlockHeightLeeway: 4,
       maxContractPrice: '20000000000000000000000000',
-      maxDownloadPrice: '1004310000000000000000000000',
+      maxDownloadPrice: '1004310000000000',
       maxRPCPrice: '99970619000000000000000000',
       maxStoragePrice: '210531181019',
-      maxUploadPrice: '1000232323000000000000000000',
+      maxUploadPrice: '1000232323000000',
       minAccountExpiry: 86400000000000,
       minMaxEphemeralAccountBalance: '1000000000000000000000000',
       minPriceTableValidity: 300000000000,

diff --git a/apps/renterd/contexts/config/transformDown.ts b/apps/renterd/contexts/config/transformDown.ts
@@ -20,6 +20,7 @@ import {
   weeksToBlocks,
   nanosecondsInDays,
   nanosecondsInMinutes,
+  valuePerByteToPerTB,
 } from '@siafoundation/units'
 import BigNumber from 'bignumber.js'
 import {
@@ -148,10 +149,13 @@ export function transformDownGouging({
       scDecimalPlaces
     ), // TB/month
     maxUploadPriceTB: toSiacoins(
-      new BigNumber(gouging.maxUploadPrice),
+      valuePerByteToPerTB(new BigNumber(gouging.maxUploadPrice)),
+      scDecimalPlaces
+    ),
+    maxDownloadPriceTB: toSiacoins(
+      valuePerByteToPerTB(new BigNumber(gouging.maxDownloadPrice)),
       scDecimalPlaces
     ),
-    maxDownloadPriceTB: toSiacoins(gouging.maxDownloadPrice, scDecimalPlaces),
     maxContractPrice: toSiacoins(gouging.maxContractPrice, scDecimalPlaces),
     maxRPCPriceMillion: toSiacoins(
       valuePerOneToPerMillion(new BigNumber(gouging.maxRPCPrice)),

diff --git a/apps/renterd/contexts/config/transformUp.ts b/apps/renterd/contexts/config/transformUp.ts
@@ -15,6 +15,7 @@ import {
   valuePerMillionToPerOne,
   daysInNanoseconds,
   minutesInNanoseconds,
+  valuePerTBToPerByte,
 } from '@siafoundation/units'
 import {
   AutopilotData,
@@ -118,8 +119,12 @@ export function transformUpGouging(
     maxStoragePrice: toHastings(
       valuePerTBPerMonthToPerBytePerBlock(values.maxStoragePriceTBMonth)
     ).toString(),
-    maxUploadPrice: toHastings(values.maxUploadPriceTB).toString(),
-    maxDownloadPrice: toHastings(values.maxDownloadPriceTB).toString(),
+    maxUploadPrice: toHastings(
+      valuePerTBToPerByte(values.maxUploadPriceTB)
+    ).toString(),
+    maxDownloadPrice: toHastings(
+      valuePerTBToPerByte(values.maxDownloadPriceTB)
+    ).toString(),
     maxContractPrice: toHastings(values.maxContractPrice).toString(),
     hostBlockHeightLeeway: Math.round(
       values.hostBlockHeightLeeway?.toNumber() || 0