defi-state-querier 0.5.28__py3-none-any.whl → 0.5.30__py3-none-any.whl

defi_services/services/lending/lending_info/optimism/xlend_optimism.py

@@ -0,0 +1,112 @@
+XLEND_OPTIMISM = {
+    "address": "0x345d2827f36621b02b783f7d5004b4a2fec00186",
+    "name": "Xlend Lending Pool",
+    "addressProvider": "0xa98cc6031ba6908d73dc5615ca82b607096d721d",
+    "dataProvider": "0xcc61e9470b5f0ce21a3f6255c73032b47aaea9c0",
+    "stakedIncentiveAddress": '0x3bbf68f18a792d34a288407f34734d16829b457e',
+    "rewardTokensList": ["0x2dad3a13ef0c6366220f989157009e501e7938f8"],
+    "oracleAddress": "0x1bc889345c912d5462b71e019f9dccba33d83db4",
+    "type": "LENDING_POOL",
+    "poolToken": "0x2dad3a13ef0c6366220f989157009e501e7938f8",
+    "forked": "aave-v3",
+    "reservesList": {
+         "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1": {
+          "tToken": "0x82e64f49ed5ec1bc6e43dad4fc8af9bb3a2312ee",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0x8619d80fb0141ba7f184cbf22fd724116d9f7ffc",
+          "loanToValue": 0.63,
+          "liquidationThreshold": 0.77
+         },
+         "0x350a791bfc2c21f9ed5d10980dad2e2638ffa7f6": {
+          "tToken": "0x191c10aa4af7c30e871e70c95db0e4eb77237530",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0x953a573793604af8d41f306feb8274190db4ae0e",
+          "loanToValue": 0.66,
+          "liquidationThreshold": 0.71
+         },
+         "0x7f5c764cbc14f9669b88837ca1490cca17c31607": {
+          "tToken": "0x625e7708f30ca75bfd92586e17077590c60eb4cd",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0xfccf3cabbe80101232d343252614b6a3ee81c989",
+          "loanToValue": 0.75,
+          "liquidationThreshold": 0.785
+         },
+         "0x68f180fcce6836688e9084f035309e29bf0a2095": {
+          "tToken": "0x078f358208685046a11c85e8ad32895ded33a249",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0x92b42c66840c7ad907b4bf74879ff3ef7c529473",
+          "loanToValue": 0.73,
+          "liquidationThreshold": 0.78
+         },
+         "0x4200000000000000000000000000000000000006": {
+          "tToken": "0xe50fa9b3c56ffb159cb0fca61f5c9d750e8128c8",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0x0c84331e39d6658cd6e6b9ba04736cc4c4734351",
+          "loanToValue": 0.8,
+          "liquidationThreshold": 0.83
+         },
+         "0x94b008aa00579c1307b0ef2c499ad98a8ce58e58": {
+          "tToken": "0x6ab707aca953edaefbc4fd23ba73294241490620",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0xfb00ac187a8eb5afae4eace434f493eb62672df7",
+          "loanToValue": 0.75,
+          "liquidationThreshold": 0.78
+         },
+         "0x76fb31fb4af56892a25e32cfc43de717950c9278": {
+          "tToken": "0xf329e36c7bf6e5e86ce2150875a84ce77f477375",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0xe80761ea617f66f96274ea5e8c37f03960ecc679",
+          "loanToValue": 0.63,
+          "liquidationThreshold": 0.7
+         },
+         "0x8c6f28f2f1a3c87f0f938b96d27520d9751ec8d9": {
+          "tToken": "0x6d80113e533a2c0fe82eabd35f1875dcea89ea97",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0x4a1c3ad6ed28a636ee1751c69071f6be75deb8b8",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.7
+         },
+         "0x4200000000000000000000000000000000000042": {
+          "tToken": "0x513c7e3a9c69ca3e22550ef58ac1c0088e918fff",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0x77ca01483f379e58174739308945f044e1a764dc",
+          "loanToValue": 0.58,
+          "liquidationThreshold": 0.63
+         },
+         "0x1f32b1c2345538c0c6f582fcb022739c4a194ebb": {
+          "tToken": "0xc45a479877e1e9dfe9fcd4056c699575a1045daa",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0x34e2ed44ef7466d5f9e0b782b5c08b57475e7907",
+          "loanToValue": 0.75,
+          "liquidationThreshold": 0.79
+         },
+         "0xc40f949f8a4e094d1b49a23ea9241d289b7b2819": {
+          "tToken": "0x8eb270e296023e9d92081fdf967ddd7878724424",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0xce186f6cccb0c955445bb9d10c59cae488fea559",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.0
+         },
+         "0xdfa46478f9e5ea86d57387849598dbfb2e964b02": {
+          "tToken": "0x8ffdf2de812095b1d19cb146e4c004587c0a0692",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0xa8669021776bc142dfca87c21b4a52595bcbb40a",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.01
+         },
+         "0x9bcef72be871e61ed4fbbc7630889bee758eb81d": {
+          "tToken": "0x724dc807b04555b71ed48a6896b6f41593b8c637",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0xf611aeb5013fd2c0511c9cd55c7dc5c1140741a6",
+          "loanToValue": 0.69,
+          "liquidationThreshold": 0.74
+         },
+         "0x0b2c639c533813f4aa9d7837caf62653d097ff85": {
+          "tToken": "0x38d693ce1df5aadf7bc62595a37d667ad57922e5",
+          "sdToken": "0xd94112b5b62d53c9402e7a60289c6810def1dc9b",
+          "dToken": "0x5d557b07776d12967914379c71a1310e917c7555",
+          "loanToValue": 0.75,
+          "liquidationThreshold": 0.78
+         }
+}
+}

