merge

source/balances/package.json

@@ -29,8 +29,8 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "4.1.7",
-    "@airswap/utils": "4.1.10",
+    "@airswap/constants": "4.1.8",
+    "@airswap/utils": "4.1.11",
     "prompt-confirm": "^2.0.4"
   },
   "publishConfig": {

source/pool/package.json

@@ -31,10 +31,10 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "4.1.7",
-    "@airswap/metadata": "4.1.14",
-    "@airswap/types": "4.1.2",
-    "@airswap/utils": "4.1.10",
+    "@airswap/constants": "4.1.8",
+    "@airswap/metadata": "4.1.15",
+    "@airswap/types": "4.1.3",
+    "@airswap/utils": "4.1.11",
     "prompt-confirm": "^2.0.4"
   },
   "publishConfig": {

source/registry/package.json

@@ -32,8 +32,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "@airswap/constants": "4.1.7",
-    "@airswap/utils": "4.1.10",
+    "@airswap/constants": "4.1.8",
+    "@airswap/utils": "4.1.11",
     "prompt-confirm": "^2.0.4"
   }
 }

source/staking/package.json

@@ -32,7 +32,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@airswap/utils": "4.1.10",
+    "@airswap/utils": "4.1.11",
     "prompt-confirm": "^2.0.4"
   }
 }

source/swap-erc20/package.json

@@ -29,10 +29,10 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "4.1.7",
+    "@airswap/constants": "4.1.8",
     "@airswap/staking": "4.0.5",
-    "@airswap/types": "4.1.2",
-    "@airswap/utils": "4.1.10",
+    "@airswap/types": "4.1.3",
+    "@airswap/utils": "4.1.11",
     "prompt-confirm": "^2.0.4"
   },
   "publishConfig": {

source/swap/package.json

@@ -32,9 +32,9 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "4.1.7",
-    "@airswap/types": "4.1.2",
-    "@airswap/utils": "4.1.10",
+    "@airswap/constants": "4.1.8",
+    "@airswap/types": "4.1.3",
+    "@airswap/utils": "4.1.11",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.7"
   },
   "publishConfig": {

source/wrapper/package.json

@@ -32,9 +32,9 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/constants": "4.1.7",
-    "@airswap/utils": "4.1.10",
-    "@airswap/types": "4.1.2",
+    "@airswap/constants": "4.1.8",
+    "@airswap/utils": "4.1.11",
+    "@airswap/types": "4.1.3",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
     "prompt-confirm": "^2.0.4"
   },

