refactor: add initialization handler

subgraphs/venus/src/mappings/comptroller.ts

@@ -1,7 +1,8 @@
 /* eslint-disable prefer-const */
 // to satisfy AS compiler
-import { Address } from '@graphprotocol/graph-ts';
+import { Address, ethereum } from '@graphprotocol/graph-ts';
 
+import { Comptroller as ComptrollerContract } from '../../generated/Comptroller/Comptroller';
 import {
   DistributedSupplierVenus,
   MarketEntered,
@@ -12,15 +13,27 @@ import {
   NewLiquidationIncentive,
   NewPriceOracle,
 } from '../../generated/DiamondComptroller/Comptroller';
+import { Comptroller } from '../../generated/schema';
 import { zeroBigInt32 } from '../constants';
-import { getMarket } from '../operations/get';
+import { comptrollerAddress } from '../constants/addresses';
+import { getComptroller, getMarket } from '../operations/get';
 import {
   getOrCreateAccount,
   getOrCreateAccountVToken,
-  getOrCreateComptroller,
   getOrCreateMarket,
 } from '../operations/getOrCreate';
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const handleInitialization = (block: ethereum.Block): void => {
+  const comptroller = new Comptroller(comptrollerAddress);
+  const comptrollerContract = ComptrollerContract.bind(comptrollerAddress);
+  comptroller.priceOracle = comptrollerContract.oracle();
+  comptroller.closeFactor = comptrollerContract.closeFactorMantissa();
+  comptroller.liquidationIncentive = comptrollerContract.liquidationIncentiveMantissa();
+  comptroller.maxAssets = comptrollerContract.maxAssets();
+  comptroller.save();
+};
+
 export function handleMarketListed(event: MarketListed): void {
   // Create the market for initial listing
   const market = getOrCreateMarket(event.params.vToken, event);
@@ -56,7 +69,7 @@ export function handleMarketExited(event: MarketExited): void {
 }
 
 export function handleNewCloseFactor(event: NewCloseFactor): void {
-  const comptroller = getOrCreateComptroller();
+  const comptroller = getComptroller();
   comptroller.closeFactor = event.params.newCloseFactorMantissa;
   comptroller.save();
 }
@@ -69,13 +82,13 @@ export function handleNewCollateralFactor(event: NewCollateralFactor): void {
 
 // This should be the first event according to bscscan but it isn't.... price oracle is. weird
 export function handleNewLiquidationIncentive(event: NewLiquidationIncentive): void {
-  const comptroller = getOrCreateComptroller();
+  const comptroller = getComptroller();
   comptroller.liquidationIncentive = event.params.newLiquidationIncentiveMantissa;
   comptroller.save();
 }
 
 export function handleNewPriceOracle(event: NewPriceOracle): void {
-  const comptroller = getOrCreateComptroller();
+  const comptroller = getComptroller();
   comptroller.priceOracle = event.params.newPriceOracle;
   comptroller.save();
 }

subgraphs/venus/src/operations/get.ts

@@ -1,6 +1,12 @@
 import { Address, log } from '@graphprotocol/graph-ts';
 
-import { Market } from '../../generated/schema';
+import { Comptroller, Market } from '../../generated/schema';
+import { comptrollerAddress } from '../constants/addresses';
+
+export function getComptroller(): Comptroller {
+  const comptroller = Comptroller.load(comptrollerAddress)!;
+  return comptroller;
+}
 
 export const getMarket = (vTokenAddress: Address): Market | null => {
   const market = Market.load(vTokenAddress);

subgraphs/venus/src/operations/getOrCreate.ts

@@ -1,15 +1,14 @@
-import { Address, BigInt, Bytes, ethereum, log } from '@graphprotocol/graph-ts';
+import { Address, BigInt, Bytes, ethereum } from '@graphprotocol/graph-ts';
 
-import { Comptroller as ComptrollerContract } from '../../generated/Comptroller/Comptroller';
-import { Account, AccountVToken, Comptroller, Market } from '../../generated/schema';
+import { Account, AccountVToken, Market } from '../../generated/schema';
 import {
   VToken as VTokenTemplate,
   VTokenUpdatedEvents as VTokenUpdatedEventsTemplate,
 } from '../../generated/templates';
 import { BEP20 } from '../../generated/templates/VToken/BEP20';
 import { VToken } from '../../generated/templates/VToken/VToken';
 import { zeroBigInt32 } from '../constants';
-import { comptrollerAddress, nullAddress } from '../constants/addresses';
+import { nullAddress } from '../constants/addresses';
 import {
   getUnderlyingPrice,
   valueOrNotAvailableAddressIfReverted,
@@ -20,22 +19,7 @@ import { getMarket } from './get';
 import { updateMarketCashMantissa } from './updateMarketCashMantissa';
 import { updateMarketRates } from './updateMarketRates';
 
-export function getOrCreateComptroller(): Comptroller {
-  let comptroller = Comptroller.load(comptrollerAddress);
-  if (!comptroller) {
-    comptroller = new Comptroller(comptrollerAddress);
-    const comptrollerContract = ComptrollerContract.bind(comptrollerAddress);
-    comptroller.priceOracle = comptrollerContract.oracle();
-    comptroller.closeFactor = comptrollerContract.closeFactorMantissa();
-    comptroller.liquidationIncentive = comptrollerContract.liquidationIncentiveMantissa();
-    comptroller.maxAssets = comptrollerContract.maxAssets();
-    comptroller.save();
-  }
-  return comptroller;
-}
-
 export function getOrCreateMarket(marketAddress: Address, event: ethereum.Event): Market {
-  // @todo add and use market id utility
   let market = getMarket(marketAddress);
   if (!market) {
     const vTokenContract = VToken.bind(marketAddress);
@@ -58,9 +42,6 @@ export function getOrCreateMarket(marketAddress: Address, event: ethereum.Event)
       market.underlyingSymbol = 'BNB';
     } else {
       market.underlyingAddress = vTokenContract.underlying();
-      log.debug('[createMarket] market underlying address: {}', [
-        market.underlyingAddress.toHexString(),
-      ]);
       const underlyingContract = BEP20.bind(Address.fromBytes(market.underlyingAddress));
       market.underlyingDecimals = underlyingContract.decimals();
       market.underlyingName = underlyingContract.name();

subgraphs/venus/src/utilities/getTokenPriceCents.ts

@@ -2,12 +2,12 @@ import { Address, BigInt, log } from '@graphprotocol/graph-ts';
 
 import { valueOrNotAvailableIntIfReverted } from '.';
 import { PriceOracle } from '../../generated/templates/VToken/PriceOracle';
-import { getOrCreateComptroller } from '../operations/getOrCreate';
+import { getComptroller } from '../operations/get';
 import { exponentToBigInt } from './exponentToBigInt';
 
 // Used for all vBEP20 contracts
 export function getTokenPriceCents(eventAddress: Address, underlyingDecimals: i32): BigInt {
-  const comptroller = getOrCreateComptroller();
+  const comptroller = getComptroller();
   if (!comptroller.priceOracle) {
     log.debug('[getTokenPrice] empty price oracle: {}', ['0']);
     return BigInt.zero();

subgraphs/venus/src/utilities/ids.ts

@@ -14,3 +14,5 @@ export const getAccountVTokenTransactionId = (
 
 export const getMarketActionId = (vTokenAddress: Address, action: i32): Bytes =>
   vTokenAddress.concatI32(action);
+
+export const getMarketId = (vTokenAddress: Address): Bytes => vTokenAddress;

subgraphs/venus/template.yaml

@@ -1,4 +1,4 @@
-specVersion: 0.0.4
+specVersion: 1.2.0
 description: Venus is an open-source protocol for algorithmic, efficient Money Markets on the BSC blockchain.
 repository: https://github.com/VenusProtocol/subgraphs
 schema:
@@ -13,7 +13,7 @@ dataSources:
       startBlock: {{ startBlock }}
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.9
       language: wasm/assemblyscript
       file: ./src/mappings/comptroller.ts
       entities:
@@ -58,7 +58,7 @@ dataSources:
       startBlock: {{ startBlock }}
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.9
       language: wasm/assemblyscript
       file: ./src/mappings/comptroller.ts
       entities:
@@ -82,6 +82,10 @@ dataSources:
           handler: handleMarketEntered
         - event: MarketExited(address,address)
           handler: handleMarketExited
+      blockHandlers:
+        - handler: handleInitialization
+          filter:
+            kind: once
 templates:
   - name: VToken
     kind: ethereum/contract
@@ -90,7 +94,7 @@ templates:
       abi: VToken
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.9
       language: wasm/assemblyscript
       file: ./src/mappings/vToken.ts
       entities:
@@ -138,7 +142,7 @@ templates:
       abi: VToken
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.5
+      apiVersion: 0.0.9
       language: wasm/assemblyscript
       file: ./src/mappings/vToken.ts
       entities:

subgraphs/venus/tests/Comptroller.test.ts

@@ -9,12 +9,7 @@ import {
 } from 'matchstick-as/assembly/index';
 
 import { handleMarketListed, handleMarketUnlisted } from '../src/mappings/comptroller';
-import {
-  comptrollerAddress,
-  interestRateModelAddress,
-  nullAddress,
-  vBnbAddress,
-} from './constants';
+import { interestRateModelAddress, nullAddress, vBnbAddress } from './constants';
 import { createMarketListedEvent } from './events';
 import { createComptrollerMock, createVBep20AndUnderlyingMock } from './mocks';
 
@@ -38,7 +33,7 @@ beforeAll(() => {
     interestRateModelAddress,
   );
 
-  createComptrollerMock(comptrollerAddress);
+  createComptrollerMock();
 });
 
 describe('handleMarketListing', () => {

subgraphs/venus/tests/VToken/index.test.ts

@@ -11,8 +11,8 @@ import {
 } from 'matchstick-as/assembly/index';
 
 import { oneBigInt, zeroBigInt32 } from '../../src/constants';
-import { comptrollerAddress } from '../../src/constants/addresses';
 import { handleMarketListed } from '../../src/mappings/comptroller';
+import { handleInitialization } from '../../src/mappings/comptroller';
 import {
   handleAccrueInterest,
   handleBorrow,
@@ -32,6 +32,7 @@ import {
 } from '../../src/mappings/vToken';
 import { getMarket } from '../../src/operations/get';
 import { getAccountVTokenId } from '../../src/utilities/ids';
+import { createComptrollerMock } from '../mocks';
 import {
   createAccrueInterestEvent,
   createBorrowEvent,
@@ -50,8 +51,13 @@ import {
   createReservesReducedEvent,
   createTransferEvent,
 } from './events';
-import { createAccountVTokenBalanceOfMock, createBorrowBalanceCurrentMock } from './mocks';
-import { createPriceOracleMock, createVBep20AndUnderlyingMock } from './mocks';
+import {
+  createAccountVTokenBalanceOfMock,
+  createBorrowBalanceCurrentMock,
+  createMockBlock,
+  createPriceOracleMock,
+  createVBep20AndUnderlyingMock,
+} from './mocks';
 
 const tokenAddress = Address.fromString('0x0000000000000000000000000000000000000b0b');
 const user1Address = Address.fromString('0x0000000000000000000000000000000000000101');
@@ -69,10 +75,10 @@ const cleanup = (): void => {
 };
 
 beforeAll(() => {
+  createComptrollerMock();
   createVBep20AndUnderlyingMock(
     aaaTokenAddress,
     tokenAddress,
-    comptrollerAddress,
     'AAA Coin',
     'AAA',
     BigInt.fromI32(18),
@@ -90,6 +96,7 @@ beforeAll(() => {
 });
 
 beforeEach(() => {
+  handleInitialization(createMockBlock());
   // Add Market
   const marketAddedEvent = createMarketListedEvent(aaaTokenAddress);
 

subgraphs/venus/tests/VToken/mocks.ts

@@ -1,14 +1,35 @@
-import { Address, BigInt, ethereum } from '@graphprotocol/graph-ts';
+import { Address, BigInt, Bytes, ethereum } from '@graphprotocol/graph-ts';
 import { createMockedFunction } from 'matchstick-as';
 
+import { comptrollerAddress } from '../../src/constants/addresses';
+
 export const mockPriceOracleAddress = Address.fromString(
   '0xb0b0000000000000000000000000000000000000',
 );
 
+export const createMockBlock = (): ethereum.Block => {
+  return new ethereum.Block(
+    Bytes.fromHexString('0x'),
+    Bytes.fromHexString('0x'),
+    Bytes.fromHexString('0x'),
+    comptrollerAddress,
+    Bytes.fromHexString('0x'),
+    Bytes.fromHexString('0x'),
+    Bytes.fromHexString('0x'),
+    BigInt.fromI32(0),
+    BigInt.fromI32(0),
+    BigInt.fromI32(0),
+    BigInt.fromI32(0),
+    BigInt.fromI32(0),
+    BigInt.fromI32(0),
+    null,
+    null,
+  );
+};
+
 export const createVBep20AndUnderlyingMock = (
   contractAddress: Address,
   underlyingAddress: Address,
-  comptrollerAddress: Address,
   name: string,
   symbol: string,
   decimals: BigInt,

subgraphs/venus/tests/constants.ts

@@ -4,5 +4,4 @@ export const vBnbAddress = Address.fromString('0xA07c5b74C9B40447a954e1466938b86
 export const interestRateModelAddress = Address.fromString(
   '0x594942C0e62eC577889777424CD367545C796A74',
 );
-export const comptrollerAddress = Address.fromString('0xfd36e2c2a6789db23113685031d7f16329158384');
 export const nullAddress = Address.fromString('0x0000000000000000000000000000000000000000');

subgraphs/venus/tests/mocks.ts

@@ -1,6 +1,7 @@
 import { Address, BigInt, ethereum } from '@graphprotocol/graph-ts';
 import { createMockedFunction } from 'matchstick-as';
 
+import { comptrollerAddress } from '../src/constants/addresses';
 import { vBnbAddress } from './constants';
 
 export const mockPriceOracleAddress = Address.fromString(
@@ -98,11 +99,7 @@ export const createVBep20AndUnderlyingMock = (
   ]);
 };
 
-export const createComptrollerMock = (comptrollerAddress: Address): void => {
-  createMockedFunction(comptrollerAddress, 'oracle', 'oracle():(address)').returns([
-    ethereum.Value.fromAddress(mockPriceOracleAddress),
-  ]);
-
+export const createComptrollerMock = (): void => {
   createMockedFunction(
     comptrollerAddress,
     'closeFactorMantissa',