defi_services/services/lending/lending_info/polygon/compound_v3_polygon.py

@@ -12,18 +12,18 @@ COMPOUND_V3_POLYGON = {
             "assets": {
                 "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619": {
                     "priceFeed": "0xf9680d99d6c9589e2a93a78a04a279e509205945",
-                    "loanToValue": 0.775,
-                    "liquidationThreshold": 0.825
+                    "loanToValue": 0.8,
+                    "liquidationThreshold": 0.85
                 },
                 "0x1bfd67037b42cf73acf2047067bd4f2c47d9bfd6": {
                     "priceFeed": "0xde31f8bfbd8c84b5360cfacca3539b938dd78ae6",
-                    "loanToValue": 0.7,
-                    "liquidationThreshold": 0.75
+                    "loanToValue": 0.75,
+                    "liquidationThreshold": 0.85
                 },
                 "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270": {
                     "priceFeed": "0xab594600376ec9fd91f8e885dadf0ce036862de0",
                     "loanToValue": 0.65,
-                    "liquidationThreshold": 0.7
+                    "liquidationThreshold": 0.8
                 },
                 "0xfa68fb4628dff1028cfec22b4162fccd0d45efb6": {
                     "priceFeed": "0x5d37e4b374e6907de8fc7fb33ee3b0af403c7403",
@@ -36,6 +36,36 @@ COMPOUND_V3_POLYGON = {
                     "liquidationThreshold": 0.65
                 }
             }
+        },
+        "0xc2132d05d31c914a87c6611c10748aeb04b58e8f": {
+            "comet": "0xaeb318360f27748acb200ce616e389a6c9409a07",
+            "assets": {
+                "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270": {
+                    "priceFeed": "0xab594600376ec9fd91f8e885dadf0ce036862de0",
+                    "loanToValue": 0.65,
+                    "liquidationThreshold": 0.8
+                },
+                "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619": {
+                    "priceFeed": "0xf9680d99d6c9589e2a93a78a04a279e509205945",
+                    "loanToValue": 0.8,
+                    "liquidationThreshold": 0.85
+                },
+                "0xfa68fb4628dff1028cfec22b4162fccd0d45efb6": {
+                    "priceFeed": "0x5d37e4b374e6907de8fc7fb33ee3b0af403c7403",
+                    "loanToValue": 0.6,
+                    "liquidationThreshold": 0.7
+                },
+                "0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4": {
+                    "priceFeed": "0x97371df4492605486e23da797fa68e55fc38a13f",
+                    "loanToValue": 0.6,
+                    "liquidationThreshold": 0.7
+                },
+                "0x1bfd67037b42cf73acf2047067bd4f2c47d9bfd6": {
+                    "priceFeed": "0xde31f8bfbd8c84b5360cfacca3539b938dd78ae6",
+                    "loanToValue": 0.75,
+                    "liquidationThreshold": 0.85
+                }
+            }
         }
     }
 }

defi_services/services/lending/lending_info/zksync/aave_v3_zksync.py

