From f140f834171b2d55de84d5315fe2c44501c75477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83lina=20Cenan?= <calina@kaolin.tech>
Date: Mon, 27 Sep 2021 13:17:20 +0300
Subject: [PATCH] v0.8.1 with corrections (#501)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Corrections for 0.8.1.
* Bump version: 0.8.0 → 0.8.1
---
 .bumpversion.cfg                                | 2 +-
 .github/workflows/release.yml                   | 3 ++-
 ocean_lib/__init__.py                           | 2 +-
 ocean_lib/web3_internal/web3_overrides/utils.py | 2 +-
 setup.py                                        | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index c840718ee..45d629eb4 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.0
+current_version = 0.8.1
 commit = True
 tag = True
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7d25141e5..42da02e72 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,6 +34,7 @@ jobs:
       - name: Publish package
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          user: ${{ secrets.PYPI_USERNAME }}
+          user: __token__
+          verbose: true
           password: ${{ secrets.PYPI_PASSWORD }}
 
diff --git a/ocean_lib/__init__.py b/ocean_lib/__init__.py
index 42aa52d84..beb060d56 100644
--- a/ocean_lib/__init__.py
+++ b/ocean_lib/__init__.py
@@ -7,5 +7,5 @@
 
 __author__ = """OceanProtocol"""
 # fmt: off
-__version__ = '0.8.0'
+__version__ = '0.8.1'
 # fmt: on
diff --git a/ocean_lib/web3_internal/web3_overrides/utils.py b/ocean_lib/web3_internal/web3_overrides/utils.py
index f933fac02..055761cd9 100644
--- a/ocean_lib/web3_internal/web3_overrides/utils.py
+++ b/ocean_lib/web3_internal/web3_overrides/utils.py
@@ -33,6 +33,6 @@ def wait_for_transaction_receipt_and_block_confirmations(
       in seconds.
     """
     receipt = web3.eth.wait_for_transaction_receipt(tx_hash, timeout)
-    while web3.eth.block_number < receipt.blockNumber + block_confirmations:
+    while web3.eth.block_number < (receipt.blockNumber + block_confirmations - 1):
         time.sleep(block_number_poll_interval)
     return web3.eth.get_transaction_receipt(tx_hash)
diff --git a/setup.py b/setup.py
index 515c0454a..f93745b1f 100644
--- a/setup.py
+++ b/setup.py
@@ -99,7 +99,7 @@
     url="https://github.com/oceanprotocol/ocean.py",
     # fmt: off
     # bumpversion.sh needs single-quotes
-    version='0.8.0',
+    version='0.8.1',
     # fmt: on
     zip_safe=False,
 )