From 2335c6568b574bf2a6071fed3f4964f0f6127efa Mon Sep 17 00:00:00 2001 From: jiangdong1992 Date: Mon, 4 Jul 2022 09:58:11 +0800 Subject: [PATCH 1/2] add usdn&usdt log --- app.py | 2 +- config.py | 1 + indexer_provider.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app.py b/app.py index 7bee59b..fbce311 100644 --- a/app.py +++ b/app.py @@ -16,7 +16,7 @@ from config import Cfg from db_provider import get_history_token_price -service_version = "20220701.01" +service_version = "20220704.01" Welcome = 'Welcome to ref datacenter API server, version '+service_version+', indexer %s' % Cfg.NETWORK[Cfg.NETWORK_ID]["INDEXER_HOST"][-3:] # Instantiation, which can be regarded as fixed format app = Flask(__name__) diff --git a/config.py b/config.py index f8dc39c..bc6bb6e 100644 --- a/config.py +++ b/config.py @@ -74,6 +74,7 @@ class Cfg: "FARMING_CONTRACT": "v2.ref-farming.testnet", "REF_CONTRACT": "ref-finance-101.testnet", "XREF_CONTRACT": "xref.ref-dev.testnet", + "USDN_CONTRACT": "usdn.testnet", "REDIS_KEY": "FARMS_TESTNET", "REDIS_POOL_KEY": "POOLS_TESTNET", "REDIS_POOL_BY_TOKEN_KEY": "POOLS_BY_TOKEN_TESTNET", diff --git a/indexer_provider.py b/indexer_provider.py index 283ab90..ea1da77 100644 --- a/indexer_provider.py +++ b/indexer_provider.py @@ -71,8 +71,8 @@ def get_actions(network_id, account_id): ) sql2 = """(predecessor_account_id = %s and """ - sql3 = "(receiver_account_id in ('%s', '%s', '%s', 'wrap.near', '%s') " % (Cfg.NETWORK[network_id]["REF_CONTRACT"], Cfg.NETWORK[network_id]["FARMING_CONTRACT"], Cfg.NETWORK[network_id]["XREF_CONTRACT"], Cfg.NETWORK[network_id]["BOOSTFARM_CONTRACT"]) - sql4 = "or (args->'args_json'->>'receiver_id' = 'aurora' and args->>'method_name' = 'ft_transfer_call') " + sql3 = "(receiver_account_id in ('%s', '%s', '%s', 'wrap.near', '%s', '%s') " % (Cfg.NETWORK[network_id]["REF_CONTRACT"], Cfg.NETWORK[network_id]["FARMING_CONTRACT"], Cfg.NETWORK[network_id]["XREF_CONTRACT"], Cfg.NETWORK[network_id]["BOOSTFARM_CONTRACT"], Cfg.NETWORK[network_id]["USDN_CONTRACT"]) + sql4 = "or (args->'args_json'->>'receiver_id' in ('aurora', 'usdn.testnet') and args->>'method_name' = 'ft_transfer_call') " sql5 = "or (receiver_account_id = 'aurora' and args->>'method_name' = 'call') " sql6 = "or args->'args_json'->>'receiver_id' in ('%s', '%s'))) " % (Cfg.NETWORK[network_id]["REF_CONTRACT"], Cfg.NETWORK[network_id]["XREF_CONTRACT"]) sql7 = "or (predecessor_account_id = 'usn' and receiver_account_id = 'usn' and args->>'method_name' in ('buy_with_price_callback', 'sell_with_price_callback') " From 5b3ddb82f47fab6a9da8e3f50b2d4db09a3490d7 Mon Sep 17 00:00:00 2001 From: jiangdong1992 Date: Mon, 4 Jul 2022 14:23:32 +0800 Subject: [PATCH 2/2] add usdn&usdt log --- app.py | 2 +- config.py | 3 ++- indexer_provider.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index fbce311..dd8827b 100644 --- a/app.py +++ b/app.py @@ -16,7 +16,7 @@ from config import Cfg from db_provider import get_history_token_price -service_version = "20220704.01" +service_version = "20220704.02" Welcome = 'Welcome to ref datacenter API server, version '+service_version+', indexer %s' % Cfg.NETWORK[Cfg.NETWORK_ID]["INDEXER_HOST"][-3:] # Instantiation, which can be regarded as fixed format app = Flask(__name__) diff --git a/config.py b/config.py index bc6bb6e..4a29410 100644 --- a/config.py +++ b/config.py @@ -74,7 +74,7 @@ class Cfg: "FARMING_CONTRACT": "v2.ref-farming.testnet", "REF_CONTRACT": "ref-finance-101.testnet", "XREF_CONTRACT": "xref.ref-dev.testnet", - "USDN_CONTRACT": "usdn.testnet", + "USN_CONTRACT": "usdn.testnet", "REDIS_KEY": "FARMS_TESTNET", "REDIS_POOL_KEY": "POOLS_TESTNET", "REDIS_POOL_BY_TOKEN_KEY": "POOLS_BY_TOKEN_TESTNET", @@ -100,6 +100,7 @@ class Cfg: "REF_CONTRACT": "v2.ref-finance.near", "XREF_CONTRACT": "xtoken.ref-finance.near", "BOOSTFARM_CONTRACT": "boostfarm.ref-finance.near", + "USN_CONTRACT": "usn", "REDIS_KEY": "FARMS_MAINNET", "REDIS_POOL_BY_TOKEN_KEY": "POOLS_BY_TOKEN_MAINNET", "REDIS_POOL_KEY": "POOLS_MAINNET", diff --git a/indexer_provider.py b/indexer_provider.py index ea1da77..e5f0e7e 100644 --- a/indexer_provider.py +++ b/indexer_provider.py @@ -71,8 +71,8 @@ def get_actions(network_id, account_id): ) sql2 = """(predecessor_account_id = %s and """ - sql3 = "(receiver_account_id in ('%s', '%s', '%s', 'wrap.near', '%s', '%s') " % (Cfg.NETWORK[network_id]["REF_CONTRACT"], Cfg.NETWORK[network_id]["FARMING_CONTRACT"], Cfg.NETWORK[network_id]["XREF_CONTRACT"], Cfg.NETWORK[network_id]["BOOSTFARM_CONTRACT"], Cfg.NETWORK[network_id]["USDN_CONTRACT"]) - sql4 = "or (args->'args_json'->>'receiver_id' in ('aurora', 'usdn.testnet') and args->>'method_name' = 'ft_transfer_call') " + sql3 = "(receiver_account_id in ('%s', '%s', '%s', 'wrap.near', '%s', '%s') " % (Cfg.NETWORK[network_id]["REF_CONTRACT"], Cfg.NETWORK[network_id]["FARMING_CONTRACT"], Cfg.NETWORK[network_id]["XREF_CONTRACT"], Cfg.NETWORK[network_id]["BOOSTFARM_CONTRACT"], Cfg.NETWORK[network_id]["USN_CONTRACT"]) + sql4 = "or (args->'args_json'->>'receiver_id' in ('aurora', '%s') and args->>'method_name' = 'ft_transfer_call') " % Cfg.NETWORK[network_id]["USN_CONTRACT"] sql5 = "or (receiver_account_id = 'aurora' and args->>'method_name' = 'call') " sql6 = "or args->'args_json'->>'receiver_id' in ('%s', '%s'))) " % (Cfg.NETWORK[network_id]["REF_CONTRACT"], Cfg.NETWORK[network_id]["XREF_CONTRACT"]) sql7 = "or (predecessor_account_id = 'usn' and receiver_account_id = 'usn' and args->>'method_name' in ('buy_with_price_callback', 'sell_with_price_callback') "