@@ -0,0 +1,47 @@
+AAVE_V3_ZKSYNC = {
+    "address": "0x78e30497a3c7527d953c6b1e3541b021a98ac43c",
+    "name": "AAVE Lending Pool",
+    "stakedIncentiveAddress": '0x37c972c9ddfc2138ebe33ec19dba063ab9f8966e',
+    "oracleAddress": "0xc7f58fca663a8d377b6d0c9703c697f56dc40088",
+    "rewardTokensList": [],
+    "type": "LENDING_POOL",
+    "poolToken": "",
+    "forked": "aave-v3",
+    "reservesList": {
+        "0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4": {
+            "tToken": "0xe977f9b2a5ccf0457870a67231f23be4daecfbdb",
+            "sdToken": "0x4b57579c895cb5cd2e7bf6e94888fc6289f3ae95",
+            "dToken": "0x0049250d15a8550c5a14baa5af5b662a93a525b9",
+            "loanToValue": 0.75,
+            "liquidationThreshold": 0.78
+        },
+        "0x493257fd37edb34451f62edf8d2a0c418852ba4c": {
+            "tToken": "0xc48574bc5358c967d9447e7df70230fdb469e4e7",
+            "sdToken": "0x4b57579c895cb5cd2e7bf6e94888fc6289f3ae95",
+            "dToken": "0x8992db58077fe8c7b80c1b3a738eae8a7bddba34",
+            "loanToValue": 0.75,
+            "liquidationThreshold": 0.78
+        },
+        "0x5aea5775959fbc2557cc8789bc1bf90a239d9a91": {
+            "tToken": "0xb7b93bcf82519bb757fd18b23a389245dbd8ca64",
+            "sdToken": "0x4b57579c895cb5cd2e7bf6e94888fc6289f3ae95",
+            "dToken": "0x98dc737ea0e9bcb254c3f98510a71c5e11f74238",
+            "loanToValue": 0.75,
+            "liquidationThreshold": 0.78
+        },
+        "0x703b52f2b28febcb60e1372858af5b18849fe867": {
+            "tToken": "0xd4e607633f3d984633e946aea4eb71f92564c1c9",
+            "sdToken": "0x4b57579c895cb5cd2e7bf6e94888fc6289f3ae95",
+            "dToken": "0x6ad279f6523f6421fd5b0324a97d8f62eecd80c8",
+            "loanToValue": 0.71,
+            "liquidationThreshold": 0.76
+        },
+        "0x5a7d6b2f92c77fad6ccabd7ee0624e64907eaf3e": {
+            "tToken": "0xd6cd2c0fc55936498726cacc497832052a9b2d1b",
+            "sdToken": "0x4b57579c895cb5cd2e7bf6e94888fc6289f3ae95",
+            "dToken": "0x6450fd7f877b5bb726f7bc6bf0e6ffabd48d72ad",
+            "loanToValue": 0.4,
+            "liquidationThreshold": 0.45
+        }
+    }
+}

defi_services/services/lending/lending_info/zksync/venus_zksync.py

@@ -0,0 +1,10 @@
+VENUS_ZKSYNC = {
+    "projectName": "Venus",
+    "name": "Venus Lending Pool",
+    "rewardToken": "0xd78abd81a3d57712a3af080dc4185b698fe9ac5a",
+    "comptrollerAddress": "",
+    "lensAddress": "",
+    "poolToken": "0xd78abd81a3d57712a3af080dc4185b698fe9ac5a",
+    "type": "LENDING_POOL",
+    "forked": "compound",
+}

defi_services/services/lending/lending_info/zksync/zerolend_zksync.py

