Merge pull request #146 from BoostryJP/dev-2.1

v2.1.2
BoostryJP · Jul 4, 2023 · e9e9e68 · e9e9e68
2 parents 8248008 + 7b52fbd
commit e9e9e68
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/ibet-for-fin-network/general/genesis.json b/ibet-for-fin-network/general/genesis.json
@@ -7,10 +7,10 @@
         "eip155Block": 3,
         "eip158Block": 3,
         "byzantiumBlock": 3,
-        "constantinopleBlock": 999999999,
-        "petersburgBlock": 999999999,
-        "istanbulBlock": 999999999,
-        "berlinBlock": 999999999,
+        "constantinopleBlock": 88666675,
+        "petersburgBlock": 88666675,
+        "istanbulBlock": 88666675,
+        "berlinBlock": 88666675,
         "istanbul": {
             "epoch": 30000,
             "policy": 0,

diff --git a/ibet-for-fin-network/validator/genesis.json b/ibet-for-fin-network/validator/genesis.json
@@ -7,10 +7,10 @@
         "eip155Block": 3,
         "eip158Block": 3,
         "byzantiumBlock": 3,
-        "constantinopleBlock": 999999999,
-        "petersburgBlock": 999999999,
-        "istanbulBlock": 999999999,
-        "berlinBlock": 999999999,
+        "constantinopleBlock": 88666675,
+        "petersburgBlock": 88666675,
+        "istanbulBlock": 88666675,
+        "berlinBlock": 88666675,
         "istanbul": {
             "epoch": 30000,
             "policy": 0,

diff --git a/local-network/docker-compose.yml b/local-network/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   validator-0:
     hostname: validator-0
-    image: ghcr.io/boostryjp/ibet-localnet/validator:v2.0.0
+    image: ghcr.io/boostryjp/ibet-localnet/validator:v2.1.0
     volumes:
       - /home/ubuntu/quorum_data/v0:/eth
     environment:
@@ -24,7 +24,7 @@ services:
     restart: always
   validator-1:
     hostname: validator-1
-    image: ghcr.io/boostryjp/ibet-localnet/validator:v2.0.0
+    image: ghcr.io/boostryjp/ibet-localnet/validator:v2.1.0
     volumes:
       - /home/ubuntu/quorum_data/v1:/eth
     environment:
@@ -46,7 +46,7 @@ services:
     restart: always
   validator-2:
     hostname: validator-2
-    image: ghcr.io/boostryjp/ibet-localnet/validator:v2.0.0
+    image: ghcr.io/boostryjp/ibet-localnet/validator:v2.1.0
     volumes:
       - /home/ubuntu/quorum_data/v2:/eth
     environment:
@@ -68,7 +68,7 @@ services:
     restart: always
   validator-3:
     hostname: validator-3
-    image: ghcr.io/boostryjp/ibet-localnet/validator:v2.0.0
+    image: ghcr.io/boostryjp/ibet-localnet/validator:v2.1.0
     volumes:
       - /home/ubuntu/quorum_data/v3:/eth
     environment:
@@ -90,7 +90,7 @@ services:
     restart: always
   general-0:
     hostname: general-0
-    image: ghcr.io/boostryjp/ibet-localnet/general:v2.0.0
+    image: ghcr.io/boostryjp/ibet-localnet/general:v2.1.0
     volumes:
       - /home/ubuntu/quorum_data/g0:/eth
     environment:

diff --git a/tests/e2e_test.py b/tests/e2e_test.py
@@ -20,7 +20,7 @@
 from eth_utils import to_checksum_address
 
 from web3 import Web3
-from web3.exceptions import BadFunctionCallOutput
+from web3.exceptions import BadFunctionCallOutput, ContractLogicError
 from web3.middleware import geth_poa_middleware
 from web3.datastructures import AttributeDict
 
@@ -506,5 +506,5 @@ def test_error_4(self):
         )
         _function = getattr(contract_with_invalid_abi.functions, "notExistAttribute")
         args = []
-        with pytest.raises(BadFunctionCallOutput):
+        with pytest.raises(ContractLogicError):
             _ = _function(*args).call()