Merge branch 'master' into staging

dappradar · Sep 10, 2024 · 89a1185 · 89a1185
2 parents 20335d9 + 0a1c724
commit 89a1185
Show file tree

Hide file tree

Showing 152 changed files with 4,592 additions and 5,722 deletions.
diff --git a/.env.dev b/.env.dev
@@ -21,6 +21,12 @@ ELYSIUM_NODE_URL=https://rpc.elysiumchain.tech
 CORE_NODE_URL=https://core.public.infstones.com
 BASE_NODE_URL=https://base.llamarpc.com
 LINEA_NODE_URL=https://rpc.linea.build
+BTTC_NODE_URL=https://rpc.bittorrentchain.io
+XAI_NODE_URL=
+BAHAMUT_NODE_URL=https://rpc2.bahamut.io/
+TONCENTER_API_KEY=
+SKALE-EUROPA_NODE_URL=https://mainnet.skalenodes.com/v1/elated-tan-skat
+ETHERLINK_NODE_URL=https://node.mainnet.etherlink.com
 ##======================== LOGSTASH ========================
 LOGSTASH_PORT=
 LOGSTASH_HOST=
@@ -29,7 +35,7 @@ LOGSTASH_INDEX=
 SLACK_WEBHOOK_URL=
 SLACK_LOGGING=false
 
-REDIS_HOST=
+REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
 REDIS_USERNAME=
 REDIS_PASSWORD=

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,30 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug npm test with arguments",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "test",
+                "--",
+                "base",
+                "uniswapv3",
+                "16905122"
+            ],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "env": {
+                "TS_NODE_TRANSPILE_ONLY": "true"
+            }
+        }
+    ]
+}
diff --git a/README.md b/README.md
@@ -513,4 +513,4 @@ assets.forEach((address, index) => {
 
 ## Contact
 
-Do not hesitate to contact us with any questions. Here is the [discord](https://discord.com/channels/415573887531745281/1059466542162653284)
+Do not hesitate to contact us with any questions. Here is the [discord](https://discord.com/channels/415573887531745281)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest --colors --verbose=false --silent=false src/factory/provider.spec.ts",
+    "test": "jest --colors --verbose=true --silent=false src/factory/provider.spec.ts",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
@@ -44,6 +44,7 @@
     "node-fetch": "^2.6.9",
     "redis": "^4.6.7",
     "reflect-metadata": "^0.1.13",
+    "retry": "^0.13.1",
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",
     "slack-notify": "^2.0.6",
@@ -91,4 +92,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}
diff --git a/src/app.config.ts b/src/app.config.ts
@@ -66,5 +66,10 @@ nodeUrls['CORE_NODE_URL'] = process.env['CORE_NODE_URL'];
 nodeUrls['LINEA_NODE_URL'] = process.env['LINEA_NODE_URL'];
 nodeUrls['WAX_NODE_URL'] = process.env['WAX_NODE_URL'];
 nodeUrls['APTOS_NODE_URL'] = process.env['APTOS_NODE_URL'];
+nodeUrls['BTTC_NODE_URL'] = process.env['BTTC_NODE_URL'];
+nodeUrls['XAI_NODE_URL'] = process.env['XAI_NODE_URL'];
+nodeUrls['BAHAMUT_NODE_URL'] = process.env['BAHAMUT_NODE_URL'];
+nodeUrls['SKALE-EUROPA_NODE_URL'] = process.env['SKALE-EUROPA_NODE_URL'];
+nodeUrls['ETHERLINK_NODE_URL'] = process.env['ETHERLINK_NODE_URL'];
 
 export { config, nodeUrls };
diff --git a/...reum/fluid/fluidLiquidityResolverAbi.json → ...stants/abi/fluidLiquidityResolverAbi.json b/...reum/fluid/fluidLiquidityResolverAbi.json → ...stants/abi/fluidLiquidityResolverAbi.json
diff --git a/src/factory/providers/base/stargate/abi.json → src/constants/abi/stargateV1Abi.json b/src/factory/providers/base/stargate/abi.json → src/constants/abi/stargateV1Abi.json
diff --git a/src/constants/contracts.json b/src/constants/contracts.json
@@ -15,7 +15,9 @@
     "zksync-era": "0x5aea5775959fbc2557cc8789bc1bf90a239d9a91",
     "base": "0x4200000000000000000000000000000000000006",
     "core": "0x40375C92d9FAf44d2f9db9Bd9ba41a3317a2404f",
-    "linea": "0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f"
+    "linea": "0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f",
+    "bttc": "0x0000000000000000000000000000000000001010",
+    "xai": "0x3fb787101dc6be47cfe18aeee15404dcc842e6af"
   },
   "BULK_BALANCE_ADDRESSES": {
     "ethereum": "0xb173393e08496209ad1cd9d57c769de76bdcea5a",

diff --git a/src/factory/factory.service.ts b/src/factory/factory.service.ts
@@ -37,7 +37,10 @@ export class FactoryService {
     if (req.block === undefined) {
       throw new RpcException('Block is undefined');
     }
-    if (this.web3ProviderService.checkNodeUrl(req?.chain)) {
+    if (
+      this.web3ProviderService.checkNodeUrl(req?.chain) &&
+      req.chain !== 'ton'
+    ) {
       throw new RpcException('Node URL is not provided');
     }
 

diff --git a/src/factory/providers/arbitrum/balancer/abi.json b/src/factory/providers/arbitrum/balancer/abi.json
@@ -0,0 +1,16 @@
+{
+  "getCurrentTokens": {
+      "constant": true,
+      "inputs": [],
+      "name": "getCurrentTokens",
+      "outputs": [
+          {
+          "internalType": "address[]",
+          "name": "tokens",
+          "type": "address[]"
+          }
+      ],
+      "payable": false,
+       "type": "function"
+  }
+}