@@ -0,0 +1,138 @@
+ZEROLEND_ZKSYNC = {
+    "address": "0x4d9429246ea989c9cee203b43f6d1c7d83e3b8f8",
+    "name": "ZeroLend Lending Pool",
+    "stakedIncentiveAddress": '0x86bd524c09508df7b4b9027464975351b1bc2c92',
+    "rewardTokensList": [],
+    "oracleAddress": "0x785765de3e9ac3d8eeb42b4724a7fea8990142b8",
+    "type": "LENDING_POOL",
+    "poolToken": "0x27d0a2b5316b98088294378692f4eabfb3222e36",
+    "forked": "aave-v3",
+    "reservesList": {
+         "0x3355df6d4c9c3035724fd0e3914de96a5a83aaf4": {
+          "tToken": "0x016341e6da8da66b33fd32189328c102f32da7cc",
+          "sdToken": "0x5fac4fd2e4bce392d34600d94aa1114274e54dff",
+          "dToken": "0xe60e1953af56db378184997cab20731d17c65004",
+          "loanToValue": 0.8,
+          "liquidationThreshold": 0.85
+         },
+         "0x5aea5775959fbc2557cc8789bc1bf90a239d9a91": {
+          "tToken": "0x9002ecb8a06060e3b56669c6b8f18e1c3b119914",
+          "sdToken": "0x9c9158bff47342a20b7d2ac09f89e96f3a209b9b",
+          "dToken": "0x56f58d9be10929cda709c4134ef7343d73b080cf",
+          "loanToValue": 0.8,
+          "liquidationThreshold": 0.825
+         },
+         "0x493257fd37edb34451f62edf8d2a0c418852ba4c": {
+          "tToken": "0x9ca4806fa54984bf5da4e280b7aa8bb821d21505",
+          "sdToken": "0x6f977fd05962d67eb7b16b15684fbea0462f442d",
+          "dToken": "0xa333c6ff89525939271e796fbde2a2d9a970f831",
+          "loanToValue": 0.75,
+          "liquidationThreshold": 0.8
+         },
+         "0x90059c32eeeb1a2aa1351a58860d98855f3655ad": {
+          "tToken": "0x52846a8d972abbf49f67d83d5509aa4129257f46",
+          "sdToken": "0x10eb1198b55e709309d1e6c94dbee2b9b4977924",
+          "dToken": "0x77dced4833e3a91437ed9891117bd5a61c2ad520",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.0
+         },
+         "0x503234f203fc7eb888eec8513210612a43cf6115": {
+          "tToken": "0xd97ac0ce99329ee19b97d03e099eb42d7aa19ddb",
+          "sdToken": "0x029214a5cd528433b8a4eccd7ef798210db3518c",
+          "dToken": "0x41c618cce58fb27caf4eeb1dd25de1d03a0daac6",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.8
+         },
+         "0xbbeb516fb02a01611cbbe0453fe3c580d7281011": {
+          "tToken": "0x7c65e6ec6feceb333092e6fe69672a3475c591fb",
+          "sdToken": "0x3f574632d049f7cded52c529238e5c530e589b36",
+          "dToken": "0xabd3c4e4ac6e0d81fcfa5c41a76e9583a8f81909",
+          "loanToValue": 0.7,
+          "liquidationThreshold": 0.75
+         },
+         "0xfd282f16a64c6d304ac05d1a58da15bed0467c71": {
+          "tToken": "0x54330d2333adbf715eb449aad38153378601cf67",
+          "sdToken": "0xba0ba840a827aa9f3c5ec0e6e13e6bb4dd026dde",
+          "dToken": "0x963cc035edd4bc0f4a89987888304580dfa9be60",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.85
+         },
+         "0x2039bb4116b4efc145ec4f0e2ea75012d6c0f181": {
+          "tToken": "0xb727f8e11bc417c90d4dcaf82eda06cf590533b5",
+          "sdToken": "0xd47c789f91cef19c124d53087d99860ce34be4a5",
+          "dToken": "0x3e1f1812c2a4f356d1b4fb5ff7cca5b2ac653b94",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.8
+         },
+         "0x4d321cd88c5680ce4f85bb58c578dfe9c2cc1ef6": {
+          "tToken": "0x2b1bbe3ba39b943eeef675d6d42607c958f8d20f",
+          "sdToken": "0xeea10809dd23febf628003b4b998821bc6af4217",
+          "dToken": "0x0eede84dd0dea309382d23dd5591077127759a77",
+          "loanToValue": 0.5,
+          "liquidationThreshold": 0.85
+         },
+         "0x240f765af2273b0cab6caff2880d6d8f8b285fa4": {
+          "tToken": "0xdb87a5493e308ee0deb24c822a559bee52460afc",
+          "sdToken": "0xea8d6ce63498dda36a58374106fd6dd3bed9dff7",
+          "dToken": "0x1f3da58fac996c2094eec9801867028953a45325",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.0
+         },
+         "0x99bbe51be7cce6c8b84883148fd3d12ace5787f2": {
+          "tToken": "0x1f2da4ff84d46b12f8931766d6d728a806b410d6",
+          "sdToken": "0xba15a3ac405c7311dd1234bfc21cc9e1f5c1b52f",
+          "dToken": "0x9bad0035b31c0193fed4322d1eb2c29aead799f8",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.3
+         },
+         "0x0e97c7a0f8b2c9885c8ac9fc6136e829cbc21d42": {
+          "tToken": "0xc3b6d357e0beadb18a23a53e1dc4839c2d15bdc2",
+          "sdToken": "0x0b272319cf39cf5fa8d2976d54189dade1e90c2c",
+          "dToken": "0xa734abe2a512dabf23146c97307cfc5b347ae50a",
+          "loanToValue": 0.6,
+          "liquidationThreshold": 0.9
+         },
+         "0x4b9eb6c0b6ea15176bbf62841c6b2a8a398cb656": {
+          "tToken": "0x15b362768465f966f1e5983b7ae87f4c5bf75c55",
+          "sdToken": "0xb6abb4183b98a2a85e1d8e9ac93542446461e2d7",
+          "dToken": "0x0325f21eb0a16802e2bacd931964434929985548",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.8
+         },
+         "0x3a287a06c66f9e95a56327185ca2bdf5f031cecd": {
+          "tToken": "0x0a2374d4387e9c8d730e7c90eed23c045938fdbb",
+          "sdToken": "0x033599b0bc6012be8cd08b258569773b610e680b",
+          "dToken": "0xf001d84605b2e7dbaaec545b431088bbf8e21dea",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.0
+         },
+         "0x703b52f2b28febcb60e1372858af5b18849fe867": {
+          "tToken": "0xe855e73cad110d2f3ee2288d506d6140722c04c7",
+          "sdToken": "0xad99d8aafb6aaa110e7883f0b91ab912219f965d",
+          "dToken": "0xa351d9eb46d4fb3269e0fe9b7416ec2318151bc0",
+          "loanToValue": 0.0,
+          "liquidationThreshold": 0.0
+         },
+         "0x5a7d6b2f92c77fad6ccabd7ee0624e64907eaf3e": {
+          "tToken": "0x072416442a0e40135e75c0eefb4be708b74b6c8a",
+          "sdToken": "0x09990d77de57895c9227321811afe2d6f3c8b55c",
+          "dToken": "0x863cd5f43a50e1141574b796d412f73232cba60c",
+          "loanToValue": 0.8,
+          "liquidationThreshold": 0.85
+         },
+         "0xe757355edba7ced7b8c0271bba4efda184ad75ab": {
+          "tToken": "0xafe91971600af83d23ab691b0a1a566d5f8e42c0",
+          "sdToken": "0xf84e6afeab770e08299f20c1f039de2c07175a12",
+          "dToken": "0x8450646d1ea5f4fef8ab6af95cffbb29664af011",
+          "loanToValue": 0.5,
+          "liquidationThreshold": 0.85
+         },
+         "0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4": {
+          "tToken": "0x9e20e83d636870a887ce7c85cecfb8b3e95c9db2",
+          "sdToken": "0x8f44d6ab626b2c3831b9a0d84322961e20d94b26",
+          "dToken": "0x5c9fa0a3ee84cbc892ab9968d7c5086cc506432d",
+          "loanToValue": 0.8,
+          "liquidationThreshold": 0.85
+         }
+}
+}

