Skip to content

ERC20 Wrapper #190

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
s-medvedev merged 1 commit into from
Sep 13, 2021
Merged

ERC20 Wrapper #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Support ERC20 Wrapper
  • Loading branch information
@anton-lisanin
anton-lisanin committed Sep 12, 2021
commit ca2c4cebf5fe46d29022aa426183f7752af89f8f
23 changes: 18 additions & 5 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 @@ -25,7 +25,7 @@
from solana.sysvar import *
from solana.transaction import AccountMeta, Transaction, TransactionInstruction
from spl.token.constants import ACCOUNT_LEN, ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID
from spl.token.instructions import get_associated_token_address, transfer2, Transfer2Params
from spl.token.instructions import get_associated_token_address, create_associated_token_account, transfer2, Transfer2Params
from web3.auto import w3

from .eth_proto import Trx
Expand Down Expand Up @@ -314,10 +314,14 @@ def call_emulated(contract_id, caller_id, data=None, value=None):
result = json.loads(output)
exit_status = result['exit_status']
if exit_status == 'revert':
offset = int(result['result'][8:8+64], 16)
length = int(result['result'][8+64:8+64+64], 16)
message = str(bytes.fromhex(result['result'][8+offset*2+64:8+offset*2+64+length*2]), 'utf8')
raise EthereumError(code=3, message='execution reverted: '+message, data='0x'+result['result'])
result_value = result['result']
if len(result_value) == 0:
raise EthereumError(code=3, message='execution reverted')

offset = int(result_value[8:8+64], 16)
length = int(result_value[8+64:8+64+64], 16)
message = str(bytes.fromhex(result_value[8+offset*2+64:8+offset*2+64+length*2]), 'utf8')
raise EthereumError(code=3, message='execution reverted: '+message, data='0x'+result_value)
if result["exit_status"] != "succeed":
raise Exception("evm emulator error ", result)
return result
Expand Down Expand Up @@ -680,6 +684,15 @@ def create_account_list_by_emulate(signer, client, ethTrx):
acc_desc["address"],
str(NEW_USER_AIRDROP_AMOUNT))

for token_account in output_json["token_accounts"]:
add_keys_05.append(AccountMeta(pubkey=token_account["key"], is_signer=False, is_writable=True))

if token_account["new"]:
trx.add(create_associated_token_account(signer.public_key(), token_account["owner"], token_account["mint"]))

for account_meta in output_json["solana_accounts"]:
add_keys_05.append(AccountMeta(pubkey=account_meta["pubkey"], is_signer=account_meta["is_signer"], is_writable=account_meta["is_writable"]))

caller_token = get_associated_token_address(PublicKey(sender_sol), ETH_TOKEN_MINT_ID)

eth_accounts = [
Expand Down