Merge branch 'v2'

Changed the price update API interval
Fix bug for swap contract dynamic price calculation caused by change to blockbook API
2024-10-30 20:49:20 +00:00 · 2024-09-18 13:52:17 +05:30 · 2024-03-06 10:37:10 +00:00 · 2024-02-10 06:49:06 +00:00 · 2024-02-10 11:48:26 +05:30 · 2023-11-22 18:57:32 +00:00
5 changed files with 2918 additions and 580 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,5 +4,9 @@ __pycache__/
 config.py
 .idea/
 py3.7/
-py3.7.0/
+py3/
+py3.8/
 *.db
+*.code-workspace
+*.log
+py*/
--- a/config-example.py
+++ b/config-example.py
@ -1,6 +1,8 @@
-dbfolder = 'path to FLO Token Scanner data folder'
-sse_pubKey = ''
-apiUrl = 'flosight api url'
-apilayerAccesskey = 'api layer access key'
-FLO_DATA_DIR = '/home/username/.flo'
-FLO_CLI_PATH = '/usr/local/bin/flo-cli'
+dbfolder = ''
+debug_status = False
+sse_pubKey = '<public key in the format of pybtc python library>'
+apiUrl = 'https://flosight.duckdns.org/api/'
+
+# your apilayer.net access key
+apilayerAccesskey = '<accesskey>'
+
--- a/parsing.py
+++ b/parsing.py
--- a/ranchimallflo_api.py
+++ b/ranchimallflo_api.py
--- a/requirements.txt
+++ b/requirements.txt
@ -1,4 +1,4 @@
-aiofiles==0.4.0
+aiofiles
 APScheduler==3.9.1
 arrow==0.15.2
 blinker==1.4
@ -17,7 +17,7 @@ Jinja2==2.11.3
 MarkupSafe==1.1.1
 multidict==4.5.2
 priority==1.3.0
-pybtc==2.0.9
+pyflo-lib==2.0.9
 pycparser==2.19
 python-dateutil==2.8.0
 Quart==0.10.0
