@arkecosystem/typescript-crypto 0.0.9 → 0.0.11

package/dist/enums/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./AbiFunction";
-export * from "./Constants";
 export * from "./ContractAbiType";
 export * from "./ContractAddresses";
 //# sourceMappingURL=index.d.ts.map

package/dist/enums/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/enums/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/enums/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC"}

package/dist/enums/index.js

@@ -1,4 +1,3 @@
 export * from "./AbiFunction";
-export * from "./Constants";
 export * from "./ContractAbiType";
 export * from "./ContractAddresses";

package/dist/identities/PrivateKey.d.ts

@@ -11,6 +11,7 @@ export declare class PrivateKey {
     static fromHex(hex: string): PrivateKey;
     static fromWif(wif: string): PrivateKey;
     sign(message: string): Promise<RecoverableSignature>;
+    signToEcdsa(message: string): Promise<string>;
 }
 export {};
 //# sourceMappingURL=PrivateKey.d.ts.map

package/dist/identities/PrivateKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrivateKey.d.ts","sourceRoot":"","sources":["../../src/identities/PrivateKey.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAkC,MAAM,QAAQ,CAAC;AAMhE,UAAU,oBAAoB;IAC7B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACV;AAED,qBAAa,UAAU;IACf,UAAU,EAAE,MAAM,CAAC;gBAEd,OAAO,EAAE,MAAM,CAAC,MAAM;IAIlC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU;IAIrD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU;IAMvC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU;IAMjC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAW1D"}
+{"version":3,"file":"PrivateKey.d.ts","sourceRoot":"","sources":["../../src/identities/PrivateKey.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAkC,MAAM,QAAQ,CAAC;AAKhE,UAAU,oBAAoB;IAC7B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACV;AAED,qBAAa,UAAU;IACf,UAAU,EAAE,MAAM,CAAC;gBAEd,OAAO,EAAE,MAAM,CAAC,MAAM;IAIlC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU;IAIrD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU;IAMvC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU;IAMjC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAWpD,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAQnD"}

package/dist/identities/PrivateKey.js

@@ -9,9 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import * as WIF from "wif";
 import { ethers, keccak256, sha256, toUtf8Bytes } from "ethers";
-import { signAsync } from "@noble/secp256k1";
-import { Constants } from "@/enums/Constants";
 import { Network } from "@/configuration/Network";
+import { signAsync } from "@noble/secp256k1";
 export class PrivateKey {
     constructor(keyPair) {
         this.privateKey = keyPair.privateKey.substring(2);
@@ -34,8 +33,17 @@ export class PrivateKey {
             return {
                 r: signature.r.toString(16).padStart(64, "0"),
                 s: signature.s.toString(16).padStart(64, "0"),
-                v: signature.recovery + Constants.ETHEREUM_RECOVERY_ID_OFFSET,
+                v: signature.recovery,
             };
         });
     }
+    signToEcdsa(message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const hash = keccak256("0x" + message).slice(2);
+            const signature = yield signAsync(hash, this.privateKey);
+            const v = signature.recovery;
+            // @see https://github.com/ArkEcosystem/mainsail/blob/16e50d45dcfbf15b20245f11b123634f0fd0b713/packages/utils/source/format-ecdsa-signature.ts#L2
+            return signature.toCompactHex() + v.toString(16).padStart(2, "0");
+        });
+    }
 }

package/dist/index.js

@@ -46,13 +46,6 @@ var AbiFunction = /* @__PURE__ */ ((AbiFunction2) => {
   return AbiFunction2;
 })(AbiFunction || {});
 
