fix: fixes to ntoken fee buffer

notional-finance · Jun 6, 2024 · 36d8165 · 36d8165
1 parent ce2b7d5
commit 36d8165
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@goldskycom/cli": "^1.12.0",
-    "@graphprotocol/graph-cli": "^0.71.2",
+    "@graphprotocol/graph-cli": "^0.73.0",
     "@graphprotocol/graph-ts": "^0.31.0",
     "hbs-cli": "^1.4.0",
     "matchstick-as": "^0.5.2"

diff --git a/src/balances.ts b/src/balances.ts
@@ -346,26 +346,32 @@ function updateNToken(
     snapshot.currentBalance = totalCash;
 
     if (
+      transfer !== null &&
+      event.receipt !== null &&
       transfer.fromSystemAccount == Vault &&
-      event.logIndex.toI32() > 1 &&
-      event.receipt !== null
+      event.logIndex.toI32() > 1
     ) {
-      let prevLog = (event.receipt as ethereum.TransactionReceipt).logs[event.logIndex.toI32() - 1];
-      if (
-        prevLog.address.toHexString() === transfer.token &&
-        prevLog.topics[0].toHexString() ==
-          "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
-      ) {
-        // This is a transfer event
-        let from = ethereum.decode("address", prevLog.topics[1]);
-        let to = ethereum.decode("address", prevLog.topics[2]);
+      if ((event.receipt as ethereum.TransactionReceipt).logs.length >= event.logIndex.toI32()) {
+        let prevLog = (event.receipt as ethereum.TransactionReceipt).logs[
+          event.logIndex.toI32() - 1
+        ];
         if (
-          from !== null &&
-          from.toAddress().toHexString() === transfer.from &&
-          to !== null &&
-          to.toAddress().toHexString() === FEE_RESERVE.toHexString()
+          prevLog.address.toHexString() === transfer.token &&
+          prevLog.topics.length == 3 &&
+          prevLog.topics[0].toHexString() ==
+            "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
         ) {
-          updateNTokenFeeBuffer(token.currencyId, transfer, event, true);
+          // This is a transfer event
+          let from = ethereum.decode("address", prevLog.topics[1]);
+          let to = ethereum.decode("address", prevLog.topics[2]);
+          if (
+            from !== null &&
+            from.toAddress().toHexString() === transfer.from &&
+            to !== null &&
+            to.toAddress().toHexString() === FEE_RESERVE.toHexString()
+          ) {
+            updateNTokenFeeBuffer(token.currencyId, transfer, event, true);
+          }
         }
       }
     }

diff --git a/v3.mainnet.json b/v3.mainnet.json
@@ -5,6 +5,6 @@
   "notional": "0x6e7058c91F85E0F6db4fc9da2CA41241f5e4263f",
   "tradingModule": "0x594734c7e06C3D483466ADBCe401C6Bd269746C8",
   "treasuryManager": "0x53144559c0d4a3304e2dd9dafbd685247429216d",
-  "startBlock": 19306415,
+  "startBlock": 19302361,
   "pollingInterval": 1800
 }
diff --git a/yarn.lock b/yarn.lock
@@ -227,10 +227,10 @@
     readline-sync "^1.4.10"
     update-notifier "^6.0.2"
 
-"@graphprotocol/graph-cli@^0.71.2":
-  version "0.71.2"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-cli/-/graph-cli-0.71.2.tgz#e10966fe6da1466a6b89e54a5a259560bc4a8a33"
-  integrity sha512-vTc2LEJMsSxCs9N1ATZuTUONi0H3wuh5o9w60zsNoNASBPtmo8elzgoXcM5ohpyMg+7cXaYaV885rG7bhYwBAQ==
+"@graphprotocol/graph-cli@^0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-cli/-/graph-cli-0.73.0.tgz#ff4ab0a153b9fedad4ade3cddb52caf68f519c1b"
+  integrity sha512-g+EapDRvxhRjMccnUJE8gBRGDIF6mXqtv8g0tzzixVClw/BezBni8QXtXMHs4Gg0G2UnerJJLp5ZQgZqtHWnmg==
   dependencies:
     "@float-capital/float-subgraph-uncrashable" "^0.0.0-alpha.4"
     "@oclif/core" "2.8.6"
@@ -252,6 +252,7 @@
     ipfs-http-client "55.0.0"
     jayson "4.0.0"
     js-yaml "3.14.1"
+    open "8.4.2"
     prettier "3.0.3"
     semver "7.4.0"
     sync-request "6.1.0"
@@ -1477,6 +1478,11 @@ defer-to-connect@^2.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
   integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
 
+define-lazy-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
+
 delay@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
@@ -2370,7 +2376,7 @@ is-core-module@^2.2.0:
   dependencies:
     has "^1.0.3"
 
-is-docker@^2.0.0:
+is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
@@ -3062,6 +3068,15 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
+[email protected]:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
 [email protected]:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.2.tgz#0e1e68fd45b135d28648b27cf08081fa6e8a297d"