Merge branch 'v2'

Fixed transaction confirmation issue
Merge pull request #1 from ranchimall/dependabot/pip/jinja2-2.11.3
2024-10-30 20:49:20 +00:00 · 2023-04-02 12:17:38 +00:00 · 2023-01-15 15:57:26 +05:30 · 2023-01-15 15:57:11 +05:30 · 2023-01-15 15:56:47 +05:30 · 2023-01-06 11:54:28 +00:00
2 changed files with 4 additions and 4 deletions
--- a/ranchimallflo_api.py
+++ b/ranchimallflo_api.py
@ -88,6 +88,7 @@ def blockdetailhelper(blockdetail):
    return blockJson

 def transactiondetailhelper(transactionHash):
+    # check if legit transaction hash
    # open the latest block database
    conn = sqlite3.connect(os.path.join(dbfolder, 'latestCache.db'))
    c = conn.cursor()
@ -1461,7 +1462,6 @@ async def gettransactiondetails(transactionHash):
        transactionJson = json.loads(transactionJsonData[0][0])
        transactionJson = update_transaction_confirmations(transactionJson)
        parseResult = json.loads(transactionJsonData[0][1])
-
        return jsonify(parsedFloData=parseResult, transactionDetails=transactionJson, transactionHash=transactionHash, result='ok')
    else:
        return jsonify(result='error', description='Transaction doesn\'t exist in database')
--- a/requirements.txt
+++ b/requirements.txt
@ -2,7 +2,7 @@ aiofiles
 APScheduler==3.9.1
 arrow==0.15.2
 blinker==1.4
-certifi==2019.9.11
+certifi==2022.12.7
 cffi
 chardet==3.0.4
 Click==7.0
@ -13,7 +13,7 @@ Hypercorn==0.8.2
 hyperframe==5.2.0
 idna==2.8
 itsdangerous==1.1.0
-Jinja2==2.10.1
+Jinja2==2.11.3
 MarkupSafe==1.1.1
 multidict==4.5.2
 priority==1.3.0
@ -27,5 +27,5 @@ six==1.12.0
 sortedcontainers==2.1.0
 toml==0.10.0
 typing-extensions==3.7.4
-urllib3==1.25.3
+urllib3==1.26.5
 wsproto==0.15.0
Author	SHA1	Message	Date
RanchiMall Dev	a85209b222	Merge branch 'v2'	2024-10-30 20:49:20 +00:00
RanchiMall Dev	5c91f769f2	Fixed transaction confirmation issue	2023-04-02 12:17:38 +00:00
Vivek Teega	285c8b363c	Merge pull request #1 from ranchimall/dependabot/pip/jinja2-2.11.3 Bump jinja2 from 2.10.1 to 2.11.3	2023-01-15 15:57:26 +05:30
Vivek Teega	f3559bd8b7	Merge pull request #4 from ranchimall/dependabot/pip/certifi-2022.12.7 Bump certifi from 2019.9.11 to 2022.12.7	2023-01-15 15:57:11 +05:30
Vivek Teega	8dafcf0299	Merge pull request #3 from ranchimall/dependabot/pip/urllib3-1.26.5 Bump urllib3 from 1.25.3 to 1.26.5	2023-01-15 15:56:47 +05:30
RanchiMall Dev	f67151c7d5	Added new API v2.0/flocoreHeight	2023-01-06 11:54:28 +00:00
RanchiMall Dev	121056110e	Removing default limit for getFloAddressTransactions	2022-12-25 17:43:33 +00:00
dependabot[bot]	971783480e	Bump certifi from 2019.9.11 to 2022.12.7 Bumps [certifi](https://github.com/certifi/python-certifi) from 2019.9.11 to 2022.12.7. - [Release notes](https://github.com/certifi/python-certifi/releases) - [Commits](https://github.com/certifi/python-certifi/compare/2019.09.11...2022.12.07) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-08 06:36:13 +00:00
dependabot[bot]	bfedebdfb3	Bump urllib3 from 1.25.3 to 1.26.5 Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.3 to 1.26.5. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.25.3...1.26.5) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-02 00:22:10 +00:00
dependabot[bot]	2d3ebfb9fb	Bump jinja2 from 2.10.1 to 2.11.3 Bumps [jinja2](https://github.com/pallets/jinja) from 2.10.1 to 2.11.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/2.10.1...2.11.3) Signed-off-by: dependabot[bot] <support@github.com>	2021-03-20 01:43:34 +00:00