decentraland-dapps 13.4.0 → 13.6.0
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/modules/features/sagas.d.ts +2 -2
- package/dist/modules/features/utils.js +1 -1
- package/dist/modules/features/utils.js.map +1 -1
- package/dist/modules/transaction/utils.d.ts +10 -0
- package/dist/modules/transaction/utils.js +23 -1
- package/dist/modules/transaction/utils.js.map +1 -1
- package/dist/modules/wallet/sagas.js +9 -29
- package/dist/modules/wallet/sagas.js.map +1 -1
- package/dist/modules/wallet/utils.d.ts +8 -0
- package/dist/modules/wallet/utils.js +40 -1
- package/dist/modules/wallet/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,6 +6,6 @@ import { ApplicationName, FeatureSagasConfig, Polling } from './types';
|
|
|
6
6
|
* @param config Configuration for the saga
|
|
7
7
|
*/
|
|
8
8
|
export declare function featuresSaga(config: FeatureSagasConfig): Generator<import("redux-saga/effects").ForkEffect<never>, void, unknown>;
|
|
9
|
-
export declare const getFetchApplicationFeaturesIntervalGenerator: (polling: Polling) => () => Generator<import("redux-saga/effects").PutEffect<import("typesafe-actions/dist/types").PayloadAction<"[Request] Fetch application features", {
|
|
9
|
+
export declare const getFetchApplicationFeaturesIntervalGenerator: (polling: Polling) => () => Generator<import("redux-saga/effects").RaceEffect<import("redux-saga/effects").TakeEffect> | import("redux-saga/effects").PutEffect<import("typesafe-actions/dist/types").PayloadAction<"[Request] Fetch application features", {
|
|
10
10
|
apps: ApplicationName[];
|
|
11
|
-
}>> | import("redux-saga/effects").
|
|
11
|
+
}>> | import("redux-saga/effects").CallEffect<true>, never, unknown>;
|
|
@@ -21,7 +21,7 @@ const fetchApplicationFeatures = (apps) => __awaiter(void 0, void 0, void 0, fun
|
|
|
21
21
|
exports.fetchApplicationFeatures = fetchApplicationFeatures;
|
|
22
22
|
const fetchSingleApplicationFeatures = (app) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
23
|
const url = `https://feature-flags.decentraland.org/${app}.json`;
|
|
24
|
-
const response = yield fetch(url);
|
|
24
|
+
const response = yield fetch(url, { credentials: 'include', mode: 'cors' });
|
|
25
25
|
const json = yield response.json();
|
|
26
26
|
return {
|
|
27
27
|
name: app,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/features/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEO,MAAM,wBAAwB,GAAG,CAAO,IAAuB,EAAE,EAAE;IACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC,CAAC,CAAA;IACjE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAE5C,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;QACtC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAA;QAC3B,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAkD,CAAC,CAAA;AACxD,CAAC,CAAA,CAAA;AARY,QAAA,wBAAwB,4BAQpC;AAED,MAAM,8BAA8B,GAAG,CACrC,GAAoB,EACU,EAAE;IAChC,MAAM,GAAG,GAAG,0CAA0C,GAAG,OAAO,CAAA;IAChE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/features/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEO,MAAM,wBAAwB,GAAG,CAAO,IAAuB,EAAE,EAAE;IACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC,CAAC,CAAA;IACjE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAE5C,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;QACtC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAA;QAC3B,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAkD,CAAC,CAAA;AACxD,CAAC,CAAA,CAAA;AARY,QAAA,wBAAwB,4BAQpC;AAED,MAAM,8BAA8B,GAAG,CACrC,GAAoB,EACU,EAAE;IAChC,MAAM,GAAG,GAAG,0CAA0C,GAAG,OAAO,CAAA;IAChE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;IAC3E,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IAElC,OAAO;QACL,IAAI,EAAE,GAAG;QACT,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;KACxB,CAAA;AACH,CAAC,CAAA,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AnyAction } from 'redux';
|
|
2
2
|
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
3
3
|
import { Transaction, TransactionPayload, TransactionStatus } from './types';
|
|
4
|
+
import { FetchTransactionFailureAction, FetchTransactionSuccessAction } from './actions';
|
|
4
5
|
export declare const TRANSACTION_ACTION_FLAG = "_watch_tx";
|
|
5
6
|
export declare function buildActionRef(transaction: Transaction): {
|
|
6
7
|
type: string;
|
|
@@ -21,3 +22,12 @@ export declare function getTransactionOrigin(chainId?: number): "https://ropsten
|
|
|
21
22
|
export declare function isPending(status: TransactionStatus | null): boolean;
|
|
22
23
|
export declare function hasFailed(status: TransactionStatus | null): boolean;
|
|
23
24
|
export declare function hasSucceeded(status: TransactionStatus | null): boolean;
|
|
25
|
+
/**
|
|
26
|
+
* Waits for a transaction to be completed.
|
|
27
|
+
*
|
|
28
|
+
* @param txHash - The hash of the transaction to wait for.
|
|
29
|
+
*/
|
|
30
|
+
export declare function waitForTx(txHash: string): Generator<import("redux-saga/effects").RaceEffect<import("redux-saga/effects").TakeEffect>, void, {
|
|
31
|
+
success: FetchTransactionSuccessAction | undefined;
|
|
32
|
+
failure: FetchTransactionFailureAction | undefined;
|
|
33
|
+
}>;
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.hasSucceeded = exports.hasFailed = exports.isPending = exports.getTransactionOrigin = exports.getTransactionHref = exports.buildTransactionWithReceiptPayload = exports.buildTransactionPayload = exports.getTransactionHashFromAction = exports.getTransactionFromAction = exports.isTransactionAction = exports.buildActionRef = exports.TRANSACTION_ACTION_FLAG = void 0;
|
|
3
|
+
exports.waitForTx = exports.hasSucceeded = exports.hasFailed = exports.isPending = exports.getTransactionOrigin = exports.getTransactionHref = exports.buildTransactionWithReceiptPayload = exports.buildTransactionPayload = exports.getTransactionHashFromAction = exports.getTransactionFromAction = exports.isTransactionAction = exports.buildActionRef = exports.TRANSACTION_ACTION_FLAG = void 0;
|
|
4
4
|
const chain_id_1 = require("@dcl/schemas/dist/dapps/chain-id");
|
|
5
|
+
const effects_1 = require("redux-saga/effects");
|
|
5
6
|
const types_1 = require("./types");
|
|
7
|
+
const actions_1 = require("./actions");
|
|
6
8
|
// Special flag used to determine transaction hashes to be monitored
|
|
7
9
|
exports.TRANSACTION_ACTION_FLAG = '_watch_tx';
|
|
8
10
|
function buildActionRef(transaction) {
|
|
@@ -82,4 +84,24 @@ function hasSucceeded(status) {
|
|
|
82
84
|
return types_1.SUCCESS_STATUS.includes(status);
|
|
83
85
|
}
|
|
84
86
|
exports.hasSucceeded = hasSucceeded;
|
|
87
|
+
/**
|
|
88
|
+
* Waits for a transaction to be completed.
|
|
89
|
+
*
|
|
90
|
+
* @param txHash - The hash of the transaction to wait for.
|
|
91
|
+
*/
|
|
92
|
+
function* waitForTx(txHash) {
|
|
93
|
+
while (true) {
|
|
94
|
+
const { success, failure } = yield effects_1.race({
|
|
95
|
+
success: effects_1.take(actions_1.FETCH_TRANSACTION_SUCCESS),
|
|
96
|
+
failure: effects_1.take(actions_1.FETCH_TRANSACTION_FAILURE)
|
|
97
|
+
});
|
|
98
|
+
if ((success === null || success === void 0 ? void 0 : success.payload.transaction.hash) === txHash) {
|
|
99
|
+
break;
|
|
100
|
+
}
|
|
101
|
+
else if ((failure === null || failure === void 0 ? void 0 : failure.payload.transaction.hash) === txHash) {
|
|
102
|
+
throw new Error(`The transaction ${txHash} failed to be mined.`);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
exports.waitForTx = waitForTx;
|
|
85
107
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/transaction/utils.ts"],"names":[],"mappings":";;;AACA,+DAA0D;AAC1D,mCAOgB;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/transaction/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,37 +130,17 @@ function* handleConnectWalletSuccess() {
|
|
|
130
130
|
function* handleSwitchNetworkRequest(action) {
|
|
131
131
|
const { chainId } = action.payload;
|
|
132
132
|
const provider = yield effects_1.call(eth_1.getConnectedProvider);
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
133
|
+
if (!provider) {
|
|
134
|
+
yield effects_1.put(actions_1.switchNetworkFailure(chainId, 'Error switching network: Could not get provider'));
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
try {
|
|
138
|
+
yield effects_1.call(utils_1.switchProviderChainId, provider, chainId);
|
|
139
|
+
yield effects_1.put(actions_1.switchNetworkSuccess(chainId));
|
|
136
140
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
params: [{ chainId: '0x' + chainId.toString(16) }]
|
|
140
|
-
});
|
|
141
|
-
yield effects_1.put(actions_1.switchNetworkSuccess(chainId));
|
|
142
|
-
}
|
|
143
|
-
catch (switchError) {
|
|
144
|
-
// This error code indicates that the chain has not been added to MetaMask.
|
|
145
|
-
if (provider && switchError.code === 4902) {
|
|
146
|
-
try {
|
|
147
|
-
yield effects_1.call([provider, 'request'], {
|
|
148
|
-
method: 'wallet_addEthereumChain',
|
|
149
|
-
params: [utils_1.getAddEthereumChainParameters(chainId)]
|
|
150
|
-
});
|
|
151
|
-
const newChainId = yield effects_1.call(utils_1.getProviderChainId, provider);
|
|
152
|
-
if (chainId !== parseInt(newChainId, 16)) {
|
|
153
|
-
throw new Error('chainId did not change after adding network');
|
|
154
|
-
}
|
|
155
|
-
yield effects_1.put(actions_1.switchNetworkSuccess(chainId));
|
|
156
|
-
return;
|
|
157
|
-
}
|
|
158
|
-
catch (addError) {
|
|
159
|
-
yield effects_1.put(actions_1.switchNetworkFailure(chainId, `Error adding network: ${addError.message}`));
|
|
160
|
-
return;
|
|
161
|
-
}
|
|
141
|
+
catch (switchError) {
|
|
142
|
+
yield effects_1.put(actions_1.switchNetworkFailure(chainId, switchError.message));
|
|
162
143
|
}
|
|
163
|
-
yield effects_1.put(actions_1.switchNetworkFailure(chainId, `Error switching network: ${switchError.message}`));
|
|
164
144
|
}
|
|
165
145
|
}
|
|
166
146
|
function* handleSwitchNetworkSucces(_action) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAU2B;AAC3B,+DAA0D;AAC1D,+DAA2D;AAC3D,uCAMsB;AACtB,uCA+BkB;AAClB,
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAU2B;AAC3B,+DAA0D;AAC1D,+DAA2D;AAC3D,uCAMsB;AACtB,uCA+BkB;AAClB,mCAKgB;AAEhB,2CAAwD;AAExD,6DAA6D;AAC7D,MAAM,QAAQ,GAAI,MAAc,CAAC,QAAyC,CAAA;AAE1E,IAAI,oBAA2D,CAAA;AAC/D,IAAI,wBAAkB,EAAE,EAAE;IACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAA;IAC3B,oBAAoB,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QACxC,IAAI;YACF,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACtD,QAAQ,CAAC,EAAE,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,EAAE,CACnC,CAAA;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;SAC3B;IACH,CAAC,CAAA;CACF;AAED,iCAAiC;AACjC,IAAI,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA,CAAC,aAAa;AAC/C,IAAI,OAAO,GAAG,KAAK,CAAA;AAEnB,QAAe,CAAC,CAAC,UAAU;IACzB,MAAM,cAAI,CAAC,oBAAoB,CAAC,CAAA;IAChC,MAAM,aAAG,CAAC;QACR,mBAAS,CAAC,gCAAsB,EAAE,0BAA0B,CAAC;QAC7D,mBAAS,CAAC,+BAAqB,EAAE,yBAAyB,CAAC;QAC3D,mBAAS,CAAC,+BAAqB,EAAE,yBAAyB,CAAC;QAC3D,mBAAS,CAAC,8BAAoB,EAAE,wBAAwB,CAAC;QACzD,mBAAS,CAAC,2BAAiB,EAAE,sBAAsB,CAAC;QACpD,mBAAS,CAAC,gCAAsB,EAAE,0BAA0B,CAAC;QAC7D,mBAAS,CAAC,gCAAsB,EAAE,0BAA0B,CAAC;QAC7D,mBAAS,CAAC,gCAAsB,EAAE,yBAAyB,CAAC;KAC7D,CAAC,CAAA;AACJ,CAAC;AAZD,gCAYC;AAED,QAAQ,CAAC,CAAC,oBAAoB;IAC5B,oEAAoE;IACpE,MAAM,aAAG,CAAC,uBAAa,CAAC,oBAAc,EAAE,CAAC,CAAC,CAAA;AAC5C,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B;IAClC,IAAI;QACF,MAAM,aAAG,CAAC,4BAAkB,EAAE,CAAC,CAAA;QAC/B,MAAM,EACJ,OAAO,EACP,OAAO,EACR,GAGG,MAAM,cAAI,CAAC;YACb,OAAO,EAAE,cAAI,CAAC,8BAAoB,CAAC;YACnC,OAAO,EAAE,cAAI,CAAC,8BAAoB,CAAC;SACpC,CAAC,CAAA;QACF,IAAI,OAAO,EAAE;YACX,MAAM,aAAG,CAAC,8BAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;SACxD;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,OAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SACxC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAG,CAAC,0BAAgB,EAAE,CAAC,CAAA;QAC7B,MAAM,aAAG,CAAC,8BAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;KAC/C;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,yBAAyB,CAAC,MAAiC;IACnE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,CAAA;IACvC,IAAI;QACF,MAAM,OAAO,GAAW,MAAM,cAAI,CAAC,GAAS,EAAE;YAC5C,IAAI,wBAAkB,EAAE,EAAE;gBACxB,MAAM,oBAAoB,CAAC,qBAAqB,CAAC,CAAA;aAClD;YAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,iCAAU,CAAC,OAAO,CAC1C,YAAY,EACZ,oBAAc,EAAE,CACjB,CAAA;YACD,OAAO,OAAO,CAAA;QAChB,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;SACtD;QACD,MAAM,aAAG,CAAC,6BAAmB,CAAC,YAAY,CAAC,CAAC,CAAA;KAC7C;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAG,CAAC,0BAAgB,EAAE,CAAC,CAAA;QAC7B,MAAM,aAAG,CAAC,6BAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;KAC9C;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,yBAAyB,CAAC,OAAkC;IACpE,MAAM,aAAG,CAAC,8BAAoB,EAAE,CAAC,CAAA;AACnC,CAAC;AAED,QAAQ,CAAC,CAAC,sBAAsB,CAAC,OAA+B;IAC9D,IAAI;QACF,MAAM,cAAI,CAAC,GAAG,EAAE,CAAC,iCAAU,CAAC,UAAU,EAAE,CAAC,CAAA;KAC1C;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;KACrB;IACD,+BAA+B;IAC/B,OAAO,GAAG,KAAK,CAAA;AACjB,CAAC;AAED,QAAQ,CAAC,CAAC,wBAAwB,CAAC,OAAiC;IAClE,IAAI;QACF,MAAM,UAAU,GAAY,MAAM,gBAAM,CAAC,yBAAa,CAAC,CAAA;QACvD,MAAM,MAAM,GAAW,MAAM,cAAI,CAAC,mBAAW,EAAE,UAAU,CAAC,CAAA;QAC1D,MAAM,aAAG,CAAC,4BAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;KACtC;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAG,CAAC,4BAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;KAC7C;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B;IAClC,uBAAuB;IACvB,IAAI,CAAC,OAAO,IAAI,aAAa,GAAG,CAAC,EAAE;QACjC,OAAO,GAAG,IAAI,CAAA;QACd,OAAO,OAAO,EAAE;YACd,MAAM,eAAK,CAAC,aAAa,CAAC,CAAA;YAC1B,MAAM,iBAAiB,GAAY,MAAM,gBAAM,CAAC,uBAAW,CAAC,CAAA;YAC5D,IAAI,iBAAiB,EAAE;gBACrB,MAAM,aAAG,CAAC,4BAAkB,EAAE,CAAC,CAAA;aAChC;SACF;KACF;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B,CAAC,MAAkC;IACrE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAA;IAClC,MAAM,QAAQ,GAAoB,MAAM,cAAI,CAAC,0BAAoB,CAAC,CAAA;IAElE,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,aAAG,CACP,8BAAoB,CAClB,OAAO,EACP,iDAAiD,CAClD,CACF,CAAA;KACF;SAAM;QACL,IAAI;YACF,MAAM,cAAI,CAAC,6BAAqB,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;YACpD,MAAM,aAAG,CAAC,8BAAoB,CAAC,OAAO,CAAC,CAAC,CAAA;SACzC;QAAC,OAAO,WAAW,EAAE;YACpB,MAAM,aAAG,CAAC,8BAAoB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;SAC9D;KACF;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,yBAAyB,CAAC,OAAmC;IACrE,MAAM,aAAG,CAAC,4BAAkB,EAAE,CAAC,CAAA;AACjC,CAAC;AAED,SAAgB,gBAAgB,CAAC,OAA4B;IAC3D,IAAI,oBAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACpC,oBAAc,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;KACzC;SAAM;QACL,MAAM,IAAI,KAAK,CACb,oBAAoB,OAAO,CAAC,QAAQ,uBAAuB,MAAM,CAAC,MAAM,CACtE,kBAAO,CACR,EAAE,CACJ,CAAA;KACF;IAED,IAAI,OAAO,CAAC,YAAY,EAAE;QACxB,OAAO,CAAC,IAAI,CACV,6HAA6H,CAC9H,CAAA;KACF;IAED,IAAI,OAAO,CAAC,aAAa,EAAE;QACzB,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;KACtC;IAED,IAAI,OAAO,CAAC,oBAAoB,EAAE;QAChC,6BAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;KACpD;SAAM;QACL,OAAO,CAAC,IAAI,CACV,iFAAiF,6BAAqB,EAAE,IAAI,CAC7G,CAAA;KACF;IAED,OAAO,UAAU,CAAA;AACnB,CAAC;AA9BD,4CA8BC"}
|
|
@@ -49,3 +49,11 @@ export declare function getAddEthereumChainParameters(chainId: ChainId): AddEthe
|
|
|
49
49
|
* @returns A number representing the chain id, Eg: 80001 for Mumbai, 137 for Matic Mainnet
|
|
50
50
|
*/
|
|
51
51
|
export declare function getProviderChainId(provider: Provider): Promise<number>;
|
|
52
|
+
/**
|
|
53
|
+
* Change the provider's chain to a provided chain.
|
|
54
|
+
* In case it returns an error that the chain does not exist, it will try to add it.
|
|
55
|
+
* @param provider - The provider used to swith the chain
|
|
56
|
+
* @param chainId - The chain id that is being changed
|
|
57
|
+
* @returns A number representing the chain id
|
|
58
|
+
*/
|
|
59
|
+
export declare function switchProviderChainId(provider: Provider, chainId: ChainId): Promise<ChainId>;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getProviderChainId = exports.getAddEthereumChainParameters = exports.sendTransaction = exports.transactionEvents = exports.TransactionEventType = exports.getTargetNetworkProvider = exports.buildWallet = exports.fetchManaBalance = exports.setTransactionsApiUrl = exports.getTransactionsApiUrl = void 0;
|
|
12
|
+
exports.switchProviderChainId = exports.getProviderChainId = exports.getAddEthereumChainParameters = exports.sendTransaction = exports.transactionEvents = exports.TransactionEventType = exports.getTargetNetworkProvider = exports.buildWallet = exports.fetchManaBalance = exports.setTransactionsApiUrl = exports.getTransactionsApiUrl = void 0;
|
|
13
13
|
const events_1 = require("events");
|
|
14
14
|
const ethers_1 = require("ethers");
|
|
15
15
|
const decentraland_transactions_1 = require("decentraland-transactions");
|
|
@@ -199,4 +199,43 @@ function getProviderChainId(provider) {
|
|
|
199
199
|
});
|
|
200
200
|
}
|
|
201
201
|
exports.getProviderChainId = getProviderChainId;
|
|
202
|
+
/**
|
|
203
|
+
* Change the provider's chain to a provided chain.
|
|
204
|
+
* In case it returns an error that the chain does not exist, it will try to add it.
|
|
205
|
+
* @param provider - The provider used to swith the chain
|
|
206
|
+
* @param chainId - The chain id that is being changed
|
|
207
|
+
* @returns A number representing the chain id
|
|
208
|
+
*/
|
|
209
|
+
function switchProviderChainId(provider, chainId) {
|
|
210
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
211
|
+
try {
|
|
212
|
+
yield provider.request({
|
|
213
|
+
method: 'wallet_switchEthereumChain',
|
|
214
|
+
params: [{ chainId: '0x' + chainId.toString(16) }]
|
|
215
|
+
});
|
|
216
|
+
return chainId;
|
|
217
|
+
}
|
|
218
|
+
catch (switchError) {
|
|
219
|
+
// This error code indicates that the chain has not been added to MetaMask.
|
|
220
|
+
if (provider && (switchError === null || switchError === void 0 ? void 0 : switchError.code) === 4902) {
|
|
221
|
+
try {
|
|
222
|
+
yield provider.request({
|
|
223
|
+
method: 'wallet_addEthereumChain',
|
|
224
|
+
params: [getAddEthereumChainParameters(chainId)]
|
|
225
|
+
});
|
|
226
|
+
const newChainId = yield getProviderChainId(provider);
|
|
227
|
+
if (chainId !== newChainId) {
|
|
228
|
+
throw new Error('chainId did not change after adding network');
|
|
229
|
+
}
|
|
230
|
+
return chainId;
|
|
231
|
+
}
|
|
232
|
+
catch (addError) {
|
|
233
|
+
throw new Error(`Error adding network: ${addError.message}`);
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
throw new Error(`Error switching network: ${switchError.message}`);
|
|
237
|
+
}
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
exports.switchProviderChainId = switchProviderChainId;
|
|
202
241
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/wallet/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/wallet/utils.ts"],"names":[],"mappings":"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"}
|