Skip to content

develop->master 0.5.1 #400

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
vasiliy-zaznobin merged 7 commits into from
Dec 21, 2021
Merged

develop->master 0.5.1 #400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9530816
#420 Remove neon token accounts from transaction (#371)
anton-lisanin Dec 14, 2021
8b22011
#364 Do not try to send create accounts trx if it was already sent (#…
otselnik Dec 14, 2021
521bd15
#366 on bucked error only check if there success sendings, if no rais…
otselnik Dec 14, 2021
25734a3
#338 create sol price provider (#346)
ivandzen Dec 16, 2021
4bd8ac4
master v0.5.0 -> develop (#389)
vasiliy-zaznobin Dec 17, 2021
9e2ec73
Disable (disable-query-account-tests) (#397)
vakond Dec 20, 2021
f5110a7
Merge remote-tracking branch 'origin/develop' into develop->master_0.5.1
vasiliy-zaznobin Dec 21, 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
Next Next commit
#420 Remove neon token accounts from transaction (#371)
  • Loading branch information
@anton-lisanin
anton-lisanin authored Dec 14, 2021
commit 953081687b7e71ff5f655fdba0d99a863f84cc4e
2 changes: 0 additions & 2 deletions proxy/common_neon/neon_instruction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@

obligatory_accounts = [
AccountMeta(pubkey=EVM_LOADER_ID, is_signer=False, is_writable=False),
AccountMeta(pubkey=ETH_TOKEN_MINT_ID, is_signer=False, is_writable=False),
AccountMeta(pubkey=TOKEN_PROGRAM_ID, is_signer=False, is_writable=False),
AccountMeta(pubkey=SYSVAR_CLOCK_PUBKEY, is_signer=False, is_writable=False),
]


Expand Down
4 changes: 0 additions & 4 deletions proxy/common_neon/transaction_sender.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,6 @@ def create_account_list_by_emulate(self):
sender_sol = PublicKey(acc_desc["account"])
else:
add_keys_05.append(AccountMeta(pubkey=acc_desc["account"], is_signer=False, is_writable=True))
token_account = getTokenAddr(PublicKey(acc_desc["account"]))
add_keys_05.append(AccountMeta(pubkey=token_account, is_signer=False, is_writable=True))
if acc_desc["new"]:
if code_account:
add_keys_05.append(AccountMeta(pubkey=code_account, is_signer=False, is_writable=code_account_writable))
Expand All @@ -298,10 +296,8 @@ def create_account_list_by_emulate(self):

self.eth_accounts = [
AccountMeta(pubkey=contract_sol, is_signer=False, is_writable=True),
AccountMeta(pubkey=getTokenAddr(contract_sol), is_signer=False, is_writable=True),
] + ([AccountMeta(pubkey=code_sol, is_signer=False, is_writable=code_writable)] if code_sol != None else []) + [
AccountMeta(pubkey=sender_sol, is_signer=False, is_writable=True),
AccountMeta(pubkey=self.caller_token, is_signer=False, is_writable=True),
] + add_keys_05

self.steps_emulated = output_json["steps_executed"]
Expand Down