Method fromEvmAddress() fails to return the contract id from long zer…

…o address (#2018) * contract id from long zero address Signed-off-by: svetoslav-nikol0v <[email protected]> * test description Signed-off-by: svetoslav-nikol0v <[email protected]> --------- Signed-off-by: svetoslav-nikol0v <[email protected]>
hiero-ledger · Nov 17, 2023 · fe0fbe9 · fe0fbe9
1 parent e3d2ed3
commit fe0fbe9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/contract/ContractId.js b/src/contract/ContractId.js
@@ -72,7 +72,7 @@ export default class ContractId extends Key {
     static fromEvmAddress(shard, realm, evmAddress) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         if (isLongZeroAddress(hex.decode(evmAddress))) {
-            return this.fromEvmAddress(0, 0, evmAddress);
+            return new ContractId(...entity_id.fromSolidityAddress(evmAddress));
         } else {
             return new ContractId(shard, realm, 0, hex.decode(evmAddress));
         }

diff --git a/test/unit/ContractId.js b/test/unit/ContractId.js
@@ -51,4 +51,23 @@ describe("ContractId", function () {
             evmAddress: null,
         });
     });
+
+    it("should return the contract id from long zero address", function () {
+        const shard = 0,
+            realm = 0,
+            num = 5;
+        const ADDRESS_LENGTH = 42;
+        const contractId = new ContractId(shard, realm, num);
+        const longZeroAddress = contractId
+            .toSolidityAddress()
+            .padStart(ADDRESS_LENGTH, "0x");
+
+        const contractIdFromAddress = ContractId.fromEvmAddress(
+            shard,
+            realm,
+            longZeroAddress
+        );
+
+        expect(contractId).to.deep.equal(contractIdFromAddress);
+    });
 });