Do not update on rent collection (#484)

helium · Nov 10, 2023 · d102547 · d102547
1 parent efbe053
commit d102547
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/packages/account-postgres-sink-service/.gitignore b/packages/account-postgres-sink-service/.gitignore
@@ -1,4 +1,5 @@
 npm-debug.log
 dist/
 tmp/
-./node_modules
+./node_modules
+.env
diff --git a/packages/account-postgres-sink-service/package.json b/packages/account-postgres-sink-service/package.json
@@ -29,7 +29,7 @@
     "precommit": "npx git-format-staged -f 'prettier --ignore-unknown --stdin --stdin-filepath \"{}\"' .",
     "build": "tsc -p tsconfig.json",
     "start": "node lib/esm/server.js",
-    "dev": "npx ts-node --project tsconfig.cjs.json src/server.ts"
+    "dev": "ts-node-dev --respawn --project tsconfig.cjs.json src/server.ts"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.28.0",
@@ -43,6 +43,7 @@
     "bn.js": "^5.2.0",
     "bs58": "^4.0.1",
     "deep-equal": "^2.2.2",
+    "dotenv": "^16.3.1",
     "fastify": "^4.13.0",
     "fastify-cron": "^1.3.1",
     "fastify-metrics": "^10.3.0",

diff --git a/packages/account-postgres-sink-service/src/env.ts b/packages/account-postgres-sink-service/src/env.ts
@@ -1,4 +1,8 @@
 import os from 'os';
+import dotenv from "dotenv";
+
+dotenv.config();
+
 
 process.env.ANCHOR_WALLET =
   process.env.ANCHOR_WALLET || os.homedir() + '/.config/solana/id.json';

diff --git a/packages/account-postgres-sink-service/src/utils/handleAccountWebhook.ts b/packages/account-postgres-sink-service/src/utils/handleAccountWebhook.ts
@@ -78,7 +78,7 @@ export function handleAccountWebhook({
         const value = await model.findByPk(account.pubkey);
         const changed =
           !value ||
-          Object.entries(sanitized).some(([k, v]) => v !== value.dataValues[k]);
+          Object.entries(sanitized).some(([k, v]) => v?.toString() !== value.dataValues[k]?.toString());
         if (changed) {
           await model.upsert(
             {

diff --git a/packages/account-postgres-sink-service/yarn.deploy.lock b/packages/account-postgres-sink-service/yarn.deploy.lock
@@ -143,6 +143,7 @@ __metadata:
     bn.js: ^5.2.0
     bs58: ^4.0.1
     deep-equal: ^2.2.2
+    dotenv: ^16.3.1
     fastify: ^4.13.0
     fastify-cron: ^1.3.1
     fastify-metrics: ^10.3.0
@@ -1246,6 +1247,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dotenv@npm:^16.3.1":
+  version: 16.3.1
+  resolution: "dotenv@npm:16.3.1"
+  checksum: 15d75e7279018f4bafd0ee9706593dd14455ddb71b3bcba9c52574460b7ccaf67d5cf8b2c08a5af1a9da6db36c956a04a1192b101ee102a3e0cf8817bbcf3dfd
+  languageName: node
+  linkType: hard
+
 "dottie@npm:^2.0.4":
   version: 2.0.6
   resolution: "dottie@npm:2.0.6"

diff --git a/yarn.lock b/yarn.lock
@@ -958,6 +958,7 @@ __metadata:
     bn.js: ^5.2.0
     bs58: ^4.0.1
     deep-equal: ^2.2.2
+    dotenv: ^16.3.1
     fastify: ^4.13.0
     fastify-cron: ^1.3.1
     fastify-metrics: ^10.3.0