Skip to content

impl emulate deploy trx #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sinev-valentine merged 8 commits into from
Oct 8, 2021
Merged

impl emulate deploy trx #219

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
831031b
impl emulate deploy trx
sinev-valentine Oct 7, 2021
65bbd9b
add debug info
sinev-valentine Oct 8, 2021
79a9fc9
add debug info
sinev-valentine Oct 8, 2021
da988e2
fix call_signed
sinev-valentine Oct 8, 2021
ec5f058
remove debug info
sinev-valentine Oct 8, 2021
4f21fdb
remove deploy_contract()
sinev-valentine Oct 8, 2021
0b36e16
Merge branch 'develop' into 218_emulate_deploy_trx
sinev-valentine Oct 8, 2021
9dc38be
remove unused code
sinev-valentine Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove deploy_contract()
  • Loading branch information
@sinev-valentine
sinev-valentine committed Oct 8, 2021
commit 4f21fdb77bd58654aac5ee9650c0151de5ec7945
10 changes: 5 additions & 5 deletions proxy/plugin/solana_rest_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import threading
from .solana_rest_api_tools import EthereumAddress, create_account_with_seed, evm_loader_id, getTokens, \
getAccountInfo, solana_cli, call_signed, solana_url, call_emulated, \
Trx, deploy_contract, EthereumError, create_collateral_pool_address, getTokenAddr, STORAGE_SIZE, neon_config_load
Trx, EthereumError, create_collateral_pool_address, getTokenAddr, STORAGE_SIZE, neon_config_load
from solana.rpc.commitment import Commitment, Confirmed
from web3 import Web3
import logging
Expand Down Expand Up @@ -395,10 +395,10 @@ def eth_sendRawTransaction(self, rawTrx):
logger.debug('Eth Hash: %s', eth_signature)

try:
if (not trx.toAddress):
(signature, _contract_eth) = deploy_contract(self.signer, self.client, trx, self.perm_accs, steps=1000)
else:
signature = call_signed(self.signer, self.client, trx, self.perm_accs, steps=250)
# if (not trx.toAddress):
# (signature, _contract_eth) = deploy_contract(self.signer, self.client, trx, self.perm_accs, steps=1000)
# else:
signature = call_signed(self.signer, self.client, trx, self.perm_accs, steps=250)

logger.debug('Transaction signature: %s %s', signature, eth_signature)

Expand Down
112 changes: 59 additions & 53 deletions proxy/plugin/solana_rest_api_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,18 +814,20 @@ def simulate_continue(signer, client, perm_accs, trx_accs, step_count):
logger.debug("tx_count = {}, step_count = {}".format(continue_count, step_count))
return (continue_count, step_count)

def create_account_list_by_emulate(signer, client, ethTrx, deployment_address=None):
def create_account_list_by_emulate(signer, client, ethTrx):
sender_ether = bytes.fromhex(ethTrx.sender())
add_keys_05 = []
trx = Transaction()
new_neon_token_acccounts = []

if deployment_address:
to_address = "deploy"
if not ethTrx.toAddress:
to_address_arg = "deploy"
to_address = keccak_256(rlp.encode((bytes.fromhex(ethTrx.sender()), ethTrx.nonce))).digest()[-20:]
else:
to_address = ethTrx.toAddress.hex()
to_address_arg = ethTrx.toAddress.hex()
to_address = ethTrx.toAddress

output_json = call_emulated(to_address, sender_ether.hex(), ethTrx.callData.hex(), hex(ethTrx.value))
output_json = call_emulated(to_address_arg, sender_ether.hex(), ethTrx.callData.hex(), hex(ethTrx.value))
logger.debug("emulator returns: %s", json.dumps(output_json, indent=3))
for acc_desc in output_json["accounts"]:
address = bytes.fromhex(acc_desc["address"][2:])
Expand Down Expand Up @@ -866,7 +868,7 @@ def create_account_list_by_emulate(signer, client, ethTrx, deployment_address=No
str(NEW_USER_AIRDROP_AMOUNT))


