@sentio/sdk 2.37.1 → 2.37.2-rc.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/lib/fuel/codegen/codegen.js +6 -9
- package/lib/fuel/codegen/codegen.js.map +1 -1
- package/lib/fuel/fuel-plugin.d.ts.map +1 -1
- package/lib/fuel/fuel-plugin.js +1 -2
- package/lib/fuel/fuel-plugin.js.map +1 -1
- package/lib/fuel/fuel-processor.d.ts +1 -1
- package/lib/fuel/fuel-processor.js +3 -3
- package/lib/fuel/fuel-processor.js.map +1 -1
- package/lib/fuel/network.d.ts +1 -1
- package/lib/fuel/network.d.ts.map +1 -1
- package/lib/fuel/network.js +4 -3
- package/lib/fuel/network.js.map +1 -1
- package/lib/fuel/transaction.d.ts +1 -1
- package/lib/fuel/transaction.d.ts.map +1 -1
- package/lib/fuel/transaction.js +42 -19
- package/lib/fuel/transaction.js.map +1 -1
- package/lib/fuel/types.d.ts +2 -2
- package/lib/testing/fuel-facet.d.ts.map +1 -1
- package/lib/testing/fuel-facet.js +3 -2
- package/lib/testing/fuel-facet.js.map +1 -1
- package/package.json +5 -5
- package/src/fuel/codegen/codegen.ts +6 -11
- package/src/fuel/fuel-plugin.ts +1 -2
- package/src/fuel/fuel-processor.ts +4 -4
- package/src/fuel/network.ts +5 -3
- package/src/fuel/transaction.ts +41 -17
- package/src/fuel/types.ts +2 -2
- package/src/testing/fuel-facet.ts +3 -2
|
@@ -73,8 +73,8 @@ async function codegenInternal(abisDir, outDir) {
|
|
|
73
73
|
let count = 0;
|
|
74
74
|
abiTypeGen.files.forEach((file) => {
|
|
75
75
|
if (!file.path.endsWith('.hex.ts')) {
|
|
76
|
-
|
|
77
|
-
content = patchEnumType(content)
|
|
76
|
+
const content = patchImport(file.contents);
|
|
77
|
+
// content = patchEnumType(content)
|
|
78
78
|
writeFileSync(file.path, content);
|
|
79
79
|
count++;
|
|
80
80
|
}
|
|
@@ -121,13 +121,10 @@ namespace ${name} {
|
|
|
121
121
|
export abstract class CallWithLogs<T extends Array<any>, R> extends TypedCall<T, R> {
|
|
122
122
|
${Object.entries(logByTypes)
|
|
123
123
|
.flatMap(([t, ids]) => {
|
|
124
|
-
const s =
|
|
125
|
-
getLog${id}(): Array<${t}> {
|
|
126
|
-
return this.logs?.filter(l => l.logId == ${id})?.map(l => l.data) as Array<${t}>
|
|
127
|
-
}`);
|
|
124
|
+
const s = [];
|
|
128
125
|
s.push(`
|
|
129
126
|
getLogsOfType${getTypeName(t)}(): Array<${t}> {
|
|
130
|
-
return this.logs?.filter(l =>[${ids.join(', ')}].includes(l.logId) ).map(l => l.data) as Array<${t}>
|
|
127
|
+
return this.logs?.filter(l =>[${ids.map((id) => `"${id}"`).join(', ')}].includes(l.logId) ).map(l => l.data) as Array<${t}>
|
|
131
128
|
}`);
|
|
132
129
|
return s;
|
|
133
130
|
})
|
|
@@ -202,8 +199,8 @@ function collectImportedTypes(types) {
|
|
|
202
199
|
function genOnLogFunction([type, ids]) {
|
|
203
200
|
const name = getTypeName(type);
|
|
204
201
|
return `
|
|
205
|
-
onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContext) => void | Promise<void>, logIdFilter?:
|
|
206
|
-
return super.onLog<${type}>(logIdFilter ?? [${ids.join(', ')}], (log, ctx) => handler(log, ctx))
|
|
202
|
+
onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContext) => void | Promise<void>, logIdFilter?: string | string[]) {
|
|
203
|
+
return super.onLog<${type}>(logIdFilter ?? [${ids.map((id) => `"${id}"`).join(', ')}], (log, ctx) => handler(log, ctx))
|
|
207
204
|
}`;
|
|
208
205
|
}
|
|
209
206
|
function getTypeName(type) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/fuel/codegen/codegen.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/fuel/codegen/codegen.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fuel-plugin.d.ts","sourceRoot":"","sources":["../../src/fuel/fuel-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmD,MAAM,EAAiC,MAAM,iBAAiB,CAAA;AACxH,OAAO,EAEL,aAAa,EACb,WAAW,EACX,WAAW,EACX,qBAAqB,EACrB,aAAa,EACb,YAAY,EACb,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"fuel-plugin.d.ts","sourceRoot":"","sources":["../../src/fuel/fuel-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmD,MAAM,EAAiC,MAAM,iBAAiB,CAAA;AACxH,OAAO,EAEL,aAAa,EACb,WAAW,EACX,WAAW,EACX,qBAAqB,EACrB,aAAa,EACb,YAAY,EACb,MAAM,gBAAgB,CAAA;AASvB,UAAU,QAAQ;IAChB,YAAY,EAAE,CAAC,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,CAAA;CACnE;AAED,qBAAa,UAAW,SAAQ,MAAM;IACpC,IAAI,EAAE,MAAM,CAAe;IAC3B,QAAQ,EAAE,QAAQ,CAEjB;IAEK,SAAS,CAAC,MAAM,EAAE,qBAAqB;IAwD7C,iBAAiB,gBAA0B;IAE3C,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAStD,KAAK,CAAC,OAAO,EAAE,YAAY;IAEjC,SAAS,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO;IAI3C,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;CAsBvE"}
|
package/lib/fuel/fuel-plugin.js
CHANGED
|
@@ -5,7 +5,6 @@ import { TemplateInstanceState } from '../core/template.js';
|
|
|
5
5
|
import { FuelAssetProcessor } from './asset-processor.js';
|
|
6
6
|
import { FuelProcessorState } from './types.js';
|
|
7
7
|
import { FuelProcessor } from './fuel-processor.js';
|
|
8
|
-
import { BN } from 'fuels';
|
|
9
8
|
import { FuelGlobalProcessor } from './global-processor.js';
|
|
10
9
|
export class FuelPlugin extends Plugin {
|
|
11
10
|
name = 'FuelPlugin';
|
|
@@ -34,7 +33,7 @@ export class FuelPlugin extends Plugin {
|
|
|
34
33
|
if (processor instanceof FuelProcessor) {
|
|
35
34
|
if (callHandler.logConfig?.logIds?.length) {
|
|
36
35
|
contractConfig.fuelLogConfigs.push({
|
|
37
|
-
logIds: callHandler.logConfig.logIds
|
|
36
|
+
logIds: callHandler.logConfig.logIds,
|
|
38
37
|
handlerId
|
|
39
38
|
});
|
|
40
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fuel-plugin.js","sourceRoot":"","sources":["../../src/fuel/fuel-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACxH,OAAO,EACL,cAAc,EAGd,WAAW,EAIZ,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"fuel-plugin.js","sourceRoot":"","sources":["../../src/fuel/fuel-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare class FuelProcessor implements FuelBaseProcessor<FuelProcessorCon
|
|
|
13
13
|
configure(): Promise<void>;
|
|
14
14
|
onTransaction(handler: (transaction: FuelTransaction, ctx: FuelContext) => void | Promise<void>, config?: FuelFetchConfig): this;
|
|
15
15
|
onCall(nameFilter: string | string[], handler: (call: FuelCall, ctx: FuelContext) => void | Promise<void>, config?: FuelFetchConfig): this;
|
|
16
|
-
onLog<T>(logIdFilter:
|
|
16
|
+
onLog<T>(logIdFilter: string | string[], handler: (logs: FuelLog<T>, ctx: FuelContext) => void | Promise<void>): this;
|
|
17
17
|
}
|
|
18
18
|
export type FuelProcessorConfig = {
|
|
19
19
|
address: string;
|
|
@@ -28,7 +28,7 @@ export class FuelProcessor {
|
|
|
28
28
|
[this.config.address]: this.config.abi
|
|
29
29
|
}
|
|
30
30
|
: {};
|
|
31
|
-
const tx = decodeFuelTransactionWithAbi(call.transaction, abiMap, this.provider);
|
|
31
|
+
const tx = await decodeFuelTransactionWithAbi(call.transaction, abiMap, this.provider);
|
|
32
32
|
const ctx = new FuelContext(this.config.chainId, this.config.address, this.config.name ?? this.config.address, tx);
|
|
33
33
|
await handler(tx, ctx);
|
|
34
34
|
return ctx.stopAndGetResult();
|
|
@@ -67,7 +67,7 @@ export class FuelProcessor {
|
|
|
67
67
|
try {
|
|
68
68
|
const contract = new Contract(this.config.address, abi, this.provider);
|
|
69
69
|
const gqlTransaction = call.transaction;
|
|
70
|
-
const tx = decodeFuelTransactionWithAbi(gqlTransaction, { [this.config.address]: abi }, this.provider);
|
|
70
|
+
const tx = await decodeFuelTransactionWithAbi(gqlTransaction, { [this.config.address]: abi }, this.provider);
|
|
71
71
|
const ctx = new FuelContext(this.config.chainId, this.config.address, this.config.name ?? this.config.address, tx);
|
|
72
72
|
for (const op of tx.operations) {
|
|
73
73
|
for (const call of op.calls || []) {
|
|
@@ -108,7 +108,7 @@ export class FuelProcessor {
|
|
|
108
108
|
handler: async (call) => {
|
|
109
109
|
try {
|
|
110
110
|
const gqlTransaction = call.transaction;
|
|
111
|
-
const tx = decodeFuelTransactionWithAbi(gqlTransaction, { [this.config.address]: this.config.abi }, this.provider);
|
|
111
|
+
const tx = await decodeFuelTransactionWithAbi(gqlTransaction, { [this.config.address]: this.config.abi }, this.provider);
|
|
112
112
|
const results = [];
|
|
113
113
|
const logs = (tx.logs || []).filter((log) => logIds.has(log.logId));
|
|
114
114
|
for (const log of logs) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fuel-processor.js","sourceRoot":"","sources":["../../src/fuel/fuel-processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAW,QAAQ,EAAE,MAAM,OAAO,CAAA;AAClE,OAAO,EAAe,cAAc,EAAE,MAAM,cAAc,CAAA;AAC1D,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,EAG1B,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAA2C,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAErD,MAAM,OAAO,aAAa;IAWH;IAVrB,YAAY,GAAiC,EAAE,CAAA;IAEvC,QAAQ,CAAU;IAE1B,MAAM,CAAC,IAAI,CAAC,MAA2B;QACrC,MAAM,SAAS,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAA;QAC3C,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QAC/C,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,YAAqB,MAA2B;QAA3B,WAAM,GAAN,MAAM,CAAqB;IAAG,CAAC;IAEpD,KAAK,CAAC,SAAS;QACb,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC/C,IAAI,CAAC,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC5C,CAAC;IAEM,aAAa,CAClB,OAAiF,EACjF,SAA0B,yBAAyB;QAEnD,MAAM,WAAW,GAAG;YAClB,OAAO,EAAE,KAAK,EAAE,IAAmB,EAAE,EAAE;gBACrC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG;oBAC5B,CAAC,CAAC;wBACE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;qBACvC;oBACH,CAAC,CAAC,EAAE,CAAA;gBACN,MAAM,EAAE,GAAG,4BAA4B,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"fuel-processor.js","sourceRoot":"","sources":["../../src/fuel/fuel-processor.ts"],"names":[],"mappings":"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"}
|
package/lib/fuel/network.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { FuelChainId } from '@sentio/chain';
|
|
|
2
2
|
export type FuelNetwork = FuelChainId;
|
|
3
3
|
export declare const FuelNetwork: {
|
|
4
4
|
readonly MAIN_NET: FuelChainId.FUEL_MAINNET;
|
|
5
|
-
readonly TEST_NET: FuelChainId.
|
|
5
|
+
readonly TEST_NET: FuelChainId.FUEL_TESTNET;
|
|
6
6
|
};
|
|
7
7
|
export declare function getRpcEndpoint(network: FuelNetwork): string;
|
|
8
8
|
//# sourceMappingURL=network.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/fuel/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/fuel/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAK3C,MAAM,MAAM,WAAW,GAAG,WAAW,CAAA;AACrC,eAAO,MAAM,WAAW;;;CAGvB,CAAA;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAM3D"}
|
package/lib/fuel/network.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { FuelChainId } from '@sentio/chain';
|
|
2
|
-
import {
|
|
2
|
+
import { FUEL_NETWORK_URL } from 'fuels';
|
|
3
|
+
const SENTIO_FUEL_TESTNET = 'http://sentio-0.sentio.xyz:8080/sentio-internal-api/fuel-testnet/';
|
|
3
4
|
export const FuelNetwork = {
|
|
4
5
|
MAIN_NET: FuelChainId.FUEL_MAINNET,
|
|
5
|
-
TEST_NET: FuelChainId.
|
|
6
|
+
TEST_NET: FuelChainId.FUEL_TESTNET
|
|
6
7
|
};
|
|
7
8
|
export function getRpcEndpoint(network) {
|
|
8
9
|
switch (network) {
|
|
9
10
|
case FuelNetwork.TEST_NET:
|
|
10
|
-
return
|
|
11
|
+
return 'https://testnet.fuel.network/v1/graphql';
|
|
11
12
|
}
|
|
12
13
|
return FUEL_NETWORK_URL;
|
|
13
14
|
}
|
package/lib/fuel/network.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/fuel/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/fuel/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAExC,MAAM,mBAAmB,GAAG,mEAAmE,CAAA;AAG/F,MAAM,CAAC,MAAM,WAAW,GAAU;IAChC,QAAQ,EAAE,WAAW,CAAC,YAAY;IAClC,QAAQ,EAAE,WAAW,CAAC,YAAY;CACnC,CAAA;AAED,MAAM,UAAU,cAAc,CAAC,OAAoB;IACjD,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,WAAW,CAAC,QAAQ;YACvB,OAAO,yCAAyC,CAAA;IACpD,CAAC;IACD,OAAO,gBAAgB,CAAA;AACzB,CAAC"}
|
|
@@ -10,5 +10,5 @@ export type FuelTransaction = TransactionSummary & {
|
|
|
10
10
|
sender?: string;
|
|
11
11
|
};
|
|
12
12
|
export declare function decodeFuelTransaction(gqlTransaction: any, provider: Provider): FuelTransaction;
|
|
13
|
-
export declare function decodeFuelTransactionWithAbi(gqlTransaction: any, abiMap: AbiMap, provider: Provider): FuelTransaction
|
|
13
|
+
export declare function decodeFuelTransactionWithAbi(gqlTransaction: any, abiMap: AbiMap, provider: Provider): Promise<FuelTransaction>;
|
|
14
14
|
//# sourceMappingURL=transaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/fuel/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,
|
|
1
|
+
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/fuel/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EASN,QAAQ,EAIR,kBAAkB,EAEnB,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,MAAM,MAAM,eAAe,GAAG;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,yBAAyB,EAAE,eAEvC,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,kBAAkB,GAAG;IACjD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAWD,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,GAAG,eAAe,CA6B9F;AAED,wBAAsB,4BAA4B,CAChD,cAAc,EAAE,GAAG,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,eAAe,CAAC,CA8D1B"}
|
package/lib/fuel/transaction.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { arrayify, assembleTransactionSummary,
|
|
1
|
+
import { arrayify, assembleTransactionSummary, BigNumberCoder, bn, InputType, Interface, processGqlReceipt, ReceiptType, TransactionCoder, TransactionResponse, ZeroBytes32 as BaseAssetId } from 'fuels';
|
|
2
2
|
export const DEFAULT_FUEL_FETCH_CONFIG = {
|
|
3
3
|
includeFailed: false
|
|
4
4
|
};
|
|
@@ -13,8 +13,10 @@ function findSenderFromInputs(inputs) {
|
|
|
13
13
|
export function decodeFuelTransaction(gqlTransaction, provider) {
|
|
14
14
|
const rawPayload = arrayify(gqlTransaction.rawPayload);
|
|
15
15
|
const [decodedTransaction] = new TransactionCoder().decode(rawPayload, 0);
|
|
16
|
-
const { gasCosts,
|
|
16
|
+
const { gasCosts, feeParameters, txParameters } = provider.getChain().consensusParameters;
|
|
17
17
|
const blockNumber = gqlTransaction.status?.block?.header?.height;
|
|
18
|
+
const { gasPriceFactor, gasPerByte } = feeParameters;
|
|
19
|
+
const { maxInputs, maxGasPerTx } = txParameters;
|
|
18
20
|
const gqlTransactionStatus = {
|
|
19
21
|
type: gqlTransaction.status?.__typename,
|
|
20
22
|
...gqlTransaction.status
|
|
@@ -29,17 +31,26 @@ export function decodeFuelTransaction(gqlTransaction, provider) {
|
|
|
29
31
|
gasPerByte: bn(gasPerByte),
|
|
30
32
|
gasPriceFactor: bn(gasPriceFactor),
|
|
31
33
|
maxInputs,
|
|
32
|
-
gasCosts
|
|
34
|
+
gasCosts,
|
|
35
|
+
gasPrice: bn(gqlTransaction.gasPrice),
|
|
36
|
+
maxGasPerTx
|
|
33
37
|
}),
|
|
34
38
|
blockNumber,
|
|
35
39
|
sender: findSenderFromInputs(decodedTransaction.inputs)
|
|
36
40
|
};
|
|
37
41
|
}
|
|
38
|
-
export function decodeFuelTransactionWithAbi(gqlTransaction, abiMap, provider) {
|
|
42
|
+
export async function decodeFuelTransactionWithAbi(gqlTransaction, abiMap, provider) {
|
|
39
43
|
const rawPayload = arrayify(gqlTransaction.rawPayload);
|
|
40
44
|
const [decodedTransaction] = new TransactionCoder().decode(rawPayload, 0);
|
|
41
|
-
const receipts = gqlTransaction.receipts?.map(processGqlReceipt) || [];
|
|
42
|
-
const {
|
|
45
|
+
const receipts = gqlTransaction?.status.receipts?.map(processGqlReceipt) || [];
|
|
46
|
+
// const {
|
|
47
|
+
// consensusParameters: {
|
|
48
|
+
// feeParameters: { gasPerByte, gasPriceFactor },
|
|
49
|
+
// txParameters: { maxInputs, maxGasPerTx },
|
|
50
|
+
// gasCosts
|
|
51
|
+
// }
|
|
52
|
+
// } = provider.getChain()
|
|
53
|
+
//
|
|
43
54
|
const gqlTransactionStatus = {
|
|
44
55
|
type: gqlTransaction.status?.__typename,
|
|
45
56
|
...gqlTransaction.status
|
|
@@ -51,24 +62,36 @@ export function decodeFuelTransactionWithAbi(gqlTransaction, abiMap, provider) {
|
|
|
51
62
|
if (receipt.type === ReceiptType.LogData || receipt.type === ReceiptType.Log) {
|
|
52
63
|
const interfaceToUse = new Interface(abi);
|
|
53
64
|
const data = receipt.type === ReceiptType.Log ? new BigNumberCoder('u64').encode(receipt.val0) : receipt.data;
|
|
54
|
-
const logId = receipt.val1.
|
|
65
|
+
const logId = receipt.val1.toString();
|
|
55
66
|
const [decodedLog] = interfaceToUse.decodeLog(data, logId);
|
|
56
67
|
logs.push({ logId, data: decodedLog, receiptIndex: idx });
|
|
57
68
|
}
|
|
58
69
|
});
|
|
70
|
+
const txResponse = new TransactionResponse(gqlTransaction.id, provider, {
|
|
71
|
+
main: Object.values(abiMap)[0],
|
|
72
|
+
otherContractsAbis: {}
|
|
73
|
+
});
|
|
74
|
+
txResponse.gqlTransaction = {
|
|
75
|
+
...gqlTransaction,
|
|
76
|
+
status: gqlTransactionStatus
|
|
77
|
+
};
|
|
78
|
+
const summary = await txResponse.getTransactionSummary();
|
|
59
79
|
return {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
80
|
+
/*...assembleTransactionSummary({
|
|
81
|
+
id: gqlTransaction.id,
|
|
82
|
+
receipts,
|
|
83
|
+
transaction: decodedTransaction,
|
|
84
|
+
transactionBytes: rawPayload,
|
|
85
|
+
gqlTransactionStatus,
|
|
86
|
+
gasPerByte: bn(gasPerByte),
|
|
87
|
+
gasPriceFactor: bn(gasPriceFactor),
|
|
88
|
+
abiMap,
|
|
89
|
+
maxInputs,
|
|
90
|
+
gasCosts,
|
|
91
|
+
maxGasPerTx,
|
|
92
|
+
gasPrice: bn(gqlTransaction.gasPrice)
|
|
93
|
+
}),*/
|
|
94
|
+
...summary,
|
|
72
95
|
blockNumber,
|
|
73
96
|
logs,
|
|
74
97
|
sender: findSenderFromInputs(decodedTransaction.inputs)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/fuel/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,0BAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/fuel/transaction.ts"],"names":[],"mappings":"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"}
|
package/lib/fuel/types.d.ts
CHANGED
|
@@ -13,11 +13,11 @@ export type CallHandler<T> = {
|
|
|
13
13
|
fetchConfig?: Partial<FuelCallHandlerConfig>;
|
|
14
14
|
assetConfig?: Partial<FuelAssetHandlerConfig>;
|
|
15
15
|
logConfig?: {
|
|
16
|
-
logIds:
|
|
16
|
+
logIds: string[];
|
|
17
17
|
};
|
|
18
18
|
};
|
|
19
19
|
export interface FuelLog<T> {
|
|
20
|
-
logId:
|
|
20
|
+
logId: string;
|
|
21
21
|
data: T;
|
|
22
22
|
receiptIndex: number;
|
|
23
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fuel-facet.d.ts","sourceRoot":"","sources":["../../src/testing/fuel-facet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAGhE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,qBAAa,SAAS;IACpB,MAAM,EAAE,mBAAmB,CAAA;gBAEf,MAAM,EAAE,mBAAmB;IAIvC,iBAAiB,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,GAAE,WAAkC;IAW/E,OAAO,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"fuel-facet.d.ts","sourceRoot":"","sources":["../../src/testing/fuel-facet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAGhE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,qBAAa,SAAS;IACpB,MAAM,EAAE,mBAAmB,CAAA;gBAEf,MAAM,EAAE,mBAAmB;IAIvC,iBAAiB,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,GAAE,WAAkC;IAW/E,OAAO,CAAC,YAAY;CAsErB"}
|
|
@@ -34,7 +34,7 @@ export class FuelFacet {
|
|
|
34
34
|
const filter = callConfig.filters[0]?.function;
|
|
35
35
|
if (filter) {
|
|
36
36
|
// filter out by tx receipt
|
|
37
|
-
for (const receipt of transaction.receipts || []) {
|
|
37
|
+
for (const receipt of transaction.status.receipts || []) {
|
|
38
38
|
if (receipt.receiptType == 'CALL' && receipt.param1 == filter) {
|
|
39
39
|
res.push(binding);
|
|
40
40
|
}
|
|
@@ -56,9 +56,10 @@ export class FuelFacet {
|
|
|
56
56
|
handlerType: HandlerType.FUEL_CALL
|
|
57
57
|
};
|
|
58
58
|
const logIds = logConfig.logIds;
|
|
59
|
-
for (const receipt of transaction.receipts || []) {
|
|
59
|
+
for (const receipt of transaction.status.receipts || []) {
|
|
60
60
|
if ((receipt.receiptType == 'LOG' || receipt.receiptType == 'LOG_DATA') && logIds.includes(receipt.rb)) {
|
|
61
61
|
res.push(binding);
|
|
62
|
+
break;
|
|
62
63
|
}
|
|
63
64
|
}
|
|
64
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fuel-facet.js","sourceRoot":"","sources":["../../src/testing/fuel-facet.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,MAAM,OAAO,SAAS;IACpB,MAAM,CAAqB;IAE3B,YAAY,MAA2B;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,iBAAiB,CAAC,WAAgB,EAAE,UAAuB,WAAW,CAAC,QAAQ;QAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QACxD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,KAAK,CAAC,4BAA4B,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;QACzE,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YACjC,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;IAEO,YAAY,CAAC,WAAgB,EAAE,OAAoB;QACzD,MAAM,GAAG,GAAkB,EAAE,CAAA;QAC7B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YACjD,IAAI,MAAM,CAAC,QAAQ,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;gBACzC,SAAQ;YACV,CAAC;YACD,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;gBAChD,MAAM,OAAO,GAAG;oBACd,IAAI,EAAE;wBACJ,QAAQ,EAAE;4BACR,WAAW;4BACX,SAAS,EAAE,IAAI,IAAI,EAAE;yBACtB;qBACF;oBACD,UAAU,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;oBAClC,WAAW,EAAE,WAAW,CAAC,SAAS;iBACnC,CAAA;gBAED,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAA;gBAC9C,IAAI,MAAM,EAAE,CAAC;oBACX,2BAA2B;oBAC3B,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"fuel-facet.js","sourceRoot":"","sources":["../../src/testing/fuel-facet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sentio/sdk",
|
|
3
|
-
"version": "2.37.1",
|
|
3
|
+
"version": "2.37.2-rc.1",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@aptos-labs/ts-sdk": "~1.14.0",
|
|
49
49
|
"@coral-xyz/borsh": "^0.30.0",
|
|
50
|
-
"@fuel-ts/program": "0.
|
|
50
|
+
"@fuel-ts/program": "^0.88.1",
|
|
51
51
|
"@mysten/sui.js": "~0.54.1",
|
|
52
52
|
"@project-serum/anchor": "^0.26.0",
|
|
53
53
|
"@sentio/bigdecimal": "9.1.1-patch.3",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"chalk": "^5.3.0",
|
|
62
62
|
"csv-parse": "^5.5.3",
|
|
63
63
|
"ethers": "npm:@sentio/ethers@6.7.1-patch.4",
|
|
64
|
-
"fuels": "0.
|
|
64
|
+
"fuels": "^0.88.1",
|
|
65
65
|
"js-sha3": "^0.9.3",
|
|
66
66
|
"lru-cache": "^10.2.0",
|
|
67
67
|
"mkdirp": "^1.0.4",
|
|
@@ -79,8 +79,8 @@
|
|
|
79
79
|
"typedoc": "^0.25.7",
|
|
80
80
|
"utility-types": "^3.11.0",
|
|
81
81
|
"yaml": "^2.3.4",
|
|
82
|
-
"@sentio/
|
|
83
|
-
"@sentio/
|
|
82
|
+
"@sentio/protos": "2.37.2-rc.1",
|
|
83
|
+
"@sentio/runtime": "^2.37.2-rc.1"
|
|
84
84
|
},
|
|
85
85
|
"peerDependencies": {
|
|
86
86
|
"tsup": "npm:@sentio/tsup@^6.7.2"
|
|
@@ -85,8 +85,8 @@ async function codegenInternal(abisDir: string, outDir: string): Promise<number>
|
|
|
85
85
|
let count = 0
|
|
86
86
|
abiTypeGen.files.forEach((file) => {
|
|
87
87
|
if (!file.path.endsWith('.hex.ts')) {
|
|
88
|
-
|
|
89
|
-
content = patchEnumType(content)
|
|
88
|
+
const content = patchImport(file.contents)
|
|
89
|
+
// content = patchEnumType(content)
|
|
90
90
|
writeFileSync(file.path, content)
|
|
91
91
|
count++
|
|
92
92
|
}
|
|
@@ -138,15 +138,10 @@ namespace ${name} {
|
|
|
138
138
|
export abstract class CallWithLogs<T extends Array<any>, R> extends TypedCall<T, R> {
|
|
139
139
|
${Object.entries(logByTypes)
|
|
140
140
|
.flatMap(([t, ids]) => {
|
|
141
|
-
const s =
|
|
142
|
-
(id) => `
|
|
143
|
-
getLog${id}(): Array<${t}> {
|
|
144
|
-
return this.logs?.filter(l => l.logId == ${id})?.map(l => l.data) as Array<${t}>
|
|
145
|
-
}`
|
|
146
|
-
)
|
|
141
|
+
const s = []
|
|
147
142
|
s.push(`
|
|
148
143
|
getLogsOfType${getTypeName(t)}(): Array<${t}> {
|
|
149
|
-
return this.logs?.filter(l =>[${ids.join(', ')}].includes(l.logId) ).map(l => l.data) as Array<${t}>
|
|
144
|
+
return this.logs?.filter(l =>[${ids.map((id) => `"${id}"`).join(', ')}].includes(l.logId) ).map(l => l.data) as Array<${t}>
|
|
150
145
|
}`)
|
|
151
146
|
|
|
152
147
|
return s
|
|
@@ -229,8 +224,8 @@ function collectImportedTypes(types: any[]): string[] {
|
|
|
229
224
|
function genOnLogFunction([type, ids]: [string, string[]]) {
|
|
230
225
|
const name = getTypeName(type)
|
|
231
226
|
return `
|
|
232
|
-
onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContext) => void | Promise<void>, logIdFilter?:
|
|
233
|
-
return super.onLog<${type}>(logIdFilter ?? [${ids.join(', ')}], (log, ctx) => handler(log, ctx))
|
|
227
|
+
onLog${name}(handler: (log: FuelLog<${type}>, ctx: FuelContext) => void | Promise<void>, logIdFilter?: string | string[]) {
|
|
228
|
+
return super.onLog<${type}>(logIdFilter ?? [${ids.map((id) => `"${id}"`).join(', ')}], (log, ctx) => handler(log, ctx))
|
|
234
229
|
}`
|
|
235
230
|
}
|
|
236
231
|
|
package/src/fuel/fuel-plugin.ts
CHANGED
|
@@ -14,7 +14,6 @@ import { TemplateInstanceState } from '../core/template.js'
|
|
|
14
14
|
import { FuelAssetProcessor } from './asset-processor.js'
|
|
15
15
|
import { FuelProcessorState } from './types.js'
|
|
16
16
|
import { FuelProcessor } from './fuel-processor.js'
|
|
17
|
-
import { BN } from 'fuels'
|
|
18
17
|
import { FuelGlobalProcessor } from './global-processor.js'
|
|
19
18
|
|
|
20
19
|
interface Handlers {
|
|
@@ -50,7 +49,7 @@ export class FuelPlugin extends Plugin {
|
|
|
50
49
|
if (processor instanceof FuelProcessor) {
|
|
51
50
|
if (callHandler.logConfig?.logIds?.length) {
|
|
52
51
|
contractConfig.fuelLogConfigs.push({
|
|
53
|
-
logIds: callHandler.logConfig.logIds
|
|
52
|
+
logIds: callHandler.logConfig.logIds,
|
|
54
53
|
handlerId
|
|
55
54
|
})
|
|
56
55
|
} else {
|
|
@@ -40,7 +40,7 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
|
|
|
40
40
|
[this.config.address]: this.config.abi
|
|
41
41
|
}
|
|
42
42
|
: {}
|
|
43
|
-
const tx = decodeFuelTransactionWithAbi(call.transaction, abiMap, this.provider)
|
|
43
|
+
const tx = await decodeFuelTransactionWithAbi(call.transaction, abiMap, this.provider)
|
|
44
44
|
|
|
45
45
|
const ctx = new FuelContext(
|
|
46
46
|
this.config.chainId,
|
|
@@ -92,7 +92,7 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
|
|
|
92
92
|
try {
|
|
93
93
|
const contract = new Contract(this.config.address, abi, this.provider)
|
|
94
94
|
const gqlTransaction = call.transaction
|
|
95
|
-
const tx = decodeFuelTransactionWithAbi(gqlTransaction, { [this.config.address]: abi }, this.provider)
|
|
95
|
+
const tx = await decodeFuelTransactionWithAbi(gqlTransaction, { [this.config.address]: abi }, this.provider)
|
|
96
96
|
|
|
97
97
|
const ctx = new FuelContext(
|
|
98
98
|
this.config.chainId,
|
|
@@ -135,7 +135,7 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
|
|
|
135
135
|
}
|
|
136
136
|
|
|
137
137
|
public onLog<T>(
|
|
138
|
-
logIdFilter:
|
|
138
|
+
logIdFilter: string | string[],
|
|
139
139
|
handler: (logs: FuelLog<T>, ctx: FuelContext) => void | Promise<void>
|
|
140
140
|
) {
|
|
141
141
|
const logIds = new Set(Array.isArray(logIdFilter) ? logIdFilter : [logIdFilter])
|
|
@@ -144,7 +144,7 @@ export class FuelProcessor implements FuelBaseProcessor<FuelProcessorConfig> {
|
|
|
144
144
|
handler: async (call: Data_FuelCall) => {
|
|
145
145
|
try {
|
|
146
146
|
const gqlTransaction = call.transaction
|
|
147
|
-
const tx = decodeFuelTransactionWithAbi(
|
|
147
|
+
const tx = await decodeFuelTransactionWithAbi(
|
|
148
148
|
gqlTransaction,
|
|
149
149
|
{ [this.config.address]: this.config.abi! },
|
|
150
150
|
this.provider
|
package/src/fuel/network.ts
CHANGED
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
import { FuelChainId } from '@sentio/chain'
|
|
2
|
-
import {
|
|
2
|
+
import { FUEL_NETWORK_URL } from 'fuels'
|
|
3
|
+
|
|
4
|
+
const SENTIO_FUEL_TESTNET = 'http://sentio-0.sentio.xyz:8080/sentio-internal-api/fuel-testnet/'
|
|
3
5
|
|
|
4
6
|
export type FuelNetwork = FuelChainId
|
|
5
7
|
export const FuelNetwork = <const>{
|
|
6
8
|
MAIN_NET: FuelChainId.FUEL_MAINNET,
|
|
7
|
-
TEST_NET: FuelChainId.
|
|
9
|
+
TEST_NET: FuelChainId.FUEL_TESTNET
|
|
8
10
|
}
|
|
9
11
|
|
|
10
12
|
export function getRpcEndpoint(network: FuelNetwork): string {
|
|
11
13
|
switch (network) {
|
|
12
14
|
case FuelNetwork.TEST_NET:
|
|
13
|
-
return
|
|
15
|
+
return 'https://testnet.fuel.network/v1/graphql'
|
|
14
16
|
}
|
|
15
17
|
return FUEL_NETWORK_URL
|
|
16
18
|
}
|
package/src/fuel/transaction.ts
CHANGED
|
@@ -2,7 +2,6 @@ import {
|
|
|
2
2
|
AbiMap,
|
|
3
3
|
arrayify,
|
|
4
4
|
assembleTransactionSummary,
|
|
5
|
-
BaseAssetId,
|
|
6
5
|
BigNumberCoder,
|
|
7
6
|
bn,
|
|
8
7
|
Input,
|
|
@@ -12,7 +11,9 @@ import {
|
|
|
12
11
|
Provider,
|
|
13
12
|
ReceiptType,
|
|
14
13
|
TransactionCoder,
|
|
15
|
-
|
|
14
|
+
TransactionResponse,
|
|
15
|
+
TransactionSummary,
|
|
16
|
+
ZeroBytes32 as BaseAssetId
|
|
16
17
|
} from 'fuels'
|
|
17
18
|
import { FuelLog } from './types.js'
|
|
18
19
|
|
|
@@ -43,8 +44,10 @@ export function decodeFuelTransaction(gqlTransaction: any, provider: Provider):
|
|
|
43
44
|
const rawPayload = arrayify(gqlTransaction.rawPayload)
|
|
44
45
|
|
|
45
46
|
const [decodedTransaction] = new TransactionCoder().decode(rawPayload, 0)
|
|
46
|
-
const { gasCosts,
|
|
47
|
+
const { gasCosts, feeParameters, txParameters } = provider.getChain().consensusParameters
|
|
47
48
|
const blockNumber = gqlTransaction.status?.block?.header?.height
|
|
49
|
+
const { gasPriceFactor, gasPerByte } = feeParameters
|
|
50
|
+
const { maxInputs, maxGasPerTx } = txParameters
|
|
48
51
|
const gqlTransactionStatus = {
|
|
49
52
|
type: gqlTransaction.status?.__typename,
|
|
50
53
|
...gqlTransaction.status
|
|
@@ -59,45 +62,63 @@ export function decodeFuelTransaction(gqlTransaction: any, provider: Provider):
|
|
|
59
62
|
gasPerByte: bn(gasPerByte),
|
|
60
63
|
gasPriceFactor: bn(gasPriceFactor),
|
|
61
64
|
maxInputs,
|
|
62
|
-
gasCosts
|
|
65
|
+
gasCosts,
|
|
66
|
+
gasPrice: bn(gqlTransaction.gasPrice),
|
|
67
|
+
maxGasPerTx
|
|
63
68
|
}),
|
|
64
69
|
blockNumber,
|
|
65
70
|
sender: findSenderFromInputs(decodedTransaction.inputs)
|
|
66
71
|
}
|
|
67
72
|
}
|
|
68
73
|
|
|
69
|
-
export function decodeFuelTransactionWithAbi(
|
|
74
|
+
export async function decodeFuelTransactionWithAbi(
|
|
75
|
+
gqlTransaction: any,
|
|
76
|
+
abiMap: AbiMap,
|
|
77
|
+
provider: Provider
|
|
78
|
+
): Promise<FuelTransaction> {
|
|
70
79
|
const rawPayload = arrayify(gqlTransaction.rawPayload)
|
|
71
|
-
|
|
72
80
|
const [decodedTransaction] = new TransactionCoder().decode(rawPayload, 0)
|
|
73
81
|
|
|
74
|
-
const receipts = gqlTransaction.receipts?.map(processGqlReceipt) || []
|
|
75
|
-
|
|
76
|
-
const { gasCosts, maxInputs, gasPerByte, gasPriceFactor } = provider.getChain().consensusParameters
|
|
82
|
+
const receipts = gqlTransaction?.status.receipts?.map(processGqlReceipt) || []
|
|
77
83
|
|
|
84
|
+
// const {
|
|
85
|
+
// consensusParameters: {
|
|
86
|
+
// feeParameters: { gasPerByte, gasPriceFactor },
|
|
87
|
+
// txParameters: { maxInputs, maxGasPerTx },
|
|
88
|
+
// gasCosts
|
|
89
|
+
// }
|
|
90
|
+
// } = provider.getChain()
|
|
91
|
+
//
|
|
78
92
|
const gqlTransactionStatus = {
|
|
79
93
|
type: gqlTransaction.status?.__typename,
|
|
80
94
|
...gqlTransaction.status
|
|
81
95
|
}
|
|
82
|
-
const blockNumber = gqlTransactionStatus?.block?.header?.height
|
|
83
96
|
|
|
97
|
+
const blockNumber = gqlTransactionStatus?.block?.header?.height
|
|
84
98
|
const abi = Object.values(abiMap)[0]
|
|
85
|
-
|
|
86
99
|
const logs = [] as FuelLog<any>[]
|
|
87
100
|
;(receipts as any[]).forEach((receipt, idx) => {
|
|
88
101
|
if (receipt.type === ReceiptType.LogData || receipt.type === ReceiptType.Log) {
|
|
89
102
|
const interfaceToUse = new Interface(abi)
|
|
90
|
-
|
|
91
103
|
const data = receipt.type === ReceiptType.Log ? new BigNumberCoder('u64').encode(receipt.val0) : receipt.data
|
|
92
|
-
|
|
93
|
-
const logId = receipt.val1.toNumber()
|
|
104
|
+
const logId = receipt.val1.toString()
|
|
94
105
|
const [decodedLog] = interfaceToUse.decodeLog(data, logId)
|
|
95
106
|
logs.push({ logId, data: decodedLog, receiptIndex: idx })
|
|
96
107
|
}
|
|
97
108
|
})
|
|
98
109
|
|
|
110
|
+
const txResponse = new TransactionResponse(gqlTransaction.id, provider, {
|
|
111
|
+
main: Object.values(abiMap)[0],
|
|
112
|
+
otherContractsAbis: {}
|
|
113
|
+
})
|
|
114
|
+
txResponse.gqlTransaction = {
|
|
115
|
+
...gqlTransaction,
|
|
116
|
+
status: gqlTransactionStatus
|
|
117
|
+
}
|
|
118
|
+
const summary = await txResponse.getTransactionSummary()
|
|
119
|
+
|
|
99
120
|
return {
|
|
100
|
-
|
|
121
|
+
/*...assembleTransactionSummary({
|
|
101
122
|
id: gqlTransaction.id,
|
|
102
123
|
receipts,
|
|
103
124
|
transaction: decodedTransaction,
|
|
@@ -107,8 +128,11 @@ export function decodeFuelTransactionWithAbi(gqlTransaction: any, abiMap: AbiMap
|
|
|
107
128
|
gasPriceFactor: bn(gasPriceFactor),
|
|
108
129
|
abiMap,
|
|
109
130
|
maxInputs,
|
|
110
|
-
gasCosts
|
|
111
|
-
|
|
131
|
+
gasCosts,
|
|
132
|
+
maxGasPerTx,
|
|
133
|
+
gasPrice: bn(gqlTransaction.gasPrice)
|
|
134
|
+
}),*/
|
|
135
|
+
...summary,
|
|
112
136
|
blockNumber,
|
|
113
137
|
logs,
|
|
114
138
|
sender: findSenderFromInputs(decodedTransaction.inputs)
|
package/src/fuel/types.ts
CHANGED
|
@@ -16,12 +16,12 @@ export type CallHandler<T> = {
|
|
|
16
16
|
fetchConfig?: Partial<FuelCallHandlerConfig>
|
|
17
17
|
assetConfig?: Partial<FuelAssetHandlerConfig>
|
|
18
18
|
logConfig?: {
|
|
19
|
-
logIds:
|
|
19
|
+
logIds: string[]
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
export interface FuelLog<T> {
|
|
24
|
-
logId:
|
|
24
|
+
logId: string
|
|
25
25
|
data: T
|
|
26
26
|
receiptIndex: number
|
|
27
27
|
}
|
|
@@ -42,7 +42,7 @@ export class FuelFacet {
|
|
|
42
42
|
const filter = callConfig.filters[0]?.function
|
|
43
43
|
if (filter) {
|
|
44
44
|
// filter out by tx receipt
|
|
45
|
-
for (const receipt of transaction.receipts || []) {
|
|
45
|
+
for (const receipt of transaction.status.receipts || []) {
|
|
46
46
|
if (receipt.receiptType == 'CALL' && receipt.param1 == filter) {
|
|
47
47
|
res.push(binding)
|
|
48
48
|
}
|
|
@@ -65,9 +65,10 @@ export class FuelFacet {
|
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
const logIds = logConfig.logIds
|
|
68
|
-
for (const receipt of transaction.receipts || []) {
|
|
68
|
+
for (const receipt of transaction.status.receipts || []) {
|
|
69
69
|
if ((receipt.receiptType == 'LOG' || receipt.receiptType == 'LOG_DATA') && logIds.includes(receipt.rb)) {
|
|
70
70
|
res.push(binding)
|
|
71
|
+
break
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
74
|
}
|