Merge pull request #3128 from Sifchain/feature/margin-1-sq-tracking

Feature/margin 1 sq tracking

.github/workflows/go.yml

@@ -46,3 +46,38 @@ jobs:
         with:
           file: ./coverage.txt
           verbose: true
+
+  feature-toggle-margin-cli-alpha:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v2
+        with:
+          go-version: ^1.15
+        id: go
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Get dependencies
+        run: |
+          go get -v -t -d ./...
+
+      - name: Build
+        run: FEATURE_TOGGLE_MARGIN_CLI_ALPHA=1 make install
+
+      - name: Test
+        run: |
+          go test -tags "FEATURE_TOGGLE_MARGIN_CLI_ALPHA" -v ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg $(go list ./... | grep -v test | tr "\n" ",")
+          excludelist="$(find ./ -type f -name '*.go' | xargs grep -l 'DONTCOVER')"
+          for filename in ${excludelist}; do
+            filename=$(echo $filename | sed 's/^../github.com\/Sifchain\/sifnode/g')
+            echo "Excluding ${filename} from coverage report..."
+            sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
+          done
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./coverage.txt
+          verbose: true

app/setup_handlers.go

@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
-const releaseVersion = "0.15.0-rc.3"
+const releaseVersion = "0.15.0-rc.4"
 
 func SetupHandlers(app *SifchainApp) {
 

version

@@ -1 +1 @@
-0.15.0-rc.3
+0.15.0-rc.4

x/margin/keeper/calculations.go

@@ -6,7 +6,6 @@ package keeper
 import (
 	"math/big"
 
-	clptypes "github.com/Sifchain/sifnode/x/clp/types"
 	"github.com/Sifchain/sifnode/x/margin/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -30,46 +29,3 @@ func CalcMTPInterestLiabilities(mtp *types.MTP, interestRate sdk.Dec, epochPosit
 
 	return sdk.NewUintFromBigInt(interestNew.Add(interestNew, mtp.InterestUnpaid.BigInt()))
 }
-
-func CalcInterestRate(interestRateMax,
-	interestRateMin,
-	interestRateIncrease,
-	interestRateDecrease,
-	healthGainFactor,
-	sQ sdk.Dec,
-	pool clptypes.Pool) (sdk.Dec, error) {
-
-	prevInterestRate := pool.InterestRate
-
-	externalAssetBalance := sdk.NewDecFromBigInt(pool.ExternalAssetBalance.BigInt())
-	ExternalLiabilities := sdk.NewDecFromBigInt(pool.ExternalLiabilities.BigInt())
-	NativeAssetBalance := sdk.NewDecFromBigInt(pool.NativeAssetBalance.BigInt())
-	NativeLiabilities := sdk.NewDecFromBigInt(pool.NativeLiabilities.BigInt())
-
-	mul1 := externalAssetBalance.Add(ExternalLiabilities).Quo(externalAssetBalance)
-	mul2 := NativeAssetBalance.Add(NativeLiabilities).Quo(NativeAssetBalance)
-
-	targetInterestRate := healthGainFactor.Mul(mul1).Mul(mul2).Add(sQ)
-
-	interestRateChange := targetInterestRate.Sub(prevInterestRate)
-	interestRate := prevInterestRate
-	if interestRateChange.LTE(interestRateDecrease.Mul(sdk.NewDec(-1))) && interestRateChange.LTE(interestRateIncrease) {
-		interestRate = targetInterestRate
-	} else if interestRateChange.GT(interestRateIncrease) {
-		interestRate = prevInterestRate.Add(interestRateIncrease)
-	} else if interestRateChange.LT(interestRateDecrease.Mul(sdk.NewDec(-1))) {
-		interestRate = prevInterestRate.Sub(interestRateDecrease)
-	}
-
-	newInterestRate := interestRate
-
-	if interestRate.GT(interestRateMin) && interestRate.LT(interestRateMax) {
-		newInterestRate = interestRate
-	} else if interestRate.LTE(interestRateMin) {
-		newInterestRate = interestRateMin
-	} else if interestRate.GTE(interestRateMax) {
-		newInterestRate = interestRateMax
-	}
-
-	return newInterestRate, nil
-}

x/margin/keeper/keeper.go

@@ -6,7 +6,6 @@ package keeper
 import (
 	"fmt"
 	"math"
-	"math/big"
 
 	adminkeeper "github.com/Sifchain/sifnode/x/admin/keeper"
 	clptypes "github.com/Sifchain/sifnode/x/clp/types"
@@ -505,8 +504,42 @@ func (k Keeper) InterestRateComputation(ctx sdk.Context, pool clptypes.Pool) (sd
 	interestRateIncrease := k.GetInterestRateIncrease(ctx)
 	interestRateDecrease := k.GetInterestRateDecrease(ctx)
 	healthGainFactor := k.GetHealthGainFactor(ctx)
-	sQ := k.GetSQ(ctx, pool)
-	return CalcInterestRate(interestRateMax, interestRateMin, interestRateIncrease, interestRateDecrease, healthGainFactor, sQ, pool)
+
+	prevInterestRate := pool.InterestRate
+
+	externalAssetBalance := sdk.NewDecFromBigInt(pool.ExternalAssetBalance.BigInt())
+	ExternalLiabilities := sdk.NewDecFromBigInt(pool.ExternalLiabilities.BigInt())
+	NativeAssetBalance := sdk.NewDecFromBigInt(pool.NativeAssetBalance.BigInt())
+	NativeLiabilities := sdk.NewDecFromBigInt(pool.NativeLiabilities.BigInt())
+
+	mul1 := externalAssetBalance.Add(ExternalLiabilities).Quo(externalAssetBalance)
+	mul2 := NativeAssetBalance.Add(NativeLiabilities).Quo(NativeAssetBalance)
+
+	targetInterestRate := healthGainFactor.Mul(mul1).Mul(mul2)
+
+	interestRateChange := targetInterestRate.Sub(prevInterestRate)
+	interestRate := prevInterestRate
+	if interestRateChange.LTE(interestRateDecrease.Mul(sdk.NewDec(-1))) && interestRateChange.LTE(interestRateIncrease) {
+		interestRate = targetInterestRate
+	} else if interestRateChange.GT(interestRateIncrease) {
+		interestRate = prevInterestRate.Add(interestRateIncrease)
+	} else if interestRateChange.LT(interestRateDecrease.Mul(sdk.NewDec(-1))) {
+		interestRate = prevInterestRate.Sub(interestRateDecrease)
+	}
+
+	newInterestRate := interestRate
+
+	if interestRate.GT(interestRateMin) && interestRate.LT(interestRateMax) {
+		newInterestRate = interestRate
+	} else if interestRate.LTE(interestRateMin) {
+		newInterestRate = interestRateMin
+	} else if interestRate.GTE(interestRateMax) {
+		newInterestRate = interestRateMax
+	}
+
+	sQ := k.GetSQFromBlocks(ctx, pool, newInterestRate)
+
+	return newInterestRate.Add(sQ), nil
 }
 
 func (k Keeper) GetSQBeginBlock(ctx sdk.Context, pool *clptypes.Pool) uint64 {