From 75e56dcaed576f9403ed0d1f61aacbc5007ebe08 Mon Sep 17 00:00:00 2001 From: Senji888 <44082144+Ben-Rey@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:45:53 +0100 Subject: [PATCH] Fix web3-utils import (#497) * Fix web3-utils import * Update massa-web3 to 2.2.3 --- package-lock.json | 2 +- packages/massa-web3/package.json | 2 +- packages/massa-web3/src/utils/index.ts | 2 -- packages/massa-web3/src/web3/SmartContractsClient.ts | 2 +- packages/massa-web3/src/web3/WalletClient.ts | 8 +++++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 76c4c0f0..041b64ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11765,7 +11765,7 @@ }, "packages/massa-web3": { "name": "@massalabs/massa-web3", - "version": "2.2.2", + "version": "2.2.3", "license": "MIT", "dependencies": { "@massalabs/wallet-provider": "^1.3.3", diff --git a/packages/massa-web3/package.json b/packages/massa-web3/package.json index 5ce62a4c..7e6ee768 100644 --- a/packages/massa-web3/package.json +++ b/packages/massa-web3/package.json @@ -1,6 +1,6 @@ { "name": "@massalabs/massa-web3", - "version": "2.2.2", + "version": "2.2.3", "description": "massa's web3 sdk client", "main": "dist/cmd/index.js", "module": "dist/esm/index.js", diff --git a/packages/massa-web3/src/utils/index.ts b/packages/massa-web3/src/utils/index.ts index e2ec436c..3acc1f8e 100644 --- a/packages/massa-web3/src/utils/index.ts +++ b/packages/massa-web3/src/utils/index.ts @@ -1,7 +1,5 @@ export * as bytes from './bytes'; -export * as converters from '@massalabs/web3-utils/src/converters'; - export * as keyAndAddresses from './keyAndAddresses'; export * as time from './time'; diff --git a/packages/massa-web3/src/web3/SmartContractsClient.ts b/packages/massa-web3/src/web3/SmartContractsClient.ts index 6245247a..b7bf6aef 100644 --- a/packages/massa-web3/src/web3/SmartContractsClient.ts +++ b/packages/massa-web3/src/web3/SmartContractsClient.ts @@ -20,7 +20,6 @@ import { IOperationData } from '../interfaces/IOperationData'; import { IReadData } from '../interfaces/IReadData'; import { ISmartContractsClient } from '../interfaces/ISmartContractsClient'; import { JSON_RPC_REQUEST_METHOD } from '../interfaces/JsonRpcMethods'; -import { fromMAS } from '@massalabs/web3-utils/src/converters'; import { trySafeExecute } from '../utils/retryExecuteFunction'; import { BaseClient } from './BaseClient'; import { PublicApiClient } from './PublicApiClient'; @@ -31,6 +30,7 @@ import { IContractReadOperationData, IEvent, Args, + fromMAS, MAX_GAS_CALL, } from '@massalabs/web3-utils'; import { wait } from '../utils/time'; diff --git a/packages/massa-web3/src/web3/WalletClient.ts b/packages/massa-web3/src/web3/WalletClient.ts index df19b5e0..5a3ac82f 100755 --- a/packages/massa-web3/src/web3/WalletClient.ts +++ b/packages/massa-web3/src/web3/WalletClient.ts @@ -18,12 +18,14 @@ import { IRollsData } from '../interfaces/IRollsData'; import { IBalance } from '../interfaces/IBalance'; import * as ed from '@noble/ed25519'; import { IWalletClient } from '../interfaces/IWalletClient'; -import { fromMAS } from '@massalabs/web3-utils/src/converters'; - import { Address, SecretKey, PublicKey } from '../utils/keyAndAddresses'; import { IBaseAccount } from '../interfaces/IBaseAccount'; import { Web3Account } from './accounts/Web3Account'; -import { KEYS_VERSION_NUMBER, SECRET_KEY_PREFIX } from '@massalabs/web3-utils'; +import { + KEYS_VERSION_NUMBER, + SECRET_KEY_PREFIX, + fromMAS, +} from '@massalabs/web3-utils'; const MAX_WALLET_ACCOUNTS = 256;