defi_services/services/lending/liqee_service.py

@@ -35,7 +35,7 @@ class LiqeeStateService(CompoundStateService):
         self.state_service = state_service
         self.lending_data_abi = LIQEE_LENDING_DATA_ABI
         self.controller_abi = LIQEE_CONTROLLER_ABI
-        self.lquee_token_abi = LIQEE_TOKEN_ABI
+        self.liqee_token_abi = LIQEE_TOKEN_ABI
 
     # BASIC FUNCTIONS
     def get_service_info(self):
@@ -60,7 +60,7 @@ class LiqeeStateService(CompoundStateService):
         reserves_info = {}
         for token in ctokens:
             address = _w3.to_checksum_address(token)
-            contract = _w3.eth.contract(address=address, abi=self.lquee_token_abi)
+            contract = _w3.eth.contract(address=address, abi=self.liqee_token_abi)
             underlying = contract.functions.underlying().call(block_identifier=block_number)
             liquidation_threshold = comptroller_contract.functions.markets(address).call(block_identifier=block_number)
             liquidation_threshold = liquidation_threshold[0] / 10 ** 18

defi_services/services/lending/moonwell_service.py

@@ -0,0 +1,120 @@
+import logging
+
+from defi_services.abis.lending.moonwell.moonwell_comptroller_abi import MOONWELL_COMPTROLLER_ABI
+from defi_services.abis.lending.moonwell.moonwell_ctoken_abi import MOONWELL_CTOKEN_ABI
+from defi_services.abis.token.erc20_abi import ERC20_ABI
+from defi_services.constants.chain_constant import Chain
+from defi_services.constants.entities.lending_constant import Lending
+from defi_services.constants.token_constant import Token
+from defi_services.jobs.queriers.state_querier import StateQuerier
+from defi_services.services.lending.lending_info.base.moonwell_base import MOONWELL_BASE
+from defi_services.services.lending.venus_services import VenusStateService
+
+logger = logging.getLogger("MoonWell Lending Pool State Service")
+
+
+class MoonWellInfo:
+    mapping = {
+        Chain.base: MOONWELL_BASE
+    }
+
+
+class MoonWellStateService(VenusStateService):
+    def __init__(self, state_service: StateQuerier, chain_id: str = "0x38"):
+        super().__init__(state_service, chain_id)
+        self.name = f"{chain_id}_{Lending.moonwell}"
+        self.chain_id = chain_id
+        self.pool_info = MoonWellInfo.mapping.get(chain_id)
+        self.state_service = state_service
+        self.comptroller_abi = MOONWELL_COMPTROLLER_ABI
+        self.vtoken_abi = MOONWELL_CTOKEN_ABI
+
+    def get_service_info(self):
+        info = {
+            Lending.moonwell: {
+                "chain_id": self.chain_id,
+                "type": "lending",
+                "protocol_info": self.pool_info
+            }
+        }
+        return info
+
+    def get_apy_lending_pool_function_info(
+            self,
+            reserves_info: dict,
+            block_number: int = "latest"
+    ):
+        rpc_calls = {}
+        for token_address, reserve_info in reserves_info.items():
+            if token_address != Token.native_token:
+                query_id = f"decimals_{token_address}_{block_number}".lower()
+                rpc_calls[query_id] = self.state_service.get_function_info(token_address, ERC20_ABI, "decimals", [], block_number)
+
+            ctoken = reserve_info.get("cToken")
+            for fn_name in ['decimals', 'totalSupply', 'totalBorrows', 'supplyRatePerTimestamp', 'borrowRatePerTimestamp', 'exchangeRateStored']:
+                query_id = f"{fn_name}_{ctoken}_{block_number}".lower()
+                rpc_calls[query_id] = self.get_ctoken_function_info(
+                    ctoken=ctoken,
+                    fn_name=fn_name,
+                    block_number=block_number
+                )
+
+        return rpc_calls
+
+    def get_reserve_tokens_metadata(
+            self,
+            decoded_data: dict,
+            reserves_info: dict,
+            block_number: int = "latest"
+    ):
+        reserve_tokens_info = []
+        for token_address, reserve_info in reserves_info.items():
+            if token_address != Token.native_token:
+                underlying_decimals_query_id = f"decimals_{token_address}_{block_number}".lower()
+                underlying_decimals = decoded_data.get(underlying_decimals_query_id)
+            else:
+                underlying_decimals = Chain.native_decimals.get(self.chain_id, 18)
+
+            ctoken = reserve_info.get("cToken")
+            ctoken_decimals_query_id = f"decimals_{ctoken}_{block_number}".lower()
+            total_supply_query_id = f"totalSupply_{ctoken}_{block_number}".lower()
+            total_borrow_query_id = f"totalBorrows_{ctoken}_{block_number}".lower()
+            supply_rate_query_id = f"supplyRatePerTimestamp_{ctoken}_{block_number}".lower()
+            borrow_rate_query_id = f"borrowRatePerTimestamp_{ctoken}_{block_number}".lower()
+            exchange_rate_query_id = f"exchangeRateStored_{ctoken}_{block_number}".lower()
+
+            reserve_tokens_info.append({
+                "token": ctoken,
+                "token_decimals": decoded_data.get(ctoken_decimals_query_id),
+                "borrow_rate": decoded_data.get(borrow_rate_query_id),
+                "supply_rate": decoded_data.get(supply_rate_query_id),
+                "supply": decoded_data.get(total_supply_query_id),
+                "borrow": decoded_data.get(total_borrow_query_id),
+                "exchange_rate": decoded_data.get(exchange_rate_query_id),
+                "underlying_decimals": underlying_decimals,
+                "underlying": token_address
+            })
+        return reserve_tokens_info
+
+    @classmethod
+    def _calculate_interest_rates(
+            cls, token_info: dict, pool_decimals: int, apx_block_speed_in_seconds: float):
+        exchange_rate = float(token_info["exchange_rate"]) / 10 ** (18 - 8 + token_info["underlying_decimals"])
+
+        total_borrow = float(token_info["borrow"]) / 10 ** int(token_info["underlying_decimals"])
+        total_supply = float(token_info["supply"]) * exchange_rate / 10 ** int(token_info["token_decimals"])
+
+        supply_apy = ((token_info["supply_rate"] / 10 ** pool_decimals) * 86400 + 1) ** 365 - 1
+        borrow_apy = ((token_info["borrow_rate"] / 10 ** pool_decimals) * 86400 + 1) ** 365 - 1
+
+        return {
+            'deposit_apy': supply_apy,
+            'borrow_apy': borrow_apy,
+            'total_deposit': total_supply,
+            'total_borrow': total_borrow
+        }
+
+    def get_ctoken_function_info(self, ctoken: str, fn_name: str, fn_paras: list = None, block_number: int = "latest"):
+        return self.state_service.get_function_info(
+            ctoken, self.vtoken_abi, fn_name, fn_paras, block_number
+        )

