Merge branch 'main' into 2688-add-pr-title-formatting-check-in-ci

package.json

@@ -64,7 +64,7 @@
         "bn.js": "^5.1.1",
         "crypto-js": "^4.2.0",
         "js-base64": "^3.7.4",
-        "long": "^4.0.0",
+        "long": "^5.2.3",
         "pino": "^8.14.1",
         "pino-pretty": "^10.0.0",
         "protobufjs": "7.2.5",
@@ -85,7 +85,6 @@
         "@playwright/test": "^1.30.0",
         "@types/chai": "^4.3.4",
         "@types/crypto-js": "^4.2.0",
-        "@types/long": "^4.0.2",
         "@types/mocha": "^10.0.1",
         "@types/node": "^20.8.10",
         "@types/utf8": "^3.0.1",

packages/proto/.babelrc.json

@@ -1,5 +1,4 @@
 {
-    "presets": ["minify"],
     "plugins": [
         "@babel/plugin-transform-modules-commonjs",
         "@babel/plugin-syntax-dynamic-import",

packages/proto/package.json

@@ -34,15 +34,14 @@
         "last 1 Firefox versions"
     ],
     "dependencies": {
-        "long": "^4.0.0",
+        "long": "^5.2.3",
         "protobufjs": "7.2.5"
     },
     "devDependencies": {
         "@babel/cli": "^7.23.4",
         "@babel/core": "^7.23.3",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-transform-modules-commonjs": "^7.20.11",
-        "@types/long": "^4.0.2",
         "@typescript-eslint/eslint-plugin": "^5.62.0",
         "@typescript-eslint/parser": "^5.62.0",
         "babel-plugin-dynamic-import-node": "^2.3.3",

src/EthereumFlow.js

@@ -46,7 +46,7 @@ import * as hex from "./encoding/hex.js";
  * @typedef {import("./Timestamp.js").default} Timestamp
  * @typedef {import("./transaction/TransactionId.js").default} TransactionId
  * @typedef {import("./transaction/TransactionResponse.js").default} TransactionResponse
- * @typedef {import("long").Long} Long
+ * @typedef {import("long")} Long
  */
 
 /**

src/EthereumTransaction.js

@@ -42,7 +42,7 @@ import Transaction, {
  * @typedef {import("./client/Client.js").default<*, *>} Client
  * @typedef {import("./Timestamp.js").default} Timestamp
  * @typedef {import("./transaction/TransactionId.js").default} TransactionId
- * @typedef {import("long").Long} Long
+ * @typedef {import("long")} Long
  */
 
 /**

src/StakingInfo.js

@@ -24,7 +24,7 @@ import Timestamp from "./Timestamp.js";
 import * as HashgraphProto from "@hashgraph/proto";
 
 /**
- * @typedef {import("long").Long} Long
+ * @typedef {import("long")} Long
  */
 
 /**

src/address_book/NodeAddress.js

@@ -29,7 +29,7 @@ import * as utf8 from "../encoding/utf8.js";
 
 /**
  * @typedef {import("./Endpoint.js").EndPointJson} EndpointJson
- * @typedef {import("long").Long} Long
+ * @typedef {import("long")} Long
  */
 
 /**

src/contract/ContractCreateFlow.js

@@ -46,7 +46,7 @@ import PublicKey from "../PublicKey.js";
 
 /**
  * @typedef {import("bignumber.js").BigNumber} BigNumber
- * @typedef {import("long").Long} Long
+ * @typedef {import("long")} Long
  */
 
 export default class ContractCreateFlow {

src/contract/ContractFunctionParameters.js

@@ -29,6 +29,7 @@ import BigNumber from "bignumber.js";
 import * as util from "../util.js";
 import { defaultAbiCoder } from "@ethersproject/abi";
 import { arrayify } from "@ethersproject/bytes";
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import EvmAddress from "../EvmAddress.js";
 

src/contract/DelegateContractId.js

@@ -29,7 +29,7 @@ import * as hex from "../encoding/hex.js";
  */
 
 /**
- * @typedef {import("long").Long} Long
+ * @typedef {import("long")} Long
  * @typedef {import("../client/Client.js").default<*, *>} Client
  */
 

src/schedule/ScheduleId.js

@@ -22,7 +22,7 @@ import * as entity_id from "../EntityIdHelper.js";
 import * as HashgraphProto from "@hashgraph/proto";
 
 /**
- * @typedef {import("long").Long} Long
+ * @typedef {import("long")} Long
  * @typedef {import("../client/Client.js").default<*, *>} Client
  */
 

src/token/TokenId.js

@@ -22,7 +22,7 @@ import * as entity_id from "../EntityIdHelper.js";
 import * as HashgraphProto from "@hashgraph/proto";
 
 /**
- * @typedef {import("long").Long} Long
+ * @typedef {import("long")} Long
  * @typedef {import("../client/Client.js").default<*, *>} Client
  */
 

src/topic/TopicId.js

@@ -22,7 +22,7 @@ import * as entity_id from "../EntityIdHelper.js";
 import * as HashgraphProto from "@hashgraph/proto";
 
 /**
- * @typedef {import("long").Long} Long
+ * @typedef {import("long")} Long
  * @typedef {import("../client/Client.js").default<*, *>} Client
  */
 

src/types/global.d.ts

@@ -0,0 +1,6 @@
+export {};
+
+// Declare Long globally
+declare global {
+    const Long: import("long");
+}

test/integration/TokenAirdropIntegrationTest.js

@@ -188,9 +188,10 @@ describe("TokenAirdropIntegrationTest", function () {
         expect(newPendingAirdrops[1].airdropId.nftId.tokenId).to.deep.equal(
             nftTokenId,
         );
-        expect(newPendingAirdrops[1].airdropId.nftId.serial).to.deep.equal(
-            serials[0],
-        );
+
+        expect(
+            newPendingAirdrops[1].airdropId.nftId.serial.toString(),
+        ).to.deep.equal(serials[0].toString());
     });
 
     it("should create hollow account when airdropping tokens and transfers them", async function () {