Merge remote-tracking branch 'origin/master' into release/1.5

package.json

@@ -3,7 +3,7 @@
   "description": "CowSwap - Gnosis Protocol",
   "homepage": ".",
   "private": true,
-  "version": "1.4.10-rc.0",
+  "version": "1.4.11",
   "engines": {
     "node": ">=14.0.0"
   },
@@ -202,7 +202,6 @@
     "bignumber.js": "9.0.1",
     "bnc-sdk": "^3.5.0",
     "fast-safe-stringify": "^2.0.8",
-    "ipfs-http-client": "^52.0.3",
     "paraswap": "^5.0.1",
     "react-appzi": "^1.0.4",
     "react-inlinesvg": "^2.3.0",

src/custom/api/ipfs/index.ts

@@ -1,17 +1,8 @@
-import safeStringify from 'fast-safe-stringify'
-import pinataSDK, { PinataPinByHashResponse } from '@pinata/sdk'
-import { IPFS_URI, PINATA_API_KEY, PINATA_SECRET_API_KEY } from 'constants/ipfs'
+import pinataSDK, { PinataPinResponse } from '@pinata/sdk'
+import { PINATA_API_KEY, PINATA_SECRET_API_KEY } from 'constants/ipfs'
 
 const pinata = pinataSDK(PINATA_API_KEY, PINATA_SECRET_API_KEY)
 
-export async function uploadTextFileToIpfs(file: any): Promise<string> {
-  const { create } = await import('ipfs-http-client')
-  const client = create({ url: IPFS_URI })
-  const doc = safeStringify.stableStringify(file)
-  const { cid } = await client.add(doc)
-  return cid.toString()
-}
-
-export async function pinByHash(hash: string): Promise<PinataPinByHashResponse> {
-  return pinata.pinByHash(hash)
+export async function pinJSONToIPFS(file: any): Promise<PinataPinResponse> {
+  return pinata.pinJSONToIPFS(file, { pinataMetadata: { name: 'appData-affiliate' } })
 }

src/custom/utils/metadata.ts

@@ -1,6 +1,6 @@
 import CID from 'cids'
 import multihashes from 'multihashes'
-import { uploadTextFileToIpfs, pinByHash } from 'api/ipfs'
+import { pinJSONToIPFS } from 'api/ipfs'
 
 interface Metadata {
   version: string
@@ -49,8 +49,7 @@ export function generateAppDataDoc(metadata: MetadataDoc = {}): AppDataDoc {
 }
 
 export async function uploadMetadataDocToIpfs(appDataDoc: AppDataDoc): Promise<string> {
-  const cid = await uploadTextFileToIpfs(appDataDoc)
-  await pinByHash(cid)
-  const { digest } = multihashes.decode(new CID(cid).multihash)
+  const { IpfsHash } = await pinJSONToIPFS(appDataDoc)
+  const { digest } = multihashes.decode(new CID(IpfsHash).multihash)
   return `0x${Buffer.from(digest).toString('hex')}`
 }