if address == ethTrx.toAddress or address == deployment_address:
if address == to_address:
contract_sol = PublicKey(acc_desc["account"])
if acc_desc["new"]:
code_sol = code_account
Expand Down Expand Up @@ -918,25 +920,29 @@ def create_account_list_by_emulate(signer, client, ethTrx, deployment_address=No


def call_signed(signer, client, ethTrx, perm_accs, steps):

(trx_accs, sender_ether, create_acc_trx) = create_account_list_by_emulate(signer, client, ethTrx)

msg = sender_ether + ethTrx.signature() + ethTrx.unsigned_msg()
if not ethTrx.toAddress:
call_from_holder = True
else:
call_from_holder = False
call_iterative = False
msg = sender_ether + ethTrx.signature() + ethTrx.unsigned_msg()

call_from_holder = False
call_iterative = False
try:
logger.debug("Try single trx call")
return call_signed_noniterative(signer, client, ethTrx, perm_accs, trx_accs, msg, create_acc_trx)
except Exception as err:
logger.debug(str(err))
if str(err).find("Program failed to complete") >= 0:
logger.debug("Program exceeded instructions")
call_iterative = True
elif str(err).startswith("transaction too large:"):
logger.debug("Transaction too large, call call_signed_with_holder_acc():")
call_from_holder = True
else:
raise
try:
logger.debug("Try single trx call")
return call_signed_noniterative(signer, client, ethTrx, perm_accs, trx_accs, msg, create_acc_trx)
except Exception as err:
logger.debug(str(err))
if str(err).find("Program failed to complete") >= 0:
logger.debug("Program exceeded instructions")
call_iterative = True
elif str(err).startswith("transaction too large:"):
logger.debug("Transaction too large, call call_signed_with_holder_acc():")
call_from_holder = True
else:
raise

if call_from_holder:
return call_signed_with_holder_acc(signer, client, ethTrx, perm_accs, trx_accs, steps, create_acc_trx)
Expand Down Expand Up @@ -1087,37 +1093,37 @@ def write_trx_to_holder_account(signer, client, holder, ethTrx):
logger.debug("confirmed: %s", rcpt)


def deploy_contract(signer, client, ethTrx, perm_accs, steps):
sender_ether = bytes.fromhex(ethTrx.sender())
(sender_sol, _) = ether2program(sender_ether.hex(), evm_loader_id, signer.public_key())
logger.debug("Sender account solana: %s %s", sender_ether.hex(), sender_sol)


contract_eth = keccak_256(rlp.encode((sender_ether, ethTrx.nonce))).digest()[-20:]
(contract_sol, contract_nonce) = ether2program(contract_eth.hex(), evm_loader_id, signer.public_key())

# We need append ACCOUNT_SEED_VERSION to created CODE account (to avoid using previously created accounts to store the code)
# when calculate contract_sol variable ACCOUNT_SEED_VERSION already added in `neon-cli create-program-address`.
(code_sol, code_nonce, code_seed) = ether2seed(ACCOUNT_SEED_VERSION+contract_eth, evm_loader_id, signer.public_key())

logger.debug("Legacy contract address ether: %s", contract_eth.hex())
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, ethTrx)

(trx_accs, sender_ether, create_acc_trx) = create_account_list_by_emulate(signer, client, ethTrx,
deployment_address=contract_eth)
if len(create_acc_trx.instructions):
result = send_measured_transaction(client, create_acc_trx, signer)

precall_txs = Transaction()
precall_txs.add(make_call_from_account_instruction(perm_accs, trx_accs))

logger.debug("ExecuteTrxFromAccountDataIterative:")
send_measured_transaction(client, precall_txs, signer)

return (call_continue(signer, client, perm_accs, trx_accs, steps), '0x'+contract_eth.hex())
# def deploy_contract(signer, client, ethTrx, perm_accs, steps):
# sender_ether = bytes.fromhex(ethTrx.sender())
# (sender_sol, _) = ether2program(sender_ether.hex(), evm_loader_id, signer.public_key())
# logger.debug("Sender account solana: %s %s", sender_ether.hex(), sender_sol)
#
#
# contract_eth = keccak_256(rlp.encode((sender_ether, ethTrx.nonce))).digest()[-20:]
# (contract_sol, contract_nonce) = ether2program(contract_eth.hex(), evm_loader_id, signer.public_key())
#
# # We need append ACCOUNT_SEED_VERSION to created CODE account (to avoid using previously created accounts to store the code)
# # when calculate contract_sol variable ACCOUNT_SEED_VERSION already added in `neon-cli create-program-address`.
# (code_sol, code_nonce, code_seed) = ether2seed(ACCOUNT_SEED_VERSION+contract_eth, evm_loader_id, signer.public_key())
#
# logger.debug("Legacy contract address ether: %s", contract_eth.hex())
# 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, ethTrx)
#
# (trx_accs, sender_ether, create_acc_trx) = create_account_list_by_emulate(signer, client, ethTrx,
# deployment_address=contract_eth)
# if len(create_acc_trx.instructions):
# result = send_measured_transaction(client, create_acc_trx, signer)
#
# precall_txs = Transaction()
# precall_txs.add(make_call_from_account_instruction(perm_accs, trx_accs))
#
# logger.debug("ExecuteTrxFromAccountDataIterative:")
# send_measured_transaction(client, precall_txs, signer)
#
# return (call_continue(signer, client, perm_accs, trx_accs, steps), '0x'+contract_eth.hex())


def _getAccountData(client, account, expected_length, owner=None):
Expand Down