decentraland-dapps 13.45.0 → 13.45.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/eth.d.ts +1 -0
- package/dist/lib/eth.js +8 -1
- package/dist/lib/eth.js.map +1 -1
- package/dist/modules/transaction/actions.d.ts +2 -1
- package/dist/modules/transaction/actions.js +3 -2
- package/dist/modules/transaction/actions.js.map +1 -1
- package/dist/modules/transaction/sagas.js +12 -26
- package/dist/modules/transaction/sagas.js.map +1 -1
- package/package.json +1 -1
package/dist/lib/eth.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ export declare function _getAppChainId(): ChainId;
|
|
|
21
21
|
*/
|
|
22
22
|
export declare function _setAppChainId(_appChainId: ChainId): void;
|
|
23
23
|
export declare function getNetworkProvider(chainId: ChainId): Promise<Provider>;
|
|
24
|
+
export declare function getNetworkWeb3Provider(chainId: ChainId): Promise<ethers.providers.Web3Provider>;
|
|
24
25
|
export declare function getConnectedProvider(): Promise<Provider | null>;
|
|
25
26
|
export declare function getSigner(): Promise<ethers.Signer>;
|
|
26
27
|
export declare function getConnectedProviderType(): ProviderType | null;
|
package/dist/lib/eth.js
CHANGED
|
@@ -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.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;
|
|
12
|
+
exports.getChainIdByNetwork = exports.isValidChainId = exports.isCoinbaseProvider = exports.isDapperProvider = exports.isCucumberProvider = exports.getConnectedProviderChainId = exports.getConnectedProviderType = exports.getSigner = exports.getConnectedProvider = exports.getNetworkWeb3Provider = exports.getNetworkProvider = exports._setAppChainId = exports._getAppChainId = void 0;
|
|
13
13
|
const decentraland_connect_1 = require("decentraland-connect");
|
|
14
14
|
const chain_id_1 = require("@dcl/schemas/dist/dapps/chain-id");
|
|
15
15
|
const ethers_1 = require("ethers");
|
|
@@ -54,6 +54,13 @@ function getNetworkProvider(chainId) {
|
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
56
|
exports.getNetworkProvider = getNetworkProvider;
|
|
57
|
+
function getNetworkWeb3Provider(chainId) {
|
|
58
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
59
|
+
const provider = yield getNetworkProvider(chainId);
|
|
60
|
+
return new ethers_1.ethers.providers.Web3Provider(provider);
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
exports.getNetworkWeb3Provider = getNetworkWeb3Provider;
|
|
57
64
|
function getConnectedProvider() {
|
|
58
65
|
return __awaiter(this, void 0, void 0, function* () {
|
|
59
66
|
try {
|
package/dist/lib/eth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/lib/eth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/lib/eth.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,9 +51,10 @@ export declare type FixRevertedTransactionAction = ReturnType<typeof fixReverted
|
|
|
51
51
|
export declare const REPLACE_TRANSACTION_REQUEST = "[Request] Replace Transaction";
|
|
52
52
|
export declare const REPLACE_TRANSACTION_SUCCESS = "[Success] Replace Transaction";
|
|
53
53
|
export declare const REPLACE_TRANSACTION_FAILURE = "[Failure] Replace Transaction";
|
|
54
|
-
export declare const replaceTransactionRequest: (hash: string, nonce: number) => import("typesafe-actions/dist/types").PayloadAction<"[Request] Replace Transaction", {
|
|
54
|
+
export declare const replaceTransactionRequest: (hash: string, nonce: number, address: string) => import("typesafe-actions/dist/types").PayloadAction<"[Request] Replace Transaction", {
|
|
55
55
|
hash: string;
|
|
56
56
|
nonce: number;
|
|
57
|
+
address: string;
|
|
57
58
|
}>;
|
|
58
59
|
export declare const replaceTransactionSuccess: (hash: string, replaceBy: string) => import("typesafe-actions/dist/types").PayloadAction<"[Success] Replace Transaction", {
|
|
59
60
|
hash: string;
|
|
@@ -49,9 +49,10 @@ exports.fixRevertedTransaction = fixRevertedTransaction;
|
|
|
49
49
|
exports.REPLACE_TRANSACTION_REQUEST = '[Request] Replace Transaction';
|
|
50
50
|
exports.REPLACE_TRANSACTION_SUCCESS = '[Success] Replace Transaction';
|
|
51
51
|
exports.REPLACE_TRANSACTION_FAILURE = '[Failure] Replace Transaction';
|
|
52
|
-
const replaceTransactionRequest = (hash, nonce) => (0, typesafe_actions_1.action)(exports.REPLACE_TRANSACTION_REQUEST, {
|
|
52
|
+
const replaceTransactionRequest = (hash, nonce, address) => (0, typesafe_actions_1.action)(exports.REPLACE_TRANSACTION_REQUEST, {
|
|
53
53
|
hash,
|
|
54
|
-
nonce
|
|
54
|
+
nonce,
|
|
55
|
+
address
|
|
55
56
|
});
|
|
56
57
|
exports.replaceTransactionRequest = replaceTransactionRequest;
|
|
57
58
|
const replaceTransactionSuccess = (hash, replaceBy) => (0, typesafe_actions_1.action)(exports.REPLACE_TRANSACTION_SUCCESS, { hash, replaceBy });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/modules/transaction/actions.ts"],"names":[],"mappings":";;;AACA,uDAAyC;AAGzC,oBAAoB;AAEP,QAAA,yBAAyB,GAAG,6BAA6B,CAAA;AACzD,QAAA,yBAAyB,GAAG,6BAA6B,CAAA;AACzD,QAAA,yBAAyB,GAAG,6BAA6B,CAAA;AAE/D,MAAM,uBAAuB,GAAG,CACrC,OAAe,EACf,IAAY,EACZ,YAAuB,EACvB,EAAE,CACF,IAAA,yBAAM,EAAC,iCAAyB,EAAE;IAChC,OAAO;IACP,IAAI;IACJ,MAAM,EAAE,YAAY;CACrB,CAAC,CAAA;AATS,QAAA,uBAAuB,2BAShC;AAEG,MAAM,uBAAuB,GAAG,CAAC,WAAwB,EAAE,EAAE,CAClE,IAAA,yBAAM,EAAC,iCAAyB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAA;AADvC,QAAA,uBAAuB,2BACgB;AAE7C,MAAM,uBAAuB,GAAG,CACrC,IAAY,EACZ,MAAgC,EAChC,OAAe,EACf,WAAwB,EACxB,EAAE,CACF,IAAA,yBAAM,EAAC,iCAAyB,EAAE;IAChC,IAAI;IACJ,MAAM;IACN,OAAO;IACP,WAAW;CACZ,CAAC,CAAA;AAXS,QAAA,uBAAuB,2BAWhC;AAYJ,6BAA6B;AAEhB,QAAA,0BAA0B,GAAG,4BAA4B,CAAA;AAE/D,MAAM,wBAAwB,GAAG,GAAG,EAAE,CAC3C,IAAA,yBAAM,EAAC,kCAA0B,EAAE,EAAE,CAAC,CAAA;AAD3B,QAAA,wBAAwB,4BACG;AAMxC,4BAA4B;AAEf,QAAA,yBAAyB,GAAG,2BAA2B,CAAA;AAE7D,MAAM,uBAAuB,GAAG,CACrC,IAAY,EACZ,MAAuC,EACvC,EAAE,CAAC,IAAA,yBAAM,EAAC,iCAAyB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;AAH3C,QAAA,uBAAuB,2BAGoB;AAMxD,2BAA2B;AAEd,QAAA,wBAAwB,GAAG,0BAA0B,CAAA;AAE3D,MAAM,sBAAsB,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,EAAE,CACpE,IAAA,yBAAM,EAAC,gCAAwB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;AADtC,QAAA,sBAAsB,0BACgB;AAMnD,6BAA6B;AAEhB,QAAA,0BAA0B,GAAG,4BAA4B,CAAA;AAE/D,MAAM,wBAAwB,GAAG,GAAG,EAAE,CAC3C,IAAA,yBAAM,EAAC,kCAA0B,EAAE,EAAE,CAAC,CAAA;AAD3B,QAAA,wBAAwB,4BACG;AAMxC,6BAA6B;AAEhB,QAAA,0BAA0B,GAAG,4BAA4B,CAAA;AAE/D,MAAM,wBAAwB,GAAG,CAAC,IAAY,EAAE,EAAE,CACvD,IAAA,yBAAM,EAAC,kCAA0B,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;AADjC,QAAA,wBAAwB,4BACS;AAM9C,2BAA2B;AAEd,QAAA,wBAAwB,GAAG,0BAA0B,CAAA;AAE3D,MAAM,sBAAsB,GAAG,CAAC,IAAY,EAAE,EAAE,CACrD,IAAA,yBAAM,EAAC,gCAAwB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;AAD/B,QAAA,sBAAsB,0BACS;AAM5C,sBAAsB;AAET,QAAA,2BAA2B,GAAG,+BAA+B,CAAA;AAC7D,QAAA,2BAA2B,GAAG,+BAA+B,CAAA;AAC7D,QAAA,2BAA2B,GAAG,+BAA+B,CAAA;AAEnE,MAAM,yBAAyB,GAAG,
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/modules/transaction/actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -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 eth_1 = require("../../lib/eth");
|
|
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,6 @@ 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 eth_1 = require("../../lib/eth");
|
|
14
13
|
function* transactionSaga() {
|
|
15
14
|
yield (0, effects_1.takeEvery)(actions_1.FETCH_TRANSACTION_REQUEST, handleFetchTransactionRequest);
|
|
16
15
|
yield (0, effects_1.takeEvery)(actions_1.REPLACE_TRANSACTION_REQUEST, handleReplaceTransactionRequest);
|
|
@@ -41,16 +40,15 @@ class FailedTransactionError extends Error {
|
|
|
41
40
|
}
|
|
42
41
|
exports.FailedTransactionError = FailedTransactionError;
|
|
43
42
|
function* handleFetchTransactionRequest(action) {
|
|
44
|
-
const { hash } = action.payload;
|
|
43
|
+
const { hash, address } = action.payload;
|
|
45
44
|
const transaction = yield (0, effects_1.select)(state => (0, selectors_1.getTransaction)(state, hash));
|
|
46
45
|
if (!transaction) {
|
|
47
46
|
console.warn(`Could not find a valid transaction for hash ${hash}`);
|
|
48
47
|
return;
|
|
49
48
|
}
|
|
50
49
|
try {
|
|
51
|
-
let address = yield (0, effects_1.select)(state => (0, selectors_2.getAddress)(state));
|
|
52
50
|
watchPendingIndex[hash] = true;
|
|
53
|
-
let tx = yield (0, effects_1.call)(
|
|
51
|
+
let tx = yield (0, effects_1.call)(txUtils_1.getTransaction, address, transaction.chainId, hash);
|
|
54
52
|
let isUnknown = tx == null;
|
|
55
53
|
// loop while tx is pending
|
|
56
54
|
while (isUnknown ||
|
|
@@ -74,7 +72,7 @@ function* handleFetchTransactionRequest(action) {
|
|
|
74
72
|
const isReplaced = statusInNetwork === types_1.TransactionStatus.REPLACED;
|
|
75
73
|
if (isDropped || isReplaced) {
|
|
76
74
|
// mark tx as dropped even if it was returned with a 'replaced' status, let the saga find its replacement
|
|
77
|
-
yield (0, effects_1.put)((0, actions_1.replaceTransactionRequest)(hash, nonce));
|
|
75
|
+
yield (0, effects_1.put)((0, actions_1.replaceTransactionRequest)(hash, nonce, address));
|
|
78
76
|
throw new FailedTransactionError(hash, types_1.TransactionStatus.DROPPED);
|
|
79
77
|
}
|
|
80
78
|
yield (0, effects_1.put)((0, actions_1.updateTransactionStatus)(hash, statusInNetwork));
|
|
@@ -82,8 +80,7 @@ function* handleFetchTransactionRequest(action) {
|
|
|
82
80
|
// sleep
|
|
83
81
|
yield (0, effects_1.delay)(TRANSACTION_FETCH_DELAY);
|
|
84
82
|
// update tx status from network
|
|
85
|
-
|
|
86
|
-
tx = yield (0, effects_1.call)(() => (0, txUtils_1.getTransaction)(address, transaction.chainId, hash));
|
|
83
|
+
tx = yield (0, effects_1.call)(txUtils_1.getTransaction, address, transaction.chainId, hash);
|
|
87
84
|
isUnknown = tx == null;
|
|
88
85
|
}
|
|
89
86
|
delete watchPendingIndex[hash];
|
|
@@ -104,43 +101,32 @@ function* handleFetchTransactionRequest(action) {
|
|
|
104
101
|
}
|
|
105
102
|
}
|
|
106
103
|
function* handleReplaceTransactionRequest(action) {
|
|
107
|
-
const { hash, nonce } = action.payload;
|
|
104
|
+
const { hash, nonce, address: account } = action.payload;
|
|
108
105
|
const transaction = yield (0, effects_1.select)(state => (0, selectors_1.getTransaction)(state, hash));
|
|
109
106
|
if (!transaction) {
|
|
110
107
|
console.warn(`Could not find a valid transaction for hash ${hash}`);
|
|
111
108
|
return;
|
|
112
109
|
}
|
|
113
|
-
const provider = yield (0, effects_1.call)(() => (0, eth_1.getConnectedProvider)());
|
|
114
|
-
if (!provider) {
|
|
115
|
-
console.warn('Could not connect to ethereum');
|
|
116
|
-
return;
|
|
117
|
-
}
|
|
118
|
-
const eth = new ethers_1.ethers.providers.Web3Provider(provider);
|
|
119
|
-
const accounts = yield (0, effects_1.call)(() => eth.listAccounts());
|
|
120
|
-
if (accounts.length === 0) {
|
|
121
|
-
console.warn('Could not get accounts');
|
|
122
|
-
return;
|
|
123
|
-
}
|
|
124
|
-
const account = accounts[0];
|
|
125
110
|
let checkpoint = null;
|
|
126
111
|
watchDroppedIndex[hash] = true;
|
|
127
112
|
while (true) {
|
|
113
|
+
const eth = yield (0, effects_1.call)(eth_1.getNetworkWeb3Provider, transaction.chainId);
|
|
128
114
|
// check if tx has status, this is to recover from a tx that is dropped momentarily
|
|
129
|
-
const tx = yield (0, effects_1.call)(
|
|
115
|
+
const tx = yield (0, effects_1.call)(txUtils_1.getTransaction, account, transaction.chainId, hash);
|
|
130
116
|
if (tx != null) {
|
|
131
117
|
const txInState = yield (0, effects_1.select)(state => (0, selectors_1.getTransaction)(state, hash));
|
|
132
118
|
yield (0, effects_1.put)((0, actions_1.fetchTransactionRequest)(account, hash, (0, utils_1.buildActionRef)(txInState)));
|
|
133
119
|
break;
|
|
134
120
|
}
|
|
135
121
|
// get latest block
|
|
136
|
-
const blockNumber = yield (0, effects_1.call)(
|
|
122
|
+
const blockNumber = yield (0, effects_1.call)(eth.getBlockNumber);
|
|
137
123
|
let highestNonce = 0;
|
|
138
124
|
let replacedBy = null;
|
|
139
125
|
// loop through the last blocks
|
|
140
126
|
const startBlock = blockNumber;
|
|
141
127
|
const endBlock = checkpoint || blockNumber - BLOCKS_DEPTH;
|
|
142
128
|
for (let i = startBlock; i > endBlock; i--) {
|
|
143
|
-
let block = yield (0, effects_1.call)(
|
|
129
|
+
let block = yield (0, effects_1.call)(eth.getBlockWithTransactions, i);
|
|
144
130
|
const transactions = block != null && block.transactions != null ? block.transactions : [];
|
|
145
131
|
// look for a replacement tx, if so break the loop
|
|
146
132
|
replacedBy = transactions.find(tx => tx.nonce === nonce && tx.from.toString() === account);
|
|
@@ -199,7 +185,7 @@ function* handleWatchDroppedTransactions() {
|
|
|
199
185
|
transaction.nonce != null);
|
|
200
186
|
for (const tx of droppedTransactions) {
|
|
201
187
|
if (!watchDroppedIndex[tx.hash]) {
|
|
202
|
-
yield (0, effects_1.fork)(handleReplaceTransactionRequest, (0, actions_1.replaceTransactionRequest)(tx.hash, tx.nonce));
|
|
188
|
+
yield (0, effects_1.fork)(handleReplaceTransactionRequest, (0, actions_1.replaceTransactionRequest)(tx.hash, tx.nonce, tx.from));
|
|
203
189
|
}
|
|
204
190
|
}
|
|
205
191
|
}
|
|
@@ -216,7 +202,7 @@ function* handleWatchRevertedTransaction(action) {
|
|
|
216
202
|
return;
|
|
217
203
|
}
|
|
218
204
|
else if (txInNetwork == null && txInState.nonce) {
|
|
219
|
-
yield (0, effects_1.put)((0, actions_1.replaceTransactionRequest)(hash, txInState.nonce));
|
|
205
|
+
yield (0, effects_1.put)((0, actions_1.replaceTransactionRequest)(hash, txInState.nonce, txInState.from));
|
|
220
206
|
return;
|
|
221
207
|
}
|
|
222
208
|
} while (!isExpired(txInState, REVERTED_TRANSACTION_THRESHOLD));
|
|
@@ -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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"}
|