From d1390332db142a77641b0dcd37cf827a3e1515de Mon Sep 17 00:00:00 2001 From: Ioannis Tourkogiorgis Date: Wed, 21 Aug 2024 12:14:26 +0200 Subject: [PATCH 1/8] chore: update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1ab05f7..ff5623f 100644 --- a/.gitignore +++ b/.gitignore @@ -79,6 +79,7 @@ web_modules/ .yarn-integrity # dotenv environment variable files +.env .env.* !.env.template From f60f9058a88940efe57030fb6a779e017aa69db6 Mon Sep 17 00:00:00 2001 From: Ioannis Tourkogiorgis Date: Fri, 27 Sep 2024 17:22:49 +0300 Subject: [PATCH 2/8] fix: logic error when trying to get cross chain property --- src/common/dripsContracts.ts | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/common/dripsContracts.ts b/src/common/dripsContracts.ts index c08af12..bcd8799 100644 --- a/src/common/dripsContracts.ts +++ b/src/common/dripsContracts.ts @@ -137,7 +137,15 @@ export async function getCrossChainAddressDriverAccountIdByAddress( address: Address, ): Promise { // AddressDriver account IDs are the same across all chains. - const { addressDriver } = dripsContracts[queryableChains[0]]!; + const availableChain = queryableChains.find( + (chain) => dripsContracts[chain] && dripsContracts[chain]!.addressDriver, + ); + + if (!availableChain) { + throw new Error('No available chain with initialized contracts.'); + } + + const { addressDriver } = dripsContracts[availableChain]!; const accountId = (await addressDriver.calcAccountId(address)).toString(); @@ -149,7 +157,15 @@ export async function getCrossChainRepoDriverAccountIdByAddress( project: string, ): Promise { // RepoDriver account IDs are the same across all chains. - const { repoDriver } = dripsContracts[queryableChains[0]]!; + const availableChain = queryableChains.find( + (chain) => dripsContracts[chain] && dripsContracts[chain]!.repoDriver, + ); + + if (!availableChain) { + throw new Error('No available chain with initialized contracts.'); + } + + const { repoDriver } = dripsContracts[availableChain]!; const nameAsBytesLike = ethers.toUtf8Bytes(project); From 05b38247a0e544aac3e8eefabedad657ec4a5d00 Mon Sep 17 00:00:00 2001 From: Ioannis Tourkogiorgis Date: Thu, 3 Oct 2024 16:25:45 +0200 Subject: [PATCH 3/8] refactor: update Filecoin contract addresses --- src/common/dripsContracts.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/dripsContracts.ts b/src/common/dripsContracts.ts index bcd8799..bd6db99 100644 --- a/src/common/dripsContracts.ts +++ b/src/common/dripsContracts.ts @@ -56,9 +56,9 @@ const chainConfigs: Record< repoDriverAddress: '0x54372850Db72915Fd9C5EC745683EB607b4a8642', }, FILECOIN: { - dripsAddress: '0x29252acF5a3dA105CB3aC245B7758F6e50281ba7', - addressDriverAddress: '0xE13A4f3671ee451F81Df3aa1AEb6653e4c33D5e0', - repoDriverAddress: '0x249e35aC49ccC4B1F0688Bc4c0bFA866a1b1E3fE', + dripsAddress: '0x0B71C2a08d27E86d3841A6772332DEde0bc8DCa5', + addressDriverAddress: '0xEFcd912a5a67C3a7Cc70a2Fb9aa17781bf1cE68F', + repoDriverAddress: '0xf3aE6ADDeEE195e91380F5F9Ce73698460BAdf79', }, }; From fa82875a5a44e0d694cb94f49a0253b8cdfb6f66 Mon Sep 17 00:00:00 2001 From: Ioannis Tourkogiorgis Date: Mon, 7 Oct 2024 17:04:40 +0300 Subject: [PATCH 4/8] fix: rpc endpoint validation --- src/common/queryableChains.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/queryableChains.ts b/src/common/queryableChains.ts index b512cff..ea7efe2 100644 --- a/src/common/queryableChains.ts +++ b/src/common/queryableChains.ts @@ -7,7 +7,7 @@ import appSettings from './appSettings'; const queryableChains: SupportedChain[] = []; Object.keys(SupportedChain).forEach((chain) => { - if (appSettings.rpcConfigs[chain as SupportedChain]) { + if (appSettings.rpcConfigs[chain as SupportedChain]?.url) { queryableChains.push(chain as SupportedChain); } }); From 0afb79e783f829f06f78614f2032299d47d267db Mon Sep 17 00:00:00 2001 From: Jason Efstathiou Date: Mon, 7 Oct 2024 17:09:51 +0200 Subject: [PATCH 5/8] move before auth middleware --- src/server.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server.ts b/src/server.ts index 56d5661..4a551c2 100644 --- a/src/server.ts +++ b/src/server.ts @@ -118,6 +118,10 @@ const startServer = async () => { app.set('trust proxy', 1); + app.route('/health').get((_, res) => { + res.status(200).send('OK'); + }); + app.use( '/', cors(), From 632c52f6e74a2f22f5a5c6291dcc9a6a8b6bfba5 Mon Sep 17 00:00:00 2001 From: Jason Efstathiou Date: Thu, 10 Oct 2024 15:54:25 +0200 Subject: [PATCH 6/8] don't build on start --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ceccdae..c2dc15b 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "build:contracts": "typechain --target=ethers-v6 --out-dir ./src/generated/contracts ./src/abi/**.json", "build": "npm run build:contracts && npm run build:graphql && tsc", "dev": "npx nodemon", - "start": "npm run build && node dist/index.js", + "start": "node dist/index.js", "check": "tsc --noEmit" }, "keywords": [], From 5e1e142972d81268123b10dda2870a658fef5f0d Mon Sep 17 00:00:00 2001 From: Jason Efstathiou Date: Thu, 10 Oct 2024 15:54:35 +0200 Subject: [PATCH 7/8] delete unused & broken dockerfile --- Dockerfile | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e8aac8f..0000000 --- a/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM node:20 - -COPY ./ /app - -WORKDIR /app - -RUN npm ci - -ENV PORT=8080 -ENV NETWORK=localtestnet -ENV PUBLIC_API_KEYS=afdb8b7e-8fa7-4de9-bd95-b650b839e745 -ENV POSTGRES_CONNECTION_STRING=postgresql://user:admin@postgres-event-processor:5432/dripsdb -ENV PRETEND_ALL_REPOS_EXIST=true -ENV REPO_DRIVER_ADDRESS=0xb9C8e18E82687a564Ac4D26E22D28a4C95057CE9 -ENV RPC_URL=http://testnet:8545 - -CMD ["npm", "run", "start:local"] From 6abd0cec37961adfd1210c5046e4acb3ba727e1a Mon Sep 17 00:00:00 2001 From: Jason Efstathiou Date: Thu, 10 Oct 2024 17:10:20 +0200 Subject: [PATCH 8/8] update filecoin contracts --- src/common/dripsContracts.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/dripsContracts.ts b/src/common/dripsContracts.ts index bd6db99..2ed9a54 100644 --- a/src/common/dripsContracts.ts +++ b/src/common/dripsContracts.ts @@ -56,9 +56,9 @@ const chainConfigs: Record< repoDriverAddress: '0x54372850Db72915Fd9C5EC745683EB607b4a8642', }, FILECOIN: { - dripsAddress: '0x0B71C2a08d27E86d3841A6772332DEde0bc8DCa5', - addressDriverAddress: '0xEFcd912a5a67C3a7Cc70a2Fb9aa17781bf1cE68F', - repoDriverAddress: '0xf3aE6ADDeEE195e91380F5F9Ce73698460BAdf79', + dripsAddress: '0xd320F59F109c618b19707ea5C5F068020eA333B3', + addressDriverAddress: '0x04693D13826a37dDdF973Be4275546Ad978cb9EE', + repoDriverAddress: '0xe75f56B26857cAe06b455Bfc9481593Ae0FB4257', }, };