update imports for [email protected]

package.json

@@ -41,7 +41,7 @@
     "@rsksmart/nod3": "^0.5.0",
     "@rsksmart/rsk-contract-parser": "^1.0.4",
     "@rsksmart/rsk-js-cli": "^1.0.0",
-    "@rsksmart/rsk-utils": "^1.1.0",
+    "@rsksmart/rsk-utils": "^2.0.5",
     "bignumber.js": "^7.2.1",
     "body-parser": "^1.19.0",
     "bunyan": "^2.0.4",

src/api/lib/blocksMetadata.js

@@ -1,5 +1,6 @@
 
-import { newBigNumber, add0x } from '../../lib/utils'
+import { newBigNumber } from '../../lib/utils'
+import { add0x } from '@rsksmart/rsk-utils'
 export const BLOCK_METADATA_FIELD = '_metadata'
 
 export function addMetadataToBlocks (blocks) {

src/lib/NativeContracts.js

@@ -1,4 +1,4 @@
-import { isAddress } from './utils'
+import { isAddress } from '@rsksmart/rsk-utils'
 
 export const nativeContracts = {
   bridge: '0x0000000000000000000000000000000001000006',

src/lib/btcUtils.js

@@ -1,6 +1,6 @@
 import crypto from 'crypto'
 import * as bs58 from 'bs58'
-import { remove0x, add0x, keccak256 } from './utils'
+import { remove0x, add0x, keccak256 } from '@rsksmart/rsk-utils'
 import secp256k1 from 'secp256k1'
 
 const PREFIXES = {

src/lib/ids.js

@@ -1,4 +1,5 @@
-import { isTxOrBlockHash, isBlockHash } from './utils'
+import { isBlockHash } from './utils'
+import { isTxOrBlockHash } from '@rsksmart/rsk-utils'
 
 const checkNumbers = payload => {
   for (let name in payload) {

src/lib/utils.js

@@ -2,7 +2,6 @@ import { BigNumber } from 'bignumber.js'
 import { BIG_NUMBER } from './types'
 import { remove0x, toBuffer, isAddress } from '@rsksmart/rsk-utils'
 import crypto from 'crypto'
-export * from '@rsksmart/rsk-utils'
 
 export function convertUnixTimestampToISO (unixTimestamp) {
   return new Date(unixTimestamp * 1000).toISOString()

src/repositories/token.repository.js

@@ -1,7 +1,7 @@
 import { rawTokenToEntity, tokenEntityToRaw, tokensByAddressEntityToRaw } from '../converters/token.converters'
 import { addressRelatedTables } from './includeRelatedTables'
 import { generateFindQuery } from './utils'
-import { isAddress } from '@rsksmart/rsk-utils/dist/addresses'
+import { isAddress } from '@rsksmart/rsk-utils'
 
 export function getTokenRepository (prismaClient) {
   return {

src/services/classes/Address.js

@@ -1,11 +1,11 @@
 import { BcThing } from './BcThing'
-import { isBlockObject, isNullData, isAddress, isValidBlockNumber } from '../../lib/utils'
+import { isBlockObject, isValidBlockNumber } from '../../lib/utils'
+import { isAddress, isNullData, isZeroAddress } from '@rsksmart/rsk-utils'
 import { fields, addrTypes } from '../../lib/types'
 import Contract from './Contract'
 import { BcSearch } from '@rsksmart/rsk-contract-parser'
 import { createTxObject } from './Tx'
 import { InternalTx, checkInternalTransactionData } from './InternalTx'
-import { isZeroAddress } from '@rsksmart/rsk-utils'
 import { getNativeContractName, isNativeContract } from '../../lib/NativeContracts'
 
 export class Address extends BcThing {

src/services/classes/Addresses.js

@@ -1,5 +1,5 @@
 import Address from './Address'
-import { isAddress } from '../../lib/utils'
+import { isAddress } from '@rsksmart/rsk-utils'
 
 export class Addresses {
   constructor ({ nod3, initConfig }) {

src/services/classes/BcThing.js

@@ -1,4 +1,5 @@
-import { isAddress, serialize, isTxOrBlockHash, isBlockHash } from '../../lib/utils'
+import { serialize, isBlockHash } from '../../lib/utils'
+import { isAddress, isTxOrBlockHash } from '@rsksmart/rsk-utils'
 import { REPOSITORIES } from '../../repositories'
 export class BcThing {
   constructor ({ nod3, initConfig, log, name } = {}) {

src/services/classes/BlockSummary.js

@@ -3,7 +3,7 @@ import Tx from './Tx'
 import BlockTrace from './BlockTrace'
 import { BlockAddresses } from './BlockAddresses'
 import { isBlockHash } from '../../lib/utils'
-import { isAddress } from '@rsksmart/rsk-utils/dist/addresses'
+import { isAddress } from '@rsksmart/rsk-utils'
 import config from '../../lib/config'
 
 export class BlockSummary extends BcThing {

src/services/classes/Contract.js

@@ -2,7 +2,8 @@ import { BcThing } from './BcThing'
 import ContractParser from '@rsksmart/rsk-contract-parser'
 import { NULL_BALANCE, tokensInterfaces } from '../../lib/types'
 import TokenAddress from './TokenAddress'
-import { chunkArray, hasValue } from '../../lib/utils'
+import { chunkArray } from '../../lib/utils'
+import { hasValue } from '@rsksmart/rsk-utils'
 import { REPOSITORIES } from '../../repositories'
 import { isNativeContract } from '../../lib/NativeContracts'
 import config from '../../lib/config'

src/services/classes/InternalTx.js

@@ -1,6 +1,7 @@
 import { BcThing } from './BcThing'
 import { generateId } from '../../lib/ids'
-import { isBlockHash, isAddress, convertUnixTimestampToISO } from '../../lib/utils'
+import { isBlockHash, convertUnixTimestampToISO } from '../../lib/utils'
+import { isAddress } from '@rsksmart/rsk-utils'
 
 const ITX_FIELDS = {
   blockNumber: null,

src/services/classes/TokenAddress.js

@@ -1,7 +1,7 @@
 import { BcThing } from './BcThing'
 import Contract from './Contract'
-import { isBlockObject, isAddress } from '../../lib/utils'
-import { isZeroAddress } from '@rsksmart/rsk-utils'
+import { isBlockObject } from '../../lib/utils'
+import { isZeroAddress, isAddress } from '@rsksmart/rsk-utils'
 
 export class TokenAddress extends BcThing {
   constructor (tokenAddress, contract) {

src/services/classes/TxPool.js

@@ -1,5 +1,6 @@
 import BlocksBase from '../../lib/BlocksBase'
-import { isHexString, base64toHex, convertUnixTimestampToISO } from '../../lib/utils'
+import { convertUnixTimestampToISO } from '../../lib/utils'
+import { isHexString, base64toHex } from '@rsksmart/rsk-utils'
 import { REPOSITORIES } from '../../repositories'
 export class TxPool extends BlocksBase {
   constructor (options) {

src/tools/getContractDeploymentBlock.js

@@ -1,4 +1,4 @@
-import { isAddress } from '@rsksmart/rsk-utils/dist/addresses'
+import { isAddress } from '@rsksmart/rsk-utils'
 import nod3 from '../lib/nod3Connect'
 import { BcSearch } from '@rsksmart/rsk-contract-parser'