Author	SHA1	Message	Date
RanchiMall Dev	a85209b222	Merge branch 'v2'	2024-10-30 20:49:20 +00:00
Vivek Teega	bb717d9b29	Changed the price update API interval	2024-09-18 13:52:17 +05:30
RanchiMall Dev	49a3295225	Fix bug for swap contract dynamic price calculation caused by change to blockbook API The recent update to the external API introduced a change in the response format, resulting in a bug in our code. This commit adjusts the handling of API responses to accommodate the new format, resolving the issue and ensuring proper functionality.	2024-03-06 10:37:10 +00:00
RanchiMall Dev	0eb93ad916	Error handling 1. Fixed error handling in /api/v2/participantDetails The case where contractAddress nor contractName was passed is handled now 2. Fixed error handling in /api/v2/broadcastTx/ Datadir parameter which is unnecesary for the cli command is removed	2024-02-10 06:49:06 +00:00
Vivek Teega	cce8d34be2	Merge pull request #23 from ranchimall/upgrade/blockbook Merging Upgrade/blockbook	2024-02-10 11:48:26 +05:30
RanchiMall Dev	a9f691f82f	Added pagination to contract transactions	2023-11-22 18:57:32 +00:00
RanchiMall Dev	5dfb75417f	smartContractList and tokenSmartContractList returns committee address	2023-11-14 06:48:38 +00:00
RanchiMall Dev	7dd859ec5e	Fixed issues with participant winning amount	2023-09-29 12:03:47 +00:00
RanchiMall Dev	3629ff6cea	Fixed bug with token transactions	2023-09-24 11:23:05 +00:00
RanchiMall Dev	b1c3851564	Changes to accomodate blockbook transaciton format	2023-08-30 18:29:37 +00:00
RanchiMall Dev	48a39f377a	Merge branch 'v2' of https://github.com/ranchimall/ranchimallflo-api into v2	2023-08-30 18:02:20 +00:00
RanchiMall Dev	7f0d7797a4	Added python .gitignore	2023-08-30 18:00:03 +00:00
RanchiMall Dev	af78189f9b	Fixed bug in /api/v2/smartContractTransactions - Contract Creation transactions are showing up on	2023-08-25 07:04:16 +00:00
RanchiMall Dev	60adde4768	Bugfix for transactionDetails	2023-07-13 12:11:54 +00:00
RanchiMall Dev	57f5aae06b	Changing key from subtxs to subTransactions	2023-07-12 08:07:02 +00:00
RanchiMall Dev	d7ef9b456f	Changes to show sub transactions	2023-07-12 07:21:40 +00:00
RanchiMall Dev	468d07a047	Fixed bug with /api/v2/floAddressTransactions/<floAddress> Filtering transactions based on senderFloAddress and receiverFloAddress	2023-07-04 21:43:49 +00:00
RanchiMall Dev	0f6f5fe955	Fix bug : typo	2023-07-03 22:43:00 +00:00
RanchiMall Dev	5af8a2e1d1	Fixed Smart Contract transactions	2023-07-03 19:54:48 +00:00
RanchiMall Dev	1f54180929	Change in transaction return format	2023-06-30 10:05:59 +00:00
RanchiMall Dev	0b78851c97	Change in requirements.txt	2023-06-30 10:05:04 +00:00
RanchiMall Dev	a0f7f78a9e	Fix bug in /api/v2/smartContractDeposits	2023-06-12 09:12:26 +00:00
Vivek Teega	84dbe93e81	Added currentDepositBalance in the json response of /api/v2/smartContractInfo	2023-06-12 14:33:43 +05:30
Vivek Teega	b6f123b15c	Cleaned redundancy in v2/participantDetails Reffering issue https://github.com/ranchimall/ranchimallflo-api/issues/14 * Removed redundancy in fetching contractStructure * Removed redundncy in connecting to system.db and contract's database	2023-05-16 11:16:59 +00:00
Vivek Teega	646e874d68	Fixed bug with status of the contract for one-time-event type of contracts	2023-05-06 13:53:46 +00:00
Vivek Teega	71f32d96e4	Moved host and port to config file	2023-04-30 11:02:53 +00:00
Vivek Teega	9b50ee8af3	Fixed issue with double smart contracts returns in /api/v2/tokenSmartContractList	2023-04-30 10:59:32 +00:00
Vivek Teega	70061a0bec	Show userChoices along with smartContractList functions	2023-04-24 18:23:59 +00:00
Vivek Teega	d17112523d	Added accepting_token, selling_token info for token swap as part of smart contract info	2023-04-22 17:44:29 +00:00
Vivek Teega	0c4b624073	Temp Bug fix for API returning smart contract details fetching from system.db's activecontracts table	2023-04-22 17:28:18 +00:00
Vivek Teega	975d856570	API route fix for smartContractDeposits	2023-04-17 10:09:53 +00:00
Vivek Teega	72aed8673e	Logic added to smartContractDeposits API	2023-04-15 12:28:54 +00:00
Vivek Teega	46ea7ee84f	Further API changes to integrate into floscout	2023-04-14 22:56:25 +00:00
Vivek Teega	1e8b460be4	Merge branch 'v2' of https://github.com/ranchimall/ranchimallflo-api into v2	2023-04-14 15:38:49 +00:00
Vivek Teega	e884e3fafe	Fixed bug in /api/v2/smartContractList	2023-04-14 15:38:35 +00:00
RanchiMall Dev	9731999833	Fixed order to descending for latestBlocks and latestTransactions	2023-04-08 17:31:20 +00:00
RanchiMall Dev	26444acca9	Changed api/v2/latestTransactionDetails parameter to v2	2023-04-08 09:56:17 +00:00
RanchiMall Dev	c46c45e6b9	Updated gitignore and requirements.txt	2023-04-08 09:29:23 +00:00
RanchiMall Dev	1fde179a32	Fixed the change in transactions columns, from blocktime -> time	2023-04-08 09:29:02 +00:00
Vivek Teega	ab84bca560	Fixed block confirmations on the version 2 of the API	2023-04-03 17:45:12 +00:00
Vivek Teega	0f5809acf8	Updating parsing module and .gitignore	2023-03-03 11:22:56 +00:00
Vivek Teega	bc88536d9e	Making smart contract name input to be case insensitive	2023-02-10 16:27:29 +00:00
Vivek Teega	130662a6a2	Fixed order of transactions in API responses	2023-02-06 18:11:21 +00:00
Vivek Teega	3285e65a40	API input validation	2023-02-04 07:46:31 +00:00
Vivek Teega	2686bb70fc	Added senderAddress and receiverAddress along with the transactionDetails API	2023-01-27 07:37:43 +00:00
Vivek Teega	e4dd64f7a1	Added response codes to v2	2023-01-18 20:19:47 +00:00
Vivek Teega	188b64f347	Named the new api version as 'v2' & added debug_status of the API as part of the config file	2023-01-18 16:01:52 +00:00
Vivek Teega	0eabc5bcde	Rearranged the code & fixed a bug in participant details API	2023-01-18 11:34:26 +00:00
Vivek Teega	1d5282177c	Merge changes from all the other branches for a fresh codebase to start changes for new code additions	2022-12-09 14:13:56 +00:00
Vivek Teega	5f7e497043	getParticipantDetails : Added support for one-time-event internal trigger contract	2022-04-05 04:53:03 +00:00
Vivek Teega	7894562e0c	v2 of getSmartContractInfo	2022-04-04 13:24:30 +00:00