Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .pnpmfile.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@ const approvedList = new Map([
],
[
'wyvern-js',
['git+https://github.com/ProjectOpenSea/wyvern-js.git#v3.2.1', 'github:ProjectOpenSea/wyvern-js#semver:^3.2.1'],
[
'git+https://github.com/ProjectOpenSea/wyvern-js.git#7823dfdf5a272ebbc6a46e66d23563a9d6cc1be2',
'git+https://github.com/ProjectOpenSea/wyvern-js.git#v4.0.1',
],
],
[
'wyvern-schemas',
'git+https://github.com/ProjectOpenSea/wyvern-schemas.git#0a8d569931ddb6faa6e96f5a60fa2f83f0a8750e',
],
['wyvern-schemas', 'git+https://github.com/ProjectOpenSea/wyvern-schemas.git#v0.13.1'],
/* cspell:disable-next-line */
['async-eventemitter', 'github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c'],
// opensea-js (v1), (and more, run `pnpm -r why web3@0.20.7`) -> web3
Expand Down Expand Up @@ -69,8 +75,8 @@ function validatePackage({ dependencies, devDependencies, optionalDependencies,
function lockPackage(pkg) {
if (pkg.name === 'opensea-js') {
const prefix = 'git+https://github.com/ProjectOpenSea/wyvern-'
pkg.dependencies['wyvern-js'] = `${prefix}js.git#fabb7660f23f2252c141077e32193d281036299e`
pkg.dependencies['wyvern-schemas'] = `${prefix}schemas.git#e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26`
pkg.dependencies['wyvern-js'] = `${prefix}js.git#v4.0.1`
pkg.dependencies['wyvern-schemas'] = `${prefix}schemas.git#v0.15.1`
}
}

Expand Down
3 changes: 2 additions & 1 deletion packages/mask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"d3": "^5.16.0",
"date-fns": "^2.28.0",
"elliptic": "^6.5.3",
"ethereum-types": "^3.6.1",
"ethereumjs-util": "^7.1.0",
"ethjs-ens": "^2.0.1",
"event-iterator": "^2.0.0",
Expand All @@ -92,7 +93,7 @@
"json2csv": "^5.0.6",
"millify": "^4.0.0",
"next-tick": "^1.0.0",
"opensea-js": "^1.2.7",
"opensea-js": "^3.0.1",
"promievent": "^0.1.4",
"protobufjs": "^6.11.2",
"react-draggable": "^4.4.4",
Expand Down
13 changes: 6 additions & 7 deletions packages/mask/src/plugins/Collectible/types/opensea.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import type { OpenSeaPort } from 'opensea-js'
import type {
AssetContractType,
AuctionType,
OpenSeaAccount,
TokenStandardVersion,
WyvernSchemaName,
} from 'opensea-js/lib/types'
import type { AssetContractType, OpenSeaAccount, TokenStandardVersion, WyvernSchemaName } from 'opensea-js/lib/types'

export type CreateSellOrderPayload = Parameters<OpenSeaPort['createSellOrder']>[0]

enum AuctionType {
Dutch = 'dutch',
English = 'english',
MinPrice = 'min_price',
}
export interface OpenSeaCustomTrait {
trait_type: string
value: string
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-providers/src/opensea/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ function createNFTAsset(asset: OpenSeaResponse, chainId: ChainId): NonFungibleTo
link: createAssetLink(asset.creator),
},
token_id: asset.token_id,
token_address: asset.token_address,
token_address: asset.asset_contract.address,
traits: asset.traits,
safelist_request_status: asset.collection?.safelist_request_status ?? '',
description: asset.description,
Expand Down
Loading