9998886727

Committed 18 Jul 2024 09:24PM UTC coverage: 66.465% (-0.2%) from 66.682%

Build # 9998886727

Build Type

Pull #2268

github

Committed by

meelrossi

Commit Message

fix comments

Pull Request Pull Request #2268: feat: add accept trade flow

Run Details

2635 of 5152 branches covered (51.15%)

Branch coverage included in aggregate %.

70 of 127 new or added lines in 11 files covered. (55.12%)

3 existing lines in 2 files now uncovered.

7713 of 10417 relevant lines covered (74.04%)

77.73 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

72.34

/webapp/src/modules/vendor/decentraland/BidService.ts

import { parseUnits } from '@ethersproject/units'
import { Bid, ListingStatus, Network } from '@dcl/schemas'
import { Wallet } from 'decentraland-dapps/dist/modules/wallet/types'
import { sendTransaction } from 'decentraland-dapps/dist/modules/wallet/utils'
import { ContractData, ContractName, getContract } from 'decentraland-transactions'
import { NFT } from '../../nft/types'
import { BidService as BidServiceInterface } from '../services'
import { VendorName } from '../types'
import { bidAPI } from './bid/api'
import { getERC721ContractData } from './utils'

export class BidService implements BidServiceInterface<VendorName.DECENTRALAND> {
  async fetchBySeller(seller: string) {
    const bids = await bidAPI.fetchBySeller(seller)
    return bids.data
  }

  async fetchByBidder(bidder: string) {
    const bids = await bidAPI.fetchByBidder(bidder)
    return bids.data
  }

  async fetchByNFT(nft: NFT, status: ListingStatus = ListingStatus.OPEN) {
    const bids = await bidAPI.fetchByNFT(nft.contractAddress, nft.tokenId, status)
    return bids.data
  }

  async place(wallet: Wallet | null, nft: NFT, price: number, expiresAt: number, fingerprint?: string) {
    if (!wallet) {
      throw new Error('Invalid address. Wallet must be connected.')
    }

    const priceInWei = parseUnits(price.toString(), 'ether')
    const expiresIn = Math.round((expiresAt - Date.now()) / 1000)

    switch (nft.network) {
      case Network.ETHEREUM: {
        const contract: ContractData = getContract(ContractName.Bid, nft.chainId)

        if (fingerprint) {
          return sendTransaction(
            contract,
            'placeBid(address,uint256,uint256,uint256,bytes)',
            nft.contractAddress,
            nft.tokenId,
            priceInWei,
            expiresIn,
            fingerprint
          )
        }

        return sendTransaction(
          contract,
          'placeBid(address,uint256,uint256,uint256)',
          nft.contractAddress,
          nft.tokenId,
          priceInWei,
          expiresIn
        )
      }
      case Network.MATIC: {
        const contract: ContractData = getContract(ContractName.BidV2, nft.chainId)
        return sendTransaction(
          contract,
          'placeBid(address,uint256,uint256,uint256)',
          nft.contractAddress,
          nft.tokenId,
          priceInWei,
          expiresIn
        )
      }
    }
  }

  async accept(wallet: Wallet | null, bid: Bid) {
    if (!wallet) {
      throw new Error('Invalid address. Wallet must be connected.')
    }

    if (!('bidAddress' in bid)) {
      throw new Error('BidService does not support offchain bids')
    }

    const contract: ContractData = getERC721ContractData(bid)

    return sendTransaction(
      contract,
      'safeTransferFrom(address,address,uint256,bytes)',
      wallet.address,
      bid.bidAddress,
      bid.tokenId,
      bid.blockchainId
    )
  }

  async cancel(wallet: Wallet | null, bid: Bid) {
    if (!wallet) {
      throw new Error('Invalid address. Wallet must be connected.')
    }

    if (!('bidAddress' in bid)) {
      throw new Error('BidService does not support offchain bids')
    }

    const contract: ContractData =
      bid.network === Network.ETHEREUM ? getContract(ContractName.Bid, bid.chainId) : getContract(ContractName.BidV2, bid.chainId)
    return sendTransaction(contract, 'cancelBid(address,uint256)', bid.contractAddress, bid.tokenId)
  }
}

