Skip to content

Last changes from devnet-aws #592

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
afalaleev merged 17 commits into from
Feb 22, 2022
Merged

Last changes from devnet-aws #592

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aa2d446
Use slot for block number. #580
afalaleev Feb 17, 2022
62c4368
All connections to Solana by SolanaInteractor
afalaleev Feb 19, 2022
d61b87c
Add installing of solcx to Dockerfile
afalaleev Feb 19, 2022
b89880d
Fix Neon EVM program version
afalaleev Feb 19, 2022
34d6675
Use SolTxSender for transaction sending.
afalaleev Feb 20, 2022
fea297d
Fix exeception on erasing not-exist key
afalaleev Feb 20, 2022
f799d94
Add reconnect on disconnect from Solana node
afalaleev Feb 20, 2022
cd67692
Use cache of existing blocks
afalaleev Feb 20, 2022
2d230a3
Fix Neon EVM version in docker-compose
afalaleev Feb 20, 2022
44162f6
Fix block order in cache
afalaleev Feb 20, 2022
1c35651
Change type of exception on connection problem
afalaleev Feb 20, 2022
263eb27
Create fake blocks for empty slots
afalaleev Feb 20, 2022
b0f0aaa
Call cancel on unknown errors for iterative transactions. #587
afalaleev Feb 21, 2022
447e57e
Merge branch 'develop' into ci-test-block-develop
afalaleev Feb 21, 2022
2cedfa5
Switch to latest build
afalaleev Feb 21, 2022
3611be8
Use solana instead of client
afalaleev Feb 21, 2022
d538a20
Use solana instead of client
afalaleev Feb 22, 2022
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
Use solana instead of client
  • Loading branch information
@afalaleev
afalaleev committed Feb 21, 2022
commit 3611be8c9f3a88b547036e9324c7603b5a9ffaf0
4 changes: 2 additions & 2 deletions proxy/common_neon/estimate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def evm_step_cost(signature_cnt):

@logged_group("neon.Proxy")
class GasEstimate:
def __init__(self, request, db, client, evm_step_count):
def __init__(self, request, db, solana, evm_step_count):
self.sender: bytes = bytes.fromhex(request.get('from', "0x%040x" % 0x0)[2:])
self.step_count = evm_step_count

Expand All @@ -46,7 +46,7 @@ def __init__(self, request, db, client, evm_step_count):
signed_trx = w3.eth.account.sign_transaction(unsigned_trx, eth_keys.PrivateKey(os.urandom(32)))
trx = EthTrx.fromString(signed_trx.rawTransaction)

self.tx_sender = NeonTxSender(db, client, trx, steps=evm_step_count)
self.tx_sender = NeonTxSender(db, solana, trx, steps=evm_step_count)

def iteration_info(self) -> Tuple[int, int]:
if self.tx_sender.steps_emulated > 0:
Expand Down
2 changes: 1 addition & 1 deletion proxy/plugin/solana_rest_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def eth_gasPrice(self):

def eth_estimateGas(self, param):
try:
calculator = GasEstimate(param, self._db, self._client, evm_step_count)
calculator = GasEstimate(param, self._db, self._solana, evm_step_count)
return calculator.estimate()

except EthereumError:
Expand Down