defi_services/services/lending/morpho_aave_v2_services.py

@@ -3,9 +3,9 @@ import time
 
 from web3 import Web3
 
-from defi_services.abis.lending.aave_v2_and_forlks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.lending_pool_abi import LENDING_POOL_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.oracle_abi import ORACLE_ABI
+from defi_services.abis.lending.aave_v2_and_forks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
+from defi_services.abis.lending.aave_v2_and_forks.lending_pool_abi import LENDING_POOL_ABI
+from defi_services.abis.lending.aave_v2_and_forks.oracle_abi import ORACLE_ABI
 from defi_services.abis.lending.morpho.morpho_aave_v2_comptroller_abi import MORPHO_AAVE_V2_COMPTROLLER
 from defi_services.abis.lending.morpho.morpho_aave_v2_lens_abi import MORPHO_AAVE_V2_LENS_ABI
 from defi_services.abis.token.erc20_abi import ERC20_ABI

defi_services/services/lending/morpho_aave_v3_services.py

@@ -3,8 +3,8 @@ import time
 
 from web3 import Web3
 
-from defi_services.abis.lending.aave_v2_and_forlks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
-from defi_services.abis.lending.aave_v2_and_forlks.oracle_abi import ORACLE_ABI
+from defi_services.abis.lending.aave_v2_and_forks.aave_v2_incentives_abi import AAVE_V2_INCENTIVES_ABI
+from defi_services.abis.lending.aave_v2_and_forks.oracle_abi import ORACLE_ABI
 from defi_services.abis.lending.aave.aave_v3.aave_v3_lending_pool_abi import AAVE_V3_LENDING_POOL_ABI
 from defi_services.abis.lending.morpho.morpho_aave_v3_comptroller_abi import MORPHO_AAVE_V3_COMPTROLLER_ABI
 from defi_services.abis.token.erc20_abi import ERC20_ABI