-// src/enums/Constants.ts
-var Constants = /* @__PURE__ */ ((Constants2) => {
-  Constants2["EIP_1559_PREFIX"] = "02";
-  Constants2[Constants2["ETHEREUM_RECOVERY_ID_OFFSET"] = 27] = "ETHEREUM_RECOVERY_ID_OFFSET";
-  return Constants2;
-})(Constants || {});
-
 // src/enums/ContractAbiType.ts
 var ContractAbiType = /* @__PURE__ */ ((ContractAbiType2) => {
   ContractAbiType2["CUSTOM"] = "custom";
@@ -23525,9 +23518,15 @@ var PrivateKey = class _PrivateKey {
     return {
       r: signature.r.toString(16).padStart(64, "0"),
       s: signature.s.toString(16).padStart(64, "0"),
-      v: signature.recovery + 27 /* ETHEREUM_RECOVERY_ID_OFFSET */
+      v: signature.recovery
     };
   }
+  async signToEcdsa(message) {
+    const hash2 = keccak256("0x" + message).slice(2);
+    const signature = await signAsync(hash2, this.privateKey);
+    const v = signature.recovery;
+    return signature.toCompactHex() + v.toString(16).padStart(2, "0");
+  }
 };
 
 // src/identities/PublicKey.ts
@@ -24926,18 +24925,17 @@ var AbstractTransactionBuilder = class {
         value: "0",
         senderPublicKey: "",
         gasPrice: "5",
+        gasLimit: 1e6,
         nonce: "1",
-        network: Network.get().chainId(),
-        gas: 1e6,
         data: ""
       }
     );
   }
