@sentio/sdk 2.41.3-rc.1 → 2.41.3-rc.3
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/base-processor.d.ts +0 -2
- package/lib/fuel/base-processor.d.ts.map +1 -1
- package/lib/fuel/base-processor.js +1 -6
- package/lib/fuel/base-processor.js.map +1 -1
- package/lib/fuel/codegen/codegen.d.ts.map +1 -1
- package/lib/fuel/codegen/codegen.js +17 -26
- package/lib/fuel/codegen/codegen.js.map +1 -1
- package/lib/fuel/context.d.ts +2 -2
- package/lib/fuel/context.d.ts.map +1 -1
- package/lib/fuel/context.js +2 -3
- package/lib/fuel/context.js.map +1 -1
- package/lib/fuel/network.d.ts.map +1 -1
- package/lib/fuel/network.js +1 -2
- package/lib/fuel/network.js.map +1 -1
- package/lib/fuel/transaction.d.ts.map +1 -1
- package/lib/fuel/transaction.js +2 -1
- package/lib/fuel/transaction.js.map +1 -1
- package/package.json +4 -4
- package/src/fuel/base-processor.ts +7 -7
- package/src/fuel/codegen/codegen.ts +20 -28
- package/src/fuel/context.ts +3 -3
- package/src/fuel/network.ts +1 -2
- package/src/fuel/transaction.ts +3 -1
@@ -1,6 +1,5 @@
|
|
1
1
|
import { FuelProcessor, FuelProcessorConfig } from './fuel-processor.js';
|
2
2
|
import { JsonAbi } from 'fuels';
|
3
|
-
import { FuelCall } from './context.js';
|
4
3
|
import { FuelLog } from './types.js';
|
5
4
|
export declare abstract class FuelAbstractProcessor extends FuelProcessor {
|
6
5
|
protected constructor(abi: JsonAbi, config?: FuelProcessorConfig);
|
@@ -10,6 +9,5 @@ export declare class TypedCall<T extends Array<any>, R> {
|
|
10
9
|
returnValue: R;
|
11
10
|
argsObject?: Record<string, any>;
|
12
11
|
logs?: FuelLog<unknown>[];
|
13
|
-
constructor(call: FuelCall);
|
14
12
|
}
|
15
13
|
//# sourceMappingURL=base-processor.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"base-processor.d.ts","sourceRoot":"","sources":["../../src/fuel/base-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;
|
1
|
+
{"version":3,"file":"base-processor.d.ts","sourceRoot":"","sources":["../../src/fuel/base-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAG/B,OAAO,EAAE,OAAO,EAAsB,MAAM,YAAY,CAAA;AAExD,8BAAsB,qBAAsB,SAAQ,aAAa;IAC/D,SAAS,aAAa,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,mBAAmB;CAWjE;AAED,qBAAa,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5C,IAAI,EAAE,CAAC,CAAA;IACP,WAAW,EAAE,CAAC,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAChC,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAA;CAQ1B"}
|
@@ -1,4 +1,5 @@
|
|
1
1
|
import { FuelProcessor } from './fuel-processor.js';
|
2
|
+
// import { FuelCall } from './context.js'
|
2
3
|
import { FuelChainId } from '@sentio/chain';
|
3
4
|
import { FuelProcessorState } from './types.js';
|
4
5
|
export class FuelAbstractProcessor extends FuelProcessor {
|
@@ -19,11 +20,5 @@ export class TypedCall {
|
|
19
20
|
returnValue;
|
20
21
|
argsObject;
|
21
22
|
logs;
|
22
|
-
constructor(call) {
|
23
|
-
this.args = call.functionScopes[0].getCallConfig().args;
|
24
|
-
this.returnValue = call.value;
|
25
|
-
this.argsObject = call.args;
|
26
|
-
this.logs = call.logs;
|
27
|
-
}
|
28
23
|
}
|
29
24
|
//# sourceMappingURL=base-processor.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/fuel/base-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAuB,MAAM,qBAAqB,CAAA;
|
1
|
+
{"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/fuel/base-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAuB,MAAM,qBAAqB,CAAA;AAExE,0CAA0C;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAW,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAExD,MAAM,OAAgB,qBAAsB,SAAQ,aAAa;IAC/D,YAAsB,GAAY,EAAE,MAA4B;QAC9D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG;gBACP,OAAO,EAAE,WAAW,CAAC,YAAY;gBACjC,OAAO,EAAE,GAAG;aACb,CAAA;QACH,CAAC;QACD,MAAM,CAAC,GAAG,GAAG,GAAG,CAAA;QAChB,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC5C,CAAC;CACF;AAED,MAAM,OAAO,SAAS;IACpB,IAAI,CAAG;IACP,WAAW,CAAG;IACd,UAAU,CAAsB;IAChC,IAAI,CAAqB;CAQ1B"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../../src/fuel/codegen/codegen.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../../src/fuel/codegen/codegen.ts"],"names":[],"mappings":"AAQA,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAO5D"}
|
@@ -4,6 +4,7 @@ import { AbiTypeGen, ProgramTypeEnum } from '@fuel-ts/abi-typegen';
|
|
4
4
|
import mkdirp from 'mkdirp';
|
5
5
|
import path from 'path';
|
6
6
|
import { upperFirst } from './utils.js';
|
7
|
+
import { versions as builtinVersions } from '@fuel-ts/versions';
|
7
8
|
export async function codegen(abisDir, outDir) {
|
8
9
|
if (!fs.existsSync(abisDir)) {
|
9
10
|
return;
|
@@ -12,22 +13,7 @@ export async function codegen(abisDir, outDir) {
|
|
12
13
|
console.log(chalk.green(`Generated ${numFiles} files for Fuel`));
|
13
14
|
}
|
14
15
|
function patchImport(contents) {
|
15
|
-
return (
|
16
|
-
/* .replace(
|
17
|
-
`import { Interface, Contract, ContractFactory } from "fuels";`,
|
18
|
-
`import { Contract, } from "@fuel-ts/program";
|
19
|
-
import { ContractFactory } from "@fuel-ts/contract";
|
20
|
-
import { Interface } from "@fuel-ts/abi-coder";`
|
21
|
-
)
|
22
|
-
.replace(
|
23
|
-
`import type { Provider, Account, AbstractAddress, BytesLike, DeployContractOptions, StorageSlot } from "fuels";
|
24
|
-
`,
|
25
|
-
`import type { Provider, Account } from "@fuel-ts/account";
|
26
|
-
import type { AbstractAddress, BytesLike } from "@fuel-ts/interfaces";
|
27
|
-
import type { DeployContractOptions } from "@fuel-ts/contract";
|
28
|
-
import type { StorageSlot } from "@fuel-ts/transactions";`
|
29
|
-
)*/
|
30
|
-
.replace(/from\s+['"](\..+)['"]/g, `from '\$1.js'`));
|
16
|
+
return contents.replace(/from\s+['"](\..+)['"]/g, `from '\$1.js'`);
|
31
17
|
}
|
32
18
|
/*function patchEnumType(contents: string) {
|
33
19
|
const matches = contents.matchAll(/export type (.+) = Enum<{ Ok: T, Err: E }>;/g)
|
@@ -68,10 +54,10 @@ async function codegenInternal(abisDir, outDir) {
|
|
68
54
|
binFiles: [],
|
69
55
|
storageSlotsFiles: [],
|
70
56
|
outputDir: outDir,
|
71
|
-
programType: ProgramTypeEnum.CONTRACT
|
57
|
+
programType: ProgramTypeEnum.CONTRACT,
|
58
|
+
versions: { FUELS: builtinVersions.FUELS }
|
72
59
|
});
|
73
60
|
mkdirp.sync(outDir);
|
74
|
-
mkdirp.sync(path.join(outDir, 'factories'));
|
75
61
|
let count = 0;
|
76
62
|
abiTypeGen.files.forEach((file) => {
|
77
63
|
if (!file.path.endsWith('.hex.ts')) {
|
@@ -89,13 +75,17 @@ async function codegenInternal(abisDir, outDir) {
|
|
89
75
|
// }
|
90
76
|
// }
|
91
77
|
for (const abi of abiTypeGen.abis) {
|
92
|
-
const name = abi.
|
78
|
+
const name = abi.capitalizedName.endsWith('Abi') ? abi.capitalizedName.slice(0, -3) : abi.capitalizedName;
|
93
79
|
const filePath = path.join(outDir, `${name}Processor.ts`);
|
94
80
|
const importedTypes = collectImportedTypes(abi.types);
|
95
81
|
const logByTypes = {};
|
96
82
|
for (const logType of abi.rawContents.loggedTypes) {
|
83
|
+
const metadataTypeId = abi.rawContents.concreteTypes.find((t) => t.concreteTypeId == logType.concreteTypeId)?.metadataTypeId;
|
97
84
|
// @ts-ignore - we know that the type is in the abi
|
98
|
-
|
85
|
+
let t = abi.types.find((t) => t.rawAbiType.concreteTypeId == logType.concreteTypeId);
|
86
|
+
if (!t) {
|
87
|
+
t = abi.types.find((t) => t.rawAbiType.typeId == metadataTypeId);
|
88
|
+
}
|
99
89
|
// @ts-ignore - we know that the type is in the abi
|
100
90
|
const typeName = t?.attributes?.outputLabel;
|
101
91
|
if (typeName) {
|
@@ -111,15 +101,14 @@ async function codegenInternal(abisDir, outDir) {
|
|
111
101
|
/* eslint-disable */
|
112
102
|
|
113
103
|
import { FuelAbstractProcessor, FuelContext, FuelProcessorConfig, TypedCall, FuelFetchConfig, FuelCall, FuelLog} from '@sentio/sdk/fuel'
|
114
|
-
import {${abi.name}__factory } from './factories/${abi.name}__factory.js'
|
115
104
|
import {${abi.commonTypesInUse.join(',')}} from './common.js'
|
116
|
-
import {${importedTypes.join(',')}} from './${abi.
|
105
|
+
import {${importedTypes.join(',')}, ${abi.capitalizedName}} from './${abi.capitalizedName}.js'
|
117
106
|
|
118
107
|
import type { BigNumberish, BN } from 'fuels';
|
119
|
-
import type { BytesLike } from 'fuels';
|
108
|
+
import type { BytesLike, Bytes } from 'fuels';
|
120
109
|
|
121
110
|
|
122
|
-
namespace ${name} {
|
111
|
+
namespace ${name}NS {
|
123
112
|
export abstract class CallWithLogs<T extends Array<any>, R> extends TypedCall<T, R> {
|
124
113
|
${Object.entries(logByTypes)
|
125
114
|
.flatMap(([t, ids]) => {
|
@@ -133,12 +122,14 @@ ${Object.entries(logByTypes)
|
|
133
122
|
.join('\n')}
|
134
123
|
}
|
135
124
|
|
136
|
-
${
|
125
|
+
${''
|
126
|
+
// abi.functions.map(genCallType).join('\n')
|
127
|
+
}
|
137
128
|
}
|
138
129
|
|
139
130
|
export class ${name}Processor extends FuelAbstractProcessor {
|
140
131
|
constructor(config?: FuelProcessorConfig) {
|
141
|
-
super(${abi.
|
132
|
+
super(${abi.capitalizedName}.abi, config)
|
142
133
|
}
|
143
134
|
|
144
135
|
static bind(config: FuelProcessorConfig) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/fuel/codegen/codegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AACpD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,UAAU,EAAoB,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACpF,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;
|
1
|
+
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/fuel/codegen/codegen.ts"],"names":[],"mappings":"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"}
|
package/lib/fuel/context.d.ts
CHANGED
@@ -2,10 +2,10 @@ import { BaseContext, Labels } from '../core/index.js';
|
|
2
2
|
import { ChainId } from '@sentio/chain';
|
3
3
|
import { RecordMetaData } from '@sentio/protos';
|
4
4
|
import type { CallResult } from 'fuels';
|
5
|
-
import {
|
5
|
+
import { InvocationScopeLike } from 'fuels';
|
6
6
|
import { FuelTransaction } from './transaction.js';
|
7
7
|
import { FuelLog } from './types.js';
|
8
|
-
export declare class FuelCall
|
8
|
+
export declare class FuelCall {
|
9
9
|
readonly args?: Record<string, any> | undefined;
|
10
10
|
readonly logs?: FuelLog<unknown>[] | undefined;
|
11
11
|
constructor(funcScopes: InvocationScopeLike | Array<InvocationScopeLike>, callResult: CallResult, isMultiCall: boolean, args?: Record<string, any> | undefined, logs?: FuelLog<unknown>[] | undefined);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/fuel/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAmB,MAAM,kBAAkB,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/fuel/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAmB,MAAM,kBAAkB,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,qBAAa,QAAQ;IAKjB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACnC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;gBAJlC,UAAU,EAAE,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAC,EAC5D,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,OAAO,EACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAAA,EAC1B,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,YAAA;CAIrC;AAED,qBAAa,WAAY,SAAQ,WAAW;IAGxC,QAAQ,CAAC,OAAO,EAAE,OAAO;IACzB,QAAQ,CAAC,eAAe,EAAE,MAAM;IAChC,QAAQ,CAAC,YAAY,EAAE,MAAM;IAC7B,QAAQ,CAAC,WAAW,EAAE,eAAe,GAAG,IAAI;IAL9C,OAAO,CAAC,QAAQ,CAAa;gBAElB,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,eAAe,GAAG,IAAI;IAK9C,UAAU,IAAI,OAAO;IAIrB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInC,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc;CAa5E"}
|
package/lib/fuel/context.js
CHANGED
@@ -1,12 +1,11 @@
|
|
1
1
|
import { BaseContext, normalizeLabels } from '../core/index.js';
|
2
|
-
|
3
|
-
export class FuelCall extends InvocationCallResult {
|
2
|
+
export class FuelCall {
|
4
3
|
args;
|
5
4
|
logs;
|
6
5
|
constructor(funcScopes, callResult, isMultiCall, args, logs) {
|
7
|
-
super(funcScopes, callResult, isMultiCall);
|
8
6
|
this.args = args;
|
9
7
|
this.logs = logs;
|
8
|
+
// super(funcScopes, callResult, isMultiCall)
|
10
9
|
}
|
11
10
|
}
|
12
11
|
export class FuelContext extends BaseContext {
|
package/lib/fuel/context.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/fuel/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAU,eAAe,EAAE,MAAM,kBAAkB,CAAA;
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/fuel/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAU,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAQvE,MAAM,OAAO,QAAQ;IAKR;IACA;IALX,YACE,UAA4D,EAC5D,UAAsB,EACtB,WAAoB,EACX,IAA0B,EAC1B,IAAyB;QADzB,SAAI,GAAJ,IAAI,CAAsB;QAC1B,SAAI,GAAJ,IAAI,CAAqB;QAElC,6CAA6C;IAC/C,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,WAAW;IAG/B;IACA;IACA;IACA;IALH,QAAQ,GAAW,CAAC,CAAC,CAAA;IAC7B,YACW,OAAgB,EAChB,eAAuB,EACvB,YAAoB,EACpB,WAAmC;QAE5C,KAAK,CAAC,EAAE,CAAC,CAAA;QALA,YAAO,GAAP,OAAO,CAAS;QAChB,oBAAe,GAAf,eAAe,CAAQ;QACvB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,gBAAW,GAAX,WAAW,CAAwB;IAG9C,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAES,mBAAmB,CAAC,IAAY,EAAE,MAAc;QACxD,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,eAAe;YAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,IAAI,CAAC,CAAC;YACvD,gBAAgB,EAAE,CAAC;YACnB,eAAe,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO;YACpD,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;YAC1B,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;SAChC,CAAA;IACH,CAAC;CACF"}
|
@@ -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;AAE3C,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,5 +1,4 @@
|
|
1
1
|
import { FuelChainId } from '@sentio/chain';
|
2
|
-
import { FUEL_NETWORK_URL } from 'fuels';
|
3
2
|
export const FuelNetwork = {
|
4
3
|
MAIN_NET: FuelChainId.FUEL_MAINNET,
|
5
4
|
TEST_NET: FuelChainId.FUEL_TESTNET
|
@@ -9,6 +8,6 @@ export function getRpcEndpoint(network) {
|
|
9
8
|
case FuelNetwork.TEST_NET:
|
10
9
|
return 'https://testnet.fuel.network/v1/graphql';
|
11
10
|
}
|
12
|
-
return
|
11
|
+
return 'https://testnet.fuel.network/v1/graphql';
|
13
12
|
}
|
14
13
|
//# sourceMappingURL=network.js.map
|
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;
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/fuel/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAG3C,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,yCAAyC,CAAA;AAClD,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/fuel/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EASN,QAAQ,EAIR,kBAAkB,EACnB,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,CA+B9F;AAED,wBAAsB,4BAA4B,CAChD,cAAc,EAAE,GAAG,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,eAAe,CAAC,
|
1
|
+
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../src/fuel/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EASN,QAAQ,EAIR,kBAAkB,EACnB,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,CA+B9F;AAED,wBAAsB,4BAA4B,CAChD,cAAc,EAAE,GAAG,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,eAAe,CAAC,CAgE1B"}
|
package/lib/fuel/transaction.js
CHANGED
@@ -69,10 +69,11 @@ export async function decodeFuelTransactionWithAbi(gqlTransaction, abiMap, provi
|
|
69
69
|
logs.push({ logId, data: decodedLog, receiptIndex: idx });
|
70
70
|
}
|
71
71
|
});
|
72
|
-
const txResponse = new TransactionResponse(gqlTransaction.
|
72
|
+
const txResponse = new TransactionResponse(gqlTransaction.status.transactionId, provider, {
|
73
73
|
main: Object.values(abiMap)[0],
|
74
74
|
otherContractsAbis: {}
|
75
75
|
});
|
76
|
+
// @ts-ignore - hack
|
76
77
|
txResponse.gqlTransaction = {
|
77
78
|
...gqlTransaction,
|
78
79
|
status: gqlTransactionStatus
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/fuel/transaction.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/fuel/transaction.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.41.3-rc.
|
3
|
+
"version": "2.41.3-rc.3",
|
4
4
|
"license": "Apache-2.0",
|
5
5
|
"type": "module",
|
6
6
|
"exports": {
|
@@ -64,7 +64,7 @@
|
|
64
64
|
"chalk": "^5.3.0",
|
65
65
|
"csv-parse": "^5.5.3",
|
66
66
|
"ethers": "npm:@sentio/ethers@6.13.1-patch.1",
|
67
|
-
"fuels": "^0.
|
67
|
+
"fuels": "^0.94.1",
|
68
68
|
"graphql": "^16.9.0",
|
69
69
|
"js-sha3": "^0.9.3",
|
70
70
|
"lru-cache": "^11.0.0",
|
@@ -83,8 +83,8 @@
|
|
83
83
|
"typechain": "^8.3.2",
|
84
84
|
"utility-types": "^3.11.0",
|
85
85
|
"yaml": "^2.3.4",
|
86
|
-
"@sentio/protos": "2.41.3-rc.
|
87
|
-
"@sentio/runtime": "^2.41.3-rc.
|
86
|
+
"@sentio/protos": "2.41.3-rc.3",
|
87
|
+
"@sentio/runtime": "^2.41.3-rc.3"
|
88
88
|
},
|
89
89
|
"peerDependencies": {
|
90
90
|
"tsup": "npm:@sentio/tsup@^6.7.2"
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { FuelProcessor, FuelProcessorConfig } from './fuel-processor.js'
|
2
2
|
import { JsonAbi } from 'fuels'
|
3
|
-
import { FuelCall } from './context.js'
|
3
|
+
// import { FuelCall } from './context.js'
|
4
4
|
import { FuelChainId } from '@sentio/chain'
|
5
5
|
import { FuelLog, FuelProcessorState } from './types.js'
|
6
6
|
|
@@ -24,10 +24,10 @@ export class TypedCall<T extends Array<any>, R> {
|
|
24
24
|
argsObject?: Record<string, any>
|
25
25
|
logs?: FuelLog<unknown>[]
|
26
26
|
|
27
|
-
constructor(call: FuelCall) {
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
}
|
27
|
+
// constructor(call: FuelCall) {
|
28
|
+
// this.args = call.args as T
|
29
|
+
// this.returnValue = call.value as R
|
30
|
+
// this.argsObject = call.args
|
31
|
+
// this.logs = call.logs
|
32
|
+
// }
|
33
33
|
}
|
@@ -4,6 +4,7 @@ import { AbiTypeGen, IFile, IFunction, ProgramTypeEnum } from '@fuel-ts/abi-type
|
|
4
4
|
import mkdirp from 'mkdirp'
|
5
5
|
import path from 'path'
|
6
6
|
import { upperFirst } from './utils.js'
|
7
|
+
import { versions as builtinVersions } from '@fuel-ts/versions'
|
7
8
|
|
8
9
|
export async function codegen(abisDir: string, outDir: string) {
|
9
10
|
if (!fs.existsSync(abisDir)) {
|
@@ -15,24 +16,7 @@ export async function codegen(abisDir: string, outDir: string) {
|
|
15
16
|
}
|
16
17
|
|
17
18
|
function patchImport(contents: string) {
|
18
|
-
return (
|
19
|
-
contents
|
20
|
-
/* .replace(
|
21
|
-
`import { Interface, Contract, ContractFactory } from "fuels";`,
|
22
|
-
`import { Contract, } from "@fuel-ts/program";
|
23
|
-
import { ContractFactory } from "@fuel-ts/contract";
|
24
|
-
import { Interface } from "@fuel-ts/abi-coder";`
|
25
|
-
)
|
26
|
-
.replace(
|
27
|
-
`import type { Provider, Account, AbstractAddress, BytesLike, DeployContractOptions, StorageSlot } from "fuels";
|
28
|
-
`,
|
29
|
-
`import type { Provider, Account } from "@fuel-ts/account";
|
30
|
-
import type { AbstractAddress, BytesLike } from "@fuel-ts/interfaces";
|
31
|
-
import type { DeployContractOptions } from "@fuel-ts/contract";
|
32
|
-
import type { StorageSlot } from "@fuel-ts/transactions";`
|
33
|
-
)*/
|
34
|
-
.replace(/from\s+['"](\..+)['"]/g, `from '\$1.js'`)
|
35
|
-
)
|
19
|
+
return contents.replace(/from\s+['"](\..+)['"]/g, `from '\$1.js'`)
|
36
20
|
}
|
37
21
|
|
38
22
|
/*function patchEnumType(contents: string) {
|
@@ -77,11 +61,11 @@ async function codegenInternal(abisDir: string, outDir: string): Promise<number>
|
|
77
61
|
binFiles: [],
|
78
62
|
storageSlotsFiles: [],
|
79
63
|
outputDir: outDir,
|
80
|
-
programType: ProgramTypeEnum.CONTRACT
|
64
|
+
programType: ProgramTypeEnum.CONTRACT,
|
65
|
+
versions: { FUELS: builtinVersions.FUELS }
|
81
66
|
})
|
82
67
|
|
83
68
|
mkdirp.sync(outDir)
|
84
|
-
mkdirp.sync(path.join(outDir, 'factories'))
|
85
69
|
let count = 0
|
86
70
|
abiTypeGen.files.forEach((file) => {
|
87
71
|
if (!file.path.endsWith('.hex.ts')) {
|
@@ -101,15 +85,21 @@ async function codegenInternal(abisDir: string, outDir: string): Promise<number>
|
|
101
85
|
// }
|
102
86
|
|
103
87
|
for (const abi of abiTypeGen.abis) {
|
104
|
-
const name = abi.
|
88
|
+
const name = abi.capitalizedName.endsWith('Abi') ? abi.capitalizedName.slice(0, -3) : abi.capitalizedName
|
105
89
|
const filePath = path.join(outDir, `${name}Processor.ts`)
|
106
90
|
const importedTypes = collectImportedTypes(abi.types)
|
107
91
|
|
108
92
|
const logByTypes: Record<string, string[]> = {}
|
109
93
|
|
110
94
|
for (const logType of abi.rawContents.loggedTypes) {
|
95
|
+
const metadataTypeId = abi.rawContents.concreteTypes.find(
|
96
|
+
(t) => t.concreteTypeId == logType.concreteTypeId
|
97
|
+
)?.metadataTypeId
|
111
98
|
// @ts-ignore - we know that the type is in the abi
|
112
|
-
|
99
|
+
let t = abi.types.find((t) => t.rawAbiType.concreteTypeId == logType.concreteTypeId)
|
100
|
+
if (!t) {
|
101
|
+
t = abi.types.find((t) => t.rawAbiType.typeId == metadataTypeId)
|
102
|
+
}
|
113
103
|
// @ts-ignore - we know that the type is in the abi
|
114
104
|
const typeName = t?.attributes?.outputLabel
|
115
105
|
if (typeName) {
|
@@ -126,15 +116,14 @@ async function codegenInternal(abisDir: string, outDir: string): Promise<number>
|
|
126
116
|
/* eslint-disable */
|
127
117
|
|
128
118
|
import { FuelAbstractProcessor, FuelContext, FuelProcessorConfig, TypedCall, FuelFetchConfig, FuelCall, FuelLog} from '@sentio/sdk/fuel'
|
129
|
-
import {${abi.name}__factory } from './factories/${abi.name}__factory.js'
|
130
119
|
import {${abi.commonTypesInUse.join(',')}} from './common.js'
|
131
|
-
import {${importedTypes.join(',')}} from './${abi.
|
120
|
+
import {${importedTypes.join(',')}, ${abi.capitalizedName}} from './${abi.capitalizedName}.js'
|
132
121
|
|
133
122
|
import type { BigNumberish, BN } from 'fuels';
|
134
|
-
import type { BytesLike } from 'fuels';
|
123
|
+
import type { BytesLike, Bytes } from 'fuels';
|
135
124
|
|
136
125
|
|
137
|
-
namespace ${name} {
|
126
|
+
namespace ${name}NS {
|
138
127
|
export abstract class CallWithLogs<T extends Array<any>, R> extends TypedCall<T, R> {
|
139
128
|
${Object.entries(logByTypes)
|
140
129
|
.flatMap(([t, ids]) => {
|
@@ -149,12 +138,15 @@ ${Object.entries(logByTypes)
|
|
149
138
|
.join('\n')}
|
150
139
|
}
|
151
140
|
|
152
|
-
${
|
141
|
+
${
|
142
|
+
''
|
143
|
+
// abi.functions.map(genCallType).join('\n')
|
144
|
+
}
|
153
145
|
}
|
154
146
|
|
155
147
|
export class ${name}Processor extends FuelAbstractProcessor {
|
156
148
|
constructor(config?: FuelProcessorConfig) {
|
157
|
-
super(${abi.
|
149
|
+
super(${abi.capitalizedName}.abi, config)
|
158
150
|
}
|
159
151
|
|
160
152
|
static bind(config: FuelProcessorConfig) {
|
package/src/fuel/context.ts
CHANGED
@@ -2,11 +2,11 @@ import { BaseContext, Labels, normalizeLabels } from '../core/index.js'
|
|
2
2
|
import { ChainId } from '@sentio/chain'
|
3
3
|
import { RecordMetaData } from '@sentio/protos'
|
4
4
|
import type { CallResult } from 'fuels'
|
5
|
-
import {
|
5
|
+
import { InvocationScopeLike } from 'fuels'
|
6
6
|
import { FuelTransaction } from './transaction.js'
|
7
7
|
import { FuelLog } from './types.js'
|
8
8
|
|
9
|
-
export class FuelCall
|
9
|
+
export class FuelCall {
|
10
10
|
constructor(
|
11
11
|
funcScopes: InvocationScopeLike | Array<InvocationScopeLike>,
|
12
12
|
callResult: CallResult,
|
@@ -14,7 +14,7 @@ export class FuelCall extends InvocationCallResult {
|
|
14
14
|
readonly args?: Record<string, any>,
|
15
15
|
readonly logs?: FuelLog<unknown>[]
|
16
16
|
) {
|
17
|
-
super(funcScopes, callResult, isMultiCall)
|
17
|
+
// super(funcScopes, callResult, isMultiCall)
|
18
18
|
}
|
19
19
|
}
|
20
20
|
|
package/src/fuel/network.ts
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
import { FuelChainId } from '@sentio/chain'
|
2
|
-
import { FUEL_NETWORK_URL } from 'fuels'
|
3
2
|
|
4
3
|
export type FuelNetwork = FuelChainId
|
5
4
|
export const FuelNetwork = <const>{
|
@@ -12,5 +11,5 @@ export function getRpcEndpoint(network: FuelNetwork): string {
|
|
12
11
|
case FuelNetwork.TEST_NET:
|
13
12
|
return 'https://testnet.fuel.network/v1/graphql'
|
14
13
|
}
|
15
|
-
return
|
14
|
+
return 'https://testnet.fuel.network/v1/graphql'
|
16
15
|
}
|
package/src/fuel/transaction.ts
CHANGED
@@ -108,10 +108,12 @@ export async function decodeFuelTransactionWithAbi(
|
|
108
108
|
}
|
109
109
|
})
|
110
110
|
|
111
|
-
const txResponse = new TransactionResponse(gqlTransaction.
|
111
|
+
const txResponse = new TransactionResponse(gqlTransaction.status.transactionId, provider, {
|
112
112
|
main: Object.values(abiMap)[0],
|
113
113
|
otherContractsAbis: {}
|
114
114
|
})
|
115
|
+
|
116
|
+
// @ts-ignore - hack
|
115
117
|
txResponse.gqlTransaction = {
|
116
118
|
...gqlTransaction,
|
117
119
|
status: gqlTransactionStatus
|