Skip to content

345 transfer to treasures on each iteration #252

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 25 commits into from
Oct 29, 2021
Merged

345 transfer to treasures on each iteration #252

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
21fa7f9
Add account metas for some neon-evm instructions
vasiliy-zaznobin Oct 20, 2021
6da0c85
Add account metas for the 09-th neon-evm instruction
vasiliy-zaznobin Oct 20, 2021
eda73a4
Add gas_used_and_paid and number_of_payments into STORAGE_ACCOUNT_INF…
vasiliy-zaznobin Oct 21, 2021
c34fa78
Remove is_rw_blocked_acc from ACCOUNT_INFO_LAYOUT
vasiliy-zaznobin Oct 21, 2021
d7c4fcd
Merge remote-tracking branch 'origin/develop' into 313-Payment_for_sp…
vasiliy-zaznobin Oct 21, 2021
6cbb1c1
Fix after merge origin/develop
vasiliy-zaznobin Oct 21, 2021
ec80db4
Remove rw_blocked_acc
vasiliy-zaznobin Oct 22, 2021
37a252f
Introduce a new version of the instruction 11(0x0B) -> 18(0x13)
vasiliy-zaznobin Oct 25, 2021
174caca
Introduce a new version of the instruction 11(0x0B) -> 18(0x12)
vasiliy-zaznobin Oct 25, 2021
a27fb33
Introduce a new version of the instruction 09(0x09) -> 19(0x13)
vasiliy-zaznobin Oct 25, 2021
35460e6
Introduce a new version of the instruction 09(0x09) -> 19(0x13)
vasiliy-zaznobin Oct 26, 2021
00fdfc5
Introduce a new version of the instructions
vasiliy-zaznobin Oct 26, 2021
cb84c9e
Add collateral pool for the instruction 10(0x0A) 'Continue'
vasiliy-zaznobin Oct 26, 2021
4b80435
Restore the field 'is_rw_blocked'
vasiliy-zaznobin Oct 27, 2021
b40e52a
Restore the field 'is_rw_blocked'
vasiliy-zaznobin Oct 27, 2021
2cc184b
Merge remote-tracking branch 'origin/develop' into 313-Payment_for_sp…
vasiliy-zaznobin Oct 27, 2021
fbb59cb
Merge remote-tracking branch 'origin/develop' into 345-Transfer_to_tr…
vasiliy-zaznobin Oct 27, 2021
390e12b
Merge branch '313-Payment_for_spent_gas_at_the_end_of_each_iteration'…
vasiliy-zaznobin Oct 27, 2021
65b757d
Introduce a new version of the instruction 'Continue' 10(0x0A) -> 20(…
vasiliy-zaznobin Oct 27, 2021
0a5eff0
Replace a new version of the instruction 18(0x12) -> 22(0x16)
vasiliy-zaznobin Oct 28, 2021
673667d
Replace a new version of the instruction 18(0x12) -> 22(0x16)
vasiliy-zaznobin Oct 28, 2021
8e1bce1
Merge remote-tracking branch 'origin/develop' into 313-Payment_for_sp…
vasiliy-zaznobin Oct 28, 2021
30ca2aa
Merge remote-tracking branch 'origin/313-Payment_for_spent_gas_at_the…
vasiliy-zaznobin Oct 28, 2021
b9237b8
Merge remote-tracking branch 'origin/develop' into 345-Transfer_to_tr…
vasiliy-zaznobin Oct 28, 2021
72c57c5
Merge remote-tracking branch 'origin/develop' into 345-Transfer_to_tr…
vasiliy-zaznobin Oct 29, 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
Add account metas for some neon-evm instructions
  • Loading branch information
@vasiliy-zaznobin
vasiliy-zaznobin committed Oct 20, 2021
commit 21fa7f94f8bd34223d6e4c64a16a0149af8efaaf
4 changes: 4 additions & 0 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 @@ -630,6 +630,8 @@ def make_partial_call_instruction(perm_accs, trx_accs, step_count, call_data):
AccountMeta(pubkey=sysinstruct, is_signer=False, is_writable=False),
AccountMeta(pubkey=perm_accs.operator, is_signer=True, is_writable=True),
AccountMeta(pubkey=perm_accs.collateral_pool_address, is_signer=False, is_writable=True),
AccountMeta(pubkey=perm_accs.operator_token, is_signer=False, is_writable=True),
AccountMeta(pubkey=trx_accs.caller_token, is_signer=False, is_writable=True),
AccountMeta(pubkey=system, is_signer=False, is_writable=False),

] + trx_accs.eth_accounts + [
Expand Down Expand Up @@ -696,6 +698,8 @@ def make_call_from_account_instruction(perm_accs, trx_accs, step_count = 0):

AccountMeta(pubkey=perm_accs.operator, is_signer=True, is_writable=True),
AccountMeta(pubkey=perm_accs.collateral_pool_address, is_signer=False, is_writable=True),
AccountMeta(pubkey=perm_accs.operator_token, is_signer=False, is_writable=True),
AccountMeta(pubkey=trx_accs.caller_token, is_signer=False, is_writable=True),
AccountMeta(pubkey=system, is_signer=False, is_writable=False),

] + trx_accs.eth_accounts + [
Expand Down