583 introduce full test suite tf

Dockerfile

@@ -40,7 +40,7 @@ COPY --from=spl /opt/solana_utils.py \
                 /spl/bin/
 COPY --from=spl /opt/neon-cli /spl/bin/emulator
 
-COPY proxy/operator-keypairs/* /root/.config/solana/
+COPY proxy/operator-keypairs/id.json /root/.config/solana/
 
 COPY . /opt
 ARG PROXY_REVISION

proxy/common_neon/estimate.py

@@ -13,11 +13,20 @@
 @logged_group("neon.Proxy")
 class GasEstimate:
     def __init__(self, request: dict, solana: SolanaInteractor):
-        self.sender = request.get('from', "0x0000000000000000000000000000000000000000")[2:]
-        self.contract = request.get('to', '0x')[2:]
-        self.value = request.get('value', '0x00')
-        self.data = request.get('data', '0x')[2:]
+        self.sender = request.get('from') or '0x0000000000000000000000000000000000000000'
+        if self.sender:
+            self.sender = self.sender[2:]
 
+        self.contract = request.get('to') or ''
+        if self.contract:
+            self.contract = self.contract[2:]
+
+        self.data = request.get('data') or ''
+        if self.data:
+            self.data = self.data[2:]
+
+        self.value = request.get('value') or '0x00'
+
         self.solana = solana
 
     def execution_cost(self) -> int:
@@ -76,10 +85,8 @@ def estimate(self):
         overhead = self.iterative_overhead_cost()
 
         gas = execution_cost + trx_size_cost + overhead + EXTRA_GAS
-
-        # TODO: MM restriction. Uncomment ?
-        # if gas < 21000:
-        #     gas = 21000
+        if gas < 21000:
+            gas = 21000
 
         self.debug(f'execution_cost: {execution_cost}, ' +
                    f'trx_size_cost: {trx_size_cost}, ' +

proxy/deploy-test.sh

@@ -4,6 +4,8 @@ set -xeuo pipefail
 echo "Deploy test..."
 
 solana config set -u $SOLANA_URL
+ln -s /opt/proxy/operator-keypairs/id?*.json /root/.config/solana/
+
 solana address || solana-keygen new --no-passphrase
 export $(/spl/bin/neon-cli --commitment confirmed --url $SOLANA_URL --evm_loader "$EVM_LOADER" neon-elf-params)
 

proxy/indexer/indexer_db.py

@@ -134,3 +134,6 @@ def get_contract_code(self, address) -> str:
 
     def fill_account_info_by_indexer(self, neon_account: str, pda_account: str, code_account: str, slot: int):
         self._account_db.set_acc_indexer(neon_account, pda_account, code_account, slot)
+
+    def get_sol_sign_list_by_neon_sign(self, neon_sign: str) -> [str]:
+        return self._txs_db.get_sol_sign_list_by_neon_sign(neon_sign)

proxy/indexer/transactions_db.py

@@ -22,6 +22,22 @@ def set_txs(self, neon_sign: str, used_ixs: [SolanaIxSignInfo]):
                 VALUES(%s, %s, %s, %s) ON CONFLICT DO NOTHING''',
                 rows)
 
+    def get_sol_sign_list_by_neon_sign(self, neon_sign: str) -> [str]:
+        request = f'''
+            SELECT sol_sign
+              FROM {self._table_name} AS a
+             WHERE neon_sign = %s
+        '''
+
+        with self._conn.cursor() as cursor:
+            cursor.execute(request, [neon_sign])
+            values = cursor.fetchall()
+
+        if not values:
+            return []
+
+        return [v[0] for v in values]
+
 
 class NeonTxsDB(BaseDB):
     def __init__(self):
@@ -112,3 +128,6 @@ def get_tx_list_by_sol_sign(self, sol_sign_list: [str]) -> [NeonTxFullInfo]:
             return []
 
         return [self._tx_from_value(v) for v in values if v is not None]
+
+    def get_sol_sign_list_by_neon_sign(self, neon_sign: str) -> [str]:
+        return self._sol_neon_txs_db.get_sol_sign_list_by_neon_sign(neon_sign)

proxy/memdb/memdb.py

@@ -59,3 +59,6 @@ def get_logs(self, from_block, to_block, addresses, topics, block_hash):
 
     def get_contract_code(self, address: str) -> str:
         return self._db.get_contract_code(address)
+
+    def get_sol_sign_list_by_neon_sign(self, neon_sign: str) -> [str]:
+        return self._db.get_sol_sign_list_by_neon_sign(neon_sign)

proxy/plugin/solana_rest_api.py

@@ -42,7 +42,7 @@
 modelInstanceLock = threading.Lock()
 modelInstance = None
 
-NEON_PROXY_PKG_VERSION = '0.6.0-dev'
+NEON_PROXY_PKG_VERSION = '0.7.1-dev'
 NEON_PROXY_REVISION = 'NEON_PROXY_REVISION_TO_BE_REPLACED'
 
 
@@ -386,6 +386,12 @@ def eth_sendRawTransaction(self, rawTrx):
             # self.error(f"eth_sendRawTransaction type(err): {type(err}}, Exception: {err}")
             raise
 
+    def neon_getSolanaTransactionByNeonTransaction(self, neonTxId: str) -> [str]:
+        if not isinstance(neonTxId, str):
+            return []
+        return self._db.get_sol_sign_list_by_neon_sign(neonTxId)
+
+
 
 class JsonEncoder(json.JSONEncoder):
     def default(self, obj):

proxy/run-test-proxy.sh

@@ -8,6 +8,7 @@ if [ -z "$SOLANA_URL" ]; then
 fi
 
 solana config set -u $SOLANA_URL
+ln -s /opt/proxy/operator-keypairs/id?*.json /root/.config/solana/
 
 echo "$(date "+%F %X.%3N") I $(basename "$0"):${LINENO} $$ ${COMPONENT}:StartScript {} Dumping evm_loader and extracting ELF parameters"
 export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)

proxy/testing/test_neon_token.py

@@ -62,7 +62,7 @@ def deploy_contract(self):
         artifacts = compile_source(NEON_TOKEN_CONTRACT)
         _, self.neon_token_iface = artifacts.popitem()
 
-        self.neon_contract = proxy.eth.contract(abi=self.neon_token_iface['abi'], 
+        self.neon_contract = proxy.eth.contract(abi=self.neon_token_iface['abi'],
                                                 bytecode=self.neon_token_iface['bin'])
 
         deployer = self.create_eth_account(self, 100)
@@ -79,7 +79,7 @@ def deploy_contract(self):
         print(f'deploy status: {tx_deploy_receipt.status}')
         self.neon_token_address = tx_deploy_receipt.contractAddress
         print(f'NeonToken contract address is: {self.neon_token_address}')
-        self.neon_contract = proxy.eth.contract(address=self.neon_token_address, 
+        self.neon_contract = proxy.eth.contract(address=self.neon_token_address,
                                                 abi=self.neon_token_iface['abi'])
 
     def withdraw(self, source_acc: NeonAccount, dest_acc: SolanaAccount, withdraw_amount_alan: int):
@@ -92,7 +92,7 @@ def withdraw(self, source_acc: NeonAccount, dest_acc: SolanaAccount, withdraw_am
         withdraw_tx_receipt = proxy.eth.wait_for_transaction_receipt(withdraw_tx_hash)
         print(f'withdraw_tx_receipt: {withdraw_tx_receipt}')
         print(f'deploy status: {withdraw_tx_receipt.status}')
-    
+
     def test_success_withdraw_to_non_existing_account(self):
         """
         Should succesfully withdraw NEON tokens to previously non-existing Associated Token Account
@@ -102,7 +102,7 @@ def test_success_withdraw_to_non_existing_account(self):
 
         dest_token_acc = get_associated_token_address(dest_acc.public_key(), NEON_TOKEN_MINT)
         print(f"Destination token account: {dest_token_acc}")
-        
+
         withdraw_amount_alan = pow(10, 18) # 1 NEON
         withdraw_amount_galan = int(withdraw_amount_alan / 1_000_000_000)
 
@@ -126,7 +126,7 @@ def test_success_withdraw_to_non_existing_account(self):
         destination_balance_after_galan = self.spl_neon_token.get_balance(dest_token_acc, commitment=Confirmed)
         print(f'Destination account balance after (Galan): {destination_balance_after_galan}')
         self.assertEqual(int(destination_balance_after_galan['result']['value']['amount']), withdraw_amount_galan)
-    
+
     def test_success_withdraw_to_existing_account(self):
         """
         Should succesfully withdraw NEON tokens to existing Associated Token Account
@@ -138,17 +138,17 @@ def test_success_withdraw_to_existing_account(self):
         trx = Transaction()
         trx.add(
             create_associated_token_account(
-                dest_acc.public_key(), 
-                dest_acc.public_key(), 
+                dest_acc.public_key(),
+                dest_acc.public_key(),
                 NEON_TOKEN_MINT
             )
         )
         opts = TxOpts(skip_preflight=True, skip_confirmation=False)
         solana.send_transaction(trx, dest_acc, opts=opts)
-        
+
         dest_token_acc = get_associated_token_address(dest_acc.public_key(), NEON_TOKEN_MINT)
         print(f"Destination token account: {dest_token_acc}")
-        
+
         withdraw_amount_alan = 2_123_000_321_000_000_000
         withdraw_amount_galan = int(withdraw_amount_alan / 1_000_000_000)
 
@@ -174,7 +174,7 @@ def test_success_withdraw_to_existing_account(self):
         destination_balance_after_galan = int(resp['result']['value']['amount'])
         print(f'Destination account balance after (Galan): {destination_balance_after_galan}')
         self.assertEqual(destination_balance_after_galan, withdraw_amount_galan)
-    
+
     def test_failed_withdraw_non_divisible_amount(self):
         """
         Should fail withdrawal because amount not divised by 1 billion
@@ -184,7 +184,7 @@ def test_failed_withdraw_non_divisible_amount(self):
 
         dest_token_acc = get_associated_token_address(dest_acc.public_key(), NEON_TOKEN_MINT)
         print(f"Destination token account: {dest_token_acc}")
-        
+
         withdraw_amount_alan = pow(10, 18) + 123 # NEONs
 
         # Check source balance
@@ -209,7 +209,7 @@ def test_failed_withdraw_non_divisible_amount(self):
         destination_balance_after_galan = self.spl_neon_token.get_balance(dest_token_acc, commitment=Confirmed)
         print(f'Destination account balance after (Galan): {destination_balance_after_galan}')
         self.assertTrue(destination_balance_after_galan['error'] is not None)
-    
+
     def test_failed_withdraw_insufficient_balance(self):
         """
         Should fail withdrawal because of insufficient balance
@@ -219,7 +219,7 @@ def test_failed_withdraw_insufficient_balance(self):
 
         dest_token_acc = get_associated_token_address(dest_acc.public_key(), NEON_TOKEN_MINT)
         print(f"Destination token account: {dest_token_acc}")
-        
+
         withdraw_amount_alan = 2 * pow(10, 18) # 2 NEONs
 
         # Check source balance
@@ -244,7 +244,7 @@ def test_failed_withdraw_insufficient_balance(self):
         destination_balance_after_galan = self.spl_neon_token.get_balance(dest_token_acc, commitment=Confirmed)
         print(f'Destination account balance after (Galan): {destination_balance_after_galan}')
         self.assertTrue(destination_balance_after_galan['error'] is not None)
-    
+
     def test_failed_withdraw_all_balance(self):
         """
         Should fail withdrawal all balance
@@ -254,7 +254,7 @@ def test_failed_withdraw_all_balance(self):
 
         dest_token_acc = get_associated_token_address(dest_acc.public_key(), NEON_TOKEN_MINT)
         print(f"Destination token account: {dest_token_acc}")
-        
+
         withdraw_amount_alan = 1_000_000_000_000_000_000 # 1 NEON
 
         # Check source balance