decentraland-dapps 12.54.0 → 13.0.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/AddressProvider/AddressProvider.js +1 -1
- package/dist/containers/AddressProvider/AddressProvider.js.map +1 -1
- package/dist/containers/AddressProvider/utils.d.ts +1 -1
- package/dist/lib/entities.d.ts +1 -1
- package/dist/lib/entities.js +10 -12
- package/dist/lib/entities.js.map +1 -1
- package/dist/lib/eth.js +1 -1
- package/dist/lib/eth.js.map +1 -1
- package/dist/lib/types.d.ts +1 -2
- package/dist/modules/authorization/sagas.js +3 -3
- package/dist/modules/authorization/sagas.js.map +1 -1
- package/dist/modules/authorization/utils.d.ts +2 -2
- package/dist/modules/authorization/utils.js +4 -4
- package/dist/modules/authorization/utils.js.map +1 -1
- package/dist/modules/profile/sagas.js +2 -2
- package/dist/modules/profile/sagas.js.map +1 -1
- package/dist/modules/transaction/sagas.js +7 -7
- package/dist/modules/transaction/sagas.js.map +1 -1
- package/dist/modules/transaction/txUtils.js +5 -6
- package/dist/modules/transaction/txUtils.js.map +1 -1
- package/dist/modules/transaction/types.d.ts +1 -1
- package/dist/modules/transaction/types.js.map +1 -1
- package/dist/modules/wallet/sagas.js.map +1 -1
- package/dist/modules/wallet/utils.d.ts +4 -4
- package/dist/modules/wallet/utils.js +16 -20
- package/dist/modules/wallet/utils.js.map +1 -1
- package/dist/providers/WalletProvider/WalletProvider.js +1 -1
- package/dist/providers/WalletProvider/WalletProvider.js.map +1 -1
- package/dist/providers/WalletProvider/WalletProvider.types.d.ts +2 -2
- package/package.json +8 -10
- package/dist/contracts/ERC20.d.ts +0 -100
- package/dist/contracts/ERC20.js +0 -16
- package/dist/contracts/ERC20.js.map +0 -1
- package/dist/contracts/ERC20Abi.d.ts +0 -3
- package/dist/contracts/ERC20Abi.js +0 -426
- package/dist/contracts/ERC20Abi.js.map +0 -1
- package/dist/contracts/ERC721.d.ts +0 -75
- package/dist/contracts/ERC721.js +0 -16
- package/dist/contracts/ERC721.js.map +0 -1
- package/dist/contracts/ERC721Abi.d.ts +0 -3
- package/dist/contracts/ERC721Abi.js +0 -468
- package/dist/contracts/ERC721Abi.js.map +0 -1
|
@@ -39,7 +39,7 @@ const AddressProvider = (props) => {
|
|
|
39
39
|
const [isLoading, setIsLoading] = react_1.useState(!!isENS);
|
|
40
40
|
const [error, setError] = react_1.useState();
|
|
41
41
|
react_1.useEffect(() => {
|
|
42
|
-
if (address && !ethers_1.utils.isAddress(address) && !isENS) {
|
|
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,oBAAY,CAAC,KAAK,CAAC,CAAA;IAC1C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,gBAAQ,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACtE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,gBAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,gBAAQ,EAAgB,CAAA;IAElD,iBAAS,CAAC,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,iBAAS,CAAC,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,sBAAc,CAAC,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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ChainId } from '@dcl/schemas';
|
|
2
2
|
export declare const isENSAddress: (address: string) => boolean;
|
|
3
|
-
export declare const resolveENSname: (name: string, chainId: ChainId) => Promise<string>;
|
|
3
|
+
export declare const resolveENSname: (name: string, chainId: ChainId) => Promise<string | null>;
|
package/dist/lib/entities.d.ts
CHANGED
package/dist/lib/entities.js
CHANGED
|
@@ -10,13 +10,11 @@ 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
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const address_1 = require("web3x/address");
|
|
13
|
+
const ethers_1 = require("ethers");
|
|
14
|
+
const crypto_1 = require("@dcl/crypto");
|
|
15
|
+
const schemas_1 = require("@dcl/schemas");
|
|
17
16
|
const dcl_catalyst_client_1 = require("dcl-catalyst-client");
|
|
18
|
-
const
|
|
19
|
-
const eth_2 = require("./eth");
|
|
17
|
+
const eth_1 = require("./eth");
|
|
20
18
|
const peer_1 = require("./peer");
|
|
21
19
|
class EntitiesOperator {
|
|
22
20
|
constructor(peerUrl) {
|
|
@@ -32,13 +30,13 @@ class EntitiesOperator {
|
|
|
32
30
|
*/
|
|
33
31
|
authenticateEntityDeployment(address, entityId) {
|
|
34
32
|
return __awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
const provider = yield
|
|
33
|
+
const provider = yield eth_1.getConnectedProvider();
|
|
36
34
|
if (!provider)
|
|
37
35
|
throw new Error("The provider couldn't be retrieved when creating the auth chain");
|
|
38
|
-
const eth = new
|
|
39
|
-
const personal =
|
|
40
|
-
const signature = yield personal.
|
|
41
|
-
return
|
|
36
|
+
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
37
|
+
const personal = eth.getSigner(address);
|
|
38
|
+
const signature = yield personal.signMessage(entityId);
|
|
39
|
+
return crypto_1.Authenticator.createSimpleAuthChain(entityId, address, signature);
|
|
42
40
|
});
|
|
43
41
|
}
|
|
44
42
|
/**
|
|
@@ -49,7 +47,7 @@ class EntitiesOperator {
|
|
|
49
47
|
*/
|
|
50
48
|
getProfileEntity(address) {
|
|
51
49
|
return __awaiter(this, void 0, void 0, function* () {
|
|
52
|
-
const entities = yield this.catalystClient.fetchEntitiesByPointers(
|
|
50
|
+
const entities = yield this.catalystClient.fetchEntitiesByPointers(schemas_1.EntityType.PROFILE, [address.toLowerCase()]);
|
|
53
51
|
if (entities.length > 0) {
|
|
54
52
|
return entities[0];
|
|
55
53
|
}
|
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;AACtD,0CAAiD;AACjD,6DAG4B;AAC5B,+BAA4C;AAE5C,iCAAgC;AAEhC,MAAa,gBAAgB;IAI3B,YAAY,OAAe;QACzB,IAAI,CAAC,cAAc,GAAG,IAAI,oCAAc,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAA;QAClE,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,0BAAoB,EAAE,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,oBAAU,CAAC,OAAO,EAClB,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,MAAc,EACd,UAAsB,EACtB,OAAe,EACf,OAAe;;YAEf,MAAM,OAAO,GAAmC;gBAC9C,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,CAAC,OAAO,CAAC;gBACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,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,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,iCAClC,cAAc,KACjB,SAAS,IACT,CAAA;QACJ,CAAC;KAAA;CACF;AAzFD,4CAyFC"}
|
package/dist/lib/eth.js
CHANGED
|
@@ -24,7 +24,7 @@ function getNetworkProvider(chainId) {
|
|
|
24
24
|
*/
|
|
25
25
|
const connectedProvider = yield getConnectedProvider();
|
|
26
26
|
if (connectedProvider) {
|
|
27
|
-
const connectedChainId = yield new ethers_1.providers.Web3Provider(connectedProvider)
|
|
27
|
+
const connectedChainId = yield new ethers_1.ethers.providers.Web3Provider(connectedProvider)
|
|
28
28
|
.getSigner()
|
|
29
29
|
.getChainId();
|
|
30
30
|
if (chainId === connectedChainId) {
|
package/dist/lib/eth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/lib/eth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA2D;AAC3D,+DAA0D;AAE1D,
|
|
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,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,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,gBAAQ,EAAE,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,gBAAgB,GAAG,2BAA2B,EAAE,CAAA;IACtD,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;KAC7D;IACD,MAAM,MAAM,GAAG,0CAAqB,CAAC,gBAAgB,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;AACvC,CAAC;AAPD,kDAOC"}
|
package/dist/lib/types.d.ts
CHANGED
|
@@ -38,14 +38,14 @@ function createAuthorizationSaga() {
|
|
|
38
38
|
if (!multicallProviders[chainId]) {
|
|
39
39
|
// provider party 🎉
|
|
40
40
|
const provider = yield effects_1.call(() => eth_1.getNetworkProvider(chainId));
|
|
41
|
-
const ethersProvider = new ethers_1.providers.Web3Provider(provider);
|
|
41
|
+
const ethersProvider = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
42
42
|
const multicallProvider = new multicall_1.providers.MulticallProvider(ethersProvider, { batchSize: 500 } // defaults to 50
|
|
43
43
|
);
|
|
44
44
|
multicallProviders[chainId] = multicallProvider;
|
|
45
45
|
}
|
|
46
46
|
switch (authorization.type) {
|
|
47
47
|
case types_1.AuthorizationType.ALLOWANCE:
|
|
48
|
-
const erc20 = new ethers_1.Contract(authorization.contractAddress, [
|
|
48
|
+
const erc20 = new ethers_1.ethers.Contract(authorization.contractAddress, [
|
|
49
49
|
'function allowance(address owner, address spender) view returns (uint256)'
|
|
50
50
|
], multicallProviders[chainId]);
|
|
51
51
|
promises.push(
|
|
@@ -59,7 +59,7 @@ function createAuthorizationSaga() {
|
|
|
59
59
|
}));
|
|
60
60
|
break;
|
|
61
61
|
case types_1.AuthorizationType.APPROVAL:
|
|
62
|
-
const erc721 = new ethers_1.Contract(authorization.contractAddress, [
|
|
62
|
+
const erc721 = new ethers_1.ethers.Contract(authorization.contractAddress, [
|
|
63
63
|
'function isApprovedForAll(address owner, address operator) view returns (bool)'
|
|
64
64
|
], multicallProviders[chainId]);
|
|
65
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():
|
|
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,12 +1,12 @@
|
|
|
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
|
|
8
|
-
.pow(
|
|
9
|
-
.sub(
|
|
7
|
+
return ethers_1.ethers.BigNumber.from(2)
|
|
8
|
+
.pow(256)
|
|
9
|
+
.sub(1);
|
|
10
10
|
}
|
|
11
11
|
exports.getTokenAmountToApprove = getTokenAmountToApprove;
|
|
12
12
|
function hasAuthorization(authorizations, authorizationToFind) {
|
|
@@ -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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createProfileSaga = void 0;
|
|
4
4
|
const effects_1 = require("redux-saga/effects");
|
|
5
|
-
const
|
|
5
|
+
const schemas_1 = require("@dcl/schemas");
|
|
6
6
|
const peer_1 = require("../../lib/peer");
|
|
7
7
|
const entities_1 = require("../../lib/entities");
|
|
8
8
|
const actions_1 = require("../wallet/actions");
|
|
@@ -63,7 +63,7 @@ function createProfileSaga({ peerUrl }) {
|
|
|
63
63
|
const newAvatar = Object.assign(Object.assign(Object.assign({}, entity.metadata.avatars[0]), changes), { version: entity.metadata.avatars[0].version + 1 });
|
|
64
64
|
const profileMetadata = Object.assign(Object.assign({}, entity.metadata), { avatars: [newAvatar, ...entity.metadata.avatars.slice(1)] });
|
|
65
65
|
const newProfileEntity = Object.assign(Object.assign({}, entity), { metadata: profileMetadata });
|
|
66
|
-
yield effects_1.call([entities, 'deployEntityWithoutNewFiles'], newProfileEntity,
|
|
66
|
+
yield effects_1.call([entities, 'deployEntityWithoutNewFiles'], newProfileEntity, schemas_1.EntityType.PROFILE, address, address);
|
|
67
67
|
return newAvatar;
|
|
68
68
|
}
|
|
69
69
|
return profileSaga;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/profile/sagas.ts"],"names":[],"mappings":";;;AAAA,gDAAqE;
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/profile/sagas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FailedTransactionError = exports.transactionSaga = void 0;
|
|
4
|
-
const eth_1 = require("web3x/eth");
|
|
5
4
|
const effects_1 = require("redux-saga/effects");
|
|
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");
|
|
@@ -10,7 +10,7 @@ const selectors_1 = require("./selectors");
|
|
|
10
10
|
const utils_1 = require("./utils");
|
|
11
11
|
const txUtils_1 = require("./txUtils");
|
|
12
12
|
const selectors_2 = require("../wallet/selectors");
|
|
13
|
-
const
|
|
13
|
+
const eth_1 = require("../../lib/eth");
|
|
14
14
|
function* transactionSaga() {
|
|
15
15
|
yield effects_1.takeEvery(actions_1.FETCH_TRANSACTION_REQUEST, handleFetchTransactionRequest);
|
|
16
16
|
yield effects_1.takeEvery(actions_1.REPLACE_TRANSACTION_REQUEST, handleReplaceTransactionRequest);
|
|
@@ -109,18 +109,18 @@ function* handleReplaceTransactionRequest(action) {
|
|
|
109
109
|
console.warn(`Could not find a valid transaction for hash ${hash}`);
|
|
110
110
|
return;
|
|
111
111
|
}
|
|
112
|
-
const provider = yield effects_1.call(() =>
|
|
112
|
+
const provider = yield effects_1.call(() => eth_1.getConnectedProvider());
|
|
113
113
|
if (!provider) {
|
|
114
114
|
console.warn('Could not connect to ethereum');
|
|
115
115
|
return;
|
|
116
116
|
}
|
|
117
|
-
const eth = new
|
|
118
|
-
const accounts = yield effects_1.call(() => eth.
|
|
117
|
+
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
118
|
+
const accounts = yield effects_1.call(() => eth.listAccounts());
|
|
119
119
|
if (accounts.length === 0) {
|
|
120
120
|
console.warn('Could not get accounts');
|
|
121
121
|
return;
|
|
122
122
|
}
|
|
123
|
-
const account = accounts[0]
|
|
123
|
+
const account = accounts[0];
|
|
124
124
|
let checkpoint = null;
|
|
125
125
|
watchDroppedIndex[hash] = true;
|
|
126
126
|
while (true) {
|
|
@@ -139,7 +139,7 @@ function* handleReplaceTransactionRequest(action) {
|
|
|
139
139
|
const startBlock = blockNumber;
|
|
140
140
|
const endBlock = checkpoint || blockNumber - BLOCKS_DEPTH;
|
|
141
141
|
for (let i = startBlock; i > endBlock; i--) {
|
|
142
|
-
let block = yield effects_1.call(() => eth.
|
|
142
|
+
let block = yield effects_1.call(() => eth.getBlockWithTransactions(i));
|
|
143
143
|
const transactions = block != null && block.transactions != null ? block.transactions : [];
|
|
144
144
|
// look for a replacement tx, if so break the loop
|
|
145
145
|
replacedBy = transactions.find(tx => tx.nonce === nonce && tx.from.toString() === account);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/transaction/sagas.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/transaction/sagas.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,22 +10,21 @@ 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
|
|
14
|
-
const
|
|
15
|
-
const eth_2 = require("../../lib/eth");
|
|
13
|
+
const ethers_1 = require("ethers");
|
|
14
|
+
const eth_1 = require("../../lib/eth");
|
|
16
15
|
const types_1 = require("./types");
|
|
17
16
|
function getTransaction(address, chainId, hash) {
|
|
18
17
|
return __awaiter(this, void 0, void 0, function* () {
|
|
19
|
-
const provider = yield
|
|
18
|
+
const provider = yield eth_1.getNetworkProvider(chainId);
|
|
20
19
|
if (!provider)
|
|
21
20
|
return null;
|
|
22
|
-
const eth = new
|
|
21
|
+
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
23
22
|
if (!address) {
|
|
24
23
|
return null;
|
|
25
24
|
}
|
|
26
25
|
let currentNonce = null;
|
|
27
26
|
try {
|
|
28
|
-
currentNonce = yield eth.getTransactionCount(
|
|
27
|
+
currentNonce = yield eth.getTransactionCount(address);
|
|
29
28
|
}
|
|
30
29
|
catch (error) {
|
|
31
30
|
console.warn(`Could not get current nonce for account "${address}"`, error.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"txUtils.js","sourceRoot":"","sources":["../../../src/modules/transaction/txUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAA+B;
|
|
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,wBAAkB,CAAC,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 { TransactionResponse, TransactionReceipt } from '
|
|
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",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/modules/transaction/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/modules/transaction/types.ts"],"names":[],"mappings":";;;AAMA,IAAY,iBAOX;AAPD,WAAY,iBAAiB;IAC3B,sCAAiB,CAAA;IACjB,wCAAmB,CAAA;IACnB,0CAAqB,CAAA;IACrB,wCAAmB,CAAA;IACnB,0CAAqB,CAAA;IACrB,4CAAuB,CAAA;AACzB,CAAC,EAPW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAO5B;AAyCY,QAAA,eAAe,GAAG;IAC7B,iBAAiB,CAAC,SAAS;IAC3B,iBAAiB,CAAC,QAAQ;IAC1B,iBAAiB,CAAC,OAAO;IACzB,iBAAiB,CAAC,QAAQ;CAC3B,CAAA;AAEY,QAAA,aAAa,GAAG;IAC3B,iBAAiB,CAAC,OAAO;IACzB,iBAAiB,CAAC,QAAQ;CAC3B,CAAA;AAEY,QAAA,cAAc,GAAG;IAC5B,iBAAiB,CAAC,QAAQ;IAC1B,iBAAiB,CAAC,SAAS;CAC5B,CAAA"}
|
|
@@ -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,mCAMgB;AAEhB,2CAAyC;AAEzC,6DAA6D;AAC7D,MAAM,QAAQ,GAAI,MAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { EventEmitter } from 'events';
|
|
3
|
-
import {
|
|
3
|
+
import { ethers } from 'ethers';
|
|
4
|
+
import { Provider } from 'decentraland-connect';
|
|
4
5
|
import { ContractData } from 'decentraland-transactions';
|
|
5
6
|
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
6
7
|
import { AddEthereumChainParameters, Wallet } from './types';
|
|
7
|
-
import { Provider } from 'decentraland-connect';
|
|
8
8
|
export declare const getTransactionsApiUrl: () => string;
|
|
9
9
|
export declare const setTransactionsApiUrl: (url: string) => string;
|
|
10
10
|
export declare function fetchManaBalance(chainId: ChainId, address: string): Promise<number>;
|
|
11
11
|
export declare function buildWallet(): Promise<Wallet>;
|
|
12
|
-
export declare function getTargetNetworkProvider(chainId: ChainId): Promise<providers.Web3Provider>;
|
|
12
|
+
export declare function getTargetNetworkProvider(chainId: ChainId): Promise<ethers.providers.Web3Provider>;
|
|
13
13
|
export declare enum TransactionEventType {
|
|
14
14
|
ERROR = "error",
|
|
15
15
|
SUCCESS = "success"
|
|
@@ -39,7 +39,7 @@ export declare function sendTransaction(contract: ContractData, contractMethodNa
|
|
|
39
39
|
* @param contract - The contract to send the transaction to.
|
|
40
40
|
* @param getPopulatedTransaction - A function that returns a populated transaction.
|
|
41
41
|
*/
|
|
42
|
-
export declare function sendTransaction(contract: ContractData, getPopulatedTransaction: (populateTransaction: Contract['populateTransaction']) => Promise<PopulatedTransaction>): Promise<string>;
|
|
42
|
+
export declare function sendTransaction(contract: ContractData, getPopulatedTransaction: (populateTransaction: ethers.Contract['populateTransaction']) => Promise<ethers.PopulatedTransaction>): Promise<string>;
|
|
43
43
|
export declare function getAddEthereumChainParameters(chainId: ChainId): AddEthereumChainParameters;
|
|
44
44
|
/**
|
|
45
45
|
* Obtains the chain id through a provider.
|
|
@@ -12,10 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
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
|
-
const eth_1 = require("web3x/eth");
|
|
16
15
|
const decentraland_transactions_1 = require("decentraland-transactions");
|
|
17
16
|
const chain_id_1 = require("@dcl/schemas/dist/dapps/chain-id");
|
|
18
|
-
const
|
|
17
|
+
const eth_1 = require("../../lib/eth");
|
|
19
18
|
const chainConfiguration_1 = require("../../lib/chainConfiguration");
|
|
20
19
|
let TRANSACTIONS_API_URL = 'https://transactions-api.decentraland.co/v1';
|
|
21
20
|
const getTransactionsApiUrl = () => TRANSACTIONS_API_URL;
|
|
@@ -25,11 +24,11 @@ exports.setTransactionsApiUrl = setTransactionsApiUrl;
|
|
|
25
24
|
function fetchManaBalance(chainId, address) {
|
|
26
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
27
26
|
try {
|
|
28
|
-
const provider = yield
|
|
27
|
+
const provider = yield eth_1.getNetworkProvider(chainId);
|
|
29
28
|
const contract = decentraland_transactions_1.getContract(decentraland_transactions_1.ContractName.MANAToken, chainId);
|
|
30
|
-
const mana = new ethers_1.Contract(contract.address, contract.abi, new ethers_1.providers.Web3Provider(provider));
|
|
29
|
+
const mana = new ethers_1.ethers.Contract(contract.address, contract.abi, new ethers_1.ethers.providers.Web3Provider(provider));
|
|
31
30
|
const balance = yield mana.balanceOf(address);
|
|
32
|
-
return parseFloat(ethers_1.utils.formatEther(balance));
|
|
31
|
+
return parseFloat(ethers_1.ethers.utils.formatEther(balance));
|
|
33
32
|
}
|
|
34
33
|
catch (error) {
|
|
35
34
|
return 0;
|
|
@@ -39,21 +38,21 @@ function fetchManaBalance(chainId, address) {
|
|
|
39
38
|
exports.fetchManaBalance = fetchManaBalance;
|
|
40
39
|
function buildWallet() {
|
|
41
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
-
const provider = yield
|
|
41
|
+
const provider = yield eth_1.getConnectedProvider();
|
|
43
42
|
if (!provider) {
|
|
44
43
|
// This could happen if metamask is not installed
|
|
45
44
|
throw new Error('Could not connect to Ethereum');
|
|
46
45
|
}
|
|
47
|
-
const eth = new
|
|
48
|
-
const accounts = yield eth.
|
|
46
|
+
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
47
|
+
const accounts = yield eth.listAccounts();
|
|
49
48
|
if (accounts.length === 0) {
|
|
50
49
|
// This could happen if metamask was not enabled
|
|
51
50
|
throw new Error('Could not get address');
|
|
52
51
|
}
|
|
53
52
|
const address = accounts[0].toString();
|
|
54
|
-
const chainId = yield eth.
|
|
53
|
+
const { chainId } = yield eth.getNetwork();
|
|
55
54
|
const chainConfig = chainConfiguration_1.getChainConfiguration(chainId);
|
|
56
|
-
const expectedChainId =
|
|
55
|
+
const expectedChainId = eth_1.getConnectedProviderChainId();
|
|
57
56
|
const expectedChainConfig = chainConfiguration_1.getChainConfiguration(expectedChainId);
|
|
58
57
|
const networks = {};
|
|
59
58
|
for (const network of Object.keys(expectedChainConfig.networkMapping)) {
|
|
@@ -65,7 +64,7 @@ function buildWallet() {
|
|
|
65
64
|
}
|
|
66
65
|
return {
|
|
67
66
|
address: address.toLowerCase(),
|
|
68
|
-
providerType:
|
|
67
|
+
providerType: eth_1.getConnectedProviderType(),
|
|
69
68
|
networks: networks,
|
|
70
69
|
network: chainConfig.network,
|
|
71
70
|
chainId
|
|
@@ -75,8 +74,8 @@ function buildWallet() {
|
|
|
75
74
|
exports.buildWallet = buildWallet;
|
|
76
75
|
function getTargetNetworkProvider(chainId) {
|
|
77
76
|
return __awaiter(this, void 0, void 0, function* () {
|
|
78
|
-
const networkProvider = yield
|
|
79
|
-
return new ethers_1.providers.Web3Provider(networkProvider);
|
|
77
|
+
const networkProvider = yield eth_1.getNetworkProvider(chainId);
|
|
78
|
+
return new ethers_1.ethers.providers.Web3Provider(networkProvider);
|
|
80
79
|
});
|
|
81
80
|
}
|
|
82
81
|
exports.getTargetNetworkProvider = getTargetNetworkProvider;
|
|
@@ -90,22 +89,19 @@ function sendTransaction(...args) {
|
|
|
90
89
|
return __awaiter(this, void 0, void 0, function* () {
|
|
91
90
|
const [contract, contractMethodNameOrGetPopulatedTransaction, ...contractArguments] = args;
|
|
92
91
|
try {
|
|
93
|
-
|
|
94
|
-
const connectedProvider = yield eth_2.getConnectedProvider();
|
|
92
|
+
const connectedProvider = yield eth_1.getConnectedProvider();
|
|
95
93
|
if (!connectedProvider) {
|
|
96
94
|
throw new Error('Provider not connected');
|
|
97
95
|
}
|
|
98
96
|
const chainId = yield getProviderChainId(connectedProvider);
|
|
99
|
-
// get a provider for the target network
|
|
100
97
|
const targetNetworkProvider = yield getTargetNetworkProvider(contract.chainId);
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
// populate the transaction data
|
|
98
|
+
const contractInstance = new ethers_1.ethers.Contract(contract.address, contract.abi, targetNetworkProvider);
|
|
99
|
+
// Populate the transaction data
|
|
104
100
|
const unsignedTx = yield (typeof contractMethodNameOrGetPopulatedTransaction ===
|
|
105
101
|
'function'
|
|
106
102
|
? contractMethodNameOrGetPopulatedTransaction(contractInstance.populateTransaction)
|
|
107
103
|
: contractInstance.populateTransaction[contractMethodNameOrGetPopulatedTransaction](...contractArguments));
|
|
108
|
-
//
|
|
104
|
+
// If the connected provider is in the target network, use it to sign and send the tx
|
|
109
105
|
if (chainId === contract.chainId) {
|
|
110
106
|
const signer = targetNetworkProvider.getSigner();
|
|
111
107
|
const tx = yield signer.sendTransaction(unsignedTx);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/wallet/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/wallet/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ class WalletProvider extends react_1.default.PureComponent {
|
|
|
45
45
|
}
|
|
46
46
|
handle(method, type, handler) {
|
|
47
47
|
return __awaiter(this, void 0, void 0, function* () {
|
|
48
|
-
// try to use
|
|
48
|
+
// try to use ethers abstraction
|
|
49
49
|
const provider = yield eth_1.getConnectedProvider();
|
|
50
50
|
if (provider) {
|
|
51
51
|
try {
|