From 3e929eff5635997ff7170e0889e91e05d551d211 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Wed, 14 Jun 2023 22:56:35 +0000 Subject: [PATCH] lint --- .../src/types/st-object.ts | 5 +++- packages/xrpl/src/Wallet/index.ts | 10 +++---- packages/xrpl/src/Wallet/signer.ts | 4 +-- packages/xrpl/src/client/partialPayment.ts | 2 +- packages/xrpl/src/models/utils/flags.ts | 7 +++-- packages/xrpl/src/sugar/autofill.ts | 5 +++- packages/xrpl/src/sugar/utils.ts | 5 +++- packages/xrpl/src/utils/hashes/hashLedger.ts | 2 +- packages/xrpl/src/utils/hashes/index.ts | 2 +- packages/xrpl/src/utils/hooks.ts | 30 +------------------ packages/xrpl/src/utils/parseNFTokenID.ts | 2 +- .../test/integration/requests/submit.test.ts | 2 +- .../requests/submitMultisigned.test.ts | 2 +- .../transactions/nftokenMint.test.ts | 2 +- packages/xrpl/test/integration/utils.ts | 2 +- packages/xrpl/test/utils/hashes.test.ts | 2 +- packages/xrpl/test/wallet/index.test.ts | 2 +- packages/xrpl/test/wallet/signer.test.ts | 2 +- 18 files changed, 35 insertions(+), 53 deletions(-) diff --git a/packages/ripple-binary-codec/src/types/st-object.ts b/packages/ripple-binary-codec/src/types/st-object.ts index 925fc28e..3b3c29c7 100644 --- a/packages/ripple-binary-codec/src/types/st-object.ts +++ b/packages/ripple-binary-codec/src/types/st-object.ts @@ -5,7 +5,10 @@ import { XrplDefinitionsBase, } from '../enums' import { SerializedType, JsonObject } from './serialized-type' -import { xAddressToClassicAddress, isValidXAddress } from '@transia/ripple-address-codec' +import { + xAddressToClassicAddress, + isValidXAddress, +} from '@transia/ripple-address-codec' import { BinaryParser } from '../serdes/binary-parser' import { BinarySerializer, BytesList } from '../serdes/binary-serializer' import { Buffer } from 'buffer/' diff --git a/packages/xrpl/src/Wallet/index.ts b/packages/xrpl/src/Wallet/index.ts index 87da8fbf..09920e51 100644 --- a/packages/xrpl/src/Wallet/index.ts +++ b/packages/xrpl/src/Wallet/index.ts @@ -1,9 +1,4 @@ /* eslint-disable max-lines -- There are lots of equivalent constructors which make sense to have here. */ -import BigNumber from 'bignumber.js' -import { fromSeed } from 'bip32' -import { mnemonicToSeedSync, validateMnemonic } from 'bip39' -import isEqual from 'lodash/isEqual' -import omitBy from 'lodash/omitBy' import { classicAddressToXAddress, isValidXAddress, @@ -23,6 +18,11 @@ import { verify, sign, } from '@transia/ripple-keypairs' +import BigNumber from 'bignumber.js' +import { fromSeed } from 'bip32' +import { mnemonicToSeedSync, validateMnemonic } from 'bip39' +import isEqual from 'lodash/isEqual' +import omitBy from 'lodash/omitBy' import ECDSA from '../ECDSA' import { ValidationError, XrplError } from '../errors' diff --git a/packages/xrpl/src/Wallet/signer.ts b/packages/xrpl/src/Wallet/signer.ts index 5deb1a3b..1d76dd5f 100644 --- a/packages/xrpl/src/Wallet/signer.ts +++ b/packages/xrpl/src/Wallet/signer.ts @@ -1,5 +1,3 @@ -import { BigNumber } from 'bignumber.js' -import { flatMap } from 'lodash' import { decodeAccountID } from '@transia/ripple-address-codec' import { decode, @@ -8,6 +6,8 @@ import { encodeForSigningClaim, } from '@transia/ripple-binary-codec' import { sign as signWithKeypair, verify } from '@transia/ripple-keypairs' +import { BigNumber } from 'bignumber.js' +import { flatMap } from 'lodash' import { ValidationError } from '../errors' import { Signer } from '../models/common' diff --git a/packages/xrpl/src/client/partialPayment.ts b/packages/xrpl/src/client/partialPayment.ts index 7f4e03c8..701fc2fe 100644 --- a/packages/xrpl/src/client/partialPayment.ts +++ b/packages/xrpl/src/client/partialPayment.ts @@ -1,5 +1,5 @@ -import BigNumber from 'bignumber.js' import { decode } from '@transia/ripple-binary-codec' +import BigNumber from 'bignumber.js' import type { AccountTxResponse, diff --git a/packages/xrpl/src/models/utils/flags.ts b/packages/xrpl/src/models/utils/flags.ts index c072edc7..b29095ab 100644 --- a/packages/xrpl/src/models/utils/flags.ts +++ b/packages/xrpl/src/models/utils/flags.ts @@ -2,6 +2,7 @@ /* eslint-disable no-bitwise -- flags require bitwise operations */ import { ValidationError } from '../../errors' +import { Hook } from '../common' import { AccountRootFlagsInterface, AccountRootFlags, @@ -78,10 +79,10 @@ export function setTransactionFlagsToNumber(tx: Transaction): void { return case 'SetHook': tx.Flags = convertSetHookFlagsToNumber(tx.Flags) - tx.Hooks.forEach((h) => { - h.Hook.Flags = convertSetHookFlagsToNumber( + tx.Hooks.forEach((hook: Hook) => { + hook.Hook.Flags = convertSetHookFlagsToNumber( // eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- idk - h.Hook.Flags as SetHookFlagsInterface, + hook.Hook.Flags as SetHookFlagsInterface, ) }) return diff --git a/packages/xrpl/src/sugar/autofill.ts b/packages/xrpl/src/sugar/autofill.ts index 1d87597c..ed7e54c0 100644 --- a/packages/xrpl/src/sugar/autofill.ts +++ b/packages/xrpl/src/sugar/autofill.ts @@ -1,5 +1,8 @@ +import { + xAddressToClassicAddress, + isValidXAddress, +} from '@transia/ripple-address-codec' import BigNumber from 'bignumber.js' -import { xAddressToClassicAddress, isValidXAddress } from '@transia/ripple-address-codec' import type { Client } from '..' import { ValidationError, XrplError } from '../errors' diff --git a/packages/xrpl/src/sugar/utils.ts b/packages/xrpl/src/sugar/utils.ts index d654491d..c11ce5c5 100644 --- a/packages/xrpl/src/sugar/utils.ts +++ b/packages/xrpl/src/sugar/utils.ts @@ -1,4 +1,7 @@ -import { xAddressToClassicAddress, isValidXAddress } from '@transia/ripple-address-codec' +import { + xAddressToClassicAddress, + isValidXAddress, +} from '@transia/ripple-address-codec' /** * If an address is an X-Address, converts it to a classic address. diff --git a/packages/xrpl/src/utils/hashes/hashLedger.ts b/packages/xrpl/src/utils/hashes/hashLedger.ts index 4f9aa31b..67986cf4 100644 --- a/packages/xrpl/src/utils/hashes/hashLedger.ts +++ b/packages/xrpl/src/utils/hashes/hashLedger.ts @@ -3,8 +3,8 @@ /* eslint-disable no-bitwise -- this file mimics behavior in rippled. It uses bitwise operators for and-ing numbers with a mask and bit shifting. */ -import BigNumber from 'bignumber.js' import { decode, encode } from '@transia/ripple-binary-codec' +import BigNumber from 'bignumber.js' import { ValidationError, XrplError } from '../../errors' import type { Ledger } from '../../models/ledger' diff --git a/packages/xrpl/src/utils/hashes/index.ts b/packages/xrpl/src/utils/hashes/index.ts index 0ce43601..2ed7c923 100644 --- a/packages/xrpl/src/utils/hashes/index.ts +++ b/packages/xrpl/src/utils/hashes/index.ts @@ -3,8 +3,8 @@ /* eslint-disable no-bitwise -- this file mimics behavior in rippled. It uses bitwise operators for and-ing numbers with a mask and bit shifting. */ -import BigNumber from 'bignumber.js' import { decodeAccountID } from '@transia/ripple-address-codec' +import BigNumber from 'bignumber.js' import hashLedger, { hashLedgerHeader, diff --git a/packages/xrpl/src/utils/hooks.ts b/packages/xrpl/src/utils/hooks.ts index 55c56bf3..b44dd1b5 100644 --- a/packages/xrpl/src/utils/hooks.ts +++ b/packages/xrpl/src/utils/hooks.ts @@ -8,7 +8,7 @@ import { TRANSACTION_TYPES, TRANSACTION_TYPE_MAP, } from '@transia/ripple-binary-codec' -import createHash = require('create-hash') +// import createHash = require('create-hash') import { XrplError } from '../errors' import { HookParameter } from '../models/common' @@ -58,34 +58,6 @@ export function calculateHookOn(arr: Array): string { return hash.toUpperCase() } -/** - * Calculate the sha256 of a string - * - * @param string - the string to calculate the sha256 - * @returns the sha256 - */ -export async function sha256(string: string): Promise { - const hash = createHash('sha256') - hash.update(string) - const hashBuffer = hash.digest() - const hashArray = Array.from(new Uint8Array(hashBuffer)) - const hashHex = hashArray - // eslint-disable-next-line @typescript-eslint/no-magic-numbers -- Required - .map((bytes) => bytes.toString(16).padStart(2, '0')) - .join('') - return hashHex -} - -/** - * Calculate the hex of a namespace - * - * @param namespace - the namespace to calculate the hex - * @returns the hex - */ -export async function hexNamespace(namespace: string): Promise { - return (await sha256(namespace)).toUpperCase() -} - function isHex(value: string): boolean { return /^[0-9A-F]+$/iu.test(value) } diff --git a/packages/xrpl/src/utils/parseNFTokenID.ts b/packages/xrpl/src/utils/parseNFTokenID.ts index d634975b..2371e34c 100644 --- a/packages/xrpl/src/utils/parseNFTokenID.ts +++ b/packages/xrpl/src/utils/parseNFTokenID.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-magic-numbers -- Doing hex string parsing. */ -import BigNumber from 'bignumber.js' import { encodeAccountID } from '@transia/ripple-address-codec' +import BigNumber from 'bignumber.js' import { XrplError } from '../errors' diff --git a/packages/xrpl/test/integration/requests/submit.test.ts b/packages/xrpl/test/integration/requests/submit.test.ts index 173c5334..8ce09af2 100644 --- a/packages/xrpl/test/integration/requests/submit.test.ts +++ b/packages/xrpl/test/integration/requests/submit.test.ts @@ -1,5 +1,5 @@ -import { assert } from 'chai' import { decode } from '@transia/ripple-binary-codec' +import { assert } from 'chai' import { AccountSet, diff --git a/packages/xrpl/test/integration/requests/submitMultisigned.test.ts b/packages/xrpl/test/integration/requests/submitMultisigned.test.ts index c29f6163..fdda7230 100644 --- a/packages/xrpl/test/integration/requests/submitMultisigned.test.ts +++ b/packages/xrpl/test/integration/requests/submitMultisigned.test.ts @@ -1,5 +1,5 @@ -import { assert } from 'chai' import { decode } from '@transia/ripple-binary-codec' +import { assert } from 'chai' import { AccountSet, diff --git a/packages/xrpl/test/integration/transactions/nftokenMint.test.ts b/packages/xrpl/test/integration/transactions/nftokenMint.test.ts index 30f32d11..a8906830 100644 --- a/packages/xrpl/test/integration/transactions/nftokenMint.test.ts +++ b/packages/xrpl/test/integration/transactions/nftokenMint.test.ts @@ -1,6 +1,6 @@ +import { Client } from '@transia/xrpl' import { assert } from 'chai' import _ from 'lodash' -import { Client } from 'xrpl' import { convertStringToHex, diff --git a/packages/xrpl/test/integration/utils.ts b/packages/xrpl/test/integration/utils.ts index afa06006..077200b8 100644 --- a/packages/xrpl/test/integration/utils.ts +++ b/packages/xrpl/test/integration/utils.ts @@ -1,7 +1,7 @@ +import { decode } from '@transia/ripple-binary-codec' import { assert } from 'chai' import omit from 'lodash/omit' import throttle from 'lodash/throttle' -import { decode } from '@transia/ripple-binary-codec' import { Client, diff --git a/packages/xrpl/test/utils/hashes.test.ts b/packages/xrpl/test/utils/hashes.test.ts index 6ed3597c..4c96dd6f 100644 --- a/packages/xrpl/test/utils/hashes.test.ts +++ b/packages/xrpl/test/utils/hashes.test.ts @@ -1,8 +1,8 @@ import fs from 'fs' import path from 'path' -import { assert } from 'chai' import { encode } from '@transia/ripple-binary-codec' +import { assert } from 'chai' import { OfferCreate, Transaction, ValidationError } from '../../src' import { diff --git a/packages/xrpl/test/wallet/index.test.ts b/packages/xrpl/test/wallet/index.test.ts index 4889acdf..0b56fa7e 100644 --- a/packages/xrpl/test/wallet/index.test.ts +++ b/packages/xrpl/test/wallet/index.test.ts @@ -1,5 +1,5 @@ -import { assert } from 'chai' import { decode } from '@transia/ripple-binary-codec' +import { assert } from 'chai' import { NFTokenMint, Payment, Transaction } from '../../src' import ECDSA from '../../src/ECDSA' diff --git a/packages/xrpl/test/wallet/signer.test.ts b/packages/xrpl/test/wallet/signer.test.ts index 6ed32a71..07975891 100644 --- a/packages/xrpl/test/wallet/signer.test.ts +++ b/packages/xrpl/test/wallet/signer.test.ts @@ -1,5 +1,5 @@ -import { assert } from 'chai' import { decode, encode } from '@transia/ripple-binary-codec' +import { assert } from 'chai' import { Transaction, ValidationError } from '../../src' import Wallet from '../../src/Wallet'