Merge pull request #71 from Gearbox-protocol/v3

v3 logic

Author: 5lliot

cmd/account_mining/main.go

@@ -127,7 +127,7 @@ func StartServer(lc fx.Lifecycle, client core.ClientI, config *config.Config) {
 	lc.Append(fx.Hook{
 		OnStart: func(context.Context) error {
 			go func() {
-				contractETH, err := addressProvider.NewAddressProvider(common.HexToAddress(config.AddressProviderAddress), client)
+				contractETH, err := addressProvider.NewAddressProvider(common.HexToAddress(config.AddressProviderAddrs), client)
 				log.CheckFatal(err)
 				gearToken, err := contractETH.GetGearToken(&bind.CallOpts{})
 				log.CheckFatal(err)

cmd/main.go

@@ -53,7 +53,7 @@ func StartServer(lc fx.Lifecycle, engine ds.EngineI, cfg *config.Config, client
 			// In production, we'd want to separate the Listen and Serve phases for
 			// better error-handling.
 			go func() {
-				engine.UseThreads()
+				// engine.UseThreads()
 				engine.SyncHandler()
 			}()
 			return nil

config/config.go

@@ -4,7 +4,7 @@ import "github.com/Gearbox-protocol/sdk-go/log"
 
 type Config struct {
 	// Authentication
-	AddressProviderAddress string `env:"REACT_APP_ADDRESS_PROVIDER" validate:"required"`
+	AddressProviderAddrs string `env:"REACT_APP_ADDRESS_PROVIDER" validate:"required"`
 
 	// Database
 	DatabaseUrl string `env:"DATABASE_URL" validate:"required"`

db_scripts/local_testing/local_test.sh

@@ -0,0 +1,59 @@
+set -e 
+
+PARENT_DIR=$(dirname $0)
+MAINNET_IP=$1
+PROXY_IP=$2
+SUPERUSER=$3
+
+FORK_BLOCK=`jq .forkBlock < <(curl https://anvil.gearbox.foundation/forks/432945bc-3620-11ee-be56-0242ac120002  )`
+
+if [ "$PROXY_IP" = '' ]; then 
+    ssh -t debian@$MAINNET_IP "bash /home/debian/db_copy.sh"
+    scp debian@$MAINNET_IP:/tmp/db.sql /tmp/db.sql
+else 
+    ssh -t root@$PROXY_IP 'ssh -t debian@'$MAINNET_IP' "bash /home/debian/db_copy.sh"'
+    ssh -t root@$PROXY_IP 'scp debian@'$MAINNET_IP':/tmp/db.sql /tmp/db.sql'
+    scp root@$PROXY_IP:/tmp/db.sql /tmp/db.sql
+fi
+
+if [ "$SUPERUSER" = "postgres" ]; then
+    sudo su postgres
+fi
+
+
+if [ "$SUPERUSER" =  "debian" ]; then
+    export TDB="postgres://$SUPERUSER:123Sample@localhost:5432/sample?sslmode=disable"
+else 
+    export TDB="postgres://$SUPERUSER@localhost:5432/sample?sslmode=disable"
+fi
+
+set +e
+psql -U $SUPERUSER -d postgres -c 'drop database sample'
+psql -U $SUPERUSER -d postgres -c 'create database sample'
+psql -U $SUPERUSER -d sample < /tmp/db.sql
+set -e 
+
+# psql -U $SUPERUSER -d sample < db_scripts/local_testing/missing_table_from_download_db.sql
+psql -U $SUPERUSER -d sample < $PARENT_DIR/../../migrations/000016_rankings.up.sql
+migrate -path $PARENT_DIR/../../migrations/ -database "$TDB" up
+
+
+psql -U $SUPERUSER -d sample < <(cat $PARENT_DIR/reset_to_blocknum.sql | sed "s/18246321/$FORK_BLOCK/" )
+set -e
+psql -U $SUPERUSER -d postgres -c 'drop database tmp_sample'
+set +e
+createdb -O $SUPERUSER -T sample tmp_sample
+
+# create user sample with encrypted password '123Sample';
+# GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO sample;
+# ALTER DATABASE sample OWNER TO sample;
+# update schema_migrations set version=27, dirty='f';
+#
+# SELECT format(
+#           'ALTER TABLE public.%I OWNER TO sample',
+#           table_name
+#        )
+# FROM information_schema.tables
+# WHERE table_schema = 'public';
+
+# SELECT * FROM information_schema.tables  WHERE table_schema = 'public';

…_scripts/local_testing/local_db_copy.sql …sting/missing_table_from_download_db.sqldb_scripts/local_testing/local_db_copy.sql renamed to db_scripts/local_testing/missing_table_from_download_db.sql db_scripts/local_testing/local_db_copy.sql renamed to db_scripts/local_testing/missing_table_from_download_db.sql

@@ -37,8 +37,14 @@ CREATE TABLE current_debts (
     profit_underlying DOUBLE PRECISION,
     collateral_usd DOUBLE PRECISION,
     collateral_underlying DOUBLE PRECISION,
+    --
+    total_value_usd double precision,
+    tf_index double precision,
+    --
     repay_amount DOUBLE PRECISION,
     repay_amount_bi varchar(80));
 
 ALTER TABLE ONLY current_debts
-    ADD CONSTRAINT current_debts_block_num_fkey FOREIGN KEY (block_num) REFERENCES blocks(id) ON DELETE CASCADE;
+    ADD CONSTRAINT current_debts_block_num_fkey FOREIGN KEY (block_num) REFERENCES blocks(id) ON DELETE CASCADE;
+
+

db_scripts/local_testing/reset_to_blocknum.sql

@@ -0,0 +1,80 @@
+delete from account_operations where block_num>18246321;
+delete from allowed_protocols where block_num>18246321;
+delete from allowed_tokens where block_num>18246321;
+delete from credit_manager_stats where block_num>18246321;
+delete from credit_session_snapshots where block_num>18246321;
+delete from dao_operations where block_num> 18246321;
+delete from blocks where id > 18246321;
+
+
+delete from debts where block_num> 18246321;
+update debt_sync set last_calculated_at=18246321;
+delete from token_oracle where  block_num> 18246321;
+delete from transfer_account_allowed  where  block_num> 18246321;
+delete from no_session_transfers where  block_num> 18246321;
+delete from fast_check_params where  block_num> 18246321;
+delete from parameters where  block_num> 18246321;
+delete from pool_stats where  block_num> 18246321;
+delete from pool_ledger where  block_num> 18246321;
+delete from current_debts where block_num > 18246321;  
+delete from liquidable_accounts where block_num> 18246321; -- doesn't matter if it is closed or open
+delete from token_ltramp where block_num> 18246321; 
+delete from quota_details where block_num> 18246321; 
+
+-- a
+update sync_adapters set last_sync = 18246321 where type in ('CreditConfigurator',  'AccountManager','CreditFilter', 'CreditManager', 'Pool') and last_sync > 18246321;
+-- 
+delete from credit_sessions where since> 18246321;
+update  credit_sessions set closed_at=0,liquidator='', remaining_funds='0', close_transfers='{}',status=0 where closed_at> 18246321;
+
+-- the borrower is not accounted for ; i.e. transfer of acocunt is not handled and should be used carefully
+update credit_sessions cs set borrowed_amount=css.borrowed_amount_bi, balances=css.balances from  (select distinct on(session_id) * from credit_session_snapshots order by session_id, block_num desc) css where css.session_id=cs.id  and cs.status=0;
+
+-- for creditmanager
+
+update credit_managers cm set 
+    opened_accounts_count=cms.opened_accounts_count,
+    total_opened_accounts=cms.total_opened_accounts,
+    total_repaid_accounts=cms.total_repaid_accounts,
+    total_closed_accounts=cms.total_closed_accounts,
+    total_liquidated_accounts=cms.total_liquidated_accounts,
+    total_borrowed_bi=cms.total_borrowed_bi,
+    cumulative_borrowed_bi=cms.cumulative_borrowed_bi,
+    total_repaid_bi=cms.total_repaid_bi,
+    total_losses_bi=cms.total_losses_bi,
+    total_profit_bi=cms.total_profit_bi,
+    total_borrowed=cms.total_borrowed,
+    cumulative_borrowed=cms.cumulative_borrowed,
+    total_repaid=cms.total_repaid,
+    total_losses=cms.total_losses,
+    total_profit=cms.total_profit,
+    unique_users=cms.unique_users from (select distinct on (credit_manager) * from credit_manager_stats order by credit_manager, block_num desc) cms 
+    where cm.address= cms.credit_manager;
+
+
+
+
+delete from price_feeds where block_num >  18246321;
+delete from token_oracle where block_num > 18246321;
+update sync_adapters set last_sync=18246321 where type in ('PriceOracle', 'ChainlinkPriceFeed', 'CompositeChainlinkPF', 'QueryPriceFeed');
+update sync_adapters set last_sync=18246321 where type in ('AddressProvider',  'ACL', 'AccountFactory');
+delete from rebase_details where block_num > 18246321;
+
+
+
+update sync_adapters set last_sync=18246321 where type in ('ContractRegister', 'ACL');
+delete from debts where block_num > 18246321;
+delete from current_debts where block_num > 18246321;
+update debt_sync set last_calculated_at=18246321;
+----
+
+-- sync adapter for treasury is not updated.
+-- tokens and token_current_price, schema_migrations not are needed to be updated.
+-- faucet and operations are reduntant tables.
+-- gear_balances , no need to udpate as GearToken syncadpater is not updated.
+-- PooLMReward syncadapter is for table diesel_transfers, lm_rewards, diesel_balances.
+
+
+-- ALTER DATABASE gearbox RENAME TO old_gearbox;
+-- ALTER DATABASE sample RENAME TO gearbox;
+-- createdb -O sample -T sample tmp_sample

db_scripts/reset_to_blocknum.sql

@@ -5,22 +5,32 @@ import (
 
 	"github.com/Gearbox-protocol/sdk-go/core"
 	"github.com/Gearbox-protocol/sdk-go/core/schemas"
+	"github.com/Gearbox-protocol/sdk-go/core/schemas/schemas_v3"
+	"github.com/Gearbox-protocol/third-eye/ds"
 )
 
 type sessionDetailsForCalc struct {
+	addr string
 	*schemas.CreditSessionSnapshot
 	CM            string
 	rebaseDetails *schemas.RebaseDetailsForDB
 	stETH         string
+	// for v3
+	forQuotas v3DebtDetails
+	version   core.VersionType
+}
+
+func (s sessionDetailsForCalc) GetAddr() string {
+	return s.addr
 }
 
 func (s sessionDetailsForCalc) GetCM() string {
 	return s.CM
 }
-func (s sessionDetailsForCalc) GetBalances() map[string]core.BalanceType {
+func (s sessionDetailsForCalc) GetBalances() core.DBBalanceFormat {
 	// credit session snapshot is not saved to db , so we can use it.
 	schemas.AdjustRebaseToken(*s.Balances, s.stETH, s.rebaseDetails)
-	return s.Balances.ToBalanceType()
+	return *s.Balances
 }
 
 func (s sessionDetailsForCalc) GetBorrowedAmount() *big.Int {
@@ -29,6 +39,13 @@ func (s sessionDetailsForCalc) GetBorrowedAmount() *big.Int {
 func (s sessionDetailsForCalc) GetCumulativeIndex() *big.Int {
 	return s.СumulativeIndexAtOpen.Convert()
 }
+func (s sessionDetailsForCalc) GetVersion() core.VersionType {
+	return s.version
+}
+
+func (s sessionDetailsForCalc) GetQuotaCumInterestAndFees() (*big.Int, *big.Int) {
+	return s.CumulativeQuotaInterest.Convert(), s.QuotaFees.Convert()
+}
 
 type storeForCalc struct {
 	inner *DebtEngine
@@ -41,6 +58,28 @@ func (s storeForCalc) GetPrices(token string, version core.VersionType, blockNum
 	return s.inner.GetTokenLastPrice(token, version)
 }
 
-func (s storeForCalc) GetLiqThreshold(cm, token string) *big.Int {
+func (s storeForCalc) GetLiqThreshold(ts uint64, cm, token string) *big.Int {
+	if ltRamp := s.inner.tokenLTRamp[cm][token]; ltRamp != nil {
+		return ltRamp.GetLTForTs(ts)
+	}
 	return s.inner.allowedTokensThreshold[cm][token].Convert()
 }
+
+type poolDetailsForCalc struct {
+	cumIndexAndUToken *ds.CumIndexAndUToken
+	forQuotas         v3DebtDetails
+}
+
+func (s poolDetailsForCalc) GetUnderlying() string {
+	return s.cumIndexAndUToken.Token
+}
+
+func (s poolDetailsForCalc) getPool() string {
+	return s.cumIndexAndUToken.PoolAddr
+}
+func (s poolDetailsForCalc) GetPoolQuotaDetails() map[string]*schemas_v3.QuotaDetails {
+	return s.forQuotas.poolQuotaDetails[s.getPool()]
+}
+func (s poolDetailsForCalc) GetCumIndexNow() *big.Int {
+	return s.cumIndexAndUToken.CumulativeIndex
+}

debts/calc_details.go

@@ -11,13 +11,16 @@ import (
 	"gorm.io/gorm/clause"
 )
 
+// checks
 func (eng *DebtEngine) liquidationCheck(debt *schemas.Debt, cmAddr, borrower string, token *ds.CumIndexAndUToken) {
 	lastDebt := eng.lastDebts[debt.SessionId]
+	var sendMsgAfterXBlocks int64 = 20
+
 	if lastDebt != nil {
 		if !core.IntGreaterThanEqualTo(lastDebt.CalHealthFactor, 10000) &&
 			core.IntGreaterThanEqualTo(debt.CalHealthFactor, 10000) {
 			if eng.liquidableBlockTracker[debt.SessionId] != nil &&
-				(debt.BlockNumber-eng.liquidableBlockTracker[debt.SessionId].BlockNum) >= 20 {
+				(debt.BlockNumber-eng.liquidableBlockTracker[debt.SessionId].BlockNum) >= sendMsgAfterXBlocks {
 				eng.repo.RecentMsgf(log.RiskHeader{
 					BlockNumber: debt.BlockNumber,
 					EventCode:   "AMQP",
@@ -34,7 +37,6 @@ func (eng *DebtEngine) liquidationCheck(debt *schemas.Debt, cmAddr, borrower str
 			eng.addLiquidableAccount(debt.SessionId, debt.BlockNumber)
 		}
 	}
-	var sendMsgAfterXBlocks int64 = 20
 	// sent the account is liquidable notification after 20 blocks
 	if !core.IntGreaterThanEqualTo(debt.CalHealthFactor, 10000) &&
 		eng.liquidableBlockTracker[debt.SessionId] != nil &&