From 4d0b53ee0301ab7af7106cd083129257f4e5b3b0 Mon Sep 17 00:00:00 2001 From: goga-m Date: Wed, 9 Nov 2022 14:29:58 +0100 Subject: [PATCH] Revert "fix: provide network's `pubKeyHash` in transfer serializer (#16)" This reverts commit dc6e04360b6e7196e65a113fdb9fb408b84e3aec. --- packages/ark/source/crypto/identities/address.ts | 2 +- packages/ark/source/crypto/identities/helpers.ts | 2 +- packages/ark/source/crypto/transactions/types/transfer.ts | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/ark/source/crypto/identities/address.ts b/packages/ark/source/crypto/identities/address.ts index 33d176eb..d6759576 100644 --- a/packages/ark/source/crypto/identities/address.ts +++ b/packages/ark/source/crypto/identities/address.ts @@ -41,7 +41,7 @@ export class Address { return Base58Check.encode(buffer); } - public static toBuffer(address: string, network?: Pick): Buffer { + public static toBuffer(address: string, network?: Network): Buffer { const result: Buffer = Base58Check.decode(address); if (result[0] !== getPubKeyHash(network)) { diff --git a/packages/ark/source/crypto/identities/helpers.ts b/packages/ark/source/crypto/identities/helpers.ts index 9851b75c..2c6f9851 100644 --- a/packages/ark/source/crypto/identities/helpers.ts +++ b/packages/ark/source/crypto/identities/helpers.ts @@ -3,5 +3,5 @@ import { configManager } from "../managers/index.js"; export const getWIF = (network?: Network): number => (network ? network.wif : configManager.get("network.wif")); -export const getPubKeyHash = (network?: Pick): number => +export const getPubKeyHash = (network?: Network): number => network ? network.pubKeyHash : configManager.get("network.pubKeyHash"); diff --git a/packages/ark/source/crypto/transactions/types/transfer.ts b/packages/ark/source/crypto/transactions/types/transfer.ts index 62e6d4a6..fdafb11d 100644 --- a/packages/ark/source/crypto/transactions/types/transfer.ts +++ b/packages/ark/source/crypto/transactions/types/transfer.ts @@ -2,7 +2,7 @@ import { BigNumber, ByteBuffer } from "@ardenthq/sdk-helpers"; import { TransactionType, TransactionTypeGroup } from "../../enums.js"; import { Address } from "../../identities/address.js"; -import { ISerializeOptions, Network } from "../../interfaces/index.js"; +import { ISerializeOptions } from "../../interfaces/index.js"; import * as schemas from "./schemas.js"; import { Transaction } from "./transaction.js"; @@ -28,9 +28,7 @@ export abstract class TransferTransaction extends Transaction { buff.writeUInt32LE(data.expiration || 0); if (data.recipientId) { - buff.writeBuffer( - Address.toBuffer(data.recipientId, data.network ? { pubKeyHash: data.network } : undefined), - ); + buff.writeBuffer(Address.toBuffer(data.recipientId)); } return buff;