tools/constants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airswap/constants",
-  "version": "4.1.7",
+  "version": "4.1.8",
   "description": "AirSwap: Constants for Developers",
   "repository": {
     "type": "git",

tools/libraries/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airswap/libraries",
-  "version": "4.1.15",
+  "version": "4.1.16",
   "description": "AirSwap: Libraries for Developers",
   "repository": {
     "type": "git",
@@ -27,15 +27,15 @@
   },
   "dependencies": {
     "@airswap/balances": "4.0.4",
-    "@airswap/constants": "4.1.7",
+    "@airswap/constants": "4.1.8",
     "@airswap/jsonrpc-client-websocket": "0.0.1",
     "@airswap/registry": "4.1.3",
     "@airswap/pool": "4.1.4",
     "@airswap/staking": "4.0.5",
     "@airswap/swap": "4.1.2",
     "@airswap/swap-erc20": "4.1.6",
-    "@airswap/types": "4.1.2",
-    "@airswap/utils": "4.1.10",
+    "@airswap/types": "4.1.3",
+    "@airswap/utils": "4.1.11",
     "@airswap/wrapper": "4.1.5",
     "browser-or-node": "^2.1.1",
     "ethers": "^5.6.9",

tools/metadata/index.ts

@@ -22,6 +22,7 @@ const AIRSWAP_LOGO_URI =
   'https://storage.googleapis.com/subgraph-images/158680119781426823563.png'
 const AIRSWAP_SYMBOL = 'AST'
 const DEFAULT_NAME = 'Unknown NFT'
+const DEFAULT_IPFS_URI = 'https://ipfs.io/ipfs/'
 
 import { abi as ERC165_ABI } from '@openzeppelin/contracts/build/contracts/ERC165.json'
 import { abi as ERC20_ABI } from '@openzeppelin/contracts/build/contracts/ERC20.json'
@@ -224,19 +225,16 @@ export async function getCollectionTokenInfo(
   address: string,
   id: string
 ): Promise<CollectionTokenInfo> {
-  const tokenKind = await getTokenKind(provider, address)
+  const kind = await getTokenKind(provider, address)
 
   let uri = null
   let metadata = null
 
   if (!ethers.utils.isAddress(address)) {
     throw new Error(`Invalid address: ${address}`)
   }
-  if (isNaN(Number(id))) {
-    throw new Error(`Invalid id: ${id}`)
-  }
   try {
-    switch (tokenKind) {
+    switch (kind) {
       case TokenKinds.ERC721:
         uri = await new ethers.Contract(address, ERC721_ABI, provider).tokenURI(
           id
@@ -253,18 +251,18 @@ export async function getCollectionTokenInfo(
   }
   return {
     chainId: (await provider.getNetwork()).chainId,
-    kind: tokenKind,
     address: address.toLowerCase(),
-    id: Number(id),
+    kind,
+    id,
     uri,
     ...metadata,
   }
 }
 
-async function fetchMetaData(url: string) {
+async function fetchMetaData(url: string, ipfsUri = DEFAULT_IPFS_URI) {
   if (validUrl.isUri(url)) {
     if (url.startsWith('ipfs')) {
-      url = `https://cloudflare-ipfs.com/${url.replace('://', '/')}`
+      url = url.replace('ipfs://', ipfsUri)
     }
     const data = await (await fetch(url)).json()
     if (typeof data === 'string')
@@ -286,11 +284,12 @@ const transformErc721TokenAttributeToCollectionTokenAttribute = (
 })
 
 const transformERC721ToCollectionToken = (
-  metadata: any
+  metadata: any,
+  ipfsUri = DEFAULT_IPFS_URI
 ): CollectionTokenMetadata => ({
   name: metadata.name || DEFAULT_NAME,
   description: metadata.description,
-  image: metadata.image?.replace('ipfs://', 'https://ipfs.io/ipfs/'),
+  image: metadata.image?.replace('ipfs://', ipfsUri),
   attributes: (metadata.attributes || []).map(
     transformErc721TokenAttributeToCollectionTokenAttribute
   ),
@@ -304,15 +303,14 @@ const transformErc1155TokenAttributeToCollectionTokenAttribute = (
 })
 
 const transformERC1155ToCollectionToken = (
-  metadata: any
+  metadata: any,
+  ipfsUri = DEFAULT_IPFS_URI
 ): CollectionTokenMetadata => ({
   name: metadata.name || DEFAULT_NAME,
   description: metadata.description,
   image:
-    (metadata.image_url || metadata.image || '').replace(
-      'ipfs://',
-      'https://ipfs.io/ipfs/'
-    ) || undefined,
+    (metadata.image_url || metadata.image || '').replace('ipfs://', ipfsUri) ||
+    undefined,
   attributes: (metadata.attributes || []).map(
     transformErc1155TokenAttributeToCollectionTokenAttribute
   ),

tools/metadata/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airswap/metadata",
-  "version": "4.1.14",
+  "version": "4.1.15",
   "description": "AirSwap: Token Metadata for Developers",
   "repository": {
     "type": "git",
@@ -20,8 +20,8 @@
     "test": "TS_NODE_COMPILER_OPTIONS='{\"strict\":false}' yarn mocha -r ts-node/esm test/*.ts"
   },
   "dependencies": {
-    "@airswap/constants": "4.1.7",
-    "@airswap/types": "4.1.2",
+    "@airswap/constants": "4.1.8",
+    "@airswap/types": "4.1.3",
     "@airswap/wrapper": "4.1.5",
     "@openzeppelin/contracts": "^4.8.3",
     "@uniswap/token-lists": "^1.0.0-beta.24",

tools/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airswap/types",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "AirSwap: Types for Developers",
   "repository": {
     "type": "git",

tools/types/src/typescript.ts

@@ -114,6 +114,6 @@ export type CollectionTokenInfo = {
   chainId: number
   kind: string
   address: string
-  id: number
+  id: string
   uri: string
 } & CollectionTokenMetadata

tools/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airswap/utils",
-  "version": "4.1.10",
+  "version": "4.1.11",
   "description": "AirSwap: Utilities for Developers",
   "repository": {
     "type": "git",
@@ -21,8 +21,8 @@
     "test:ci": "yarn test"
   },
   "dependencies": {
-    "@airswap/constants": "4.1.7",
-    "@airswap/types": "4.1.2",
+    "@airswap/constants": "4.1.8",
+    "@airswap/types": "4.1.3",
     "@metamask/eth-sig-util": "^5.0.2",
     "bignumber.js": "^9.0.1",
     "ethereumjs-util": "^7.1.5",