decentraland-dapps 29.6.0 → 29.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/trades.d.ts +0 -8
- package/dist/lib/trades.js +5 -27
- package/dist/lib/trades.js.map +1 -1
- package/package.json +3 -3
package/dist/lib/trades.d.ts
CHANGED
|
@@ -1,15 +1,7 @@
|
|
|
1
1
|
import type { TypedDataField } from '@ethersproject/abstract-signer';
|
|
2
2
|
import { Contract } from '@ethersproject/contracts';
|
|
3
3
|
import { ChainId, OnChainTrade, Trade, TradeAsset, TradeAssetType, TradeCreation } from '@dcl/schemas';
|
|
4
|
-
import { ContractData } from 'decentraland-transactions';
|
|
5
4
|
export declare const OFFCHAIN_MARKETPLACE_TYPES: Record<string, TypedDataField[]>;
|
|
6
|
-
/**
|
|
7
|
-
* The newest off-chain marketplace deployed on a chain.
|
|
8
|
-
*
|
|
9
|
-
* `getContract` THROWS for a version that is not deployed on the given chain rather than returning a
|
|
10
|
-
* falsy value, which is why each candidate is tried in turn.
|
|
11
|
-
*/
|
|
12
|
-
export declare function getLatestOffChainMarketplaceContract(chainId: ChainId): ContractData;
|
|
13
5
|
export declare function getOffChainMarketplaceContract(chainId: ChainId): Promise<Contract>;
|
|
14
6
|
export declare function getValueForTradeAsset(asset: TradeAsset): string;
|
|
15
7
|
export declare function generateTradeValues(trade: Omit<TradeCreation, 'signature'>): {
|
package/dist/lib/trades.js
CHANGED
|
@@ -41,37 +41,12 @@ export const OFFCHAIN_MARKETPLACE_TYPES = {
|
|
|
41
41
|
{ name: 'required', type: 'bool' }
|
|
42
42
|
]
|
|
43
43
|
};
|
|
44
|
-
/**
|
|
45
|
-
* Off-chain marketplace versions, newest first.
|
|
46
|
-
*
|
|
47
|
-
* The EIP-712 domain names its verifying contract, so the version a trade is signed against is part of
|
|
48
|
-
* what the signer signed. Trades should settle on the newest deployment, but V3 is testnet-only for now,
|
|
49
|
-
* so mainnet has to keep using V2 rather than fail.
|
|
50
|
-
*/
|
|
51
|
-
const OFF_CHAIN_MARKETPLACE_CONTRACT_NAMES = [ContractName.OffChainMarketplaceV3, ContractName.OffChainMarketplaceV2];
|
|
52
|
-
/**
|
|
53
|
-
* The newest off-chain marketplace deployed on a chain.
|
|
54
|
-
*
|
|
55
|
-
* `getContract` THROWS for a version that is not deployed on the given chain rather than returning a
|
|
56
|
-
* falsy value, which is why each candidate is tried in turn.
|
|
57
|
-
*/
|
|
58
|
-
export function getLatestOffChainMarketplaceContract(chainId) {
|
|
59
|
-
for (const contractName of OFF_CHAIN_MARKETPLACE_CONTRACT_NAMES) {
|
|
60
|
-
try {
|
|
61
|
-
return getContract(contractName, chainId);
|
|
62
|
-
}
|
|
63
|
-
catch (_error) {
|
|
64
|
-
continue;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
throw new Error(`No off-chain marketplace contract exists on chain ${chainId}`);
|
|
68
|
-
}
|
|
69
44
|
export async function getOffChainMarketplaceContract(chainId) {
|
|
70
45
|
const provider = await getNetworkProvider(chainId);
|
|
71
46
|
if (!provider) {
|
|
72
47
|
throw new Error('Could not get connected provider');
|
|
73
48
|
}
|
|
74
|
-
const { address, abi } =
|
|
49
|
+
const { address, abi } = getContract(ContractName.OffChainMarketplaceV2, chainId);
|
|
75
50
|
const instance = new Contract(address, abi, new Web3Provider(provider));
|
|
76
51
|
return instance;
|
|
77
52
|
}
|
|
@@ -160,7 +135,10 @@ export function getOnChainTrade(trade, sentBeneficiaryAddress) {
|
|
|
160
135
|
};
|
|
161
136
|
}
|
|
162
137
|
export async function getTradeSignature(trade) {
|
|
163
|
-
const marketplaceContract =
|
|
138
|
+
const marketplaceContract = getContract(ContractName.OffChainMarketplaceV2, trade.chainId);
|
|
139
|
+
if (!marketplaceContract) {
|
|
140
|
+
throw new Error(`The ${ContractName.OffChainMarketplace} contract doesn't exist on chain ${trade.chainId}`);
|
|
141
|
+
}
|
|
164
142
|
const signer = (await getSigner());
|
|
165
143
|
const SALT = hexZeroPad(hexlify(trade.chainId), 32);
|
|
166
144
|
const domain = {
|
package/dist/lib/trades.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trades.js","sourceRoot":"","sources":["../../src/lib/trades.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,OAAO,EAA+D,cAAc,EAAiB,MAAM,cAAc,CAAA;AACzH,OAAO,EAAgB,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACnF,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,QAAQ,CAAA;AAElD,MAAM,CAAC,MAAM,0BAA0B,GAAqC;IAC1E,KAAK,EAAE;QACL,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,2BAA2B,EAAE;QACnD,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;KACtC;IACD,KAAK,EAAE;QACL,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;QACtC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5C,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE;QAChC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;KACzC;IACD,uBAAuB,EAAE;QACvB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;QACtC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5C,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE;KACjC;IACD,MAAM,EAAE;QACN,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;QACjC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;QACvC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;QACtC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;QACjC,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,SAAS,EAAE;QACnD,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE;QACjD,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;QACxC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE;KACpD;IACD,aAAa,EAAE;QACb,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5C,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE;QACpC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE;QAChC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE;KACnC;CACF,CAAA;AAED
|
|
1
|
+
{"version":3,"file":"trades.js","sourceRoot":"","sources":["../../src/lib/trades.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decentraland-dapps",
|
|
3
|
-
"version": "29.6.
|
|
3
|
+
"version": "29.6.1",
|
|
4
4
|
"description": "Common modules for Decentraland dApps",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.js",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"date-fns": "1.30.1",
|
|
32
32
|
"dcl-catalyst-client": "^22.0.0",
|
|
33
33
|
"decentraland-crypto-fetch": "^2.0.1",
|
|
34
|
-
"decentraland-transactions": "^3.
|
|
34
|
+
"decentraland-transactions": "^3.0.2",
|
|
35
35
|
"events": "3.3.0",
|
|
36
36
|
"eventsource": "3.0.7",
|
|
37
37
|
"flat": "5.0.2",
|
|
@@ -130,5 +130,5 @@
|
|
|
130
130
|
"publishConfig": {
|
|
131
131
|
"provenance": true
|
|
132
132
|
},
|
|
133
|
-
"commit": "
|
|
133
|
+
"commit": "d895bba475b6d6f7cd3cd6bfd502354dfda35a8f"
|
|
134
134
|
}
|