@sentio/sdk 1.15.0 → 1.16.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.
Files changed (14) hide show
  1. package/lib/builtin/internal/erc20_processor.js.map +1 -1
  2. package/lib/builtin/internal/erc20bytes_processor.js.map +1 -1
  3. package/lib/builtin/internal/weth9_processor.js.map +1 -1
  4. package/lib/target-ethers-sentio/codegen.js +12 -3
  5. package/lib/target-ethers-sentio/codegen.js.map +1 -1
  6. package/lib/test/codegen.test.js +1 -1
  7. package/lib/test/codegen.test.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/builtin/internal/erc20_processor.ts +22 -16
  10. package/src/builtin/internal/erc20bytes_processor.ts +18 -12
  11. package/src/builtin/internal/weth9_processor.ts +18 -12
  12. package/src/target-ethers-sentio/codegen.ts +14 -4
  13. package/src/test/abis/evm/Seaport.json +2595 -0
  14. package/src/test/codegen.test.ts +1 -1
package/src/builtin/internal/erc20_processor.ts CHANGED
@@ -171,7 +171,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
171
171
  owner: PromiseOrValue<string>,
172
172
  spender: PromiseOrValue<string>,
173
173
  overrides?: CallOverrides
174
- ) {
174
+ ): Promise<BigNumber> {
175
175
  try {
176
176
  if (overrides) {
177
177
  return await this.contract.allowance(owner, spender, overrides);
@@ -183,7 +183,10 @@ export class ERC20ContractView extends ContractView<ERC20> {
183
183
  }
184
184
  }
185
185
 
186
- async balanceOf(account: PromiseOrValue<string>, overrides?: CallOverrides) {
186
+ async balanceOf(
187
+ account: PromiseOrValue<string>,
188
+ overrides?: CallOverrides
189
+ ): Promise<BigNumber> {
187
190
  try {
188
191
  if (overrides) {
189
192
  return await this.contract.balanceOf(account, overrides);
@@ -195,7 +198,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
195
198
  }
196
199
  }
197
200
 
198
- async decimals(overrides?: CallOverrides) {
201
+ async decimals(overrides?: CallOverrides): Promise<number> {
199
202
  try {
200
203
  if (overrides) {
201
204
  return await this.contract.decimals(overrides);
@@ -207,7 +210,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
207
210
  }
208
211
  }
209
212
 
210
- async locker(overrides?: CallOverrides) {
213
+ async locker(overrides?: CallOverrides): Promise<string> {
211
214
  try {
212
215
  if (overrides) {
213
216
  return await this.contract.locker(overrides);
@@ -219,7 +222,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
219
222
  }
220
223
  }
221
224
 
222
- async name(overrides?: CallOverrides) {
225
+ async name(overrides?: CallOverrides): Promise<string> {
223
226
  try {
224
227
  if (overrides) {
225
228
  return await this.contract.name(overrides);
@@ -231,7 +234,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
231
234
  }
232
235
  }
233
236
 
234
- async owner(overrides?: CallOverrides) {
237
+ async owner(overrides?: CallOverrides): Promise<string> {
235
238
  try {
236
239
  if (overrides) {
237
240
  return await this.contract.owner(overrides);
@@ -243,7 +246,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
243
246
  }
244
247
  }
245
248
 
246
- async symbol(overrides?: CallOverrides) {
249
+ async symbol(overrides?: CallOverrides): Promise<string> {
247
250
  try {
248
251
  if (overrides) {
249
252
  return await this.contract.symbol(overrides);
@@ -255,7 +258,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
255
258
  }
256
259
  }
257
260
 
258
- async totalSupply(overrides?: CallOverrides) {
261
+ async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
259
262
  try {
260
263
  if (overrides) {
261
264
  return await this.contract.totalSupply(overrides);
@@ -280,7 +283,7 @@ export class ERC20BoundContractView extends BoundContractView<
280
283
  owner: PromiseOrValue<string>,
281
284
  spender: PromiseOrValue<string>,
282
285
  overrides?: CallOverrides
283
- ) {
286
+ ): Promise<BigNumber> {
284
287
  try {
285
288
  if (!overrides && this.context) {
286
289
  overrides = {
@@ -297,7 +300,10 @@ export class ERC20BoundContractView extends BoundContractView<
297
300
  }
298
301
  }
299
302
 
300
- async balanceOf(account: PromiseOrValue<string>, overrides?: CallOverrides) {
303
+ async balanceOf(
304
+ account: PromiseOrValue<string>,
305
+ overrides?: CallOverrides
306
+ ): Promise<BigNumber> {
301
307
  try {
302
308
  if (!overrides && this.context) {
303
309
  overrides = {
@@ -314,7 +320,7 @@ export class ERC20BoundContractView extends BoundContractView<
314
320
  }
315
321
  }
316
322
 
317
- async decimals(overrides?: CallOverrides) {
323
+ async decimals(overrides?: CallOverrides): Promise<number> {
318
324
  try {
319
325
  if (!overrides && this.context) {
320
326
  overrides = {
@@ -331,7 +337,7 @@ export class ERC20BoundContractView extends BoundContractView<
331
337
  }
332
338
  }
333
339
 
334
- async locker(overrides?: CallOverrides) {
340
+ async locker(overrides?: CallOverrides): Promise<string> {
335
341
  try {
336
342
  if (!overrides && this.context) {
337
343
  overrides = {
@@ -348,7 +354,7 @@ export class ERC20BoundContractView extends BoundContractView<
348
354
  }
349
355
  }
350
356
 
351
- async name(overrides?: CallOverrides) {
357
+ async name(overrides?: CallOverrides): Promise<string> {
352
358
  try {
353
359
  if (!overrides && this.context) {
354
360
  overrides = {
@@ -365,7 +371,7 @@ export class ERC20BoundContractView extends BoundContractView<
365
371
  }
366
372
  }
367
373
 
368
- async owner(overrides?: CallOverrides) {
374
+ async owner(overrides?: CallOverrides): Promise<string> {
369
375
  try {
370
376
  if (!overrides && this.context) {
371
377
  overrides = {
@@ -382,7 +388,7 @@ export class ERC20BoundContractView extends BoundContractView<
382
388
  }
383
389
  }
384
390
 
385
- async symbol(overrides?: CallOverrides) {
391
+ async symbol(overrides?: CallOverrides): Promise<string> {
386
392
  try {
387
393
  if (!overrides && this.context) {
388
394
  overrides = {
@@ -399,7 +405,7 @@ export class ERC20BoundContractView extends BoundContractView<
399
405
  }
400
406
  }
401
407
 
402
- async totalSupply(overrides?: CallOverrides) {
408
+ async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
403
409
  try {
404
410
  if (!overrides && this.context) {
405
411
  overrides = {
package/src/builtin/internal/erc20bytes_processor.ts CHANGED
@@ -99,7 +99,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
99
99
  super(contract);
100
100
  }
101
101
 
102
- async name(overrides?: CallOverrides) {
102
+ async name(overrides?: CallOverrides): Promise<string> {
103
103
  try {
104
104
  if (overrides) {
105
105
  return await this.contract.name(overrides);
@@ -111,7 +111,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
111
111
  }
112
112
  }
113
113
 
114
- async totalSupply(overrides?: CallOverrides) {
114
+ async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
115
115
  try {
116
116
  if (overrides) {
117
117
  return await this.contract.totalSupply(overrides);
@@ -123,7 +123,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
123
123
  }
124
124
  }
125
125
 
126
- async decimals(overrides?: CallOverrides) {
126
+ async decimals(overrides?: CallOverrides): Promise<number> {
127
127
  try {
128
128
  if (overrides) {
129
129
  return await this.contract.decimals(overrides);
@@ -135,7 +135,10 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
135
135
  }
136
136
  }
137
137
 
138
- async balanceOf(who: PromiseOrValue<string>, overrides?: CallOverrides) {
138
+ async balanceOf(
139
+ who: PromiseOrValue<string>,
140
+ overrides?: CallOverrides
141
+ ): Promise<BigNumber> {
139
142
  try {
140
143
  if (overrides) {
141
144
  return await this.contract.balanceOf(who, overrides);
@@ -147,7 +150,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
147
150
  }
148
151
  }
149
152
 
150
- async symbol(overrides?: CallOverrides) {
153
+ async symbol(overrides?: CallOverrides): Promise<string> {
151
154
  try {
152
155
  if (overrides) {
153
156
  return await this.contract.symbol(overrides);
@@ -163,7 +166,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
163
166
  owner: PromiseOrValue<string>,
164
167
  spender: PromiseOrValue<string>,
165
168
  overrides?: CallOverrides
166
- ) {
169
+ ): Promise<BigNumber> {
167
170
  try {
168
171
  if (overrides) {
169
172
  return await this.contract.allowance(owner, spender, overrides);
@@ -184,7 +187,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
184
187
  // super(contract);
185
188
  // }
186
189
 
187
- async name(overrides?: CallOverrides) {
190
+ async name(overrides?: CallOverrides): Promise<string> {
188
191
  try {
189
192
  if (!overrides && this.context) {
190
193
  overrides = {
@@ -201,7 +204,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
201
204
  }
202
205
  }
203
206
 
204
- async totalSupply(overrides?: CallOverrides) {
207
+ async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
205
208
  try {
206
209
  if (!overrides && this.context) {
207
210
  overrides = {
@@ -218,7 +221,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
218
221
  }
219
222
  }
220
223
 
221
- async decimals(overrides?: CallOverrides) {
224
+ async decimals(overrides?: CallOverrides): Promise<number> {
222
225
  try {
223
226
  if (!overrides && this.context) {
224
227
  overrides = {
@@ -235,7 +238,10 @@ export class ERC20BytesBoundContractView extends BoundContractView<
235
238
  }
236
239
  }
237
240
 
238
- async balanceOf(who: PromiseOrValue<string>, overrides?: CallOverrides) {
241
+ async balanceOf(
242
+ who: PromiseOrValue<string>,
243
+ overrides?: CallOverrides
244
+ ): Promise<BigNumber> {
239
245
  try {
240
246
  if (!overrides && this.context) {
241
247
  overrides = {
@@ -252,7 +258,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
252
258
  }
253
259
  }
254
260
 
255
- async symbol(overrides?: CallOverrides) {
261
+ async symbol(overrides?: CallOverrides): Promise<string> {
256
262
  try {
257
263
  if (!overrides && this.context) {
258
264
  overrides = {
@@ -273,7 +279,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
273
279
  owner: PromiseOrValue<string>,
274
280
  spender: PromiseOrValue<string>,
275
281
  overrides?: CallOverrides
276
- ) {
282
+ ): Promise<BigNumber> {
277
283
  try {
278
284
  if (!overrides && this.context) {
279
285
  overrides = {
package/src/builtin/internal/weth9_processor.ts CHANGED
@@ -108,7 +108,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
108
108
  super(contract);
109
109
  }
110
110
 
111
- async name(overrides?: CallOverrides) {
111
+ async name(overrides?: CallOverrides): Promise<string> {
112
112
  try {
113
113
  if (overrides) {
114
114
  return await this.contract.name(overrides);
@@ -120,7 +120,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
120
120
  }
121
121
  }
122
122
 
123
- async totalSupply(overrides?: CallOverrides) {
123
+ async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
124
124
  try {
125
125
  if (overrides) {
126
126
  return await this.contract.totalSupply(overrides);
@@ -132,7 +132,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
132
132
  }
133
133
  }
134
134
 
135
- async decimals(overrides?: CallOverrides) {
135
+ async decimals(overrides?: CallOverrides): Promise<number> {
136
136
  try {
137
137
  if (overrides) {
138
138
  return await this.contract.decimals(overrides);
@@ -144,7 +144,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
144
144
  }
145
145
  }
146
146
 
147
- async balanceOf(arg0: PromiseOrValue<string>, overrides?: CallOverrides) {
147
+ async balanceOf(
148
+ arg0: PromiseOrValue<string>,
149
+ overrides?: CallOverrides
150
+ ): Promise<BigNumber> {
148
151
  try {
149
152
  if (overrides) {
150
153
  return await this.contract.balanceOf(arg0, overrides);
@@ -156,7 +159,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
156
159
  }
157
160
  }
158
161
 
159
- async symbol(overrides?: CallOverrides) {
162
+ async symbol(overrides?: CallOverrides): Promise<string> {
160
163
  try {
161
164
  if (overrides) {
162
165
  return await this.contract.symbol(overrides);
@@ -172,7 +175,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
172
175
  arg0: PromiseOrValue<string>,
173
176
  arg1: PromiseOrValue<string>,
174
177
  overrides?: CallOverrides
175
- ) {
178
+ ): Promise<BigNumber> {
176
179
  try {
177
180
  if (overrides) {
178
181
  return await this.contract.allowance(arg0, arg1, overrides);
@@ -193,7 +196,7 @@ export class WETH9BoundContractView extends BoundContractView<
193
196
  // super(contract);
194
197
  // }
195
198
 
196
- async name(overrides?: CallOverrides) {
199
+ async name(overrides?: CallOverrides): Promise<string> {
197
200
  try {
198
201
  if (!overrides && this.context) {
199
202
  overrides = {
@@ -210,7 +213,7 @@ export class WETH9BoundContractView extends BoundContractView<
210
213
  }
211
214
  }
212
215
 
213
- async totalSupply(overrides?: CallOverrides) {
216
+ async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
214
217
  try {
215
218
  if (!overrides && this.context) {
216
219
  overrides = {
@@ -227,7 +230,7 @@ export class WETH9BoundContractView extends BoundContractView<
227
230
  }
228
231
  }
229
232
 
230
- async decimals(overrides?: CallOverrides) {
233
+ async decimals(overrides?: CallOverrides): Promise<number> {
231
234
  try {
232
235
  if (!overrides && this.context) {
233
236
  overrides = {
@@ -244,7 +247,10 @@ export class WETH9BoundContractView extends BoundContractView<
244
247
  }
245
248
  }
246
249
 
247
- async balanceOf(arg0: PromiseOrValue<string>, overrides?: CallOverrides) {
250
+ async balanceOf(
251
+ arg0: PromiseOrValue<string>,
252
+ overrides?: CallOverrides
253
+ ): Promise<BigNumber> {
248
254
  try {
249
255
  if (!overrides && this.context) {
250
256
  overrides = {
@@ -261,7 +267,7 @@ export class WETH9BoundContractView extends BoundContractView<
261
267
  }
262
268
  }
263
269
 
264
- async symbol(overrides?: CallOverrides) {
270
+ async symbol(overrides?: CallOverrides): Promise<string> {
265
271
  try {
266
272
  if (!overrides && this.context) {
267
273
  overrides = {
@@ -282,7 +288,7 @@ export class WETH9BoundContractView extends BoundContractView<
282
288
  arg0: PromiseOrValue<string>,
283
289
  arg1: PromiseOrValue<string>,
284
290
  overrides?: CallOverrides
285
- ) {
291
+ ): Promise<BigNumber> {
286
292
  try {
287
293
  if (!overrides && this.context) {
288
294
  overrides = {
package/src/target-ethers-sentio/codegen.ts CHANGED
@@ -7,7 +7,7 @@ import {
7
7
  } from 'typechain'
8
8
 
9
9
  import { reservedKeywords } from '@typechain/ethers-v5/dist/codegen/reserved-keywords'
10
- import { generateInputTypes } from '@typechain/ethers-v5/dist/codegen/types'
10
+ import { generateInputTypes, generateOutputTypes } from '@typechain/ethers-v5/dist/codegen/types'
11
11
  import { getFullSignatureForEvent } from 'typechain/dist/utils/signatures'
12
12
  import { codegenCallTraceTypes, codegenFunctions } from './functions'
13
13
 
@@ -144,7 +144,7 @@ export function codeGenSentioFile(contract: Contract): string {
144
144
  if (s.structName.namespace) {
145
145
  return [s.structName.namespace]
146
146
  } else {
147
- return [s.structName.identifier]
147
+ return [s.structName.identifier + 'StructOutput']
148
148
  }
149
149
  })
150
150
  })
@@ -246,9 +246,17 @@ function generateOnEventFunction(event: EventDeclaration, contractName: string,
246
246
  `
247
247
  }
248
248
 
249
+ // https://github.com/dethcrypto/TypeChain/blob/015abb28bd22826611051f27e0ec96a00f9a0b61/packages/target-ethers-v5/src/codegen/functions.ts#L54
250
+ function generateReturnTypes(fn: FunctionDeclaration) {
251
+ // sounds like returnResultObject should be true but we need to set false to make it work
252
+ return `Promise<${generateOutputTypes({ returnResultObject: false, useStructs: true }, fn.outputs)}>`
253
+ }
254
+
249
255
  function generateViewFunction(func: FunctionDeclaration): string {
250
256
  return `
251
- async ${func.name}(${generateInputTypes(func.inputs, { useStructs: true })}overrides?: CallOverrides) {
257
+ async ${func.name}(${generateInputTypes(func.inputs, {
258
+ useStructs: true,
259
+ })}overrides?: CallOverrides): ${generateReturnTypes(func)} {
252
260
  try {
253
261
  if (overrides) {
254
262
  return await this.contract.${func.name}(${
@@ -268,7 +276,9 @@ function generateViewFunction(func: FunctionDeclaration): string {
268
276
 
269
277
  function generateBoundViewFunction(func: FunctionDeclaration): string {
270
278
  return `
271
- async ${func.name}(${generateInputTypes(func.inputs, { useStructs: true })}overrides?: CallOverrides) {
279
+ async ${func.name}(${generateInputTypes(func.inputs, {
280
+ useStructs: true,
281
+ })}overrides?: CallOverrides): ${generateReturnTypes(func)} {
272
282
  try {
273
283
  if (!overrides && this.context) {
274
284
  overrides = {