@shapeshiftoss/unchained-client 6.10.0 → 6.11.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/bitcoin/parser/index.d.ts.map +1 -1
- package/dist/bitcoin/parser/index.js +4 -3
- package/dist/bitcoin/parser/index.js.map +1 -1
- package/dist/cosmos/parser/index.d.ts +4 -4
- package/dist/cosmos/parser/index.d.ts.map +1 -1
- package/dist/cosmos/parser/index.js +27 -14
- package/dist/cosmos/parser/index.js.map +1 -1
- package/dist/cosmos/parser/utils.d.ts +1 -1
- package/dist/cosmos/parser/utils.d.ts.map +1 -1
- package/dist/cosmos/parser/utils.js +13 -9
- package/dist/cosmos/parser/utils.js.map +1 -1
- package/dist/cosmos/types.d.ts +4 -0
- package/dist/cosmos/types.d.ts.map +1 -1
- package/dist/ethereum/parser/foxy.d.ts +7 -7
- package/dist/ethereum/parser/foxy.d.ts.map +1 -1
- package/dist/ethereum/parser/foxy.js +11 -31
- package/dist/ethereum/parser/foxy.js.map +1 -1
- package/dist/ethereum/parser/index.d.ts.map +1 -1
- package/dist/ethereum/parser/index.js +4 -3
- package/dist/ethereum/parser/index.js.map +1 -1
- package/dist/ethereum/parser/thor.d.ts +5 -3
- package/dist/ethereum/parser/thor.d.ts.map +1 -1
- package/dist/ethereum/parser/thor.js +15 -19
- package/dist/ethereum/parser/thor.js.map +1 -1
- package/dist/ethereum/parser/uniV2.d.ts +5 -4
- package/dist/ethereum/parser/uniV2.d.ts.map +1 -1
- package/dist/ethereum/parser/uniV2.js +78 -73
- package/dist/ethereum/parser/uniV2.js.map +1 -1
- package/dist/ethereum/parser/weth.d.ts +6 -4
- package/dist/ethereum/parser/weth.d.ts.map +1 -1
- package/dist/ethereum/parser/weth.js +44 -55
- package/dist/ethereum/parser/weth.js.map +1 -1
- package/dist/ethereum/parser/yearn.d.ts +10 -10
- package/dist/ethereum/parser/yearn.d.ts.map +1 -1
- package/dist/ethereum/parser/yearn.js +23 -22
- package/dist/ethereum/parser/yearn.js.map +1 -1
- package/dist/generated/bitcoin/api.d.ts +1 -1
- package/dist/generated/bitcoin/api.js +1 -1
- package/dist/generated/bitcoin/base.d.ts +1 -1
- package/dist/generated/bitcoin/base.js +1 -1
- package/dist/generated/bitcoin/common.d.ts +1 -1
- package/dist/generated/bitcoin/common.js +1 -1
- package/dist/generated/bitcoin/configuration.d.ts +1 -1
- package/dist/generated/bitcoin/configuration.js +1 -1
- package/dist/generated/bitcoin/index.d.ts +1 -1
- package/dist/generated/bitcoin/index.js +1 -1
- package/dist/generated/ethereum/api.d.ts +1 -1
- package/dist/generated/ethereum/api.js +1 -1
- package/dist/generated/ethereum/base.d.ts +1 -1
- package/dist/generated/ethereum/base.js +1 -1
- package/dist/generated/ethereum/common.d.ts +1 -1
- package/dist/generated/ethereum/common.js +1 -1
- package/dist/generated/ethereum/configuration.d.ts +1 -1
- package/dist/generated/ethereum/configuration.js +1 -1
- package/dist/generated/ethereum/index.d.ts +1 -1
- package/dist/generated/ethereum/index.js +1 -1
- package/dist/tsconfig.tsbuildinfo +165 -149
- package/dist/types.d.ts +12 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/utils.d.ts +1 -1
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +6 -3
- package/dist/utils.js.map +1 -1
- package/dist/websocket.d.ts.map +1 -1
- package/dist/websocket.js +5 -1
- package/dist/websocket.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bitcoin/parser/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAwB,MAAM,aAAa,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAGlC,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,iBAAiB;IAC5B,OAAO,EAAE,OAAO,CAAA;gBAEJ,IAAI,EAAE,qBAAqB;IAIjC,KAAK,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bitcoin/parser/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAwB,MAAM,aAAa,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAGlC,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,iBAAiB;IAC5B,OAAO,EAAE,OAAO,CAAA;gBAEJ,IAAI,EAAE,qBAAqB;IAIjC,KAAK,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CA+DjE"}
|
|
@@ -35,6 +35,7 @@ class TransactionParser {
|
|
|
35
35
|
blockHeight: tx.blockHeight,
|
|
36
36
|
blockTime: tx.blockTime,
|
|
37
37
|
caip2: caip_1.caip2.toCAIP2({ chain: types_1.ChainTypes.Bitcoin, network: utils_2.toNetworkType(this.network) }),
|
|
38
|
+
chainId: caip_1.caip2.toCAIP2({ chain: types_1.ChainTypes.Bitcoin, network: utils_2.toNetworkType(this.network) }),
|
|
38
39
|
confirmations: tx.confirmations,
|
|
39
40
|
status: tx.confirmations > 0 ? types_2.Status.Confirmed : types_2.Status.Pending,
|
|
40
41
|
transfers: [],
|
|
@@ -42,7 +43,7 @@ class TransactionParser {
|
|
|
42
43
|
};
|
|
43
44
|
tx.vin.forEach((vin) => {
|
|
44
45
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
45
|
-
if (vin.isAddress
|
|
46
|
+
if (vin.isAddress && ((_a = vin.addresses) === null || _a === void 0 ? void 0 : _a.includes(address))) {
|
|
46
47
|
// send amount
|
|
47
48
|
const sendValue = new bignumber_js_1.BigNumber((_b = vin.value) !== null && _b !== void 0 ? _b : 0);
|
|
48
49
|
if (sendValue.gt(0)) {
|
|
@@ -51,13 +52,13 @@ class TransactionParser {
|
|
|
51
52
|
// network fee
|
|
52
53
|
const fees = new bignumber_js_1.BigNumber((_g = tx.fees) !== null && _g !== void 0 ? _g : 0);
|
|
53
54
|
if (fees.gt(0)) {
|
|
54
|
-
parsedTx.fee = { caip19: caip19Bitcoin, value: fees.toString(10) };
|
|
55
|
+
parsedTx.fee = { caip19: caip19Bitcoin, assetId: caip19Bitcoin, value: fees.toString(10) };
|
|
55
56
|
}
|
|
56
57
|
}
|
|
57
58
|
});
|
|
58
59
|
tx.vout.forEach((vout) => {
|
|
59
60
|
var _a, _b, _c, _d, _e, _f;
|
|
60
|
-
if (vout.isAddress
|
|
61
|
+
if (vout.isAddress && ((_a = vout.addresses) === null || _a === void 0 ? void 0 : _a.includes(address))) {
|
|
61
62
|
// receive amount
|
|
62
63
|
const receiveValue = new bignumber_js_1.BigNumber((_b = vout.value) !== null && _b !== void 0 ? _b : 0);
|
|
63
64
|
if (receiveValue.gt(0)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bitcoin/parser/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwC;AAExC,8CAAmF;AACnF,gDAAiD;AACjD,uCAAkE;AAClE,uCAA+C;AAE/C,mCAAuC;AAOvC,MAAa,iBAAiB;IAG5B,YAAY,IAA2B;;QACrC,IAAI,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,SAAS,CAAA;IAC1C,CAAC;IAEK,KAAK,CAAC,EAAe,EAAE,OAAe;;YAC1C,MAAM,aAAa,GAAG,aAAM,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,kBAAU,CAAC,OAAO;gBACzB,OAAO,EAAE,qBAAa,CAAC,IAAI,CAAC,OAAO,CAAC;gBACpC,cAAc,EAAE,qBAAc,CAAC,MAAM;gBACrC,cAAc,EAAE,qBAAc,CAAC,OAAO;aACvC,CAAC,CAAA;YAEF,MAAM,QAAQ,GAAa;gBACzB,OAAO;gBACP,SAAS,EAAE,EAAE,CAAC,SAAS;gBACvB,WAAW,EAAE,EAAE,CAAC,WAAW;gBAC3B,SAAS,EAAE,EAAE,CAAC,SAAS;gBACvB,KAAK,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,kBAAU,CAAC,OAAO,EAAE,OAAO,EAAE,qBAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzF,aAAa,EAAE,EAAE,CAAC,aAAa;gBAC/B,MAAM,EAAE,EAAE,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,cAAM,CAAC,SAAS,CAAC,CAAC,CAAC,cAAM,CAAC,OAAO;gBAChE,SAAS,EAAE,EAAE;gBACb,IAAI,EAAE,EAAE,CAAC,IAAI;aACd,CAAA;YAED,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;gBACrB,IAAI,GAAG,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bitcoin/parser/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ChainId, AssetId } from '@shapeshiftoss/caip';
|
|
2
2
|
import { Tx as CosmosTx } from '../index';
|
|
3
3
|
import { ParsedTx } from '../types';
|
|
4
4
|
export interface TransactionParserArgs {
|
|
5
|
-
chainId:
|
|
5
|
+
chainId: ChainId;
|
|
6
6
|
}
|
|
7
7
|
export declare class TransactionParser {
|
|
8
|
-
chainId:
|
|
9
|
-
assetId:
|
|
8
|
+
chainId: ChainId;
|
|
9
|
+
assetId: AssetId;
|
|
10
10
|
constructor(args: TransactionParserArgs);
|
|
11
11
|
parse(tx: CosmosTx, address: string): Promise<ParsedTx>;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cosmos/parser/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAiD,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cosmos/parser/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAiD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAErG,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAE,MAAM,UAAU,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAGnC,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,qBAAa,iBAAiB;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;gBAEJ,IAAI,EAAE,qBAAqB;IAUjC,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CA2D9D"}
|
|
@@ -28,6 +28,7 @@ class TransactionParser {
|
|
|
28
28
|
blockHeight: (_a = tx.blockHeight) !== null && _a !== void 0 ? _a : -1,
|
|
29
29
|
blockTime: (_b = tx.timestamp) !== null && _b !== void 0 ? _b : Math.floor(Date.now() / 1000),
|
|
30
30
|
caip2: this.chainId,
|
|
31
|
+
chainId: this.chainId,
|
|
31
32
|
confirmations: tx.confirmations,
|
|
32
33
|
status: tx.confirmations > 0 ? types_1.Status.Confirmed : types_1.Status.Pending,
|
|
33
34
|
transfers: [],
|
|
@@ -37,26 +38,38 @@ class TransactionParser {
|
|
|
37
38
|
// This works ok enough for transactions we generate but way may want to improve in the future
|
|
38
39
|
const { from, to, data, value, origin } = utils_1.valuesFromMsgEvents(tx.messages[0], tx.events, this.assetId);
|
|
39
40
|
parsedTx.data = data;
|
|
40
|
-
if (from === address
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
41
|
+
if (from === address && value.gt(0)) {
|
|
42
|
+
parsedTx.transfers = [
|
|
43
|
+
{
|
|
44
|
+
type: types_1.TransferType.Send,
|
|
45
|
+
caip19: this.assetId,
|
|
46
|
+
assetId: this.assetId,
|
|
47
|
+
from,
|
|
48
|
+
to,
|
|
49
|
+
totalValue: value.toString(10),
|
|
50
|
+
components: [{ value: value.toString(10) }],
|
|
51
|
+
},
|
|
52
|
+
];
|
|
53
|
+
}
|
|
54
|
+
if (to === address && value.gt(0)) {
|
|
55
|
+
parsedTx.transfers = [
|
|
56
|
+
{
|
|
57
|
+
type: types_1.TransferType.Receive,
|
|
58
|
+
caip19: this.assetId,
|
|
59
|
+
assetId: this.assetId,
|
|
60
|
+
from,
|
|
61
|
+
to,
|
|
62
|
+
totalValue: value.toString(10),
|
|
63
|
+
components: [{ value: value.toString(10) }],
|
|
64
|
+
},
|
|
65
|
+
];
|
|
53
66
|
}
|
|
54
67
|
// We use origin for fees because some txs have a different from and origin addresses
|
|
55
68
|
if (origin === address) {
|
|
56
69
|
// network fee
|
|
57
70
|
const fees = new bignumber_js_1.BigNumber(tx.fee.amount);
|
|
58
71
|
if (fees.gt(0)) {
|
|
59
|
-
parsedTx.fee = { caip19: this.assetId, value: fees.toString(10) };
|
|
72
|
+
parsedTx.fee = { caip19: this.assetId, assetId: this.assetId, value: fees.toString(10) };
|
|
60
73
|
}
|
|
61
74
|
}
|
|
62
75
|
return parsedTx;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cosmos/parser/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cosmos/parser/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { Event, Message } from '../../generated/cosmos';
|
|
|
3
3
|
import BigNumber from 'bignumber.js';
|
|
4
4
|
export declare const valuesFromMsgEvents: (msg: Message, events: {
|
|
5
5
|
[key: string]: Event[];
|
|
6
|
-
},
|
|
6
|
+
}, assetId: string) => {
|
|
7
7
|
from: string;
|
|
8
8
|
to: string;
|
|
9
9
|
value: BigNumber;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/cosmos/parser/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAEvD,OAAO,SAAS,MAAM,cAAc,CAAA;AAOpC,eAAO,MAAM,mBAAmB,QACzB,OAAO;;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/cosmos/parser/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAEvD,OAAO,SAAS,MAAM,cAAc,CAAA;AAOpC,eAAO,MAAM,mBAAmB,QACzB,OAAO;;YAEH,MAAM;UACN,MAAM;QAAM,MAAM;WAAS,SAAS;UAAQ,UAAU,GAAG,SAAS;YAAU,MAAM;CAQ5F,CAAA"}
|
|
@@ -10,10 +10,10 @@ const logger = new logger_1.Logger({
|
|
|
10
10
|
namespace: ['client', 'cosmos', 'utils'],
|
|
11
11
|
level: process.env.LOG_LEVEL,
|
|
12
12
|
});
|
|
13
|
-
const valuesFromMsgEvents = (msg, events,
|
|
13
|
+
const valuesFromMsgEvents = (msg, events, assetId) => {
|
|
14
14
|
var _a, _b, _c, _d;
|
|
15
15
|
const virtualMsg = virtualMessageFromEvents(msg, events);
|
|
16
|
-
const data = metaData(virtualMsg,
|
|
16
|
+
const data = metaData(virtualMsg, assetId);
|
|
17
17
|
const from = (_a = virtualMsg === null || virtualMsg === void 0 ? void 0 : virtualMsg.from) !== null && _a !== void 0 ? _a : '';
|
|
18
18
|
const to = (_b = virtualMsg === null || virtualMsg === void 0 ? void 0 : virtualMsg.to) !== null && _b !== void 0 ? _b : '';
|
|
19
19
|
const origin = (_c = virtualMsg === null || virtualMsg === void 0 ? void 0 : virtualMsg.origin) !== null && _c !== void 0 ? _c : '';
|
|
@@ -21,7 +21,7 @@ const valuesFromMsgEvents = (msg, events, caip19) => {
|
|
|
21
21
|
return { from, to, value, data, origin };
|
|
22
22
|
};
|
|
23
23
|
exports.valuesFromMsgEvents = valuesFromMsgEvents;
|
|
24
|
-
const metaData = (msg,
|
|
24
|
+
const metaData = (msg, assetId) => {
|
|
25
25
|
var _a, _b, _c, _d;
|
|
26
26
|
if (!msg)
|
|
27
27
|
return;
|
|
@@ -43,7 +43,8 @@ const metaData = (msg, caip19) => {
|
|
|
43
43
|
delegator: msg.origin,
|
|
44
44
|
destinationValidator: msg.to,
|
|
45
45
|
value: (_b = msg === null || msg === void 0 ? void 0 : msg.value) === null || _b === void 0 ? void 0 : _b.amount,
|
|
46
|
-
caip19:
|
|
46
|
+
caip19: assetId,
|
|
47
|
+
assetId: assetId,
|
|
47
48
|
};
|
|
48
49
|
case 'withdraw_delegator_reward':
|
|
49
50
|
return {
|
|
@@ -51,7 +52,8 @@ const metaData = (msg, caip19) => {
|
|
|
51
52
|
method: msg.type,
|
|
52
53
|
destinationValidator: msg.to,
|
|
53
54
|
value: (_c = msg === null || msg === void 0 ? void 0 : msg.value) === null || _c === void 0 ? void 0 : _c.amount,
|
|
54
|
-
caip19:
|
|
55
|
+
caip19: assetId,
|
|
56
|
+
assetId: assetId,
|
|
55
57
|
};
|
|
56
58
|
case 'ibc_send':
|
|
57
59
|
case 'ibc_receive':
|
|
@@ -60,7 +62,8 @@ const metaData = (msg, caip19) => {
|
|
|
60
62
|
method: msg.type,
|
|
61
63
|
ibcDestination: msg.to,
|
|
62
64
|
ibcSource: msg.from,
|
|
63
|
-
caip19:
|
|
65
|
+
caip19: assetId,
|
|
66
|
+
assetId: assetId,
|
|
64
67
|
value: (_d = msg === null || msg === void 0 ? void 0 : msg.value) === null || _d === void 0 ? void 0 : _d.amount,
|
|
65
68
|
};
|
|
66
69
|
// known message types with no applicable metadata
|
|
@@ -110,9 +113,10 @@ const virtualMessageFromEvents = (msg, events) => {
|
|
|
110
113
|
origin: msg.origin,
|
|
111
114
|
};
|
|
112
115
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
+
// no virtual message handled, but also no transaction message
|
|
117
|
+
if (!msg) {
|
|
118
|
+
console.warn(`no transaction message found and unable to create virtual message from events: ${events}`);
|
|
116
119
|
}
|
|
120
|
+
return msg;
|
|
117
121
|
};
|
|
118
122
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/cosmos/parser/utils.ts"],"names":[],"mappings":";;;;;;AAEA,kDAA8C;AAC9C,gEAAoC;AAEpC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;IACxB,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC;IACxC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;CAC7B,CAAC,CAAA;AAEK,MAAM,mBAAmB,GAAG,CACjC,GAAY,EACZ,MAAkC,EAClC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/cosmos/parser/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/cosmos/types.d.ts
CHANGED
|
@@ -4,7 +4,11 @@ export interface TxMetadata extends Omit<StandardTxMetadata, 'parser'> {
|
|
|
4
4
|
delegator?: string;
|
|
5
5
|
sourceValidator?: string;
|
|
6
6
|
destinationValidator?: string;
|
|
7
|
+
/**
|
|
8
|
+
* @deprecated use 'assetId' instead
|
|
9
|
+
*/
|
|
7
10
|
caip19?: string;
|
|
11
|
+
assetId?: string;
|
|
8
12
|
value?: string;
|
|
9
13
|
ibcDestination?: string;
|
|
10
14
|
ibcSource?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cosmos/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAEzD,MAAM,WAAW,UAAW,SAAQ,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC;IACpE,MAAM,EAAE,QAAQ,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,QAAS,SAAQ,UAAU;IAC1C,IAAI,CAAC,EAAE,UAAU,CAAA;CAClB"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cosmos/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAEzD,MAAM,WAAW,UAAW,SAAQ,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC;IACpE,MAAM,EAAE,QAAQ,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,QAAS,SAAQ,UAAU;IAC1C,IAAI,CAAC,EAAE,UAAU,CAAA;CAClB"}
|
|
@@ -2,13 +2,13 @@ import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
|
|
|
2
2
|
import { ethers } from 'ethers';
|
|
3
3
|
import { TxSpecific, SubParser } from '../types';
|
|
4
4
|
export declare class Parser implements SubParser {
|
|
5
|
-
abiInterface: ethers.utils.Interface;
|
|
6
|
-
readonly
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
readonly abiInterface: ethers.utils.Interface;
|
|
6
|
+
readonly supportedFunctions: {
|
|
7
|
+
stakeSigHash: string;
|
|
8
|
+
unstakeSigHash: string;
|
|
9
|
+
instantUnstakeSigHash: string;
|
|
10
|
+
claimWithdrawSigHash: string;
|
|
11
|
+
};
|
|
10
12
|
parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
|
|
11
|
-
supportedFoxyFunctions(): string[];
|
|
12
|
-
abiInterfaceSupportsSigHash(txSigHash: string | undefined): ethers.utils.Interface | undefined;
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=foxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"foxy.d.ts","sourceRoot":"","sources":["../../../src/ethereum/parser/foxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAKhD,qBAAa,MAAO,YAAW,SAAS;IACtC,
|
|
1
|
+
{"version":3,"file":"foxy.d.ts","sourceRoot":"","sources":["../../../src/ethereum/parser/foxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAKhD,qBAAa,MAAO,YAAW,SAAS;IACtC,QAAQ,CAAC,YAAY,yBAA+C;IAEpE,QAAQ,CAAC,kBAAkB;;;;;MAK1B;IAEK,KAAK,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAsB9D"}
|
|
@@ -21,39 +21,27 @@ const foxyStaking_1 = __importDefault(require("./abi/foxyStaking"));
|
|
|
21
21
|
class Parser {
|
|
22
22
|
constructor() {
|
|
23
23
|
this.abiInterface = new ethers_1.ethers.utils.Interface(foxyStaking_1.default);
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
this.supportedFunctions = {
|
|
25
|
+
stakeSigHash: this.abiInterface.getSighash('stake(uint256,address)'),
|
|
26
|
+
unstakeSigHash: this.abiInterface.getSighash('unstake'),
|
|
27
|
+
instantUnstakeSigHash: this.abiInterface.getSighash('instantUnstake'),
|
|
28
|
+
claimWithdrawSigHash: this.abiInterface.getSighash('claimWithdraw'),
|
|
29
|
+
};
|
|
30
30
|
}
|
|
31
31
|
parse(tx) {
|
|
32
32
|
var _a;
|
|
33
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
|
+
const txData = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.data;
|
|
34
35
|
if (!utils_1.txInteractsWithContract(tx, constants_1.FOXY_STAKING_CONTRACT))
|
|
35
36
|
return;
|
|
36
|
-
const txData = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.data;
|
|
37
37
|
if (!txData)
|
|
38
38
|
return;
|
|
39
39
|
const txSigHash = utils_1.getSigHash(txData);
|
|
40
|
-
|
|
41
|
-
if (!abiInterface)
|
|
40
|
+
if (!Object.values(this.supportedFunctions).some((hash) => hash === txSigHash))
|
|
42
41
|
return;
|
|
43
|
-
const decoded = abiInterface.parseTransaction({ data: txData });
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
case this.stakeSigHash:
|
|
47
|
-
case this.unstakeSigHash:
|
|
48
|
-
case this.instantUnstakeSigHash:
|
|
49
|
-
case this.claimWithdrawSigHash:
|
|
50
|
-
return decoded.args;
|
|
51
|
-
default:
|
|
52
|
-
return undefined;
|
|
53
|
-
}
|
|
54
|
-
})();
|
|
55
|
-
// We didn't recognise the sigHash - exit
|
|
56
|
-
if (!result)
|
|
42
|
+
const decoded = this.abiInterface.parseTransaction({ data: txData });
|
|
43
|
+
// failed to decode input data
|
|
44
|
+
if (!decoded)
|
|
57
45
|
return;
|
|
58
46
|
return {
|
|
59
47
|
data: {
|
|
@@ -63,14 +51,6 @@ class Parser {
|
|
|
63
51
|
};
|
|
64
52
|
});
|
|
65
53
|
}
|
|
66
|
-
supportedFoxyFunctions() {
|
|
67
|
-
return [this.stakeSigHash, this.unstakeSigHash, this.instantUnstakeSigHash, this.claimWithdrawSigHash];
|
|
68
|
-
}
|
|
69
|
-
abiInterfaceSupportsSigHash(txSigHash) {
|
|
70
|
-
if (this.supportedFoxyFunctions().some((abi) => abi === txSigHash))
|
|
71
|
-
return this.abiInterface;
|
|
72
|
-
return undefined;
|
|
73
|
-
}
|
|
74
54
|
}
|
|
75
55
|
exports.Parser = Parser;
|
|
76
56
|
//# sourceMappingURL=foxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"foxy.js","sourceRoot":"","sources":["../../../src/ethereum/parser/foxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,mCAA+B;AAC/B,uCAAsC;AAEtC,mCAA6D;AAC7D,2CAAmD;AACnD,oEAAgD;AAEhD,MAAa,MAAM;IAAnB;
|
|
1
|
+
{"version":3,"file":"foxy.js","sourceRoot":"","sources":["../../../src/ethereum/parser/foxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,mCAA+B;AAC/B,uCAAsC;AAEtC,mCAA6D;AAC7D,2CAAmD;AACnD,oEAAgD;AAEhD,MAAa,MAAM;IAAnB;QACW,iBAAY,GAAG,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,qBAAgB,CAAC,CAAA;QAE3D,uBAAkB,GAAG;YAC5B,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,wBAAwB,CAAC;YACpE,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC;YACvD,qBAAqB,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC;YACrE,oBAAoB,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,eAAe,CAAC;SACpE,CAAA;IAwBH,CAAC;IAtBO,KAAK,CAAC,EAAe;;;YACzB,MAAM,MAAM,GAAG,MAAA,EAAE,CAAC,gBAAgB,0CAAE,IAAI,CAAA;YAExC,IAAI,CAAC,+BAAuB,CAAC,EAAE,EAAE,iCAAqB,CAAC;gBAAE,OAAM;YAC/D,IAAI,CAAC,MAAM;gBAAE,OAAM;YAEnB,MAAM,SAAS,GAAG,kBAAU,CAAC,MAAM,CAAC,CAAA;YAEpC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC;gBAAE,OAAM;YAEtF,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAEpE,8BAA8B;YAC9B,IAAI,CAAC,OAAO;gBAAE,OAAM;YAEpB,OAAO;gBACL,IAAI,EAAE;oBACJ,MAAM,EAAE,OAAO,CAAC,IAAI;oBACpB,MAAM,EAAE,gBAAQ,CAAC,IAAI;iBACtB;aACF,CAAA;;KACF;CACF;AAhCD,wBAgCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ethereum/parser/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAK5D,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAyB,MAAM,UAAU,CAAA;AAS/E,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,iBAAiB;IAC5B,OAAO,EAAE,OAAO,CAAA;IAEhB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;gBAE9B,IAAI,EAAE,qBAAqB;IAgBvC,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAWnD,KAAK,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ethereum/parser/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAK5D,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAyB,MAAM,UAAU,CAAA;AAS/E,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,iBAAiB;IAC5B,OAAO,EAAE,OAAO,CAAA;IAEhB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;gBAE9B,IAAI,EAAE,qBAAqB;IAgBvC,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAWnD,KAAK,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;IAyBjG,OAAO,CAAC,MAAM,CAAC,SAAS;IAUxB,OAAO,CAAC,wBAAwB;CAmHjC"}
|
|
@@ -58,7 +58,7 @@ class TransactionParser {
|
|
|
58
58
|
// return any addresses that can be detected
|
|
59
59
|
getInternalAddress(inputData) {
|
|
60
60
|
switch (utils_2.getSigHash(inputData)) {
|
|
61
|
-
case this.thor.transferOutSigHash:
|
|
61
|
+
case this.thor.supportedFunctions.transferOutSigHash:
|
|
62
62
|
return this.thor.getInternalAddress(inputData);
|
|
63
63
|
case utils_2.SENDMULTISIG_SIG_HASH:
|
|
64
64
|
return utils_2.getInternalMultisigAddress(inputData);
|
|
@@ -77,6 +77,7 @@ class TransactionParser {
|
|
|
77
77
|
blockHeight: tx.blockHeight,
|
|
78
78
|
blockTime: tx.blockTime,
|
|
79
79
|
caip2: caip_1.caip2.toCAIP2({ chain: types_1.ChainTypes.Ethereum, network: utils_2.toNetworkType(this.network) }),
|
|
80
|
+
chainId: caip_1.caip2.toCAIP2({ chain: types_1.ChainTypes.Ethereum, network: utils_2.toNetworkType(this.network) }),
|
|
80
81
|
confirmations: tx.confirmations,
|
|
81
82
|
status: TransactionParser.getStatus(tx),
|
|
82
83
|
trade: contractParserResult === null || contractParserResult === void 0 ? void 0 : contractParserResult.trade,
|
|
@@ -117,7 +118,7 @@ class TransactionParser {
|
|
|
117
118
|
// network fee
|
|
118
119
|
const fees = new bignumber_js_1.BigNumber((_e = tx.fees) !== null && _e !== void 0 ? _e : 0);
|
|
119
120
|
if (fees.gt(0)) {
|
|
120
|
-
parsedTx.fee = { caip19: caip19Ethereum, value: fees.toString(10) };
|
|
121
|
+
parsedTx.fee = { caip19: caip19Ethereum, assetId: caip19Ethereum, value: fees.toString(10) };
|
|
121
122
|
}
|
|
122
123
|
}
|
|
123
124
|
if (address === receiveAddress) {
|
|
@@ -129,7 +130,7 @@ class TransactionParser {
|
|
|
129
130
|
}
|
|
130
131
|
(_f = tx.tokenTransfers) === null || _f === void 0 ? void 0 : _f.forEach((transfer) => {
|
|
131
132
|
// FTX Token (FTT) name and symbol was set backwards on the ERC20 contract
|
|
132
|
-
if (transfer.token
|
|
133
|
+
if (transfer.token === '0x50D1c9771902476076eCFc8B2A83Ad6b9355a4c9') {
|
|
133
134
|
transfer.name = transfer.symbol;
|
|
134
135
|
transfer.symbol = transfer.name;
|
|
135
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ethereum/parser/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAwC;AACxC,mCAA+B;AAE/B,8CAAmF;AACnF,gDAAiD;AACjD,uCAAyD;AACzD,uCAAoE;AAEpE,mCAAsG;AACtG,6CAA8B;AAC9B,+CAAgC;AAChC,2CAA4B;AAC5B,+CAAgC;AAChC,6CAA8B;AAC9B,6CAA8B;AAO9B,MAAa,iBAAiB;IAW5B,YAAY,IAA2B;;QACrC,MAAM,QAAQ,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAElE,IAAI,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,SAAS,CAAA;QAExC,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAC3E,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;QAClE,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAA;QAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;QAClE,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,CAAA;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;QAEhE,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;IACpF,CAAC;IAED,4CAA4C;IAC5C,kBAAkB,CAAC,SAAiB;QAClC,QAAQ,kBAAU,CAAC,SAAS,CAAC,EAAE;YAC7B,KAAK,IAAI,CAAC,IAAI,CAAC,kBAAkB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ethereum/parser/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,12 @@ export interface ParserArgs {
|
|
|
6
6
|
rpcUrl: string;
|
|
7
7
|
}
|
|
8
8
|
export declare class Parser implements SubParser {
|
|
9
|
-
abiInterface: ethers.utils.Interface;
|
|
10
|
-
readonly depositSigHash: string;
|
|
11
|
-
readonly transferOutSigHash: string;
|
|
12
9
|
readonly routerContract: string;
|
|
10
|
+
readonly abiInterface: ethers.utils.Interface;
|
|
11
|
+
readonly supportedFunctions: {
|
|
12
|
+
depositSigHash: string;
|
|
13
|
+
transferOutSigHash: string;
|
|
14
|
+
};
|
|
13
15
|
constructor(args: ParserArgs);
|
|
14
16
|
getInternalAddress(inputData: string): string | undefined;
|
|
15
17
|
parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thor.d.ts","sourceRoot":"","sources":["../../../src/ethereum/parser/thor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE5D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAOzD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,MAAO,YAAW,SAAS;IACtC,
|
|
1
|
+
{"version":3,"file":"thor.d.ts","sourceRoot":"","sources":["../../../src/ethereum/parser/thor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE5D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAOzD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,MAAO,YAAW,SAAS;IACtC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,YAAY,yBAAuC;IAE5D,QAAQ,CAAC,kBAAkB;;;MAG1B;gBAEW,IAAI,EAAE,UAAU;IAS5B,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAWnD,KAAK,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAiC9D"}
|
|
@@ -22,8 +22,10 @@ const SWAP_TYPES = ['SWAP', '=', 's'];
|
|
|
22
22
|
class Parser {
|
|
23
23
|
constructor(args) {
|
|
24
24
|
this.abiInterface = new ethers_1.ethers.utils.Interface(thor_1.default);
|
|
25
|
-
this.
|
|
26
|
-
|
|
25
|
+
this.supportedFunctions = {
|
|
26
|
+
depositSigHash: this.abiInterface.getSighash('deposit'),
|
|
27
|
+
transferOutSigHash: this.abiInterface.getSighash('transferOut'),
|
|
28
|
+
};
|
|
27
29
|
// TODO: Router contract can change, use /inbound_addresses endpoint to determine current router contract
|
|
28
30
|
this.routerContract = {
|
|
29
31
|
mainnet: constants_1.THOR_ROUTER_CONTRACT_MAINNET,
|
|
@@ -32,9 +34,9 @@ class Parser {
|
|
|
32
34
|
}
|
|
33
35
|
// detect address associated with transferOut internal transaction
|
|
34
36
|
getInternalAddress(inputData) {
|
|
35
|
-
if (utils_1.getSigHash(inputData) !== this.transferOutSigHash)
|
|
37
|
+
if (utils_1.getSigHash(inputData) !== this.supportedFunctions.transferOutSigHash)
|
|
36
38
|
return;
|
|
37
|
-
const result = this.abiInterface.decodeFunctionData(this.transferOutSigHash, inputData);
|
|
39
|
+
const result = this.abiInterface.decodeFunctionData(this.supportedFunctions.transferOutSigHash, inputData);
|
|
38
40
|
const [type] = result.memo.split(':');
|
|
39
41
|
if (type !== 'OUT' || type !== 'REFUND')
|
|
40
42
|
return;
|
|
@@ -48,31 +50,25 @@ class Parser {
|
|
|
48
50
|
return;
|
|
49
51
|
if (!txData)
|
|
50
52
|
return;
|
|
53
|
+
const txSigHash = utils_1.getSigHash(txData);
|
|
54
|
+
if (!Object.values(this.supportedFunctions).some((hash) => hash === txSigHash))
|
|
55
|
+
return;
|
|
51
56
|
const decoded = this.abiInterface.parseTransaction({ data: txData });
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
case this.depositSigHash:
|
|
55
|
-
case this.transferOutSigHash:
|
|
56
|
-
return decoded.args;
|
|
57
|
-
default:
|
|
58
|
-
return undefined;
|
|
59
|
-
}
|
|
60
|
-
})();
|
|
61
|
-
// We didn't recognise the sigHash - exit
|
|
62
|
-
if (!result)
|
|
57
|
+
// failed to decode input data
|
|
58
|
+
if (!decoded)
|
|
63
59
|
return;
|
|
64
60
|
const data = {
|
|
65
61
|
method: decoded.name,
|
|
66
62
|
parser: types_1.TxParser.Thor,
|
|
67
63
|
};
|
|
68
|
-
const [type] =
|
|
64
|
+
const [type] = decoded.args.memo.split(':');
|
|
69
65
|
if (SWAP_TYPES.includes(type) || type === 'OUT') {
|
|
70
|
-
return { trade: { dexName: types_1.Dex.Thor, type: types_1.TradeType.Trade, memo:
|
|
66
|
+
return { trade: { dexName: types_1.Dex.Thor, type: types_1.TradeType.Trade, memo: decoded.args.memo }, data };
|
|
71
67
|
}
|
|
72
68
|
if (type === 'REFUND') {
|
|
73
|
-
return { trade: { dexName: types_1.Dex.Thor, type: types_1.TradeType.Refund, memo:
|
|
69
|
+
return { trade: { dexName: types_1.Dex.Thor, type: types_1.TradeType.Refund, memo: decoded.args.memo }, data };
|
|
74
70
|
}
|
|
75
|
-
//
|
|
71
|
+
// memo type not supported
|
|
76
72
|
return;
|
|
77
73
|
});
|
|
78
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thor.js","sourceRoot":"","sources":["../../../src/ethereum/parser/thor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAA+B;AAE/B,uCAAsD;AAEtD,sDAAiC;AACjC,mCAA6D;AAC7D,2CAAwF;AAExF,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAOrC,MAAa,MAAM;
|
|
1
|
+
{"version":3,"file":"thor.js","sourceRoot":"","sources":["../../../src/ethereum/parser/thor.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,15 +6,16 @@ export interface ParserArgs {
|
|
|
6
6
|
provider: ethers.providers.JsonRpcProvider;
|
|
7
7
|
}
|
|
8
8
|
export declare class Parser implements SubParser {
|
|
9
|
-
abiInterface: ethers.utils.Interface;
|
|
10
9
|
network: Network;
|
|
11
10
|
provider: ethers.providers.JsonRpcProvider;
|
|
12
|
-
readonly addLiquidityEthSigHash: string;
|
|
13
|
-
readonly removeLiquidityEthSigHash: string;
|
|
14
11
|
readonly wethContract: string;
|
|
12
|
+
readonly abiInterface: ethers.utils.Interface;
|
|
13
|
+
readonly supportedFunctions: {
|
|
14
|
+
addLiquidityEthSigHash: string;
|
|
15
|
+
removeLiquidityEthSigHash: string;
|
|
16
|
+
};
|
|
15
17
|
constructor(args: ParserArgs);
|
|
16
18
|
parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
|
|
17
19
|
private static pairFor;
|
|
18
|
-
private getTransfers;
|
|
19
20
|
}
|
|
20
21
|
//# sourceMappingURL=uniV2.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uniV2.d.ts","sourceRoot":"","sources":["../../../src/ethereum/parser/uniV2.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAMzD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,eAAe,CAAA;CAC3C;AAED,qBAAa,MAAO,YAAW,SAAS;IACtC,
|
|
1
|
+
{"version":3,"file":"uniV2.d.ts","sourceRoot":"","sources":["../../../src/ethereum/parser/uniV2.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAMzD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,eAAe,CAAA;CAC3C;AAED,qBAAa,MAAO,YAAW,SAAS;IACtC,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,eAAe,CAAA;IAE1C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,YAAY,yBAAwC;IAE7D,QAAQ,CAAC,kBAAkB;;;MAG1B;gBAEW,IAAI,EAAE,UAAU;IAUtB,KAAK,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IA6F7D,OAAO,CAAC,MAAM,CAAC,OAAO;CAOvB"}
|