decentraland-dapps 13.31.4 → 13.31.6
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/README.md +0 -2
- package/dist/containers/AddressProvider/AddressProvider.js +2 -2
- package/dist/containers/AddressProvider/AddressProvider.js.map +1 -1
- package/dist/containers/AddressProvider/utils.js +2 -2
- package/dist/containers/AddressProvider/utils.js.map +1 -1
- package/dist/containers/LoginModal/LoginModal.js +2 -2
- package/dist/containers/LoginModal/LoginModal.js.map +1 -1
- package/dist/lib/entities.js +2 -2
- package/dist/lib/entities.js.map +1 -1
- package/dist/lib/eth.d.ts +3 -3
- package/dist/lib/eth.js +8 -8
- package/dist/lib/eth.js.map +1 -1
- package/dist/modules/authorization/sagas.js +4 -5
- package/dist/modules/authorization/sagas.js.map +1 -1
- package/dist/modules/authorization/utils.d.ts +2 -2
- package/dist/modules/authorization/utils.js +2 -2
- package/dist/modules/authorization/utils.js.map +1 -1
- package/dist/modules/gateway/transak/Transak.d.ts +2 -1
- package/dist/modules/gateway/transak/Transak.js +25 -9
- package/dist/modules/gateway/transak/Transak.js.map +1 -1
- package/dist/modules/gateway/transak/types.d.ts +6 -0
- package/dist/modules/gateway/transak/types.js +8 -1
- package/dist/modules/gateway/transak/types.js.map +1 -1
- package/dist/modules/gateway/types.d.ts +4 -0
- package/dist/modules/gateway/types.js.map +1 -1
- package/dist/modules/transaction/sagas.js +2 -2
- package/dist/modules/transaction/sagas.js.map +1 -1
- package/dist/modules/transaction/txUtils.js +2 -2
- package/dist/modules/transaction/txUtils.js.map +1 -1
- package/dist/modules/transaction/types.d.ts +1 -1
- package/dist/modules/wallet/sagas.js +3 -3
- package/dist/modules/wallet/sagas.js.map +1 -1
- package/dist/modules/wallet/utils/buildWallet.js +2 -2
- package/dist/modules/wallet/utils/buildWallet.js.map +1 -1
- package/dist/modules/wallet/utils/fetchManaBalance.js +3 -5
- package/dist/modules/wallet/utils/fetchManaBalance.js.map +1 -1
- package/dist/modules/wallet/utils/getAddEthereumChainParameters.js.map +1 -1
- package/dist/modules/wallet/utils/getProviderChainId.d.ts +1 -1
- package/dist/modules/wallet/utils/getTargetNetworkProvider.d.ts +2 -2
- package/dist/modules/wallet/utils/getTargetNetworkProvider.js +2 -2
- package/dist/modules/wallet/utils/getTargetNetworkProvider.js.map +1 -1
- package/dist/modules/wallet/utils/switchProviderChainId.d.ts +2 -2
- package/dist/providers/WalletProvider/WalletProvider.types.d.ts +5 -5
- package/package.json +4 -3
package/README.md
CHANGED
|
@@ -29,7 +29,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
29
29
|
};
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
const react_1 = __importStar(require("react"));
|
|
32
|
-
const
|
|
32
|
+
const ethers_1 = require("ethers");
|
|
33
33
|
const AddressProvider_types_1 = require("./AddressProvider.types");
|
|
34
34
|
const utils_1 = require("./utils");
|
|
35
35
|
const AddressProvider = (props) => {
|
|
@@ -39,7 +39,7 @@ const AddressProvider = (props) => {
|
|
|
39
39
|
const [isLoading, setIsLoading] = (0, react_1.useState)(!!isENS);
|
|
40
40
|
const [error, setError] = (0, react_1.useState)();
|
|
41
41
|
(0, react_1.useEffect)(() => {
|
|
42
|
-
if (address && !
|
|
42
|
+
if (address && !ethers_1.ethers.utils.isAddress(address) && !isENS) {
|
|
43
43
|
setError(AddressProvider_types_1.AddressError.INVALID);
|
|
44
44
|
}
|
|
45
45
|
}, [address, isENS]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddressProvider.js","sourceRoot":"","sources":["../../../src/containers/AddressProvider/AddressProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"AddressProvider.js","sourceRoot":"","sources":["../../../src/containers/AddressProvider/AddressProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAkD;AAClD,mCAA+B;AAC/B,mEAA6D;AAC7D,mCAAsD;AAEtD,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,EAAE;IACvC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IAC1C,MAAM,KAAK,GAAG,KAAK,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAA;IAC1C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACtE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAgB,CAAA;IAElD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,CAAC,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;YACzD,QAAQ,CAAC,oCAAY,CAAC,OAAO,CAAC,CAAA;SAC/B;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IAEpB,8BAA8B;IAC9B,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,MAAM,cAAc,GAAG,GAAS,EAAE;YAChC,IAAI,KAAK,IAAI,KAAK,EAAE;gBAClB,YAAY,CAAC,IAAI,CAAC,CAAA;gBAClB,MAAM,eAAe,GAAG,MAAM,IAAA,sBAAc,EAAC,KAAK,EAAE,OAAO,CAAC,CAAA;gBAC5D,YAAY,CAAC,KAAK,CAAC,CAAA;gBACnB,IAAI,MAAM;oBAAE,OAAM;gBAClB,IAAI,CAAC,eAAe,EAAE;oBACpB,QAAQ,CAAC,oCAAY,CAAC,gBAAgB,CAAC,CAAA;oBACvC,OAAM;iBACP;gBACD,UAAU,CAAC,eAAe,CAAC,CAAA;aAC5B;QACH,CAAC,CAAA,CAAA;QACD,cAAc,EAAE,CAAA;QAChB,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,IAAI,CAAA;QACf,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;IAElB,OAAO,CACL,8DAAG,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAI,CAC1E,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,eAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA"}
|
|
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.resolveENSname = exports.isENSAddress = void 0;
|
|
13
|
-
const
|
|
13
|
+
const ethers_1 = require("ethers");
|
|
14
14
|
const eth_1 = require("../../lib/eth");
|
|
15
15
|
const isENSAddress = (address) => {
|
|
16
16
|
return address.includes('.eth');
|
|
@@ -18,7 +18,7 @@ const isENSAddress = (address) => {
|
|
|
18
18
|
exports.isENSAddress = isENSAddress;
|
|
19
19
|
const resolveENSname = (name, chainId) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
20
|
const connectedProvider = yield (0, eth_1.getNetworkProvider)(chainId);
|
|
21
|
-
const ethersProvider = new
|
|
21
|
+
const ethersProvider = new ethers_1.ethers.providers.Web3Provider(connectedProvider);
|
|
22
22
|
return yield ethersProvider.resolveName(name);
|
|
23
23
|
});
|
|
24
24
|
exports.resolveENSname = resolveENSname;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/containers/AddressProvider/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/containers/AddressProvider/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAA+B;AAE/B,uCAAkD;AAE3C,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE;IAC9C,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AACjC,CAAC,CAAA;AAFY,QAAA,YAAY,gBAExB;AAEM,MAAM,cAAc,GAAG,CAAO,IAAY,EAAE,OAAgB,EAAE,EAAE;IACrE,MAAM,iBAAiB,GAAG,MAAM,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAA;IAC3D,MAAM,cAAc,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAC3E,OAAO,MAAM,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;AAC/C,CAAC,CAAA,CAAA;AAJY,QAAA,cAAc,kBAI1B"}
|
|
@@ -20,7 +20,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
20
20
|
};
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
22
|
const React = __importStar(require("react"));
|
|
23
|
-
const
|
|
23
|
+
const decentraland_connect_1 = require("decentraland-connect");
|
|
24
24
|
const LoginModal_1 = require("decentraland-ui/dist/components/LoginModal/LoginModal");
|
|
25
25
|
const utils_1 = require("../../modules/translation/utils");
|
|
26
26
|
const utils_2 = require("./utils");
|
|
@@ -78,7 +78,7 @@ class LoginModal extends React.PureComponent {
|
|
|
78
78
|
return (React.createElement(LoginModal_1.LoginModal, { open: open, className: className, i18n: this.getModalTranslations(), message: React.createElement(utils_1.T, { id: "@dapps.login.modal.supported_wallets", values: {
|
|
79
79
|
br: React.createElement("br", null),
|
|
80
80
|
trezor_link: (React.createElement("a", { href: "https://github.com/trezor/trezor-firmware/pull/1568", target: "_blank", rel: "noopener noreferrer" }, (0, utils_1.t)('@dapps.login.modal.trezor_link')))
|
|
81
|
-
} }), loading: isLoading, hasError: hasError, onClose: onClose },
|
|
81
|
+
} }), loading: isLoading, hasError: hasError, onClose: onClose }, decentraland_connect_1.connection.getAvailableProviders().map(this.renderLoginModalOption)));
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
exports.default = LoginModal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginModal.js","sourceRoot":"","sources":["../../../src/containers/LoginModal/LoginModal.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8B;AAC9B
|
|
1
|
+
{"version":3,"file":"LoginModal.js","sourceRoot":"","sources":["../../../src/containers/LoginModal/LoginModal.tsx"],"names":[],"mappings":"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"}
|
package/dist/lib/entities.js
CHANGED
|
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.EntitiesOperator = void 0;
|
|
13
|
-
const
|
|
13
|
+
const ethers_1 = require("ethers");
|
|
14
14
|
const crypto_1 = require("@dcl/crypto");
|
|
15
15
|
const CatalystClient_1 = require("dcl-catalyst-client/dist/CatalystClient");
|
|
16
16
|
const eth_1 = require("./eth");
|
|
@@ -37,7 +37,7 @@ class EntitiesOperator {
|
|
|
37
37
|
const provider = yield (0, eth_1.getConnectedProvider)();
|
|
38
38
|
if (!provider)
|
|
39
39
|
throw new Error("The provider couldn't be retrieved when creating the auth chain");
|
|
40
|
-
const eth = new
|
|
40
|
+
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
41
41
|
const personal = eth.getSigner(address);
|
|
42
42
|
const signature = yield personal.signMessage(entityId);
|
|
43
43
|
return crypto_1.Authenticator.createSimpleAuthChain(entityId, address, signature);
|
package/dist/lib/entities.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/lib/entities.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/lib/entities.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAA+B;AAC/B,wCAAsD;AAEtD,4EAAwE;AAExE,+BAA4C;AAE5C,iCAAgC;AAEhC,MAAa,gBAAgB;IAM3B,YAAY,OAAe,EAAE,wBAAiC;QAC5D,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAA;QAClE,IAAI,CAAC,gCAAgC,GAAG,wBAAwB;YAC9D,CAAC,CAAC,IAAI,+BAAc,CAAC;gBACnB,WAAW,EAAE,wBAAwB;aACtC,CAAC;YACF,CAAC,CAAC,IAAI,CAAA;QACR,IAAI,CAAC,OAAO,GAAG,IAAI,cAAO,CAAC,OAAO,CAAC,CAAA;IACrC,CAAC;IAED;;;;;;OAMG;IACW,4BAA4B,CACxC,OAAe,EACf,QAAgB;;YAEhB,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAoB,GAAE,CAAA;YAC7C,IAAI,CAAC,QAAQ;gBACX,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAA;YACH,MAAM,GAAG,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;YAEvD,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;YACvC,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YAEtD,OAAO,sBAAa,CAAC,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;QAC1E,CAAC;KAAA;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,OAAe;;YACpC,MAAM,QAAQ,GAAa,MAAM,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAC1E,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CACxB,CAAA;YAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvB,OAAO,QAAQ,CAAC,CAAC,CAAkB,CAAA;aACpC;YAED,OAAO,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAA;QAC/C,CAAC;KAAA;IAED;;;;;;;;;OASG;IACG,2BAA2B,CAC/B,cAAkC,EAClC,WAAgC,EAChC,UAAsB,EACtB,OAAe,EACf,OAAe;;;YAEf,MAAM,OAAO,GAAmC;gBAC9C,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,CAAC,OAAO,CAAC;gBACnB,QAAQ,EAAE,cAAc;gBACxB,WAAW;gBACX,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAA;YAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,0BAA0B,CACzE,OAAO,CACR,CAAA;YAED,MAAM,SAAS,GAAc,MAAM,IAAI,CAAC,4BAA4B,CAClE,OAAO,EACP,cAAc,CAAC,QAAQ,CACxB,CAAA;YAED,MAAM,cAAc,GAClB,MAAA,IAAI,CAAC,gCAAgC,mCAAI,IAAI,CAAC,cAAc,CAAA;YAE9D,OAAO,cAAc,CAAC,YAAY,iCAC7B,cAAc,KACjB,SAAS,IACT,CAAA;;KACH;CACF;AApGD,4CAoGC"}
|
package/dist/lib/eth.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Provider } from 'decentraland-connect';
|
|
2
2
|
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
3
3
|
import { Network } from '@dcl/schemas/dist/dapps/network';
|
|
4
|
-
import {
|
|
4
|
+
import { ethers } from 'ethers';
|
|
5
5
|
import { ProviderType } from '@dcl/schemas/dist/dapps/provider-type';
|
|
6
6
|
export declare type EthereumWindow = Window & {
|
|
7
7
|
ethereum?: Provider & {
|
|
@@ -22,7 +22,7 @@ export declare function _getAppChainId(): ChainId;
|
|
|
22
22
|
export declare function _setAppChainId(_appChainId: ChainId): void;
|
|
23
23
|
export declare function getNetworkProvider(chainId: ChainId): Promise<Provider>;
|
|
24
24
|
export declare function getConnectedProvider(): Promise<Provider | null>;
|
|
25
|
-
export declare function getSigner(): Promise<Signer>;
|
|
25
|
+
export declare function getSigner(): Promise<ethers.Signer>;
|
|
26
26
|
export declare function getConnectedProviderType(): ProviderType | null;
|
|
27
27
|
export declare function getConnectedProviderChainId(): ChainId | null;
|
|
28
28
|
export declare function isCucumberProvider(): boolean;
|
package/dist/lib/eth.js
CHANGED
|
@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.getChainIdByNetwork = exports.isValidChainId = exports.isCoinbaseProvider = exports.isDapperProvider = exports.isCucumberProvider = exports.getConnectedProviderChainId = exports.getConnectedProviderType = exports.getSigner = exports.getConnectedProvider = exports.getNetworkProvider = exports._setAppChainId = exports._getAppChainId = void 0;
|
|
13
|
-
const
|
|
13
|
+
const decentraland_connect_1 = require("decentraland-connect");
|
|
14
14
|
const chain_id_1 = require("@dcl/schemas/dist/dapps/chain-id");
|
|
15
|
-
const
|
|
15
|
+
const ethers_1 = require("ethers");
|
|
16
16
|
const provider_type_1 = require("@dcl/schemas/dist/dapps/provider-type");
|
|
17
17
|
const chainConfiguration_1 = require("./chainConfiguration");
|
|
18
18
|
const utils_1 = require("./utils");
|
|
@@ -43,21 +43,21 @@ function getNetworkProvider(chainId) {
|
|
|
43
43
|
*/
|
|
44
44
|
const connectedProvider = yield getConnectedProvider();
|
|
45
45
|
if (connectedProvider) {
|
|
46
|
-
const connectedChainId = yield new
|
|
46
|
+
const connectedChainId = yield new ethers_1.ethers.providers.Web3Provider(connectedProvider)
|
|
47
47
|
.getSigner()
|
|
48
48
|
.getChainId();
|
|
49
49
|
if (chainId === connectedChainId) {
|
|
50
50
|
return connectedProvider;
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
|
-
return
|
|
53
|
+
return decentraland_connect_1.connection.createProvider(provider_type_1.ProviderType.NETWORK, chainId);
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
56
|
exports.getNetworkProvider = getNetworkProvider;
|
|
57
57
|
function getConnectedProvider() {
|
|
58
58
|
return __awaiter(this, void 0, void 0, function* () {
|
|
59
59
|
try {
|
|
60
|
-
const { provider } = yield
|
|
60
|
+
const { provider } = yield decentraland_connect_1.connection.tryPreviousConnection();
|
|
61
61
|
return provider ? provider : null;
|
|
62
62
|
}
|
|
63
63
|
catch (error) {
|
|
@@ -72,18 +72,18 @@ function getSigner() {
|
|
|
72
72
|
if (!provider) {
|
|
73
73
|
throw new Error('Could not connect to provider');
|
|
74
74
|
}
|
|
75
|
-
const eth = new
|
|
75
|
+
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
76
76
|
return eth.getSigner();
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
79
|
exports.getSigner = getSigner;
|
|
80
80
|
function getConnectedProviderType() {
|
|
81
|
-
const connectionData =
|
|
81
|
+
const connectionData = decentraland_connect_1.connection.getConnectionData();
|
|
82
82
|
return connectionData ? connectionData.providerType : null;
|
|
83
83
|
}
|
|
84
84
|
exports.getConnectedProviderType = getConnectedProviderType;
|
|
85
85
|
function getConnectedProviderChainId() {
|
|
86
|
-
const connectionData =
|
|
86
|
+
const connectionData = decentraland_connect_1.connection.getConnectionData();
|
|
87
87
|
return connectionData ? connectionData.chainId : null;
|
|
88
88
|
}
|
|
89
89
|
exports.getConnectedProviderChainId = getConnectedProviderChainId;
|
package/dist/lib/eth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/lib/eth.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/lib/eth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA2D;AAC3D,+DAA0D;AAE1D,mCAA+B;AAC/B,yEAAoE;AACpE,6DAA4D;AAC5D,mCAAkC;AAWlC;;GAEG;AACH,IAAI,UAAmB,CAAA;AAEvB;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO,UAAU,CAAA;AACnB,CAAC;AAFD,wCAEC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,WAAoB;IACjD,UAAU,GAAG,WAAW,CAAA;AAC1B,CAAC;AAFD,wCAEC;AAED,SAAsB,kBAAkB,CAAC,OAAgB;;QACvD;;;UAGE;QACF,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;QACtD,IAAI,iBAAiB,EAAE;YACrB,MAAM,gBAAgB,GAAG,MAAM,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAC9D,iBAAiB,CAClB;iBACE,SAAS,EAAE;iBACX,UAAU,EAAE,CAAA;YACf,IAAI,OAAO,KAAK,gBAAgB,EAAE;gBAChC,OAAO,iBAAiB,CAAA;aACzB;SACF;QACD,OAAO,iCAAU,CAAC,cAAc,CAAC,4BAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACjE,CAAC;CAAA;AAjBD,gDAiBC;AAED,SAAsB,oBAAoB;;QACxC,IAAI;YACF,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,iCAAU,CAAC,qBAAqB,EAAE,CAAA;YAC7D,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAA;SAClC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;CAAA;AAPD,oDAOC;AAED,SAAsB,SAAS;;QAC7B,MAAM,QAAQ,GAAG,MAAM,oBAAoB,EAAE,CAAA;QAC7C,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;SACjD;QAED,MAAM,GAAG,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QACvD,OAAO,GAAG,CAAC,SAAS,EAAE,CAAA;IACxB,CAAC;CAAA;AARD,8BAQC;AAED,SAAgB,wBAAwB;IACtC,MAAM,cAAc,GAAG,iCAAU,CAAC,iBAAiB,EAAE,CAAA;IACrD,OAAO,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAA;AAC5D,CAAC;AAHD,4DAGC;AAED,SAAgB,2BAA2B;IACzC,MAAM,cAAc,GAAG,iCAAU,CAAC,iBAAiB,EAAE,CAAA;IACrD,OAAO,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAA;AACvD,CAAC;AAHD,kEAGC;AAED,SAAgB,kBAAkB;IAChC,MAAM,QAAQ,GAAI,MAAyB,CAAC,QAAQ,CAAA;IACpD,OAAO,IAAA,gBAAQ,GAAE,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAA;AAC1D,CAAC;AAHD,gDAGC;AAED,SAAgB,gBAAgB;IAC9B,MAAM,QAAQ,GAAI,MAAyB,CAAC,QAAQ,CAAA;IACpD,OAAO,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAA;AAC1C,CAAC;AAHD,4CAGC;AAED,SAAgB,kBAAkB;IAChC,MAAM,QAAQ,GAAI,MAAyB,CAAC,QAAQ,CAAA;IACpD,OAAO,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAA;AACzC,CAAC;AAHD,gDAGC;AAED,SAAgB,cAAc,CAAC,OAAwB;IACrD,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;AACzD,CAAC;AAFD,wCAEC;AAED,SAAgB,mBAAmB,CAAC,OAAgB;IAClD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAA;IACnC,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;KAC9C;IACD,MAAM,MAAM,GAAG,IAAA,0CAAqB,EAAC,UAAU,CAAC,CAAA;IAChD,OAAO,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;AACvC,CAAC;AAPD,kDAOC"}
|
|
@@ -12,8 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.authorizationSaga = exports.createAuthorizationSaga = void 0;
|
|
13
13
|
const effects_1 = require("redux-saga/effects");
|
|
14
14
|
const multicall_1 = require("@0xsequence/multicall");
|
|
15
|
-
const
|
|
16
|
-
const contracts_1 = require("@ethersproject/contracts");
|
|
15
|
+
const ethers_1 = require("ethers");
|
|
17
16
|
const decentraland_transactions_1 = require("decentraland-transactions");
|
|
18
17
|
const eth_1 = require("../../lib/eth");
|
|
19
18
|
const utils_1 = require("./utils");
|
|
@@ -39,14 +38,14 @@ function createAuthorizationSaga() {
|
|
|
39
38
|
if (!multicallProviders[chainId]) {
|
|
40
39
|
// provider party 🎉
|
|
41
40
|
const provider = yield (0, effects_1.call)(() => (0, eth_1.getNetworkProvider)(chainId));
|
|
42
|
-
const ethersProvider = new
|
|
41
|
+
const ethersProvider = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
43
42
|
const multicallProvider = new multicall_1.providers.MulticallProvider(ethersProvider, { batchSize: 500 } // defaults to 50
|
|
44
43
|
);
|
|
45
44
|
multicallProviders[chainId] = multicallProvider;
|
|
46
45
|
}
|
|
47
46
|
switch (authorization.type) {
|
|
48
47
|
case types_1.AuthorizationType.ALLOWANCE:
|
|
49
|
-
const erc20 = new
|
|
48
|
+
const erc20 = new ethers_1.ethers.Contract(authorization.contractAddress, [
|
|
50
49
|
'function allowance(address owner, address spender) view returns (uint256)'
|
|
51
50
|
], multicallProviders[chainId]);
|
|
52
51
|
promises.push(
|
|
@@ -60,7 +59,7 @@ function createAuthorizationSaga() {
|
|
|
60
59
|
}));
|
|
61
60
|
break;
|
|
62
61
|
case types_1.AuthorizationType.APPROVAL:
|
|
63
|
-
const erc721 = new
|
|
62
|
+
const erc721 = new ethers_1.ethers.Contract(authorization.contractAddress, [
|
|
64
63
|
'function isApprovedForAll(address owner, address operator) view returns (bool)'
|
|
65
64
|
], multicallProviders[chainId]);
|
|
66
65
|
promises.push(
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/authorization/sagas.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAyD;AACzD,qDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/authorization/sagas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ethers } from 'ethers';
|
|
2
2
|
import { Authorization } from './types';
|
|
3
|
-
export declare function getTokenAmountToApprove(): BigNumber;
|
|
3
|
+
export declare function getTokenAmountToApprove(): ethers.BigNumber;
|
|
4
4
|
export declare function hasAuthorization(authorizations: Authorization[], authorizationToFind: Authorization): boolean;
|
|
5
5
|
export declare function areEqual(left: Authorization, right: Authorization): boolean;
|
|
6
6
|
export declare function isValidType(type: string): boolean;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isValidType = exports.areEqual = exports.hasAuthorization = exports.getTokenAmountToApprove = void 0;
|
|
4
|
-
const
|
|
4
|
+
const ethers_1 = require("ethers");
|
|
5
5
|
const types_1 = require("./types");
|
|
6
6
|
function getTokenAmountToApprove() {
|
|
7
|
-
return
|
|
7
|
+
return ethers_1.ethers.BigNumber.from(2)
|
|
8
8
|
.pow(256)
|
|
9
9
|
.sub(1);
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/authorization/utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/authorization/utils.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAC/B,mCAA0D;AAE1D,SAAgB,uBAAuB;IACrC,OAAO,eAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;SAC5B,GAAG,CAAC,GAAG,CAAC;SACR,GAAG,CAAC,CAAC,CAAC,CAAA;AACX,CAAC;AAJD,0DAIC;AAED,SAAgB,gBAAgB,CAC9B,cAA+B,EAC/B,mBAAkC;IAElC,OAAO,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CACzC,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAC7C,CAAA;AACH,CAAC;AAPD,4CAOC;AAED,SAAgB,QAAQ,CAAC,IAAmB,EAAE,KAAoB;IAChE,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI;QACxB,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE;YAClC,KAAK,CAAC,iBAAiB,CAAC,WAAW,EAAE;QACvC,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE;YAChC,KAAK,CAAC,eAAe,CAAC,WAAW,EAAE;QACrC,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO;QAC9B,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAC3D,CAAA;AACH,CAAC;AAVD,4BAUC;AAED,SAAgB,WAAW,CAAC,IAAY;IACtC,OAAO,MAAM,CAAC,MAAM,CAAS,yBAAiB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;AAChE,CAAC;AAFD,kCAEC"}
|
|
@@ -4,6 +4,7 @@ import { CustomizationOptions, OrderData } from './types';
|
|
|
4
4
|
export declare class Transak {
|
|
5
5
|
private readonly config;
|
|
6
6
|
private readonly customizationOptions;
|
|
7
|
+
private readonly pusher;
|
|
7
8
|
private sdk;
|
|
8
9
|
constructor(config: TransakConfig, customizationOptions?: Partial<CustomizationOptions>);
|
|
9
10
|
/**
|
|
@@ -28,7 +29,7 @@ export declare class Transak {
|
|
|
28
29
|
* @param status - Status of the order.
|
|
29
30
|
* @param Network - Network in which the transaction will be done.
|
|
30
31
|
*/
|
|
31
|
-
emitPurchaseEvent(orderData: OrderData, network: Network): void;
|
|
32
|
+
emitPurchaseEvent(orderData: OrderData['status'], network: Network): void;
|
|
32
33
|
/**
|
|
33
34
|
* Opens a widget using the init method of the Transak SDK.
|
|
34
35
|
*
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Transak = void 0;
|
|
7
7
|
const transak_sdk_1 = __importDefault(require("@transak/transak-sdk"));
|
|
8
|
+
const pusher_js_1 = __importDefault(require("pusher-js"));
|
|
8
9
|
const network_1 = require("@dcl/schemas/dist/dapps/network");
|
|
9
10
|
const decentraland_ui_1 = require("decentraland-ui");
|
|
10
11
|
const types_1 = require("../types");
|
|
@@ -14,6 +15,9 @@ const PURCHASE_EVENT = 'Purchase status change';
|
|
|
14
15
|
class Transak {
|
|
15
16
|
constructor(config, customizationOptions) {
|
|
16
17
|
this.config = config;
|
|
18
|
+
this.pusher = new pusher_js_1.default(config.pusher.appKey, {
|
|
19
|
+
cluster: config.pusher.appCluster
|
|
20
|
+
});
|
|
17
21
|
this.customizationOptions = customizationOptions || {};
|
|
18
22
|
}
|
|
19
23
|
/**
|
|
@@ -22,14 +26,26 @@ class Transak {
|
|
|
22
26
|
* @param network - Network in which the trasanctions will be done
|
|
23
27
|
*/
|
|
24
28
|
suscribeToEvents(network) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
this.
|
|
29
|
+
this.sdk.on(this.sdk.EVENTS.TRANSAK_ORDER_CREATED, (orderData) => {
|
|
30
|
+
const events = [
|
|
31
|
+
types_2.WebSocketEvents.ORDER_PAYMENT_VERIFYING,
|
|
32
|
+
types_2.WebSocketEvents.ORDER_PROCESSING,
|
|
33
|
+
types_2.WebSocketEvents.ORDER_COMPLETED,
|
|
34
|
+
types_2.WebSocketEvents.ORDER_FAILED
|
|
35
|
+
];
|
|
36
|
+
this.emitPurchaseEvent(orderData.status, network);
|
|
37
|
+
const channel = this.pusher.subscribe(orderData.status.id);
|
|
38
|
+
events.forEach(event => {
|
|
39
|
+
channel.bind(event, (orderData) => {
|
|
40
|
+
this.emitPurchaseEvent(orderData, network);
|
|
41
|
+
if ([
|
|
42
|
+
types_2.WebSocketEvents.ORDER_COMPLETED,
|
|
43
|
+
types_2.WebSocketEvents.ORDER_FAILED
|
|
44
|
+
].includes(event)) {
|
|
45
|
+
this.pusher.unsubscribe(orderData.id);
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
});
|
|
33
49
|
});
|
|
34
50
|
this.sdk.on(this.sdk.EVENTS.TRANSAK_WIDGET_CLOSE, () => {
|
|
35
51
|
setTimeout(() => {
|
|
@@ -70,7 +86,7 @@ class Transak {
|
|
|
70
86
|
* @param status - Status of the order.
|
|
71
87
|
*/
|
|
72
88
|
createPurchase(orderData, network) {
|
|
73
|
-
const {
|
|
89
|
+
const { id, cryptoAmount, createdAt, status, isNFTOrder, nftAssetInfo, transactionHash, walletAddress } = orderData;
|
|
74
90
|
return Object.assign({ id,
|
|
75
91
|
network, timestamp: +new Date(createdAt), status: this.getPurchaseStatus(status), address: walletAddress, gateway: decentraland_ui_1.NetworkGatewayType.TRANSAK, txHash: transactionHash || null, amount: isNFTOrder ? 1 : cryptoAmount }, (isNFTOrder && nftAssetInfo
|
|
76
92
|
? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transak.js","sourceRoot":"","sources":["../../../../src/modules/gateway/transak/Transak.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA6C;AAC7C,6DAAyD;AACzD,qDAAoD;AACpD,oCAAkE;AAClE,oCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"Transak.js","sourceRoot":"","sources":["../../../../src/modules/gateway/transak/Transak.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { EventEmitter } from 'ws';
|
|
3
|
+
export declare enum WebSocketEvents {
|
|
4
|
+
ORDER_PAYMENT_VERIFYING = "ORDER_PAYMENT_VERIFYING",
|
|
5
|
+
ORDER_PROCESSING = "ORDER_PROCESSING",
|
|
6
|
+
ORDER_COMPLETED = "ORDER_COMPLETED",
|
|
7
|
+
ORDER_FAILED = "ORDER_FAILED"
|
|
8
|
+
}
|
|
3
9
|
export declare enum TransakOrderStatus {
|
|
4
10
|
AWAITING_PAYMENT_FROM_USER = "AWAITING_PAYMENT_FROM_USER",
|
|
5
11
|
PAYMENT_DONE_MARKED_BY_USER = "PAYMENT_DONE_MARKED_BY_USER",
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ProductsAvailed = exports.TradeType = exports.TransakOrderStatus = void 0;
|
|
3
|
+
exports.ProductsAvailed = exports.TradeType = exports.TransakOrderStatus = exports.WebSocketEvents = void 0;
|
|
4
|
+
var WebSocketEvents;
|
|
5
|
+
(function (WebSocketEvents) {
|
|
6
|
+
WebSocketEvents["ORDER_PAYMENT_VERIFYING"] = "ORDER_PAYMENT_VERIFYING";
|
|
7
|
+
WebSocketEvents["ORDER_PROCESSING"] = "ORDER_PROCESSING";
|
|
8
|
+
WebSocketEvents["ORDER_COMPLETED"] = "ORDER_COMPLETED";
|
|
9
|
+
WebSocketEvents["ORDER_FAILED"] = "ORDER_FAILED";
|
|
10
|
+
})(WebSocketEvents = exports.WebSocketEvents || (exports.WebSocketEvents = {}));
|
|
4
11
|
var TransakOrderStatus;
|
|
5
12
|
(function (TransakOrderStatus) {
|
|
6
13
|
TransakOrderStatus["AWAITING_PAYMENT_FROM_USER"] = "AWAITING_PAYMENT_FROM_USER";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/modules/gateway/transak/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,kBAWX;AAXD,WAAY,kBAAkB;IAC5B,+EAAyD,CAAA;IACzD,iFAA2D,CAAA;IAC3D,+CAAyB,CAAA;IACzB,qFAA+D,CAAA;IAC/D,qGAA+E,CAAA;IAC/E,6CAAuB,CAAA;IACvB,6CAAuB,CAAA;IACvB,uCAAiB,CAAA;IACjB,2CAAqB,CAAA;IACrB,yCAAmB,CAAA;AACrB,CAAC,EAXW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAW7B;AAED,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,gCAAmB,CAAA;IACnB,oCAAuB,CAAA;AACzB,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB;AAED,IAAY,eAEX;AAFD,WAAY,eAAe;IACzB,8BAAW,CAAA;AACb,CAAC,EAFW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAE1B"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/modules/gateway/transak/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,sEAAmD,CAAA;IACnD,wDAAqC,CAAA;IACrC,sDAAmC,CAAA;IACnC,gDAA6B,CAAA;AAC/B,CAAC,EALW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAK1B;AAED,IAAY,kBAWX;AAXD,WAAY,kBAAkB;IAC5B,+EAAyD,CAAA;IACzD,iFAA2D,CAAA;IAC3D,+CAAyB,CAAA;IACzB,qFAA+D,CAAA;IAC/D,qGAA+E,CAAA;IAC/E,6CAAuB,CAAA;IACvB,6CAAuB,CAAA;IACvB,uCAAiB,CAAA;IACjB,2CAAqB,CAAA;IACrB,yCAAmB,CAAA;AACrB,CAAC,EAXW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAW7B;AAED,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,gCAAmB,CAAA;IACnB,oCAAuB,CAAA;AACzB,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB;AAED,IAAY,eAEX;AAFD,WAAY,eAAe;IACzB,8BAAW,CAAA;AACb,CAAC,EAFW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAE1B"}
|
|
@@ -10,6 +10,10 @@ export declare type MoonPayConfig = {
|
|
|
10
10
|
export declare type TransakConfig = {
|
|
11
11
|
key: string;
|
|
12
12
|
env: string;
|
|
13
|
+
pusher: {
|
|
14
|
+
appKey: string;
|
|
15
|
+
appCluster: string;
|
|
16
|
+
};
|
|
13
17
|
};
|
|
14
18
|
export declare type ManaFiatGatewaySagasConfig = {
|
|
15
19
|
[NetworkGatewayType.MOON_PAY]: MoonPayConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/modules/gateway/types.ts"],"names":[],"mappings":";;;AACA,0FAAiG;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/modules/gateway/types.ts"],"names":[],"mappings":";;;AACA,0FAAiG;AAwBjG,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,qCAAmB,CAAA;IACnB,mCAAiB,CAAA;IACjB,yCAAuB,CAAA;IACvB,uCAAqB,CAAA;AACvB,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FailedTransactionError = exports.transactionSaga = void 0;
|
|
4
4
|
const effects_1 = require("redux-saga/effects");
|
|
5
|
-
const
|
|
5
|
+
const ethers_1 = require("ethers");
|
|
6
6
|
const types_1 = require("./types");
|
|
7
7
|
const actions_1 = require("./actions");
|
|
8
8
|
const actions_2 = require("../wallet/actions");
|
|
@@ -114,7 +114,7 @@ function* handleReplaceTransactionRequest(action) {
|
|
|
114
114
|
console.warn('Could not connect to ethereum');
|
|
115
115
|
return;
|
|
116
116
|
}
|
|
117
|
-
const eth = new
|
|
117
|
+
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
118
118
|
const accounts = yield (0, effects_1.call)(() => eth.listAccounts());
|
|
119
119
|
if (accounts.length === 0) {
|
|
120
120
|
console.warn('Could not get accounts');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/transaction/sagas.ts"],"names":[],"mappings":";;;AAAA,gDAQ2B;
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/transaction/sagas.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.getTransaction = void 0;
|
|
13
|
-
const
|
|
13
|
+
const ethers_1 = require("ethers");
|
|
14
14
|
const eth_1 = require("../../lib/eth");
|
|
15
15
|
const types_1 = require("./types");
|
|
16
16
|
function getTransaction(address, chainId, hash) {
|
|
@@ -18,7 +18,7 @@ function getTransaction(address, chainId, hash) {
|
|
|
18
18
|
const provider = yield (0, eth_1.getNetworkProvider)(chainId);
|
|
19
19
|
if (!provider)
|
|
20
20
|
return null;
|
|
21
|
-
const eth = new
|
|
21
|
+
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
22
22
|
if (!address) {
|
|
23
23
|
return null;
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"txUtils.js","sourceRoot":"","sources":["../../../src/modules/transaction/txUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"txUtils.js","sourceRoot":"","sources":["../../../src/modules/transaction/txUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAA+B;AAG/B,uCAAkD;AAClD,mCAQgB;AAEhB,SAAsB,cAAc,CAClC,OAAe,EACf,OAAgB,EAChB,IAAY;;QAEZ,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAA;QAClD,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAA;QAE1B,MAAM,GAAG,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QAEvD,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,YAAY,GAAkB,IAAI,CAAA;QACtC,IAAI;YACF,YAAY,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;SACtD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,IAAI,CACV,4CAA4C,OAAO,GAAG,EACtD,KAAK,CAAC,OAAO,CACd,CAAA;SACF;QAED,IAAI,QAAQ,GAA+B,IAAI,CAAA;QAC/C,IAAI;YACF,QAAQ,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;SAC1C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,IAAI,CAAC,uCAAuC,IAAI,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;SAC5E;QAED,YAAY;QACZ,IAAI,QAAQ,IAAI,IAAI,EAAE;YACpB,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,QAAQ,CAAC,WAAW,IAAI,IAAI,EAAE;YAChC,IAAI,YAAY,IAAI,IAAI,EAAE;gBACxB,WAAW;gBACX,IAAI,QAAQ,CAAC,KAAK,GAAG,YAAY,EAAE;oBACjC,MAAM,EAAE,GAAwB;wBAC9B,IAAI;wBACJ,MAAM,EAAE,yBAAiB,CAAC,QAAQ;wBAClC,KAAK,EAAE,QAAQ,CAAC,KAAK;qBACtB,CAAA;oBACD,OAAO,EAAE,CAAA;iBACV;gBAED,SAAS;gBACT,IAAI,QAAQ,CAAC,KAAK,GAAG,YAAY,EAAE;oBACjC,MAAM,EAAE,GAAsB;wBAC5B,IAAI;wBACJ,MAAM,EAAE,yBAAiB,CAAC,MAAM;wBAChC,KAAK,EAAE,QAAQ,CAAC,KAAK;qBACtB,CAAA;oBACD,OAAO,EAAE,CAAA;iBACV;aACF;YAED,UAAU;YACV,MAAM,EAAE,mBACN,MAAM,EAAE,yBAAiB,CAAC,OAAO,IAC9B,QAAQ,CACZ,CAAA;YACD,OAAO,EAAE,CAAA;SACV;QAED,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAA;QAErD,WAAW;QACX,IAAI,OAAO,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACtC,MAAM,EAAE,mBACN,MAAM,EAAE,yBAAiB,CAAC,QAAQ,IAC/B,QAAQ,CACZ,CAAA;YACD,OAAO,EAAE,CAAA;SACV;QAED,YAAY;QACZ,MAAM,EAAE,iCACN,MAAM,EAAE,yBAAiB,CAAC,SAAS,IAChC,QAAQ,KACX,OAAO,GACR,CAAA;QACD,OAAO,EAAE,CAAA;IACX,CAAC;CAAA;AArFD,wCAqFC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { TransactionResponse, TransactionReceipt } from '@ethersproject/providers';
|
|
2
2
|
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
3
3
|
export declare enum TransactionStatus {
|
|
4
4
|
QUEUED = "queued",
|
|
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.createWalletSaga = exports.walletSaga = void 0;
|
|
13
13
|
const effects_1 = require("redux-saga/effects");
|
|
14
14
|
const chain_id_1 = require("@dcl/schemas/dist/dapps/chain-id");
|
|
15
|
-
const
|
|
15
|
+
const decentraland_connect_1 = require("decentraland-connect");
|
|
16
16
|
const eth_1 = require("../../lib/eth");
|
|
17
17
|
const actions_1 = require("./actions");
|
|
18
18
|
const utils_1 = require("./utils");
|
|
@@ -80,7 +80,7 @@ function* handleEnableWalletRequest(action) {
|
|
|
80
80
|
if ((0, eth_1.isCucumberProvider)()) {
|
|
81
81
|
yield cucumberProviderSend('eth_requestAccounts');
|
|
82
82
|
}
|
|
83
|
-
const { account } = yield
|
|
83
|
+
const { account } = yield decentraland_connect_1.connection.connect(providerType, (0, eth_1._getAppChainId)());
|
|
84
84
|
return account;
|
|
85
85
|
}));
|
|
86
86
|
if (!account) {
|
|
@@ -98,7 +98,7 @@ function* handleEnableWalletSuccess(_action) {
|
|
|
98
98
|
}
|
|
99
99
|
function* handleDisconnectWallet(_action) {
|
|
100
100
|
try {
|
|
101
|
-
yield (0, effects_1.call)(() =>
|
|
101
|
+
yield (0, effects_1.call)(() => decentraland_connect_1.connection.disconnect());
|
|
102
102
|
}
|
|
103
103
|
catch (error) {
|
|
104
104
|
console.error(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAU2B;AAC3B,+DAA0D;AAC1D
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.buildWallet = void 0;
|
|
13
|
-
const
|
|
13
|
+
const ethers_1 = require("ethers");
|
|
14
14
|
const eth_1 = require("../../../lib/eth");
|
|
15
15
|
const chainConfiguration_1 = require("../../../lib/chainConfiguration");
|
|
16
16
|
const fetchManaBalance_1 = require("./fetchManaBalance");
|
|
@@ -21,7 +21,7 @@ function buildWallet(appChainId) {
|
|
|
21
21
|
// This could happen if metamask is not installed
|
|
22
22
|
throw new Error('Could not connect to Ethereum');
|
|
23
23
|
}
|
|
24
|
-
const eth = new
|
|
24
|
+
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
25
25
|
const accounts = yield eth.listAccounts();
|
|
26
26
|
if (accounts.length === 0) {
|
|
27
27
|
// This could happen if metamask was not enabled
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildWallet.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/buildWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"buildWallet.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/buildWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAEhC,0CAG0B;AAC1B,wEAAwE;AAExE,yDAAsD;AAGtD,SAAsB,WAAW,CAAC,UAAmB;;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAoB,GAAE,CAAC;QAE9C,IAAI,CAAC,QAAQ,EAAE;YACb,iDAAiD;YACjD,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SAClD;QAED,MAAM,GAAG,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAa,MAAM,GAAG,CAAC,YAAY,EAAE,CAAC;QACpD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,gDAAgD;YAChD,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;SAC1C;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,WAAW,GAAG,IAAA,0CAAqB,EAAC,OAAO,CAAC,CAAC;QACnD,MAAM,cAAc,GAAG,IAAA,0CAAqB,EAAC,UAAU,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAsB,EAAE,CAAC;QAEvC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE;YAChE,MAAM,cAAc,GAAG,cAAc,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC9D,QAAQ,CAAC,OAAO,CAAC,GAAG;gBAClB,OAAO,EAAE,cAAc;gBACvB,IAAI,EAAE,MAAM,IAAA,mCAAgB,EAAC,cAAc,EAAE,OAAO,CAAC;aACtD,CAAC;SACH;QAED,OAAO;YACL,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE;YAC9B,YAAY,EAAE,IAAA,8BAAwB,GAAG;YACzC,QAAQ,EAAE,QAAoB;YAC9B,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,OAAO;SACR,CAAC;IACJ,CAAC;CAAA;AArCD,kCAqCC"}
|
|
@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.fetchManaBalance = void 0;
|
|
13
|
-
const
|
|
14
|
-
const contracts_1 = require("@ethersproject/contracts");
|
|
15
|
-
const web3_provider_1 = require("@ethersproject/providers/lib/web3-provider");
|
|
13
|
+
const ethers_1 = require("ethers");
|
|
16
14
|
const decentraland_transactions_1 = require("decentraland-transactions");
|
|
17
15
|
const eth_1 = require("../../../lib/eth");
|
|
18
16
|
function fetchManaBalance(chainId, address) {
|
|
@@ -20,9 +18,9 @@ function fetchManaBalance(chainId, address) {
|
|
|
20
18
|
try {
|
|
21
19
|
const provider = yield (0, eth_1.getNetworkProvider)(chainId);
|
|
22
20
|
const contract = (0, decentraland_transactions_1.getContract)(decentraland_transactions_1.ContractName.MANAToken, chainId);
|
|
23
|
-
const mana = new
|
|
21
|
+
const mana = new ethers_1.ethers.Contract(contract.address, contract.abi, new ethers_1.ethers.providers.Web3Provider(provider));
|
|
24
22
|
const balance = yield mana.balanceOf(address);
|
|
25
|
-
return parseFloat(
|
|
23
|
+
return parseFloat(ethers_1.ethers.utils.formatEther(balance));
|
|
26
24
|
}
|
|
27
25
|
catch (error) {
|
|
28
26
|
return 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchManaBalance.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/fetchManaBalance.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"fetchManaBalance.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/fetchManaBalance.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAChC,yEAGmC;AAEnC,0CAAsD;AAGtD,SAAsB,gBAAgB,CAAC,OAAgB,EAAE,OAAe;;QACtE,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,IAAA,uCAAW,EAAC,wCAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9D,MAAM,IAAI,GAAG,IAAI,eAAM,CAAC,QAAQ,CAC9B,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,GAAG,EACZ,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAC5C,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC9C,OAAO,UAAU,CAAC,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;SACtD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,CAAC;SACV;IACH,CAAC;CAAA;AAdD,4CAcC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAddEthereumChainParameters.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/getAddEthereumChainParameters.ts"],"names":[],"mappings":";;;AAAA,+DAAyE;AACzE,wEAAwE;
|
|
1
|
+
{"version":3,"file":"getAddEthereumChainParameters.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/getAddEthereumChainParameters.ts"],"names":[],"mappings":";;;AAAA,+DAAyE;AACzE,wEAAwE;AAKxE,SAAgB,6BAA6B,CAC3C,OAAgB;IAEhB,MAAM,UAAU,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,uBAAY,EAAC,OAAO,CAAE,CAAC;IACzC,MAAM,MAAM,GAAG,IAAA,0CAAqB,EAAC,OAAO,CAAC,CAAC;IAC9C,QAAQ,OAAO,EAAE;QACf,KAAK,kBAAO,CAAC,aAAa;YACxB,OAAO;gBACL,OAAO,EAAE,UAAU;gBACnB,SAAS;gBACT,cAAc,EAAE;oBACd,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE,OAAO;oBACf,QAAQ,EAAE,EAAE;iBACb;gBACD,OAAO,EAAE,CAAC,qCAAqC,CAAC;gBAChD,iBAAiB,EAAE,CAAC,0BAA0B,CAAC;aAChD,CAAC;QACJ,KAAK,kBAAO,CAAC,YAAY;YACvB,OAAO;gBACL,OAAO,EAAE,UAAU;gBACnB,SAAS;gBACT,cAAc,EAAE;oBACd,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE,OAAO;oBACf,QAAQ,EAAE,EAAE;iBACb;gBACD,OAAO,EAAE,CAAC,oCAAoC,CAAC;gBAC/C,iBAAiB,EAAE,CAAC,iCAAiC,CAAC;aACvD,CAAC;QACJ,KAAK,kBAAO,CAAC,gBAAgB,CAAC;QAC9B,KAAK,kBAAO,CAAC,gBAAgB,CAAC;QAC9B,KAAK,kBAAO,CAAC,gBAAgB,CAAC;QAC9B,KAAK,kBAAO,CAAC,cAAc,CAAC;QAC5B,KAAK,kBAAO,CAAC,eAAe;YAC1B,OAAO;gBACL,OAAO,EAAE,UAAU;gBACnB,SAAS;gBACT,cAAc,EAAE;oBACd,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE,KAAK;oBACb,QAAQ,EAAE,EAAE;iBACb;gBACD,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;gBACxB,iBAAiB,EAAE,CAAC,sBAAsB,CAAC;aAC5C,CAAC;KACL;AACH,CAAC;AAhDD,sEAgDC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ethers } from 'ethers';
|
|
2
2
|
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
3
|
-
export declare function getTargetNetworkProvider(chainId: ChainId): Promise<Web3Provider>;
|
|
3
|
+
export declare function getTargetNetworkProvider(chainId: ChainId): Promise<ethers.providers.Web3Provider>;
|
|
@@ -10,12 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.getTargetNetworkProvider = void 0;
|
|
13
|
-
const
|
|
13
|
+
const ethers_1 = require("ethers");
|
|
14
14
|
const eth_1 = require("../../../lib/eth");
|
|
15
15
|
function getTargetNetworkProvider(chainId) {
|
|
16
16
|
return __awaiter(this, void 0, void 0, function* () {
|
|
17
17
|
const networkProvider = yield (0, eth_1.getNetworkProvider)(chainId);
|
|
18
|
-
return new
|
|
18
|
+
return new ethers_1.ethers.providers.Web3Provider(networkProvider);
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
exports.getTargetNetworkProvider = getTargetNetworkProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTargetNetworkProvider.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/getTargetNetworkProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"getTargetNetworkProvider.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/getTargetNetworkProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAEhC,0CAAsD;AAGtD,SAAsB,wBAAwB,CAAC,OAAgB;;QAC7D,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;QAC1D,OAAO,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAC5D,CAAC;CAAA;AAHD,4DAGC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
1
|
+
import { Provider } from 'decentraland-connect';
|
|
2
|
+
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
3
3
|
/**
|
|
4
4
|
* Change the provider's chain to a provided chain.
|
|
5
5
|
* In case it returns an error that the chain does not exist, it will try to add it.
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
2
|
+
import { ethers } from 'ethers';
|
|
3
|
+
import { Dispatch } from 'redux';
|
|
4
|
+
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
5
|
+
import { connectWalletRequest, ConnectWalletRequestAction, changeAccount, changeNetwork, ChangeAccountAction, ChangeNetworkAction } from '../../modules/wallet/actions';
|
|
6
6
|
export declare type Props = {
|
|
7
7
|
address?: string;
|
|
8
8
|
chainId?: ChainId;
|
|
@@ -23,5 +23,5 @@ export declare type AccountsChangedHandler = (accounts: string[]) => void;
|
|
|
23
23
|
export declare type NetworkChangedHandler = (chainId: string) => void;
|
|
24
24
|
export declare type Handler = AccountsChangedHandler | NetworkChangedHandler;
|
|
25
25
|
export declare type ProviderWindow = Window & {
|
|
26
|
-
ethereum?: Web3Provider;
|
|
26
|
+
ethereum?: ethers.providers.Web3Provider;
|
|
27
27
|
};
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decentraland-dapps",
|
|
3
|
-
"version": "13.31.
|
|
3
|
+
"version": "13.31.6",
|
|
4
4
|
"dependencies": {
|
|
5
|
-
"@0xsequence/multicall": "^0.
|
|
6
|
-
"@0xsequence/relayer": "^0.
|
|
5
|
+
"@0xsequence/multicall": "^0.25.1",
|
|
6
|
+
"@0xsequence/relayer": "^0.25.1",
|
|
7
7
|
"@dcl/crypto": "^3.3.1",
|
|
8
8
|
"@dcl/schemas": "^6.4.2",
|
|
9
9
|
"@transak/transak-sdk": "^1.0.31",
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
"ethers": "^5.6.8",
|
|
19
19
|
"events": "^3.3.0",
|
|
20
20
|
"flat": "^5.0.2",
|
|
21
|
+
"pusher-js": "^8.0.1",
|
|
21
22
|
"react-intl": "^5.20.7",
|
|
22
23
|
"redux-persistence": "^1.2.0",
|
|
23
24
|
"redux-persistence-engine-localstorage": "^1.0.0",
|