Added getGlobalStateByStateRootHash method to RpcClient

Signed-off-by: Roman Bylbas <romka.bulbas@gmail.com>

Author: Roman Bylbas

src/Entity/GlobalState.php

@@ -4,17 +4,17 @@
 
 class GlobalState
 {
-    private BlockHeader $blockHeader;
+    private ?BlockHeader $blockHeader;
 
     private StoredValue $storedValue;
 
-    public function __construct(BlockHeader $blockHeader, StoredValue $storedValue)
+    public function __construct(?BlockHeader $blockHeader, StoredValue $storedValue)
     {
         $this->blockHeader = $blockHeader;
         $this->storedValue = $storedValue;
     }
 
-    public function getBlockHeader(): BlockHeader
+    public function getBlockHeader(): ?BlockHeader
     {
         return $this->blockHeader;
     }

src/Rpc/RpcClient.php

@@ -354,7 +354,7 @@ public function getDictionaryItemByURef(
     /**
      * @throws RpcError
      */
-    public function getGlobalState(string $blockHash, string $key, array $path = []): GlobalState
+    public function getGlobalStateByBlock(string $blockHash, string $key, array $path = []): GlobalState
     {
         $response = $this->rpcCallMethod(
             self::RPC_METHOD_QUERY_GLOBAL_STATE,
@@ -370,6 +370,22 @@ public function getGlobalState(string $blockHash, string $key, array $path = [])
         return GlobalStateSerializer::fromJson($response);
     }
 
+    public function getGlobalStateByStateRootHash(string $stateRootHash, string $key, array $path = []): GlobalState
+    {
+        $response = $this->rpcCallMethod(
+            self::RPC_METHOD_QUERY_GLOBAL_STATE,
+            array(
+                'state_identifier' => array(
+                    'StateRootHash' => $stateRootHash
+                ),
+                'key' => $key,
+                'path' => $path,
+            )
+        );
+
+        return GlobalStateSerializer::fromJson($response);
+    }
+
     /**
      * @throws RpcError
      */

src/Serializer/GlobalStateSerializer.php

@@ -20,7 +20,7 @@ public static function toJson($globalState): array
     public static function fromJson(array $json): GlobalState
     {
         return new GlobalState(
-            BlockHeaderSerializer::fromJson($json['block_header']),
+            isset($json['block_header']) ? BlockHeaderSerializer::fromJson($json['block_header']) : null,
             StoredValueSerializer::fromJson($json['stored_value'])
         );
     }

tests/Functional/Rpc/RpcClientTest.php

@@ -241,12 +241,22 @@ public function testGetEraSummaryBySwitchBlockHeight(): void
         $this->assertNotNull($eraSummary->getStoredValue()->getEraInfo());
     }
 
-    public function testGetGlobalState(): void
+    public function testGetGlobalStateByBlock(): void
     {
         $blockHashFromTheTestnet = '009516c04e6cb56d1d9b43070fd45cd80bf968739d39555282d8e66a8194e2e3';
         $deployHashFromTheTestnet = 'deploy-39cf80560c87af0e69eb4a2c49f2404842244eafc63c497a6c8eb92f89b3c102';
 
-        $globalState = $this->rpcClient->getGlobalState($blockHashFromTheTestnet, $deployHashFromTheTestnet);
+        $globalState = $this->rpcClient->getGlobalStateByBlock($blockHashFromTheTestnet, $deployHashFromTheTestnet);
+        $this->assertEquals($deployHashFromTheTestnet, 'deploy-' . $globalState->getStoredValue()->getDeployInfo()->getDeployHash());
+    }
+
+    public function testGetGlobalStateByStateRootHash(): void
+    {
+        $blockHashFromTheTestnet = '009516c04e6cb56d1d9b43070fd45cd80bf968739d39555282d8e66a8194e2e3';
+        $deployHashFromTheTestnet = 'deploy-39cf80560c87af0e69eb4a2c49f2404842244eafc63c497a6c8eb92f89b3c102';
+        $stateRootHash = $this->rpcClient->getStateRootHash($blockHashFromTheTestnet);
+
+        $globalState = $this->rpcClient->getGlobalStateByStateRootHash($stateRootHash, $deployHashFromTheTestnet);
         $this->assertEquals($deployHashFromTheTestnet, 'deploy-' . $globalState->getStoredValue()->getDeployInfo()->getDeployHash());
     }
 }