defi_services/services/lending/onyx_service.py

@@ -55,6 +55,8 @@ class OnyxStateService(CompoundStateService):
             # if token in [ContractAddresses.LUNA.lower(), ContractAddresses.UST.lower(), ContractAddresses.LUNA,
             #              ContractAddresses.UST]:
             #     continue
+            if token == '0x1933f1183c421d44d531ed40a5d2445f6a91646d':
+                continue
             ctokens.append(token)
 
         lens_contract = _w3.eth.contract(
@@ -78,7 +80,6 @@ class OnyxStateService(CompoundStateService):
                 "liquidationThreshold": lt,
                 "loanToValue": ltv
             }
-
         return reserves_info
 
     # PROTOCOL APY

defi_services/services/lending/radiant_v2_services.py

@@ -1,11 +1,15 @@
 import logging
 
+from defi_services.abis.lending.radiant_v2.radiant_reward_converter import RADIANT_REWARD_CONVERTER_ABI
 from defi_services.abis.lending.radiant_v2.radiant_v2_incentive_abi import RADIANT_V2_INCENTIVE_ABI
+from defi_services.abis.token.erc20_abi import ERC20_ABI
 from defi_services.constants.chain_constant import Chain
 from defi_services.constants.entities.lending_constant import Lending
 from defi_services.jobs.queriers.state_querier import StateQuerier
 from defi_services.services.lending.lending_info.arbitrum.radiant_arbitrum import RADIANT_ARB