-  gas(gas) {
-    if (gas instanceof bignumber_default) {
-      gas = gas.toFixed();
+  gasLimit(gasLimit) {
+    if (gasLimit instanceof bignumber_default) {
+      gasLimit = gasLimit.toFixed();
     }
-    this.transaction.data.gas = gas;
+    this.transaction.data.gasLimit = gasLimit;
     return this;
   }
   to(to) {
@@ -24955,16 +24953,17 @@ var AbstractTransactionBuilder = class {
     this.transaction.data.nonce = nonce;
     return this;
   }
-  network(network) {
-    this.transaction.data.network = network;
-    return this;
-  }
   async sign(passphrase) {
     this.transaction.data.senderPublicKey = PublicKey.fromPassphrase(passphrase).publicKey;
     this.transaction = await this.transaction.sign(PrivateKey.fromPassphrase(passphrase));
     this.transaction.data.hash = this.transaction.hash();
     return this;
   }
+  async legacySecondSign(passphrase, secondPassprase) {
+    await this.sign(passphrase);
+    await this.transaction.legacySecondSign(PrivateKey.fromPassphrase(secondPassprase));
+    return this;
+  }
   verify() {
     return this.transaction.verify();
   }
@@ -24983,23 +24982,25 @@ var AbstractTransactionBuilder = class {
 var TransactionUtils = class {
   static toBuffer(transaction, skipSignature = false) {
     const fields = [
-      toBeArray(transaction["network"] ?? 0),
       toBeArray(transaction["nonce"] ? transaction["nonce"] : 0),
-      toBeArray(0),
       toBeArray(transaction["gasPrice"] ?? 0),
-      toBeArray(transaction["gas"] ?? 0),
+      toBeArray(transaction["gasLimit"] ?? 0),
       transaction["to"] ?? "0x",
       toBeArray(transaction["value"] ? transaction["value"] : 0),
-      transaction["data"] && transaction["data"].startsWith("0x") ? transaction["data"] : "0x" + (transaction["data"] ?? ""),
-      []
+      transaction["data"] && transaction["data"].startsWith("0x") ? transaction["data"] : "0x" + (transaction["data"] ?? "")
     ];
-    if (!skipSignature && transaction["v"] && transaction["r"] && transaction["s"]) {
-      fields.push(toBeArray(transaction["v"] - 27 /* ETHEREUM_RECOVERY_ID_OFFSET */));
+    if (!skipSignature && transaction["v"] !== void 0 && transaction["r"] && transaction["s"]) {
+      fields.push(toBeArray(transaction["v"] + Network.get().chainId() * 2 + 35));
       fields.push("0x" + transaction["r"]);
       fields.push("0x" + transaction["s"]);
+      if (transaction.legacySecondSignature) {
+        fields.push(`0x${transaction.legacySecondSignature}`);
+      }
+    } else {
+      fields.push(toBeArray(Network.get().chainId()), toBeArray(0), toBeArray(0));
     }
     const encoded = encodeRlp(fields);
-    const payload = "02" /* EIP_1559_PREFIX */ + encoded.substring(2);
+    const payload = encoded.substring(2);
     return Buffer.from(payload, "hex");
   }
   static toHash(transaction, skipSignature = false) {
@@ -25040,6 +25041,11 @@ var AbstractTransaction = class {
     this.data["s"] = signature.s;
     return this;
   }
+  async legacySecondSign(privateKey) {
+    const hash2 = TransactionUtils.toBuffer(this.data, true).toString("hex");
+    this.data.legacySecondSignature = await privateKey.signToEcdsa(hash2);
+    return this;
+  }
   recoverSender() {
     const publicKey = this.recoverPublicKey();
     this.data["senderPublicKey"] = publicKey.publicKey;
@@ -25056,11 +25062,11 @@ var AbstractTransaction = class {
   toObject() {
     return [
       "gasPrice",
-      "network",
       "hash",
-      "gas",
+      "gasLimit",
       "nonce",
       "senderPublicKey",
+      "legacySecondSignature",
       "to",
       "value",
       "data",
@@ -25088,14 +25094,14 @@ var AbstractTransaction = class {
     return Serializer.new(this).serialize(skipSignature);
   }
   recoverPublicKey() {
-    if (!this.data.v || !this.data.r || !this.data.s) {
+    if (this.data.v === void 0 || !this.data.r || !this.data.s) {
       throw new Error("Transaction signature is missing");
     }
     return PublicKey.recover(
       Buffer.from(this.hash(true), "hex"),
       BigInt(`0x${this.data.r}`),
       BigInt(`0x${this.data.s}`),
-      this.data.v - 27 /* ETHEREUM_RECOVERY_ID_OFFSET */
+      this.data.v
     );
   }
 };
@@ -28226,7 +28232,7 @@ var Deserializer = class _Deserializer {
     this.SIGNATURE_SIZE = 64;
     this.RECOVERY_SIZE = 1;
     this.serialized = serialized;
-    this.encoded_rlp = "0x" + serialized.substring(2);
+    this.encoded_rlp = "0x" + serialized;
   }
   static new(serialized) {
     return new _Deserializer(serialized);
@@ -28234,18 +28240,20 @@ var Deserializer = class _Deserializer {
   deserialize() {
     const decodedRlp = decodeRlp(this.encoded_rlp);
     const data = {
-      network: Number(decodedRlp[0]),
-      nonce: _Deserializer.parseNumber(decodedRlp[1]),
-      gasPrice: _Deserializer.parseNumber(decodedRlp[3]).toString(),
-      gas: _Deserializer.parseNumber(decodedRlp[4]).toString(),
-      to: _Deserializer.parseAddress(decodedRlp[5]),
-      value: _Deserializer.parseBigNumber(decodedRlp[6]),
-      data: _Deserializer.parseHex(decodedRlp[7])
+      nonce: _Deserializer.parseNumber(decodedRlp[0]),
+      gasPrice: _Deserializer.parseNumber(decodedRlp[1]).toString(),
+      gasLimit: _Deserializer.parseNumber(decodedRlp[2]).toString(),
+      to: _Deserializer.parseAddress(decodedRlp[3]),
+      value: _Deserializer.parseBigNumber(decodedRlp[4]),
+      data: _Deserializer.parseHex(decodedRlp[5])
     };
-    if (decodedRlp.length === 12) {
-      data["v"] = _Deserializer.parseNumber(decodedRlp[9]) + 27 /* ETHEREUM_RECOVERY_ID_OFFSET */;
-      data["r"] = _Deserializer.parseHex(decodedRlp[10]);
-      data["s"] = _Deserializer.parseHex(decodedRlp[11]);
+    if (decodedRlp.length >= 9) {
+      data["v"] = _Deserializer.parseNumber(decodedRlp[6]) - (Network.get().chainId() * 2 + 35);
+      data["r"] = _Deserializer.parseHex(decodedRlp[7]);
+      data["s"] = _Deserializer.parseHex(decodedRlp[8]);
+      if (decodedRlp.length === 10) {
+        data.legacySecondSignature = decodedRlp[9].toString().slice(2);
+      }
     }
     const transaction = this.guessTransactionFromData(data);
     transaction.data = data;
@@ -28327,7 +28335,6 @@ export {
   AbstractTransactionBuilder,
   Address,
   Abi_Consensus_default as ConsensusContract,
-  Constants,
   ContractAbiType,
   ContractAddresses,
   Deserializer,

package/dist/transactions/Deserializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Deserializer.d.ts","sourceRoot":"","sources":["../../src/transactions/Deserializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAInE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAgB1D,qBAAa,YAAY;IACxB,cAAc,SAAM;IACpB,aAAa,SAAK;IAElB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;gBAEP,UAAU,EAAE,MAAM;IAK9B,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY;IAI5C,WAAW,IAAI,YAAY;IA6B3B,MAAM,CAAC,aAAa,CACnB,IAAI,EAAE,eAAe,EACrB,OAAO,GAAE,eAA2C,GAClD,SAAS,GAAG,IAAI;IAiBnB,OAAO,CAAC,wBAAwB;IAgDhC,OAAO,CAAC,MAAM,CAAC,WAAW;IAI1B,OAAO,CAAC,MAAM,CAAC,cAAc;IAI7B,OAAO,CAAC,MAAM,CAAC,YAAY;IAI3B,OAAO,CAAC,MAAM,CAAC,QAAQ;CAGvB"}
+{"version":3,"file":"Deserializer.d.ts","sourceRoot":"","sources":["../../src/transactions/Deserializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAenE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK1D,qBAAa,YAAY;IACxB,cAAc,SAAM;IACpB,aAAa,SAAK;IAElB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;gBAEP,UAAU,EAAE,MAAM;IAK9B,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY;IAI5C,WAAW,IAAI,YAAY;IAgC3B,MAAM,CAAC,aAAa,CACnB,IAAI,EAAE,eAAe,EACrB,OAAO,GAAE,eAA2C,GAClD,SAAS,GAAG,IAAI;IAiBnB,OAAO,CAAC,wBAAwB;IAgDhC,OAAO,CAAC,MAAM,CAAC,WAAW;IAI1B,OAAO,CAAC,MAAM,CAAC,cAAc;IAI7B,OAAO,CAAC,MAAM,CAAC,YAAY;IAI3B,OAAO,CAAC,MAAM,CAAC,QAAQ;CAGvB"}

package/dist/transactions/Deserializer.js

@@ -1,17 +1,17 @@
+import { EvmCall, Multipayment, Unvote, UsernameRegistration, UsernameResignation, ValidatorRegistration, ValidatorResignation, Vote, } from "./types";
+import { AbiDecoder } from "@/utils";
+import { AbiFunction } from "@/enums";
 import BigNumber from "bignumber.js";
-import { Constants } from "@/enums/Constants";
 import { ContractAbiType } from "@/enums/ContractAbiType";
+import { Network } from "@/configuration/Network";
 import { Transfer } from "./types/Transfer";
 import { decodeRlp } from "ethers";
-import { EvmCall, Multipayment, Unvote, UsernameRegistration, UsernameResignation, ValidatorRegistration, ValidatorResignation, Vote, } from "./types";
-import { AbiFunction } from "@/enums";
-import { AbiDecoder } from "@/utils";
 export class Deserializer {
     constructor(serialized) {
         this.SIGNATURE_SIZE = 64;
         this.RECOVERY_SIZE = 1;
         this.serialized = serialized;
-        this.encoded_rlp = "0x" + serialized.substring(2);
+        this.encoded_rlp = "0x" + serialized;
     }
     static new(serialized) {
         return new Deserializer(serialized);
@@ -19,18 +19,20 @@ export class Deserializer {
     deserialize() {
         const decodedRlp = decodeRlp(this.encoded_rlp);
         const data = {
-            network: Number(decodedRlp[0]),
-            nonce: Deserializer.parseNumber(decodedRlp[1]),
-            gasPrice: Deserializer.parseNumber(decodedRlp[3]).toString(),
-            gas: Deserializer.parseNumber(decodedRlp[4]).toString(),
-            to: Deserializer.parseAddress(decodedRlp[5]),
-            value: Deserializer.parseBigNumber(decodedRlp[6]),
-            data: Deserializer.parseHex(decodedRlp[7]),
+            nonce: Deserializer.parseNumber(decodedRlp[0]),
+            gasPrice: Deserializer.parseNumber(decodedRlp[1]).toString(),
+            gasLimit: Deserializer.parseNumber(decodedRlp[2]).toString(),
+            to: Deserializer.parseAddress(decodedRlp[3]),
+            value: Deserializer.parseBigNumber(decodedRlp[4]),
+            data: Deserializer.parseHex(decodedRlp[5]),
         };
-        if (decodedRlp.length === 12) {
-            data["v"] = Deserializer.parseNumber(decodedRlp[9]) + Constants.ETHEREUM_RECOVERY_ID_OFFSET;
-            data["r"] = Deserializer.parseHex(decodedRlp[10]);
-            data["s"] = Deserializer.parseHex(decodedRlp[11]);
+        if (decodedRlp.length >= 9) {
+            data["v"] = Deserializer.parseNumber(decodedRlp[6]) - (Network.get().chainId() * 2 + 35);
+            data["r"] = Deserializer.parseHex(decodedRlp[7]);
+            data["s"] = Deserializer.parseHex(decodedRlp[8]);
+            if (decodedRlp.length === 10) {
+                data.legacySecondSignature = decodedRlp[9].toString().slice(2);
+            }
         }
         const transaction = this.guessTransactionFromData(data);
         transaction.data = data;

package/dist/transactions/builders/AbstractTransactionBuilder.d.ts

@@ -3,12 +3,12 @@ import BigNumber from "bignumber.js";
 export declare abstract class AbstractTransactionBuilder<T extends ITransactionBuilder<T>> implements ITransactionBuilder<T> {
     transaction: ITransaction;
     constructor(data?: Record<string, unknown>);
-    gas(gas: string | BigNumber): T;
+    gasLimit(gasLimit: string | BigNumber): T;
     to(to: string): T;
     gasPrice(gasPrice: string | BigNumber): T;
     nonce(nonce: string): T;
-    network(network: number): T;
     sign(passphrase: string): Promise<T>;
+    legacySecondSign(passphrase: string, secondPassprase: string): Promise<T>;
     verify(): boolean;
     toObject(): TransactionData;
     toJson(): string;

package/dist/transactions/builders/AbstractTransactionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractTransactionBuilder.d.ts","sourceRoot":"","sources":["../../../src/transactions/builders/AbstractTransactionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAK7E,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,8BAAsB,0BAA0B,CAAC,CAAC,SAAS,mBAAmB,CAAC,CAAC,CAAC,CAAE,YAAW,mBAAmB,CAAC,CAAC,CAAC;IAC5G,WAAW,EAAE,YAAY,CAAC;gBAErB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAcnC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,CAAC;IAU/B,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC;IAMjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,CAAC;IAUzC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC;IAMvB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC;IAMrB,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAU1C,MAAM,IAAI,OAAO;IAIjB,QAAQ,IAAI,eAAe;IAI3B,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;IAIzB,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;CACvF"}
+{"version":3,"file":"AbstractTransactionBuilder.d.ts","sourceRoot":"","sources":["../../../src/transactions/builders/AbstractTransactionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE7E,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,8BAAsB,0BAA0B,CAAC,CAAC,SAAS,mBAAmB,CAAC,CAAC,CAAC,CAAE,YAAW,mBAAmB,CAAC,CAAC,CAAC;IAC5G,WAAW,EAAE,YAAY,CAAC;gBAErB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAanC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,CAAC;IAUzC,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC;IAMjB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,CAAC;IAUzC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC;IAMjB,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAUpC,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAQ/E,MAAM,IAAI,OAAO;IAIjB,QAAQ,IAAI,eAAe;IAI3B,MAAM,IAAI,MAAM;IAIhB,QAAQ,IAAI,MAAM;IAIzB,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY;CACvF"}

package/dist/transactions/builders/AbstractTransactionBuilder.js

@@ -7,27 +7,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Network } from "@/configuration/Network";
+import BigNumber from "bignumber.js";
 import { PrivateKey } from "@/identities/PrivateKey";
 import { PublicKey } from "@/identities/PublicKey";
-import BigNumber from "bignumber.js";
 export class AbstractTransactionBuilder {
     constructor(data) {
         this.transaction = this.getTransactionInstance(data !== null && data !== void 0 ? data : {
             value: "0",
             senderPublicKey: "",
             gasPrice: "5",
+            gasLimit: 1000000,
             nonce: "1",
-            network: Network.get().chainId(),
-            gas: 1000000,
             data: "",
         });
     }
-    gas(gas) {
-        if (gas instanceof BigNumber) {
-            gas = gas.toFixed();
+    gasLimit(gasLimit) {
+        if (gasLimit instanceof BigNumber) {
+            gasLimit = gasLimit.toFixed();
         }
-        this.transaction.data.gas = gas;
+        this.transaction.data.gasLimit = gasLimit;
         return this;
     }
     to(to) {
@@ -45,10 +43,6 @@ export class AbstractTransactionBuilder {
         this.transaction.data.nonce = nonce;
         return this;
     }
-    network(network) {
-        this.transaction.data.network = network;
-        return this;
-    }
     sign(passphrase) {
         return __awaiter(this, void 0, void 0, function* () {
             this.transaction.data.senderPublicKey = PublicKey.fromPassphrase(passphrase).publicKey;
@@ -57,6 +51,13 @@ export class AbstractTransactionBuilder {
             return this;
         });
     }
+    legacySecondSign(passphrase, secondPassprase) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.sign(passphrase);
+            yield this.transaction.legacySecondSign(PrivateKey.fromPassphrase(secondPassprase));
+            return this;
+        });
+    }
     verify() {
         return this.transaction.verify();
     }

package/dist/transactions/types/AbstractTransaction.d.ts

@@ -8,6 +8,7 @@ export declare abstract class AbstractTransaction implements ITransaction {
     abstract getPayload(): string;
     refreshPayloadData(): ITransaction;
     sign(privateKey: PrivateKey): Promise<ITransaction>;
+    legacySecondSign(privateKey: PrivateKey): Promise<ITransaction>;
     recoverSender(): void;
     verify(): boolean;
     toObject(): TransactionData;

package/dist/transactions/types/AbstractTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractTransaction.d.ts","sourceRoot":"","sources":["../../../src/transactions/types/AbstractTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAIxD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAKnD,8BAAsB,mBAAoB,YAAW,YAAY;IACzD,IAAI,EAAE,eAAe,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEnB,IAAI,EAAE,eAAe;aAMxB,UAAU,IAAI,MAAM;IAE7B,kBAAkB,IAAI,YAAY;IAM5B,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAYzD,aAAa,IAAI,IAAI;IAOrB,MAAM,IAAI,OAAO;IAWjB,QAAQ,IAAI,eAAe;IA4B3B,MAAM,IAAI,MAAM;IAIhB,IAAI,CAAC,aAAa,UAAQ,GAAG,MAAM;IAInC,SAAS,CAAC,aAAa,UAAQ,GAAG,MAAM;IAI/C,SAAS,CAAC,gBAAgB,IAAI,SAAS;CAYvC"}
+{"version":3,"file":"AbstractTransaction.d.ts","sourceRoot":"","sources":["../../../src/transactions/types/AbstractTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAIxD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,8BAAsB,mBAAoB,YAAW,YAAY;IACzD,IAAI,EAAE,eAAe,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEnB,IAAI,EAAE,eAAe;aAMxB,UAAU,IAAI,MAAM;IAE7B,kBAAkB,IAAI,YAAY;IAM5B,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAYnD,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAQrE,aAAa,IAAI,IAAI;IAOrB,MAAM,IAAI,OAAO;IAWjB,QAAQ,IAAI,eAAe;IA4B3B,MAAM,IAAI,MAAM;IAIhB,IAAI,CAAC,aAAa,UAAQ,GAAG,MAAM;IAInC,SAAS,CAAC,aAAa,UAAQ,GAAG,MAAM;IAI/C,SAAS,CAAC,gBAAgB,IAAI,SAAS;CAYvC"}

package/dist/transactions/types/AbstractTransaction.js

@@ -8,11 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { Address } from "@/identities/Address";
-import { Constants } from "@/enums/Constants";
+import BigNumber from "bignumber.js";
 import { PublicKey } from "@/identities/PublicKey";
 import { Serializer } from "@/transactions/Serializer";
 import { TransactionUtils } from "@/utils/TransactionUtils";
-import BigNumber from "bignumber.js";
 export class AbstractTransaction {
     constructor(data) {
         this.data = Object.assign({}, data);
@@ -32,6 +31,13 @@ export class AbstractTransaction {
             return this;
         });
     }
+    legacySecondSign(privateKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const hash = TransactionUtils.toBuffer(this.data, true).toString("hex");
+            this.data.legacySecondSignature = yield privateKey.signToEcdsa(hash);
+            return this;
+        });
+    }
     recoverSender() {
         const publicKey = this.recoverPublicKey();
         this.data["senderPublicKey"] = publicKey.publicKey;
@@ -48,11 +54,11 @@ export class AbstractTransaction {
     toObject() {
         return [
             "gasPrice",
-            "network",
             "hash",
-            "gas",
+            "gasLimit",
             "nonce",
             "senderPublicKey",
+            "legacySecondSignature",
             "to",
             "value",
             "data",
@@ -80,9 +86,9 @@ export class AbstractTransaction {
         return Serializer.new(this).serialize(skipSignature);
     }
     recoverPublicKey() {
-        if (!this.data.v || !this.data.r || !this.data.s) {
+        if (this.data.v === undefined || !this.data.r || !this.data.s) {
             throw new Error("Transaction signature is missing");
         }
-        return PublicKey.recover(Buffer.from(this.hash(true), "hex"), BigInt(`0x${this.data.r}`), BigInt(`0x${this.data.s}`), this.data.v - Constants.ETHEREUM_RECOVERY_ID_OFFSET);
+        return PublicKey.recover(Buffer.from(this.hash(true), "hex"), BigInt(`0x${this.data.r}`), BigInt(`0x${this.data.s}`), this.data.v);
     }
 }

package/dist/types.d.ts

@@ -2,9 +2,9 @@ import BigNumber from "bignumber.js";
 import { Result } from "ethers";
 export interface TransactionData {
     gasPrice?: string | null;
-    network?: number | string | null;
+    gasLimit?: string | null;
+    legacySecondSignature?: number | string | null;
     hash?: string | null;
-    gas?: string | null;
     nonce?: number | string | null;
     senderPublicKey?: string | null;
     to?: string | null;
@@ -30,6 +30,7 @@ export interface ITransaction {
     getPayload(): string;
     refreshPayloadData(): ITransaction;
     sign(privateKey: unknown): Promise<ITransaction>;
+    legacySecondSign(privateKey: unknown): Promise<ITransaction>;
     recoverSender(): void;
     verify(): boolean;
     toObject(): TransactionData;
@@ -39,12 +40,12 @@ export interface ITransaction {
 }
 export interface ITransactionBuilder<T extends ITransactionBuilder<T>> {
     transaction: ITransaction;
-    gas(gas: string | BigNumber): T;
+    gasLimit(gasLimit: string | BigNumber): T;
     gasPrice(gasPrice: string | BigNumber): T;
     to(to: string): T;
     nonce(nonce: string): T;
-    network(network: number): T;
     sign(passphrase: string): Promise<T>;
+    legacySecondSign(passphrase: string, secondPassphrase: string): Promise<T>;
     verify(): boolean;
     toObject(): TransactionData;
     toJson(): string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/utils/TransactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/TransactionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,qBAAa,gBAAgB;WACd,QAAQ,CAAC,WAAW,EAAE,eAAe,EAAE,aAAa,UAAQ,GAAG,MAAM;WA4BrE,MAAM,CAAC,WAAW,EAAE,eAAe,EAAE,aAAa,UAAQ,GAAG,MAAM;CAKjF"}
+{"version":3,"file":"TransactionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/TransactionUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,qBAAa,gBAAgB;WACd,QAAQ,CAAC,WAAW,EAAE,eAAe,EAAE,aAAa,UAAQ,GAAG,MAAM;WAkCrE,MAAM,CAAC,WAAW,EAAE,eAAe,EAAE,aAAa,UAAQ,GAAG,MAAM;CAKjF"}

package/dist/utils/TransactionUtils.js

@@ -1,28 +1,33 @@
 import { encodeRlp, keccak256, toBeArray } from "ethers";
-import { Constants } from "@/enums/Constants";
+import { Network } from "@/configuration/Network";
 export class TransactionUtils {
     static toBuffer(transaction, skipSignature = false) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const fields = [
-            toBeArray((_a = transaction["network"]) !== null && _a !== void 0 ? _a : 0),
             toBeArray(transaction["nonce"] ? transaction["nonce"] : 0),
-            toBeArray(0),
-            toBeArray((_b = transaction["gasPrice"]) !== null && _b !== void 0 ? _b : 0),
-            toBeArray((_c = transaction["gas"]) !== null && _c !== void 0 ? _c : 0),
-            (_d = transaction["to"]) !== null && _d !== void 0 ? _d : "0x",
+            toBeArray((_a = transaction["gasPrice"]) !== null && _a !== void 0 ? _a : 0),
+            toBeArray((_b = transaction["gasLimit"]) !== null && _b !== void 0 ? _b : 0),
+            (_c = transaction["to"]) !== null && _c !== void 0 ? _c : "0x",
             toBeArray(transaction["value"] ? transaction["value"] : 0),
             transaction["data"] && transaction["data"].startsWith("0x")
                 ? transaction["data"]
-                : "0x" + ((_e = transaction["data"]) !== null && _e !== void 0 ? _e : ""),
-            [],
+                : "0x" + ((_d = transaction["data"]) !== null && _d !== void 0 ? _d : ""),
         ];
-        if (!skipSignature && transaction["v"] && transaction["r"] && transaction["s"]) {
-            fields.push(toBeArray(transaction["v"] - Constants.ETHEREUM_RECOVERY_ID_OFFSET));
+        if (!skipSignature && transaction["v"] !== undefined && transaction["r"] && transaction["s"]) {
+            fields.push(toBeArray(transaction["v"] + Network.get().chainId() * 2 + 35));
             fields.push("0x" + transaction["r"]);
             fields.push("0x" + transaction["s"]);
+            if (transaction.legacySecondSignature) {
+                fields.push(`0x${transaction.legacySecondSignature}`);
+            }
         }
+        else {
+            // Push chainId + 0s for r and s
+            fields.push(toBeArray(Network.get().chainId()), toBeArray(0), toBeArray(0));
+        }
+        // TODO: second signature handling
         const encoded = encodeRlp(fields);
-        const payload = Constants.EIP_1559_PREFIX + encoded.substring(2);
+        const payload = encoded.substring(2);
         return Buffer.from(payload, "hex");
     }
     static toHash(transaction, skipSignature = false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkecosystem/typescript-crypto",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "engines": {
     "node": ">=20.12.2"
   },

package/src/enums/index.ts

@@ -1,4 +1,3 @@
 export * from "./AbiFunction";
-export * from "./Constants";
 export * from "./ContractAbiType";
 export * from "./ContractAddresses";

package/src/identities/PrivateKey.ts

@@ -1,10 +1,9 @@
 import * as WIF from "wif";
 
 import { ethers, keccak256, sha256, toUtf8Bytes } from "ethers";
-import { signAsync } from "@noble/secp256k1";
 
-import { Constants } from "@/enums/Constants";
 import { Network } from "@/configuration/Network";
+import { signAsync } from "@noble/secp256k1";
 
 interface RecoverableSignature {
 	r: string;
@@ -37,13 +36,21 @@ export class PrivateKey {
 
 	async sign(message: string): Promise<RecoverableSignature> {
 		const hash = keccak256("0x" + message).slice(2);
-
 		const signature = await signAsync(hash, this.privateKey);
 
 		return {
 			r: signature.r.toString(16).padStart(64, "0"),
 			s: signature.s.toString(16).padStart(64, "0"),
-			v: signature.recovery + Constants.ETHEREUM_RECOVERY_ID_OFFSET,
+			v: signature.recovery,
 		};
 	}
+
+	async signToEcdsa(message: string): Promise<string> {
+		const hash = keccak256("0x" + message).slice(2);
+		const signature = await signAsync(hash, this.privateKey);
+
+		const v = signature.recovery;
+		// @see https://github.com/ArkEcosystem/mainsail/blob/16e50d45dcfbf15b20245f11b123634f0fd0b713/packages/utils/source/format-ecdsa-signature.ts#L2
+		return signature.toCompactHex() + v.toString(16).padStart(2, "0");
+	}
 }