decentraland-dapps 12.45.1 → 12.46.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/containers/ChainProvider/ChainProvider.container.js +0 -3
- package/dist/containers/ChainProvider/ChainProvider.container.js.map +1 -1
- package/dist/containers/Navbar/Navbar.js +5 -6
- package/dist/containers/Navbar/Navbar.js.map +1 -1
- package/dist/modules/wallet/sagas.js +1 -4
- package/dist/modules/wallet/sagas.js.map +1 -1
- package/dist/modules/wallet/utils.d.ts +9 -0
- package/dist/modules/wallet/utils.js +26 -7
- package/dist/modules/wallet/utils.js.map +1 -1
- package/package.json +2 -2
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const react_redux_1 = require("react-redux");
|
|
7
|
-
const provider_type_1 = require("@dcl/schemas/dist/dapps/provider-type");
|
|
8
7
|
const selectors_1 = require("../../modules/wallet/selectors");
|
|
9
8
|
const chainConfiguration_1 = require("../../lib/chainConfiguration");
|
|
10
9
|
const eth_1 = require("../../lib/eth");
|
|
@@ -13,13 +12,11 @@ const mapState = (state) => {
|
|
|
13
12
|
const chainId = selectors_1.getChainId(state) || null;
|
|
14
13
|
const network = chainId && chainConfiguration_1.getChainConfiguration(chainId).network;
|
|
15
14
|
const expectedChainId = eth_1.getConnectedProviderChainId();
|
|
16
|
-
const providerType = eth_1.getConnectedProviderType();
|
|
17
15
|
const config = expectedChainId && chainConfiguration_1.getChainConfiguration(expectedChainId);
|
|
18
16
|
const isConnected = !!chainId && !!config;
|
|
19
17
|
const isSupported = isConnected && chainId === expectedChainId;
|
|
20
18
|
const isPartiallySupported = isConnected &&
|
|
21
19
|
!isSupported &&
|
|
22
|
-
providerType !== provider_type_1.ProviderType.WALLET_CONNECT &&
|
|
23
20
|
Object.values(config.networkMapping).some(mappedChainId => mappedChainId === chainId);
|
|
24
21
|
const isUnsupported = isConnected && !isSupported && !isPartiallySupported;
|
|
25
22
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChainProvider.container.js","sourceRoot":"","sources":["../../../src/containers/ChainProvider/ChainProvider.container.ts"],"names":[],"mappings":";;;;;AAAA,6CAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"ChainProvider.container.js","sourceRoot":"","sources":["../../../src/containers/ChainProvider/ChainProvider.container.ts"],"names":[],"mappings":";;;;;AAAA,6CAAqC;AACrC,8DAA2D;AAC3D,qEAAoE;AACpE,uCAA2D;AAM3D,oEAA2C;AAE3C,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAiB,EAAE;IAC7C,MAAM,OAAO,GAAG,sBAAU,CAAC,KAAK,CAAC,IAAI,IAAI,CAAA;IACzC,MAAM,OAAO,GAAG,OAAO,IAAI,0CAAqB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAA;IACjE,MAAM,eAAe,GAAG,iCAA2B,EAAE,CAAA;IACrD,MAAM,MAAM,GAAG,eAAe,IAAI,0CAAqB,CAAC,eAAe,CAAC,CAAA;IACxE,MAAM,WAAW,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,MAAM,CAAA;IACzC,MAAM,WAAW,GAAG,WAAW,IAAI,OAAO,KAAK,eAAe,CAAA;IAC9D,MAAM,oBAAoB,GACxB,WAAW;QACX,CAAC,WAAW;QACZ,MAAM,CAAC,MAAM,CAAC,MAAO,CAAC,cAAc,CAAC,CAAC,IAAI,CACxC,aAAa,CAAC,EAAE,CAAC,aAAa,KAAK,OAAO,CAC3C,CAAA;IACH,MAAM,aAAa,GAAG,WAAW,IAAI,CAAC,WAAW,IAAI,CAAC,oBAAoB,CAAA;IAC1E,OAAO;QACL,OAAO;QACP,OAAO;QACP,WAAW;QACX,WAAW;QACX,oBAAoB;QACpB,aAAa;KACd,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,SAAsB,EAAoB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;AAEtE,kBAAe,qBAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,uBAAa,CAAC,CAAA"}
|
|
@@ -26,7 +26,6 @@ const React = __importStar(require("react"));
|
|
|
26
26
|
const Button_1 = require("decentraland-ui/dist/components/Button/Button");
|
|
27
27
|
const ModalNavigation_1 = require("decentraland-ui/dist/components/ModalNavigation/ModalNavigation");
|
|
28
28
|
const Navbar_1 = require("decentraland-ui/dist/components/Navbar/Navbar");
|
|
29
|
-
const provider_type_1 = require("@dcl/schemas/dist/dapps/provider-type");
|
|
30
29
|
const chain_id_1 = require("@dcl/schemas/dist/dapps/chain-id");
|
|
31
30
|
const eth_1 = require("../../lib/eth");
|
|
32
31
|
const utils_1 = require("../../modules/translation/utils");
|
|
@@ -65,7 +64,6 @@ class Navbar extends React.PureComponent {
|
|
|
65
64
|
render() {
|
|
66
65
|
const { hasAcceptedNetworkPartialSupport, onAcceptNetworkPartialSupport } = this.props;
|
|
67
66
|
const expectedChainName = chain_id_1.getChainName(eth_1.getConnectedProviderChainId());
|
|
68
|
-
const providerType = eth_1.getConnectedProviderType();
|
|
69
67
|
return (React.createElement(React.Fragment, null,
|
|
70
68
|
React.createElement(Navbar_1.Navbar, Object.assign({}, this.props, { i18n: this.getTranslations() })),
|
|
71
69
|
React.createElement(ChainProvider_1.default, null, ({ chainId, isUnsupported, isPartiallySupported }) => isUnsupported ? (React.createElement(Modal_1.default, { open: true, size: "tiny" },
|
|
@@ -76,10 +74,11 @@ class Navbar extends React.PureComponent {
|
|
|
76
74
|
currentChainName: React.createElement("b", null, chain_id_1.getChainName(chainId)),
|
|
77
75
|
expectedChainName: React.createElement("b", null, expectedChainName)
|
|
78
76
|
} }))),
|
|
79
|
-
React.createElement(Modal_1.default.Actions, null,
|
|
80
|
-
React.createElement(
|
|
81
|
-
|
|
82
|
-
|
|
77
|
+
React.createElement(Modal_1.default.Actions, null,
|
|
78
|
+
React.createElement(Button_1.Button, { primary: true, onClick: this.handleSwitchNetwork },
|
|
79
|
+
React.createElement(utils_1.T, { id: "@dapps.navbar.wrong_network.switch_button", values: {
|
|
80
|
+
chainName: React.createElement("b", null, expectedChainName)
|
|
81
|
+
} }))))) : isPartiallySupported ? (React.createElement(Modal_1.default, { open: !hasAcceptedNetworkPartialSupport, size: "small" },
|
|
83
82
|
React.createElement(ModalNavigation_1.ModalNavigation, { title: React.createElement(utils_1.T, { id: "@dapps.navbar.partially_supported_network.header" }) }),
|
|
84
83
|
React.createElement(Modal_1.default.Content, null,
|
|
85
84
|
React.createElement(utils_1.T, { id: "@dapps.navbar.partially_supported_network.message", values: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Navbar.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8B;AAE9B,0EAAsE;AACtE,qGAAiG;AACjG,
|
|
1
|
+
{"version":3,"file":"Navbar.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -147,10 +147,7 @@ function* handleSwitchNetworkRequest(action) {
|
|
|
147
147
|
method: 'wallet_addEthereumChain',
|
|
148
148
|
params: [utils_1.getAddEthereumChainParameters(chainId)]
|
|
149
149
|
});
|
|
150
|
-
const newChainId = yield effects_1.call(
|
|
151
|
-
method: 'eth_chainId',
|
|
152
|
-
params: []
|
|
153
|
-
});
|
|
150
|
+
const newChainId = yield effects_1.call(utils_1.getProviderChainId, provider);
|
|
154
151
|
if (chainId !== parseInt(newChainId, 16)) {
|
|
155
152
|
throw new Error('chainId did not change after adding network');
|
|
156
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAU2B;AAC3B,+DAA0D;AAC1D,+DAA2D;AAC3D,uCAIsB;AACtB,uCA+BkB;AAClB,
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { PopulatedTransaction, Contract, providers } from 'ethers';
|
|
|
4
4
|
import { ContractData } from 'decentraland-transactions';
|
|
5
5
|
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
6
6
|
import { AddEthereumChainParameters, Wallet } from './types';
|
|
7
|
+
import { Provider } from 'decentraland-connect';
|
|
7
8
|
export declare const getTransactionsApiUrl: () => string;
|
|
8
9
|
export declare const setTransactionsApiUrl: (url: string) => string;
|
|
9
10
|
export declare function fetchManaBalance(chainId: ChainId, address: string): Promise<number>;
|
|
@@ -40,3 +41,11 @@ export declare function sendTransaction(contract: ContractData, contractMethodNa
|
|
|
40
41
|
*/
|
|
41
42
|
export declare function sendTransaction(contract: ContractData, getPopulatedTransaction: (populateTransaction: Contract['populateTransaction']) => Promise<PopulatedTransaction>): Promise<string>;
|
|
42
43
|
export declare function getAddEthereumChainParameters(chainId: ChainId): AddEthereumChainParameters;
|
|
44
|
+
/**
|
|
45
|
+
* Obtains the chain id through a provider.
|
|
46
|
+
* Different providers might return the chain id as a hex or a number.
|
|
47
|
+
* This function abtracts the logic in order to always obtain the chain id as a number from any given provider.
|
|
48
|
+
* @param provider - The provider used to obtain the chain id
|
|
49
|
+
* @returns A number representing the chain id, Eg: 80001 for Mumbai, 137 for Matic Mainnet
|
|
50
|
+
*/
|
|
51
|
+
export declare function getProviderChainId(provider: Provider): Promise<number>;
|
|
@@ -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.getAddEthereumChainParameters = exports.sendTransaction = exports.transactionEvents = exports.TransactionEventType = exports.getTargetNetworkProvider = exports.buildWallet = exports.fetchManaBalance = exports.setTransactionsApiUrl = exports.getTransactionsApiUrl = void 0;
|
|
12
|
+
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 eth_1 = require("web3x/eth");
|
|
@@ -95,12 +95,7 @@ function sendTransaction(...args) {
|
|
|
95
95
|
if (!connectedProvider) {
|
|
96
96
|
throw new Error('Provider not connected');
|
|
97
97
|
}
|
|
98
|
-
|
|
99
|
-
const chainIdHex = yield connectedProvider.request({
|
|
100
|
-
method: 'eth_chainId',
|
|
101
|
-
params: []
|
|
102
|
-
});
|
|
103
|
-
const chainId = parseInt(chainIdHex, 16);
|
|
98
|
+
const chainId = yield getProviderChainId(connectedProvider);
|
|
104
99
|
// get a provider for the target network
|
|
105
100
|
const targetNetworkProvider = yield getTargetNetworkProvider(contract.chainId);
|
|
106
101
|
// intantiate the contract
|
|
@@ -185,4 +180,28 @@ function getAddEthereumChainParameters(chainId) {
|
|
|
185
180
|
}
|
|
186
181
|
}
|
|
187
182
|
exports.getAddEthereumChainParameters = getAddEthereumChainParameters;
|
|
183
|
+
/**
|
|
184
|
+
* Obtains the chain id through a provider.
|
|
185
|
+
* Different providers might return the chain id as a hex or a number.
|
|
186
|
+
* This function abtracts the logic in order to always obtain the chain id as a number from any given provider.
|
|
187
|
+
* @param provider - The provider used to obtain the chain id
|
|
188
|
+
* @returns A number representing the chain id, Eg: 80001 for Mumbai, 137 for Matic Mainnet
|
|
189
|
+
*/
|
|
190
|
+
function getProviderChainId(provider) {
|
|
191
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
192
|
+
const providerChainId = (yield provider.request({
|
|
193
|
+
method: 'eth_chainId',
|
|
194
|
+
params: []
|
|
195
|
+
}));
|
|
196
|
+
let chainId;
|
|
197
|
+
if (typeof providerChainId === 'string') {
|
|
198
|
+
chainId = parseInt(providerChainId, 16);
|
|
199
|
+
}
|
|
200
|
+
else {
|
|
201
|
+
chainId = providerChainId;
|
|
202
|
+
}
|
|
203
|
+
return chainId;
|
|
204
|
+
});
|
|
205
|
+
}
|
|
206
|
+
exports.getProviderChainId = getProviderChainId;
|
|
188
207
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/wallet/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAqC;AACrC,mCAAyE;AACzE,mCAA+B;AAE/B,yEAKkC;AAClC,+DAAwE;AACxE,uCAKsB;AACtB,qEAAoE;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/wallet/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decentraland-dapps",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.46.0",
|
|
4
4
|
"dependencies": {
|
|
5
5
|
"@0xsequence/multicall": "^0.25.1",
|
|
6
6
|
"@0xsequence/relayer": "^0.25.1",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"date-fns": "^1.29.0",
|
|
12
12
|
"dcl-catalyst-client": "^11.3.0",
|
|
13
13
|
"dcl-catalyst-commons": "^8.2.0",
|
|
14
|
-
"decentraland-connect": "^3.
|
|
14
|
+
"decentraland-connect": "^3.2.0",
|
|
15
15
|
"decentraland-transactions": "^1.35.0",
|
|
16
16
|
"decentraland-ui": "^3.31.0",
|
|
17
17
|
"events": "^3.3.0",
|