+from defi_services.services.lending.lending_info.base.radiant_v2_base import RADIANT_BASE
 from defi_services.services.lending.lending_info.bsc.radiant_bsc import RADIANT_BSC
+from defi_services.services.lending.lending_info.ethereum.radiant_eth import RADIANT_ETH
 from defi_services.services.lending.valas_services import ValasStateService
 from defi_services.utils.apy import apr_to_apy
 
@@ -15,7 +19,9 @@ logger = logging.getLogger("Radiant Lending Pool State Service")
 class RadiantInfo:
     mapping = {
         Chain.arbitrum: RADIANT_ARB,
-        Chain.bsc: RADIANT_BSC
+        Chain.bsc: RADIANT_BSC,
+        Chain.ethereum: RADIANT_ETH,
+        Chain.base: RADIANT_BASE
     }
 
 
@@ -65,19 +71,55 @@ class RadiantStateService(ValasStateService):
             block_number: int = "latest"
     ):
         rpc_calls = {}
-        key = f"allPendingRewards_{self.name}_{wallet}_{block_number}".lower()
-        rpc_calls[key] = self.get_function_incentive_info(
-            "allPendingRewards", [wallet], block_number)
+        if self.chain_id != Chain.base:
+            key = f"allPendingRewards_{self.name}_{wallet}_{block_number}".lower()
+            rpc_calls[key] = self.get_function_incentive_info(
+                "allPendingRewards", [wallet], block_number)
+        else:
+            # key = f"viewPendingRewards_{self.name}_{wallet}_{block_number}".lower()
+            # rpc_calls[key] = self.get_function_reward_converter_info(
+            #     "viewPendingRewards", [wallet], block_number)
+            for token in self.pool_info.get('rewardToken'):
+                key = f"decimals_{token}"
+                rpc_calls[key] = self.state_service.get_function_info(
+                    token, ERC20_ABI, "decimals"
+                )
 
         return rpc_calls
 
     def calculate_rewards_balance(
             self, wallet: str, reserves_info: dict, decoded_data: dict, block_number: int = "latest"):
-        reward_token = self.pool_info['rewardToken']
-        key = f"allPendingRewards_{self.name}_{wallet}_{block_number}".lower()
-        rewards = decoded_data.get(key) / 10 ** 18
-        result = {
-            reward_token: {"amount": rewards}
-        }
+        if self.chain_id != Chain.base:
+            reward_token = self.pool_info['rewardToken']
+            key = f"allPendingRewards_{self.name}_{wallet}_{block_number}".lower()
+            rewards = decoded_data.get(key) / 10 ** 18
+            result = {
+                reward_token: {"amount": rewards}
+            }
+        else:
+            # key = f"viewPendingRewards_{self.name}_{wallet}_{block_number}".lower()
+            # rewards = decoded_data.get(key)
+            result = {}
+            w3 = self.state_service.get_w3()
+            contract = w3.eth.contract(w3.to_checksum_address(
+                self.pool_info.get('rewardConverter')), abi=RADIANT_REWARD_CONVERTER_ABI
+            )
+            rewards = contract.functions.viewPendingRewards(w3.to_checksum_address(wallet)).call()
+            amts = rewards[1]
+            tokens = rewards[0]
+            for idx in range(len(tokens)):
+                amount = amts[idx]
+                token = tokens[idx].lower()
+                if token not in self.pool_info.get('rewardToken', []):
+                    continue
+                decimal_key = f"decimals_{token}"
+                result.update({
+                    token.lower(): {"amount": amount / 10**decoded_data.get(decimal_key)}
+                })
 
         return result
+
+    def get_function_reward_converter_info(self, fn_name: str, fn_paras=None, block_number: int = 'latest'):
+        return self.state_service.get_function_info(
+            self.pool_info['rewardConverter'], self.incentive_abi, fn_name, fn_paras, block_number
+        )