Merge pull request #278 from opacity/feature/enable-renew

funkydrummer · web-flow · commit fcbd0e54e75b · 2020-05-28T09:48:55.000-07:00
Feature/enable renew
diff --git a/go.mod b/go.mod
@@ -10,9 +10,8 @@ require (
 	github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
-	github.com/allegro/bigcache v1.2.0 // indirect
 	github.com/aristanetworks/goarista v0.0.0-20190308231643-e9fb69a13f45 // indirect
-	github.com/aws/aws-sdk-go v1.18.0
+	github.com/aws/aws-sdk-go v1.25.48
 	github.com/bamzi/jobrunner v0.0.0-20161019143021-273175f8b6eb
 	github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32 // indirect
 	github.com/caarlos0/env v3.5.0+incompatible
@@ -29,7 +28,7 @@ require (
 	github.com/dgraph-io/badger v1.6.0
 	github.com/edsrzf/mmap-go v1.0.0 // indirect
 	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
-	github.com/ethereum/go-ethereum v1.8.23
+	github.com/ethereum/go-ethereum v1.9.14
 	github.com/fjl/memsize v0.0.0-20180929194037-2a09253e352a // indirect
 	github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a
 	github.com/gin-gonic/gin v1.3.0
@@ -48,9 +47,7 @@ require (
 	github.com/gorilla/websocket v1.4.1 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
-	github.com/hashicorp/golang-lru v0.5.3 // indirect
 	github.com/huin/goupnp v1.0.0 // indirect
-	github.com/jackpal/go-nat-pmp v1.0.1 // indirect
 	github.com/jinzhu/gorm v1.9.2
 	github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect
 	github.com/jinzhu/now v1.0.0 // indirect
@@ -90,18 +87,14 @@ require (
 	github.com/stripe/stripe-go v61.7.1+incompatible
 	github.com/swaggo/gin-swagger v1.1.0
 	github.com/swaggo/swag v1.5.0
-	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/ugorji/go v1.1.7 // indirect
 	go.etcd.io/bbolt v1.3.3 // indirect
 	go.opencensus.io v0.22.1 // indirect
 	go.uber.org/multierr v1.2.0 // indirect
 	golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d // indirect
-	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
 	golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect
 	golang.org/x/mobile v0.0.0-20191002175909-6d0d39b2ca82 // indirect
-	golang.org/x/net v0.0.0-20191011234655-491137f69257 // indirect
 	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect
 	golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect
 	golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a // indirect
 	golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
diff --git a/go.sum b/go.sum
diff --git a/models/renewals.go b/models/renewals.go
@@ -21,7 +21,7 @@ type Renewal struct {
 	ApiVersion       int               `json:"apiVersion" binding:"omitempty,gte=1" gorm:"default:1"`
 	PaymentMethod    PaymentMethodType `json:"paymentMethod" gorm:"default:0"`
 	OpqCost          float64           `json:"opqCost" binding:"omitempty,gte=0" example:"1.56"`
-	UsdCost          float64           `json:"usdcost" binding:"omitempty,gte=0" example:"39.99"`
+	//UsdCost          float64           `json:"usdcost" binding:"omitempty,gte=0" example:"39.99"`
 	DurationInMonths int               `json:"durationInMonths" gorm:"default:12" binding:"required,gte=1" minimum:"1" example:"12"`
 }
 
@@ -59,7 +59,7 @@ func (renewal *Renewal) BeforeDelete(scope *gorm.Scope) error {
 }
 
 /*GetOrCreateRenewal will either get or create an renewal.  If the renewal already existed it will update the OpqCost
-and UsdCost but will not update the EthAddress and EthPrivateKey*/
+but will not update the EthAddress and EthPrivateKey*/
 func GetOrCreateRenewal(renewal Renewal) (*Renewal, error) {
 	renewalsFromDB, err := GetRenewalsFromAccountID(renewal.AccountID)
 	if err != nil {
diff --git a/models/renewals_test.go b/models/renewals_test.go
@@ -28,7 +28,7 @@ func returnValidRenewal() (Renewal, Account) {
 		EthPrivateKey:    hex.EncodeToString(utils.Encrypt(utils.Env.EncryptionKey, privateKey, account.AccountID)),
 		PaymentStatus:    InitialPaymentInProgress,
 		OpqCost:          renewalCostInOPQ,
-		UsdCost:          utils.Env.Plans[int(account.StorageLimit)].CostInUSD,
+		//UsdCost:          utils.Env.Plans[int(account.StorageLimit)].CostInUSD,
 		DurationInMonths: 12,
 	}, account
 }
@@ -133,7 +133,7 @@ func Test_Renewal_GetOrCreateRenewal(t *testing.T) {
 	assert.Equal(t, uPtr.AccountID, renewal.AccountID)
 	assert.Equal(t, uPtr.EthAddress, renewal.EthAddress)
 	assert.Equal(t, uPtr.OpqCost, renewal.OpqCost)
-	assert.Equal(t, uPtr.UsdCost, renewal.UsdCost)
+	//assert.Equal(t, uPtr.UsdCost, renewal.UsdCost)
 
 	// simulate generating a new update with the same AccountID
 	// although another renewal already exists--price should not change
diff --git a/models/upgrades.go b/models/upgrades.go
@@ -23,7 +23,7 @@ type Upgrade struct {
 	ApiVersion       int               `json:"apiVersion" binding:"omitempty,gte=1" gorm:"default:1"`
 	PaymentMethod    PaymentMethodType `json:"paymentMethod" gorm:"default:0"`
 	OpqCost          float64           `json:"opqCost" binding:"omitempty,gte=0" example:"1.56"`
-	UsdCost          float64           `json:"usdcost" binding:"omitempty,gte=0" example:"39.99"`
+	//UsdCost          float64           `json:"usdcost" binding:"omitempty,gte=0" example:"39.99"`
 	DurationInMonths int               `json:"durationInMonths" gorm:"default:12" binding:"required,gte=1" minimum:"1" example:"12"`
 }
 
@@ -61,7 +61,7 @@ func (upgrade *Upgrade) BeforeDelete(scope *gorm.Scope) error {
 }
 
 /*GetOrCreateUpgrade will either get or create an upgrade.  If the upgrade already existed it will update the OpqCost
-and UsdCost but will not update the EthAddress and EthPrivateKey*/
+but will not update the EthAddress and EthPrivateKey*/
 func GetOrCreateUpgrade(upgrade Upgrade) (*Upgrade, error) {
 	var upgradeFromDB Upgrade
 
@@ -73,8 +73,8 @@ func GetOrCreateUpgrade(upgrade Upgrade) (*Upgrade, error) {
 		targetTime := time.Now().Add(-60 * time.Minute)
 		if targetTime.After(upgradeFromDB.UpdatedAt) {
 			upgradeFromDB.OpqCost = upgrade.OpqCost
-			upgradeFromDB.UsdCost = upgrade.UsdCost
-			err = DB.Model(&upgradeFromDB).Updates(Upgrade{OpqCost: upgrade.OpqCost, UsdCost: upgrade.UsdCost}).Error
+			//upgradeFromDB.UsdCost = upgrade.UsdCost
+			err = DB.Model(&upgradeFromDB).Updates(Upgrade{OpqCost: upgrade.OpqCost}).Error
 		}
 	}
 
diff --git a/models/upgrades_test.go b/models/upgrades_test.go
@@ -23,8 +23,8 @@ func returnValidUpgrade() (Upgrade, Account) {
 
 	upgradeCostInOPQ, _ := account.UpgradeCostInOPQ(utils.Env.Plans[1024].StorageInGB,
 		12)
-	upgradeCostInUSD, _ := account.UpgradeCostInUSD(utils.Env.Plans[1024].StorageInGB,
-		12)
+	//upgradeCostInUSD, _ := account.UpgradeCostInUSD(utils.Env.Plans[1024].StorageInGB,
+	//	12)
 
 	return Upgrade{
 		AccountID:        account.AccountID,
@@ -34,7 +34,7 @@ func returnValidUpgrade() (Upgrade, Account) {
 		EthPrivateKey:    hex.EncodeToString(utils.Encrypt(utils.Env.EncryptionKey, privateKey, account.AccountID)),
 		PaymentStatus:    InitialPaymentInProgress,
 		OpqCost:          upgradeCostInOPQ,
-		UsdCost:          upgradeCostInUSD,
+		//UsdCost:          upgradeCostInUSD,
 		DurationInMonths: 12,
 	}, account
 }
@@ -149,7 +149,7 @@ func Test_Upgrade_GetOrCreateUpgrade(t *testing.T) {
 	assert.Equal(t, uPtr.EthAddress, upgrade.EthAddress)
 	assert.Equal(t, uPtr.NewStorageLimit, upgrade.NewStorageLimit)
 	assert.Equal(t, uPtr.OpqCost, upgrade.OpqCost)
-	assert.Equal(t, uPtr.UsdCost, upgrade.UsdCost)
+	//assert.Equal(t, uPtr.UsdCost, upgrade.UsdCost)
 
 	// simulate generating a new update with the same AccountID and NewStorageLimit
 	// although another upgrade already exists--price should not change due to 1 hour price
diff --git a/routes/renew_account.go b/routes/renew_account.go
@@ -10,6 +10,7 @@ import (
 	"github.com/opacity/storage-node/models"
 	"github.com/opacity/storage-node/services"
 	"github.com/opacity/storage-node/utils"
+	"time"
 )
 
 type getRenewalAccountInvoiceObject struct {
@@ -107,7 +108,7 @@ func getAccountRenewalInvoice(c *gin.Context) error {
 		return InternalErrorResponse(c, err)
 	}
 
-	renewalCostInUSD := utils.Env.Plans[int(account.StorageLimit)].CostInUSD
+	//renewalCostInUSD := utils.Env.Plans[int(account.StorageLimit)].CostInUSD
 
 	ethAddr, privKey, err := services.EthWrapper.GenerateWallet()
 	if err != nil {
@@ -131,7 +132,6 @@ func getAccountRenewalInvoice(c *gin.Context) error {
 		EthPrivateKey:    hex.EncodeToString(encryptedKeyInBytes),
 		PaymentStatus:    models.InitialPaymentInProgress,
 		OpqCost:          renewalCostInOPQ,
-		UsdCost:          renewalCostInUSD,
 		DurationInMonths: 12,
 	}
 
@@ -163,10 +163,9 @@ func checkRenewalStatus(c *gin.Context) error {
 		return err
 	}
 
-	// TODO: re-enable this for the actual release
-	//if err := verifyRenewEligible(account, c); err != nil {
-	//	return err
-	//}
+	if err := verifyRenewEligible(account, c); err != nil {
+		return err
+	}
 
 	renewals, err := models.GetRenewalsFromAccountID(account.AccountID)
 	if err != nil {
@@ -210,8 +209,11 @@ func renewalAccountAndUpdateExpireDates(account models.Account, request checkRen
 	}
 	filesErr := models.UpdateExpiredAt(request.checkRenewalStatusObject.FileHandles,
 		request.verification.PublicKey, account.ExpirationDate())
+
+	// Setting ttls on metadata to 2 months post account expiration date so the metadatas won't
+	// be deleted too soon
 	metadatasErr := updateMetadataExpiration(request.checkRenewalStatusObject.MetadataKeys,
-		request.verification.PublicKey, account.ExpirationDate(), c)
+		request.verification.PublicKey, account.ExpirationDate().Add(24 * time.Hour * 60), c)
 
 	return utils.CollectErrors([]error{filesErr, metadatasErr})
 }
diff --git a/routes/renew_account_test.go b/routes/renew_account_test.go
@@ -47,32 +47,31 @@ func Test_GetAccountRenewInvoiceHandler_Returns_Invoice(t *testing.T) {
 	assert.Contains(t, w.Body.String(), `"opqInvoice":{"cost":16,`)
 }
 
-// TODO: re-enable this for the actual release
-//func Test_GetAccountRenewInvoiceHandler_ReturnsErrorIfExpirationDateTooFarInFuture(t *testing.T) {
-//	models.DeleteAccountsForTest(t)
-//	models.DeleteRenewalsForTest(t)
-//
-//	getInvoiceObj := getRenewalAccountInvoiceObject{}
-//
-//	v, b, _ := returnValidVerificationAndRequestBodyWithRandomPrivateKey(t, getInvoiceObj)
-//
-//	getInvoiceReq := getRenewalAccountInvoiceReq{
-//		verification: v,
-//		requestBody:  b,
-//	}
-//
-//	accountID, _ := utils.HashString(v.PublicKey)
-//	account := CreatePaidAccountForTest(t, accountID)
-//
-//	account.StorageLimit = models.StorageLimitType(1024)
-//	account.MonthsInSubscription = 13
-//	models.DB.Save(&account)
-//
-//	w := httpPostRequestHelperForTest(t, AccountRenewInvoicePath, getInvoiceReq)
-//	// Check to see if the response was what you expected
-//	assert.Equal(t, http.StatusForbidden, w.Code)
-//	assert.Contains(t, w.Body.String(), `account has too much time left to renew`)
-//}
+func Test_GetAccountRenewInvoiceHandler_ReturnsErrorIfExpirationDateTooFarInFuture(t *testing.T) {
+	models.DeleteAccountsForTest(t)
+	models.DeleteRenewalsForTest(t)
+
+	getInvoiceObj := getRenewalAccountInvoiceObject{}
+
+	v, b, _ := returnValidVerificationAndRequestBodyWithRandomPrivateKey(t, getInvoiceObj)
+
+	getInvoiceReq := getRenewalAccountInvoiceReq{
+		verification: v,
+		requestBody:  b,
+	}
+
+	accountID, _ := utils.HashString(v.PublicKey)
+	account := CreatePaidAccountForTest(t, accountID)
+
+	account.StorageLimit = models.StorageLimitType(1024)
+	account.MonthsInSubscription = 13
+	models.DB.Save(&account)
+
+	w := httpPostRequestHelperForTest(t, AccountRenewInvoicePath, getInvoiceReq)
+	// Check to see if the response was what you expected
+	assert.Equal(t, http.StatusForbidden, w.Code)
+	assert.Contains(t, w.Body.String(), `account has too much time left to renew`)
+}
 
 func Test_CheckRenewalStatusHandler_Returns_Status_OPQ_Renew_Success(t *testing.T) {
 	models.DeleteAccountsForTest(t)
@@ -211,7 +210,6 @@ func returnRenewalForTest(t *testing.T, account models.Account) models.Renewal {
 		DurationInMonths: models.DefaultMonthsPerSubscription,
 		PaymentStatus:    models.InitialPaymentInProgress,
 		OpqCost:          renewalCostInOPQ,
-		UsdCost:          utils.Env.Plans[int(account.StorageLimit)].CostInUSD,
 		EthAddress:       ethAddress.String(),
 		EthPrivateKey:    hex.EncodeToString(utils.Encrypt(utils.Env.EncryptionKey, privateKey, account.AccountID)),
 	}
diff --git a/routes/response_utils.go b/routes/response_utils.go
@@ -200,7 +200,7 @@ func verifyUpgradeEligible(account models.Account, newStorageLimit int, c *gin.C
 }
 
 func verifyRenewEligible(account models.Account, c *gin.Context) error {
-	renewalCutoffTimestamp := time.Now().Add(time.Hour * 24 * 365)
+	renewalCutoffTimestamp := time.Now().Add(time.Hour * 24 * 180)
 	if account.ExpirationDate().After(renewalCutoffTimestamp) {
 		return ForbiddenResponse(c, errors.New("account has too much time left to renew"))
 	}
diff --git a/routes/stripe_payments.go b/routes/stripe_payments.go
@@ -94,8 +94,8 @@ func createStripePayment(c *gin.Context) error {
 		if err := verifyValidStorageLimit(request.createStripePaymentObject.StorageLimit, c); err != nil {
 			return err
 		}
-		costInDollars, _ = account.UpgradeCostInUSD(request.createStripePaymentObject.StorageLimit,
-			request.createStripePaymentObject.DurationInMonths)
+		//costInDollars, _ = account.UpgradeCostInUSD(request.createStripePaymentObject.StorageLimit,
+		//	request.createStripePaymentObject.DurationInMonths)
 	} else {
 		costInDollars = utils.Env.Plans[int(account.StorageLimit)].CostInUSD
 	}
diff --git a/routes/upgrade_account.go b/routes/upgrade_account.go
@@ -2,7 +2,6 @@ package routes
 
 import (
 	"encoding/hex"
-	"errors"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/opacity/storage-node/models"
@@ -37,8 +36,9 @@ type checkUpgradeStatusReq struct {
 }
 
 type getUpgradeAccountInvoiceRes struct {
-	OpqInvoice models.Invoice `json:"opqInvoice"`
-	UsdInvoice float64        `json:"usdInvoice"`
+	OpqInvoice models.Invoice  `json:"opqInvoice"`
+	// TODO: uncomment out if we decide to support stripe for upgrades
+	// UsdInvoice float64        `json:"usdInvoice,omitempty"`
 }
 
 func (v *getUpgradeAccountInvoiceReq) getObjectRef() interface{} {
@@ -110,9 +110,8 @@ func getAccountUpgradeInvoice(c *gin.Context) error {
 	}
 
 	upgradeCostInOPQ, _ := account.UpgradeCostInOPQ(request.getUpgradeAccountInvoiceObject.StorageLimit,
-		request.getUpgradeAccountInvoiceObject.DurationInMonths)
-	upgradeCostInUSD, _ := account.UpgradeCostInUSD(request.getUpgradeAccountInvoiceObject.StorageLimit,
-		request.getUpgradeAccountInvoiceObject.DurationInMonths)
+		//request.getUpgradeAccountInvoiceObject.DurationInMonths)
+		account.MonthsInSubscription)
 
 	ethAddr, privKey, err := services.EthWrapper.GenerateWallet()
 	if err != nil {
@@ -138,8 +137,9 @@ func getAccountUpgradeInvoice(c *gin.Context) error {
 		EthPrivateKey:    hex.EncodeToString(encryptedKeyInBytes),
 		PaymentStatus:    models.InitialPaymentInProgress,
 		OpqCost:          upgradeCostInOPQ,
-		UsdCost:          upgradeCostInUSD,
-		DurationInMonths: request.getUpgradeAccountInvoiceObject.DurationInMonths,
+		//UsdCost:          upgradeCostInUSD,
+		//DurationInMonths: request.getUpgradeAccountInvoiceObject.DurationInMonths,
+		DurationInMonths: account.MonthsInSubscription,
 	}
 
 	upgradeInDB, err := models.GetOrCreateUpgrade(upgrade)
@@ -153,7 +153,7 @@ func getAccountUpgradeInvoice(c *gin.Context) error {
 			Cost:       upgradeCostInOPQ,
 			EthAddress: upgradeInDB.EthAddress,
 		},
-		UsdInvoice: upgradeCostInUSD,
+		//UsdInvoice: upgradeCostInUSD,
 	})
 }
 
@@ -174,10 +174,10 @@ func checkUpgradeStatus(c *gin.Context) error {
 	}
 
 	upgrade, err := models.GetUpgradeFromAccountIDAndStorageLimits(account.AccountID, request.checkUpgradeStatusObject.StorageLimit, int(account.StorageLimit))
-	if upgrade.DurationInMonths != request.checkUpgradeStatusObject.DurationInMonths {
-		return ForbiddenResponse(c, errors.New("durationInMonths does not match durationInMonths "+
-			"when upgrade was initiated"))
-	}
+	//if upgrade.DurationInMonths != request.checkUpgradeStatusObject.DurationInMonths {
+	//	return ForbiddenResponse(c, errors.New("durationInMonths does not match durationInMonths "+
+	//		"when upgrade was initiated"))
+	//}
 
 	//stripePayment, err := models.GetNewestStripePaymentByAccountId(account.AccountID)
 	//if stripePayment.AccountID == account.AccountID && err == nil && stripePayment.UpgradePayment {
@@ -228,13 +228,17 @@ func checkUpgradeStatus(c *gin.Context) error {
 
 func upgradeAccountAndUpdateExpireDates(account models.Account, request checkUpgradeStatusReq, c *gin.Context) error {
 	if err := account.UpgradeAccount(request.checkUpgradeStatusObject.StorageLimit,
-		request.checkUpgradeStatusObject.DurationInMonths); err != nil {
+		//request.checkUpgradeStatusObject.DurationInMonths); err != nil {
+		account.MonthsInSubscription); err != nil {
 		return err
 	}
 	filesErr := models.UpdateExpiredAt(request.checkUpgradeStatusObject.FileHandles,
 		request.verification.PublicKey, account.ExpirationDate())
+
+	// Setting ttls on metadata to 2 months post account expiration date so the metadatas won't
+	// be deleted too soon
 	metadatasErr := updateMetadataExpiration(request.checkUpgradeStatusObject.MetadataKeys,
-		request.verification.PublicKey, account.ExpirationDate(), c)
+		request.verification.PublicKey, account.ExpirationDate().Add(24 * time.Hour * 60), c)
 
 	return utils.CollectErrors([]error{filesErr, metadatasErr})
 }
diff --git a/routes/upgrade_account_test.go b/routes/upgrade_account_test.go
diff --git a/routes/upgrade_renew_test.go b/routes/upgrade_renew_test.go

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ type Upgrade struct {`
`23`	`23`	ApiVersion int `json:"apiVersion" binding:"omitempty,gte=1" gorm:"default:1"`
`24`	`24`	PaymentMethod PaymentMethodType `json:"paymentMethod" gorm:"default:0"`
`25`	`25`	OpqCost float64 `json:"opqCost" binding:"omitempty,gte=0" example:"1.56"`
`26`		- UsdCost float64 `json:"usdcost" binding:"omitempty,gte=0" example:"39.99"`
	`26`	+ //UsdCost float64 `json:"usdcost" binding:"omitempty,gte=0" example:"39.99"`
`27`	`27`	DurationInMonths int `json:"durationInMonths" gorm:"default:12" binding:"required,gte=1" minimum:"1" example:"12"`
`28`	`28`	`}`
`29`	`29`
`@@ -61,7 +61,7 @@ func (upgrade Upgrade) BeforeDelete(scope gorm.Scope) error {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/*GetOrCreateUpgrade will either get or create an upgrade. If the upgrade already existed it will update the OpqCost`
`64`		`-and UsdCost but will not update the EthAddress and EthPrivateKey*/`
	`64`	`+but will not update the EthAddress and EthPrivateKey*/`
`65`	`65`	`func GetOrCreateUpgrade(upgrade Upgrade) (*Upgrade, error) {`
`66`	`66`	`var upgradeFromDB Upgrade`
`67`	`67`
`@@ -73,8 +73,8 @@ func GetOrCreateUpgrade(upgrade Upgrade) (*Upgrade, error) {`
`73`	`73`	`targetTime := time.Now().Add(-60 * time.Minute)`
`74`	`74`	`if targetTime.After(upgradeFromDB.UpdatedAt) {`
`75`	`75`	`upgradeFromDB.OpqCost = upgrade.OpqCost`
`76`		`- upgradeFromDB.UsdCost = upgrade.UsdCost`
`77`		`- err = DB.Model(&upgradeFromDB).Updates(Upgrade{OpqCost: upgrade.OpqCost, UsdCost: upgrade.UsdCost}).Error`
	`76`	`+ //upgradeFromDB.UsdCost = upgrade.UsdCost`
	`77`	`+ err = DB.Model(&upgradeFromDB).Updates(Upgrade{OpqCost: upgrade.OpqCost}).Error`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ func verifyUpgradeEligible(account models.Account, newStorageLimit int, c *gin.C`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`func verifyRenewEligible(account models.Account, c *gin.Context) error {`
`203`		`- renewalCutoffTimestamp := time.Now().Add(time.Hour * 24 * 365)`
	`203`	`+ renewalCutoffTimestamp := time.Now().Add(time.Hour * 24 * 180)`
`204`	`204`	`if account.ExpirationDate().After(renewalCutoffTimestamp) {`
`205`	`205`	`return ForbiddenResponse(c, errors.New("account has too much time left to renew"))`
`206`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ func createStripePayment(c *gin.Context) error {`
`94`	`94`	`if err := verifyValidStorageLimit(request.createStripePaymentObject.StorageLimit, c); err != nil {`
`95`	`95`	`return err`
`96`	`96`	`}`
`97`		`- costInDollars, _ = account.UpgradeCostInUSD(request.createStripePaymentObject.StorageLimit,`
`98`		`- request.createStripePaymentObject.DurationInMonths)`
	`97`	`+ //costInDollars, _ = account.UpgradeCostInUSD(request.createStripePaymentObject.StorageLimit,`
	`98`	`+ // request.createStripePaymentObject.DurationInMonths)`
`99`	`99`	`} else {`
`100`	`100`	`costInDollars = utils.Env.Plans[int(account.StorageLimit)].CostInUSD`
`101`	`101`	`}`