1	import { parseUnits } from '@ethersproject/units'	84✔
2	import { Bid, ListingStatus, Network } from '@dcl/schemas'	84✔
3	import { Wallet } from 'decentraland-dapps/dist/modules/wallet/types'
4	import { sendTransaction } from 'decentraland-dapps/dist/modules/wallet/utils'	84✔
5	import { ContractData, ContractName, getContract } from 'decentraland-transactions'	84✔
6	import { NFT } from '../../nft/types'
7	import { BidService as BidServiceInterface } from '../services'
8	import { VendorName } from '../types'
9	import { bidAPI } from './bid/api'	84✔
10	import { getERC721ContractData } from './utils'	84✔
11
12	export class BidService implements BidServiceInterface<VendorName.DECENTRALAND> {	37✔
13	async fetchBySeller(seller: string) {
14	const bids = await bidAPI.fetchBySeller(seller)	×
15	return bids.data	×
16	}
17
18	async fetchByBidder(bidder: string) {
19	const bids = await bidAPI.fetchByBidder(bidder)	×
20	return bids.data	×
21	}
22
23	async fetchByNFT(nft: NFT, status: ListingStatus = ListingStatus.OPEN) {	×
24	const bids = await bidAPI.fetchByNFT(nft.contractAddress, nft.tokenId, status)	×
25	return bids.data	×
26	}
27
28	async place(wallet: Wallet \| null, nft: NFT, price: number, expiresAt: number, fingerprint?: string) {
29	if (!wallet) {	3✔
30	throw new Error('Invalid address. Wallet must be connected.')	1✔
31	}
32
33	const priceInWei = parseUnits(price.toString(), 'ether')	2✔
34	const expiresIn = Math.round((expiresAt - Date.now()) / 1000)	2✔
35
36	switch (nft.network) {	2✔
37	case Network.ETHEREUM: {
38	const contract: ContractData = getContract(ContractName.Bid, nft.chainId)	1✔
39
40	if (fingerprint) {	1!
41	return sendTransaction(	×
42	contract,
43	'placeBid(address,uint256,uint256,uint256,bytes)',
44	nft.contractAddress,
45	nft.tokenId,
46	priceInWei,
47	expiresIn,
48	fingerprint
49	)
50	}
51
52	return sendTransaction(	1✔
53	contract,
54	'placeBid(address,uint256,uint256,uint256)',
55	nft.contractAddress,
56	nft.tokenId,
57	priceInWei,
58	expiresIn
59	)
60	}
61	case Network.MATIC: {
62	const contract: ContractData = getContract(ContractName.BidV2, nft.chainId)	1✔
63	return sendTransaction(	1✔
64	contract,
65	'placeBid(address,uint256,uint256,uint256)',
66	nft.contractAddress,
67	nft.tokenId,
68	priceInWei,
69	expiresIn
70	)
71	}
72	}
73	}
74
75	async accept(wallet: Wallet \| null, bid: Bid) {
76	if (!wallet) {	3✔
77	throw new Error('Invalid address. Wallet must be connected.')	1✔
78	}
79
80	if (!('bidAddress' in bid)) {	2!
NEW 81	throw new Error('BidService does not support offchain bids')	×
82	}
83
84	const contract: ContractData = getERC721ContractData(bid)	2✔
85
86	return sendTransaction(	2✔
87	contract,
88	'safeTransferFrom(address,address,uint256,bytes)',
89	wallet.address,
90	bid.bidAddress,
91	bid.tokenId,
92	bid.blockchainId
93	)
94	}
95
96	async cancel(wallet: Wallet \| null, bid: Bid) {
97	if (!wallet) {	3✔
98	throw new Error('Invalid address. Wallet must be connected.')	1✔
99	}
100
101	if (!('bidAddress' in bid)) {	2!
NEW 102	throw new Error('BidService does not support offchain bids')	×
103	}
104
105	const contract: ContractData =
106	bid.network === Network.ETHEREUM ? getContract(ContractName.Bid, bid.chainId) : getContract(ContractName.BidV2, bid.chainId)	2✔
107	return sendTransaction(contract, 'cancelBid(address,uint256)', bid.contractAddress, bid.tokenId)	2✔
108	}
109	}

decentraland / marketplace / 9998886727

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous