#295 turn combined instructions ON

proxy/common_neon/neon_instruction.py

@@ -384,9 +384,9 @@ def make_partial_call_or_continue_instruction(self, steps: int = 0) -> Transacti
                 AccountMeta(pubkey=self.storage, is_signer=False, is_writable=True),
 
                 AccountMeta(pubkey=SYSVAR_INSTRUCTION_PUBKEY, is_signer=False, is_writable=False),
-                AccountMeta(pubkey=self.operator, is_signer=True, is_writable=True),
+                AccountMeta(pubkey=self.operator_pda_account, is_signer=True, is_writable=True),
                 AccountMeta(pubkey=self.collateral_pool_address, is_signer=False, is_writable=True),
-                AccountMeta(pubkey=self.operator_token, is_signer=False, is_writable=True),
+                AccountMeta(pubkey=self.operator_associated_token_address, is_signer=False, is_writable=True),
                 AccountMeta(pubkey=self.caller_token, is_signer=False, is_writable=True),
                 AccountMeta(pubkey=SYS_PROGRAM_ID, is_signer=False, is_writable=False),
 
@@ -415,9 +415,9 @@ def make_partial_call_or_continue_from_account_data(self, steps, index=None) ->
                 AccountMeta(pubkey=self.holder, is_signer=False, is_writable=True),
                 AccountMeta(pubkey=self.storage, is_signer=False, is_writable=True),
 
-                AccountMeta(pubkey=self.operator, is_signer=True, is_writable=True),
+                AccountMeta(pubkey=self.operator_pda_account, is_signer=True, is_writable=True),
                 AccountMeta(pubkey=self.collateral_pool_address, is_signer=False, is_writable=True),
-                AccountMeta(pubkey=self.operator_token, is_signer=False, is_writable=True),
+                AccountMeta(pubkey=self.operator_associated_token_address, is_signer=False, is_writable=True),
                 AccountMeta(pubkey=self.caller_token, is_signer=False, is_writable=True),
                 AccountMeta(pubkey=SYS_PROGRAM_ID, is_signer=False, is_writable=False),
 

proxy/common_neon/transaction_sender.py

@@ -379,21 +379,21 @@ def call_signed_with_holder_combined(self):
 
     def create_accounts_for_trx_if_needed(self):
         if len(self.create_acc_trx.instructions):
+            logger.debug('create_accounts_for_trx')
             precall_txs = Transaction()
             precall_txs.add(self.create_acc_trx)
             self.sender.send_measured_transaction(precall_txs, self.eth_trx, 'CreateAccountsForTrx')
 
 
     def write_trx_to_holder_account(self):
+        logger.debug('write_trx_to_holder_account')
         msg = self.eth_trx.signature() + len(self.eth_trx.unsigned_msg()).to_bytes(8, byteorder="little") + self.eth_trx.unsigned_msg()
 
-        # Write transaction to transaction holder account
         offset = 0
         receipts = []
         rest = msg
         while len(rest):
             (part, rest) = (rest[:1000], rest[1000:])
-            # logger.debug("sender_sol %s %s %s", sender_sol, holder, acc.public_key())
             trx = self.instruction.make_write_transaction(offset, part)
             receipts.append(self.sender.send_transaction_unconfirmed(trx))
             offset += len(part)
@@ -461,7 +461,7 @@ def call_cancel(self):
 
 
     def call_continue_bucked(self, instruction_type):
-        logger.debug("Send bucked combined:")
+        logger.debug("Send bucked combined: %s", instruction_type)
         steps = self.steps
 
         addition_count = 0
@@ -471,21 +471,20 @@ def call_continue_bucked(self, instruction_type):
             addition_count = 1
 
         receipts = []
-        for index in range(math.ceil(self.steps_emulated/steps) + addition_count):
+        for index in range(math.ceil(self.steps_emulated/self.steps) + addition_count):
             try:
-
+                trx = Transaction()
                 if instruction_type == CONTINUE_REGULAR:
                     trx = self.instruction.make_continue_instruction(steps, index)
                 elif instruction_type == CONTINUE_COMBINED:
                     trx = self.instruction.make_partial_call_or_continue_transaction(steps - index)
                 elif instruction_type == CONTINUE_HOLDER_COMB:
                     trx = self.instruction.make_partial_call_or_continue_from_account_data(steps, index)
                 else:
-                    raise Exception("Unknown contionue type: {}".format(instruction_type))
+                    raise Exception("Unknown continue type: {}".format(instruction_type))
 
-                result = self.sender.send_transaction_unconfirmed(trx)
-                receipts.append(result)
-            except Exception as err:
+                receipts.append(self.sender.send_transaction_unconfirmed(trx))
+            except SendTransactionError as err:
                 logger.debug(str(err))
                 if str(err).startswith("Transaction simulation failed: Error processing Instruction 0: custom program error: 0x1"):
                     pass
@@ -495,6 +494,12 @@ def call_continue_bucked(self, instruction_type):
                     steps = int(steps * 90 / 100)
                 else:
                     raise
+            except Exception as err:
+                logger.debug(str(err))
+                if str(err).startswith('failed to get recent blockhash'):
+                    pass
+                else:
+                    raise
 
         return self.collect_bucked_results(receipts, instruction_type)
 

proxy/run-proxy.sh

@@ -8,7 +8,7 @@ if [ "$CONFIG" == "ci" ]; then
   [[ -z "$SOLANA_URL"                   ]] && export SOLANA_URL="http://solana:8899"
   [[ -z "$EXTRA_GAS"                    ]] && export EXTRA_GAS=100000
   [[ -z "$NEON_CLI_TIMEOUT"             ]] && export NEON_CLI_TIMEOUT="0.5"
-  [[ -z "$USE_COMBINED_START_CONTINUE"  ]] && export USE_COMBINED_START_CONTINUE="NO"
+  [[ -z "$USE_COMBINED_START_CONTINUE"  ]] && export USE_COMBINED_START_CONTINUE="YES"
   [[ -z "$CONTINUE_COUNT_FACTOR"        ]] && export CONTINUE_COUNT_FACTOR="3"
   [[ -z "$MINIMAL_GAS_PRICE"            ]] && export MINIMAL_GAS_PRICE=0
   [[ -z "$POSTGRES_HOST"                ]] && export POSTGRES_HOST="postgres"