Refactor WriteHolder from seed to nonce (261-restrict-write-instruction)

proxy/plugin/solana_rest_api.py

@@ -49,6 +49,7 @@ class PermanentAccounts:
     def __init__(self, client, signer, proxy_id):
         self.operator = signer.public_key()
         self.operator_token = getTokenAddr(self.operator)
+        self.proxy_id = proxy_id
 
         proxy_id_bytes = proxy_id.to_bytes((proxy_id.bit_length() + 7) // 8, 'big')
         signer_public_key_bytes = bytes(signer.public_key())
@@ -58,8 +59,8 @@ def __init__(self, client, signer, proxy_id):
         self.storage = create_account_with_seed(client, funding=signer, base=signer, seed=storage_seed, storage_size=STORAGE_SIZE)
 
         holder_seed = keccak_256(b"holder" + proxy_id_bytes + signer_public_key_bytes).hexdigest()[:32]
-        self.holder_seed = bytes(holder_seed, 'utf8')
-        self.holder = create_account_with_seed(client, funding=signer, base=signer, seed=self.holder_seed, storage_size=STORAGE_SIZE)
+        holder_seed = bytes(holder_seed, 'utf8')
+        self.holder = create_account_with_seed(client, funding=signer, base=signer, seed=holder_seed, storage_size=STORAGE_SIZE)
 
         collateral_pool_index = proxy_id % 4
         self.collateral_pool_index_buf = collateral_pool_index.to_bytes(4, 'little')

proxy/plugin/solana_rest_api_tools.py

@@ -116,9 +116,9 @@ def create_account_layout(lamports, space, ether, nonce):
         nonce=nonce
     ))
 
-def write_holder_layout(seed, offset, data):
+def write_holder_layout(nonce, offset, data):
     return (bytes.fromhex('12')+
-            seed+
+            nonce.to_bytes(8, byteorder='little')+
             offset.to_bytes(4, byteorder='little')+
             len(data).to_bytes(8, byteorder='little')+
             data)
@@ -1054,7 +1054,7 @@ def call_signed_noniterative(signer, client, ethTrx, perm_accs, trx_accs, msg, c
 
 def call_signed_with_holder_acc(signer, client, ethTrx, perm_accs, trx_accs, steps, create_acc_trx):
 
-    write_trx_to_holder_account(signer, client, perm_accs.holder, perm_accs.holder_seed, ethTrx)
+    write_trx_to_holder_account(signer, client, perm_accs.holder, perm_accs.proxy_id, ethTrx)
 
     if len(create_acc_trx.instructions):
         precall_txs = Transaction()
@@ -1137,19 +1137,19 @@ def createERC20TokenAccountTrx(signer, token_info):
 
 
 
-def write_trx_to_holder_account(signer, client, holder, holder_seed, ethTrx):
+def write_trx_to_holder_account(signer, client, holder, proxy_id, ethTrx):
     msg = ethTrx.signature() + len(ethTrx.unsigned_msg()).to_bytes(8, byteorder="little") + ethTrx.unsigned_msg()
 
     # Write transaction to transaction holder account
     offset = 0
     receipts = []
     rest = msg
     while len(rest):
-        (part, rest) = (rest[:900], rest[900:])
+        (part, rest) = (rest[:1000], rest[1000:])
         trx = Transaction()
         # logger.debug("sender_sol %s %s %s", sender_sol, holder, acc.public_key())
         trx.add(TransactionInstruction(program_id=evm_loader_id,
-                                       data=write_holder_layout(holder_seed, offset, part),
+                                       data=write_holder_layout(proxy_id, offset, part),
                                        keys=[
                                            AccountMeta(pubkey=holder, is_signer=False, is_writable=True),
                                            AccountMeta(pubkey=signer.public_key(), is_signer=True, is_writable=False),
@@ -1187,7 +1187,7 @@ def deploy_contract(signer, client, ethTrx, perm_accs, steps):
     logger.debug("Legacy contract address solana: %s %s", contract_sol, contract_nonce)
     logger.debug("Legacy code address solana: %s %s", code_sol, code_nonce)
 
-    write_trx_to_holder_account(signer, client, perm_accs.holder, perm_accs.holder_seed, ethTrx)
+    write_trx_to_holder_account(signer, client, perm_accs.holder, perm_accs.proxy_id, ethTrx)
 
     # Create contract account & execute deploy transaction
     logger.debug("    # Create contract account & execute deploy transaction")