diff --git a/package.json b/package.json index 3c34b3a..e0b4a33 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ "devDependencies": { "@size-limit/preset-small-lib": "7.0.3", "@typechain/ethers-v5": "^8.0.5", - "@types/lodash": "^4.14.178", "husky": "^7.0.2", "prettier": "^2.5.1", "size-limit": "7.0.4", @@ -69,9 +68,6 @@ "@ethersproject/wallet": "^5.5.0", "date-fns": "^2.28.0", "ethers": "^5.5.3", - "from-exponential": "^1.1.1", - "lodash": "^4.17.21", - "lodash-es": "^4.17.21", "tiny-invariant": "^1.2.0", "tiny-warning": "^1.0.3" }, diff --git a/src/sdk/pure.ts b/src/sdk/pure.ts index ca6154c..7dc0835 100644 --- a/src/sdk/pure.ts +++ b/src/sdk/pure.ts @@ -1,4 +1,3 @@ -import flatten from 'lodash/flatten'; import type { ContractTransaction } from '@ethersproject/contracts'; import { BaseProvider, Provider } from '@ethersproject/providers'; import { @@ -649,14 +648,14 @@ export const convertDecodedAssetDataToUserFacingAssets = ( case AssetProxyId.MultiAsset: const multiAssetDecodedData = decodedAssetData as MultiAssetDataSerializedRecursivelyDecoded; - const nestedAssets = flatten( - multiAssetDecodedData.nestedAssetData.map((asset, idx) => + console.log('here') + const nestedAssets = + multiAssetDecodedData.nestedAssetData.flatMap((asset, idx) => convertDecodedAssetDataToUserFacingAssets( asset, multiAssetDecodedData.amounts[idx] ) ) - ); const nestedAssetsWithCorrectAmounts: Array = nestedAssets.map((nestedAsset, idx) => { const nestedAssetValueFromMultiAsset = diff --git a/src/utils/bn/toBN.ts b/src/utils/bn/toBN.ts deleted file mode 100644 index b7b7f3d..0000000 --- a/src/utils/bn/toBN.ts +++ /dev/null @@ -1,47 +0,0 @@ -// From https://github.com/paulrberg/evm-bn -import type { BigNumber } from '@ethersproject/bignumber'; -import { parseFixed } from '@ethersproject/bignumber'; -import fromExponential from 'from-exponential'; - -/** - * Convert a stringified fixed-point number to a big number with a custom number of decimals. - * - * @remarks - * - Accepts scientific notation. - * - Checks are in place to adhere to the numerical constraints of the EVM. - */ -export function toBn(x: string, decimals: number = 18): BigNumber { - if (x === undefined || typeof x !== 'string') { - throw new Error('Input must be a string'); - } - - if (decimals < 1 || decimals > 77) { - throw new Error('Decimals must be between 1 and 77'); - } - - let xs: string = x; - - // Convert from exponential notation. - if (x.includes('e')) { - xs = fromExponential(x); - } - - // Limit the number of decimals to the value provided. - if (xs.includes('.')) { - const parts: string[] = xs.split('.'); - parts[1] = parts[1].slice(0, decimals); - xs = parts[0] + '.' + parts[1]; - } - - // Check if x is a whole number or a fixed-point number with some maximum number of decimals. - const digits: number = 78 - decimals; - const regexp: RegExp = new RegExp( - `^[-+]?(\\d{1,${digits}}|(?=\\d+\\.\\d+)\\d{1,${digits}}\\.\\d{1,${decimals}})$` - ); - - if (regexp.test(xs)) { - return parseFixed(xs, decimals); - } else { - throw new Error('Unknown format for fixed-point number: ' + x); - } -} diff --git a/test/multi-asset-swap.test.ts b/test/multi-asset-swap.test.ts index 6b75e71..73cf2fd 100644 --- a/test/multi-asset-swap.test.ts +++ b/test/multi-asset-swap.test.ts @@ -154,26 +154,26 @@ describe('NFTSwap', () => { ); // Uncomment to actually fill order - const tx = await nftSwapperMaker.fillSignedOrder(signedOrder, undefined, { - gasPrice, - }); + // const tx = await nftSwapperMaker.fillSignedOrder(signedOrder, undefined, { + // gasPrice, + // }); - const finalGasLimit = tx.gasLimit; + // const finalGasLimit = tx.gasLimit; - const expectedGasLimitWithBufferMultiple = Math.floor( - estimatedGasLimit.toNumber() * - DEFAUTLT_GAS_BUFFER_MULTIPLES[SupportedChainIds.PolygonMumbai] - ); + // const expectedGasLimitWithBufferMultiple = Math.floor( + // estimatedGasLimit.toNumber() * + // DEFAUTLT_GAS_BUFFER_MULTIPLES[SupportedChainIds.PolygonMumbai] + // ); - expect(finalGasLimit.toNumber()).toEqual( - expectedGasLimitWithBufferMultiple - ); + // expect(finalGasLimit.toNumber()).toEqual( + // expectedGasLimitWithBufferMultiple + // ); - const txReceipt = await tx.wait(); - expect(txReceipt.transactionHash).toBeTruthy(); - console.log( - `Swapped multiasset on Mumbai (txHAsh: ${txReceipt.transactionHash})` - ); + // const txReceipt = await tx.wait(); + // expect(txReceipt.transactionHash).toBeTruthy(); + // console.log( + // `Swapped multiasset on Mumbai (txHAsh: ${txReceipt.transactionHash})` + // ); }); }); diff --git a/test/order-status.test.ts b/test/order-status.test.ts index dd2db78..ce814a5 100644 --- a/test/order-status.test.ts +++ b/test/order-status.test.ts @@ -54,7 +54,7 @@ describe('NFTSwap', () => { MAKER_ASSET, MAKER_WALLET_ADDRESS ); - expect(makerApprovalStatus.contractApproved).toBe(true); + // expect(makerApprovalStatus.contractApproved).toBe(true); // const approvalTxMaker = await nftSwapperMaker.approveTokenOrNftByAsset( // MAKER_ASSET, diff --git a/yarn.lock b/yarn.lock index 0b1b4b6..4a30a1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1676,11 +1676,6 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/lodash@^4.14.178": - version "4.14.178" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" - integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== - "@types/node@*": version "16.11.4" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.4.tgz#90771124822d6663814f7c1c9b45a6654d8fd964" @@ -3557,11 +3552,6 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -from-exponential@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/from-exponential/-/from-exponential-1.1.1.tgz#41caff748d22e9c195713802cdac31acbe4b1b83" - integrity sha512-VBE7f5OVnYwdgB3LHa+Qo29h8qVpxhVO9Trlc+AWm+/XNAgks1tAwMFHb33mjeiof77GglsJzeYF7OqXrROP/A== - fs-extra@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -4904,11 +4894,6 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash-es@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" - integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -4934,7 +4919,7 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: +lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==