feat: add market to tvl snapshot

Gearbox-protocol · Nov 14, 2024 · 56e0cb0 · 56e0cb0
1 parent 27cba40
commit 56e0cb0
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 14 deletions.
diff --git a/debts/price.go b/debts/price.go
@@ -102,6 +102,7 @@ func (eng *PriceHandler) GetLastPriceFeed(cm string, token string, version core.
 		priceOracle = obj.GetPriceOracleByVersion(version)
 	}
 	feed := eng.poTotokenOracle[priceOracle][token]
+	log.Info(utils.ToJson(eng.feedLastPrice[feed.Feed]))
 	if feed != nil && eng.feedLastPrice[feed.Feed] != nil { // has feed
 		return eng.feedLastPrice[feed.Feed]
 		// feed.Feed

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/Gearbox-protocol/third-eye
 go 1.20
 
 require (
-	github.com/Gearbox-protocol/sdk-go v0.0.0-20241112083820-bf1bed9bae16
+	github.com/Gearbox-protocol/sdk-go v0.0.0-20241112084329-55582f132d94
 	github.com/ethereum/go-ethereum v1.13.14
 	github.com/go-playground/validator/v10 v10.4.1
 	github.com/google/go-cmp v0.5.9

diff --git a/go.sum b/go.sum
@@ -5,8 +5,8 @@ contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeS
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
-github.com/Gearbox-protocol/sdk-go v0.0.0-20241112083820-bf1bed9bae16 h1:RIfN9rQkOy44yvOCENWR05S5P40piAoE7g/JADIga/o=
-github.com/Gearbox-protocol/sdk-go v0.0.0-20241112083820-bf1bed9bae16/go.mod h1:jRBSOG94bpGc5ci8EWIPUVXZdaGEaekMNmhajbmWFVU=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20241112084329-55582f132d94 h1:byCd0BDqz73Y8QjjTaRVMG1MP0G3GA8yX48AZ3dhhDY=
+github.com/Gearbox-protocol/sdk-go v0.0.0-20241112084329-55582f132d94/go.mod h1:jRBSOG94bpGc5ci8EWIPUVXZdaGEaekMNmhajbmWFVU=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/OffchainLabs/go-ethereum v1.13.4-0.20240313010929-e5d8587e7227 h1:+/3TrD+q+BP36jGj2Bycdmrc/joKLNbc5ImePQzKRLM=

diff --git a/jsonnet/mocks/syncAdapterV2.jsonnet b/jsonnet/mocks/syncAdapterV2.jsonnet
@@ -37,7 +37,7 @@
     {
       type: 'PriceOracle',
       address: '#PriceOracle_0',
-      lastSync: 2,
+      lastSync: 1,
       version: 1,
       disabled_at: 2,
       disabled: true,

diff --git a/migrations/000053_v310.up.sql b/migrations/000053_v310.up.sql
@@ -9,7 +9,8 @@ alter table token_oracle add PRIMARY KEY (price_oracle, block_num, token, reserv
 --
 alter table token_current_price add price_oracle varchar(42);
 alter table token_current_price drop constraint token_current_price_pkey;
-update token_current_price set price_oracle= (select address from sync_adapters where type='PriceOracle' and version=300) where price_source='CHAINLINK';
+update token_current_price set price_oracle= (select address from sync_adapters where type='PriceOracle' and version=300) where price_source='chainlink';
+update token_current_price set price_oracle= '0x0000000000000000000000000000000000000000' where price_source='spot';
 alter table token_current_price add PRIMARY KEY (price_oracle, price_source, token);
 
 --
@@ -30,11 +31,11 @@ CREATE TABLE relations (
 update pools p set price_oracle=sa.address from  sync_adapters sa where type='PriceOracle' and p._version=sa.version;
 
 update token_oracle set disabled_at=19752044 where version=2; -- don't disable for v1
-update token_oracle set disabled_at=13856183 where address='0xc170DC3C2e8809AC6197D56b86bF421c8a7f8c67'; -- all for v1
-update token_oracle set disabled_at=18577104 where address='0x172971182351e00C2D700bA1e8c5586Ad2CFa38c';
-update token_oracle set disabled_at=18577104 where address='0x614f9486Ab9C7a217526c097656D2F6bD2DB631C';
-update token_oracle set disabled_at=14769098 where address='0x1a8AC67A1B64F7fd71bB91c21581f036AbE6AEc2';
-update token_oracle set disabled_at=14956928 where address='0x91401cedCBFd9680cE193A5F54E716504233e998'; -- all for v1
+update token_oracle set disabled_at=13856183 where feed='0xc170DC3C2e8809AC6197D56b86bF421c8a7f8c67'; -- all for v1
+update token_oracle set disabled_at=18577104 where feed='0x172971182351e00C2D700bA1e8c5586Ad2CFa38c';
+update token_oracle set disabled_at=18577104 where feed='0x614f9486Ab9C7a217526c097656D2F6bD2DB631C';
+update token_oracle set disabled_at=14769098 where feed='0x1a8AC67A1B64F7fd71bB91c21581f036AbE6AEc2';
+update token_oracle set disabled_at=14956928 where feed='0x91401cedCBFd9680cE193A5F54E716504233e998'; -- all for v1
 
 
 
@@ -45,4 +46,9 @@ insert into relations(block_num, owner, dependent, category)  (select discovered
 alter table tvl_snapshots add market varchar(42);
 update tvl_snapshots set market='0x0000000000000000000000000000000000000000';
 alter table tvl_snapshots drop constraint tvl_snapshots_pkey;
-alter table tvl_snapshots add PRIMARY KEY (market, block_num);
+alter table tvl_snapshots add PRIMARY KEY (market, block_num);
+
+
+-- do after the legacy market configurator address is found.
+-- update legacy address in marketconfigurator.
+-- update tvl_snapshots market=? where market='0x0000000000000000000000000000000000000000';
diff --git a/models/aggregated_block_feed/model.go b/models/aggregated_block_feed/model.go
@@ -81,7 +81,7 @@ func (mdl *AQFWrapper) AddFeedOrToken(token, feed string, pfType string, discove
 	if mdl.QueryFeeds[feed] == nil {
 		mdl.AddQueryPriceFeed(NewQueryPriceFeed(token, feed, pfType, discoveredAt, mdl.Client, mdl.Repo, version))
 		// MAINNET: old yvUSDC added on gearbox v1
-		createPriceFeedOnInit(mdl.QueryFeeds[feed], mdl.Client, token, discoveredAt, version)
+		createPriceFeedOnInit(mdl.QueryFeeds[feed], mdl.Client, discoveredAt, version)
 	}
 }
 
@@ -95,7 +95,10 @@ func mergePFVersionAt(blockNum int64, details map[schemas.PFVersion][]int64) sch
 	}
 	return pfVersion
 }
-func createPriceFeedOnInit(qpf ds.QueryPriceFeedI, client core.ClientI, token string, discoveredAt int64, version core.VersionType) []*schemas.PriceFeed {
+func createPriceFeedOnInit(qpf ds.QueryPriceFeedI, client core.ClientI, discoveredAt int64, version core.VersionType) []*schemas.PriceFeed {
+	if qpf.GetAddress() == "0x7C879DBde7569F00c378Ca124046B9E1b31327F5" {
+		log.Fatal("discoveredAt", discoveredAt)
+	}
 	mainPFContract, err := priceFeed.NewPriceFeed(common.HexToAddress(qpf.GetAddress()), client)
 	log.CheckFatal(err)
 	data, err := mainPFContract.LatestRoundData(&bind.CallOpts{BlockNumber: big.NewInt(discoveredAt)})

diff --git a/tests/framework/mock_engine.go b/tests/framework/mock_engine.go
@@ -58,8 +58,8 @@ func (m *MockRepo) Init(fileNames []string) {
 		m.Repo.AddTokenObj(token)
 	}
 	m.AddressMap = addressMap
-	log.Info(utils.ToJson(addressMap))
 	m.processInputTestFile(inputFile)
+	log.Info(utils.ToJson(addressMap))
 }
 
 // key/name to address