Skip to content

Commit

Permalink
Merge pull request #317 from skalenetwork/bump-version-in-develop
Browse files Browse the repository at this point in the history
Bump version to 2.1.5
  • Loading branch information
badrogger authored Jun 19, 2023
2 parents 04af93a + 9b3c100 commit 439cf6d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.4
2.1.5
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
skale.py==5.8dev4
skale.py==6.0dev0
4 changes: 2 additions & 2 deletions tests/docker_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ def make_tx(w3, wallet, failed=False):
number = 3 if failed else 4
return tester.functions.setOnlyEven(
number
).buildTransaction({
'gasPrice': w3.eth.gasPrice,
).build_transaction({
'gasPrice': w3.eth.gas_price,
'gas': DEFAULT_GAS,
'from': wallet.address
})
Expand Down
4 changes: 2 additions & 2 deletions tests/processor_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ def make_tx(w3, wallet, failed=False):
number = 3 if failed else 4
return tester.functions.setOnlyEven(
number
).buildTransaction({
'gasPrice': w3.eth.gasPrice,
).build_transaction({
'gasPrice': w3.eth.gas_price,
'gas': DEFAULT_GAS,
'from': wallet.address
})
Expand Down
6 changes: 3 additions & 3 deletions tests/utils/account.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ def send_eth(
'to': address,
'value': amount,
'gas': 8000000,
'gasPrice': w3.eth.gasPrice
'gasPrice': w3.eth.gas_price
}
signed_txn = wallet.sign(tx)
h = w3.eth.sendRawTransaction(signed_txn.rawTransaction)
w3.eth.waitForTransactionReceipt(h, timeout=60)
h = w3.eth.send_raw_transaction(signed_txn.rawTransaction)
w3.eth.wait_for_transaction_receipt(h, timeout=60)


def generate_address(w3: Web3) -> str:
Expand Down
4 changes: 2 additions & 2 deletions transaction_manager/eth.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def chain_id(self) -> int:
return self.w3.eth.chain_id

def get_balance(self, address: str) -> int:
checksum_addres = self.w3.toChecksumAddress(address)
checksum_addres = self.w3.to_checksum_address(address)
return self.w3.eth.get_balance(checksum_addres)

TX_ATTRS = [
Expand Down Expand Up @@ -190,7 +190,7 @@ def send_tx(self, signed_tx: Dict) -> str:
return tx_hash

def get_nonce(self, address: str) -> int:
checksum_addres = self.w3.toChecksumAddress(address)
checksum_addres = self.w3.to_checksum_address(address)
return self.w3.eth.get_transaction_count(checksum_addres)

def wait_for_blocks(
Expand Down

0 comments on commit 439cf6d

Please sign in to comment.