ponder 0.10.8 → 0.10.9
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/CHANGELOG.md +8 -0
- package/dist/esm/build/schema.js +8 -1
- package/dist/esm/build/schema.js.map +1 -1
- package/dist/esm/indexing/ponderActions.js +28 -6
- package/dist/esm/indexing/ponderActions.js.map +1 -1
- package/dist/esm/indexing-store/index.js +1 -1
- package/dist/esm/indexing-store/index.js.map +1 -1
- package/dist/types/build/schema.d.ts.map +1 -1
- package/dist/types/indexing/ponderActions.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/build/schema.ts +11 -1
- package/src/indexing/ponderActions.ts +31 -6
- package/src/indexing-store/index.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# ponder
|
|
2
2
|
|
|
3
|
+
## 0.10.9
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#1640](https://github.com/ponder-sh/ponder/pull/1640) [`22b4593e53b93569d95fd45a89532040f1f98ac2`](https://github.com/ponder-sh/ponder/commit/22b4593e53b93569d95fd45a89532040f1f98ac2) Thanks [@kyscott18](https://github.com/kyscott18)! - Added retry logic for "ContractFunctionZeroDataError" when a rpc incorrectly returns "0x".
|
|
8
|
+
|
|
9
|
+
- [#1639](https://github.com/ponder-sh/ponder/pull/1639) [`37dff4a356c644464f8e9a8a7767696994981f04`](https://github.com/ponder-sh/ponder/commit/37dff4a356c644464f8e9a8a7767696994981f04) Thanks [@kyscott18](https://github.com/kyscott18)! - Added validation for schemas with duplicate table names.
|
|
10
|
+
|
|
3
11
|
## 0.10.8
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
package/dist/esm/build/schema.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { getSql } from '../drizzle/kit/index.js';
|
|
2
2
|
import { BuildError } from '../internal/errors.js';
|
|
3
|
-
import { SQL, getTableColumns, is } from "drizzle-orm";
|
|
3
|
+
import { SQL, getTableColumns, getTableName, is } from "drizzle-orm";
|
|
4
4
|
import { PgBigSerial53, PgBigSerial64, PgSequence, PgSerial, PgSmallSerial, PgTable, PgView, getTableConfig, } from "drizzle-orm/pg-core";
|
|
5
5
|
export const buildSchema = ({ schema }) => {
|
|
6
6
|
const statements = getSql(schema);
|
|
7
|
+
const tableNames = new Set();
|
|
7
8
|
for (const [name, s] of Object.entries(schema)) {
|
|
8
9
|
if (is(s, PgTable)) {
|
|
9
10
|
let hasPrimaryKey = false;
|
|
@@ -43,6 +44,12 @@ export const buildSchema = ({ schema }) => {
|
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
}
|
|
47
|
+
if (tableNames.has(getTableName(s))) {
|
|
48
|
+
throw new Error(`Schema validation failed: table name '${getTableName(s)}' is used multiple times.`);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
tableNames.add(getTableName(s));
|
|
52
|
+
}
|
|
46
53
|
if (getTableConfig(s).primaryKeys.length > 1) {
|
|
47
54
|
throw new Error(`Schema validation failed: '${name}' has multiple primary keys.`);
|
|
48
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/build/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/build/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,9 +24,9 @@ export const getPonderActions = (getBlockNumber) => {
|
|
|
24
24
|
return (client) => {
|
|
25
25
|
const actions = {};
|
|
26
26
|
const _publicActions = publicActions(client);
|
|
27
|
-
const
|
|
27
|
+
const getPonderAction = (action) => {
|
|
28
28
|
// @ts-ignore
|
|
29
|
-
|
|
29
|
+
return ({ cache, blockNumber: userBlockNumber, ...args }) =>
|
|
30
30
|
// @ts-ignore
|
|
31
31
|
_publicActions[action]({
|
|
32
32
|
...args,
|
|
@@ -35,12 +35,34 @@ export const getPonderActions = (getBlockNumber) => {
|
|
|
35
35
|
: { blockNumber: userBlockNumber ?? getBlockNumber() }),
|
|
36
36
|
});
|
|
37
37
|
};
|
|
38
|
+
const getRetryAction = (action) => {
|
|
39
|
+
return async (...args) => {
|
|
40
|
+
const RETRY_COUNT = 3;
|
|
41
|
+
for (let i = 0; i <= RETRY_COUNT; i++) {
|
|
42
|
+
try {
|
|
43
|
+
// @ts-ignore
|
|
44
|
+
return await action(...args);
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
if (error?.message?.includes("returned no data") ===
|
|
48
|
+
false ||
|
|
49
|
+
i === RETRY_COUNT) {
|
|
50
|
+
throw error;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
};
|
|
38
56
|
for (const action of blockDependentActions) {
|
|
39
|
-
|
|
57
|
+
actions[action] = getPonderAction(action);
|
|
40
58
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
59
|
+
// @ts-ignore
|
|
60
|
+
actions.multicall = getRetryAction(getPonderAction("multicall"));
|
|
61
|
+
// @ts-ignore
|
|
62
|
+
actions.readContract = getRetryAction(getPonderAction("readContract"));
|
|
63
|
+
actions.simulateContract = getRetryAction(
|
|
64
|
+
// @ts-ignore
|
|
65
|
+
getPonderAction("simulateContract"));
|
|
44
66
|
for (const action of nonBlockDependentActions) {
|
|
45
67
|
// @ts-ignore
|
|
46
68
|
actions[action] = _publicActions[action];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ponderActions.js","sourceRoot":"","sources":["../../../src/indexing/ponderActions.ts"],"names":[],"mappings":"AACA,OAAO,EAqBL,aAAa,GACd,MAAM,MAAM,CAAC;AAEd,wEAAwE;AACxE,MAAM,qBAAqB,GAAG;IAC5B,YAAY;IACZ,MAAM;IACN,aAAa;IACb,eAAe;IACf,UAAU;IACV,SAAS;IACT,cAAc;IACd,eAAe;IACf,cAAc;IACd,YAAY;IACZ,gBAAgB;IAChB,YAAY;CAC0D,CAAC;AAEzE,+DAA+D;AAC/D,MAAM,wBAAwB,GAAG;IAC/B,gBAAgB;IAChB,uBAAuB;IACvB,6BAA6B;CACyC,CAAC;AAoHzE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,cAA4B,EAAE,EAAE;IAC/D,OAAO,CAKL,MAA4C,EAC7B,EAAE;QACjB,MAAM,OAAO,GAAG,EAAmB,CAAC;QACpC,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QAE7C,MAAM,
|
|
1
|
+
{"version":3,"file":"ponderActions.js","sourceRoot":"","sources":["../../../src/indexing/ponderActions.ts"],"names":[],"mappings":"AACA,OAAO,EAqBL,aAAa,GACd,MAAM,MAAM,CAAC;AAEd,wEAAwE;AACxE,MAAM,qBAAqB,GAAG;IAC5B,YAAY;IACZ,MAAM;IACN,aAAa;IACb,eAAe;IACf,UAAU;IACV,SAAS;IACT,cAAc;IACd,eAAe;IACf,cAAc;IACd,YAAY;IACZ,gBAAgB;IAChB,YAAY;CAC0D,CAAC;AAEzE,+DAA+D;AAC/D,MAAM,wBAAwB,GAAG;IAC/B,gBAAgB;IAChB,uBAAuB;IACvB,6BAA6B;CACyC,CAAC;AAoHzE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,cAA4B,EAAE,EAAE;IAC/D,OAAO,CAKL,MAA4C,EAC7B,EAAE;QACjB,MAAM,OAAO,GAAG,EAAmB,CAAC;QACpC,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QAE7C,MAAM,eAAe,GAAG,CAOtB,MAAc,EACd,EAAE;YACF,aAAa;YACb,OAAO,CAAC,EACN,KAAK,EACL,WAAW,EAAE,eAAe,EAC5B,GAAG,IAAI,EAC8B,EAAE,EAAE;YACzC,aAAa;YACb,cAAc,CAAC,MAAM,CAAC,CAAC;gBACrB,GAAG,IAAI;gBACP,GAAG,CAAC,KAAK,KAAK,WAAW;oBACvB,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE;oBACxB,CAAC,CAAC,EAAE,WAAW,EAAE,eAAe,IAAI,cAAc,EAAE,EAAE,CAAC;aACC,CAAC,CAAC;QAClE,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,CAAC,MAA0C,EAAE,EAAE;YACpE,OAAO,KAAK,EAAE,GAAG,IAA+B,EAAE,EAAE;gBAClD,MAAM,WAAW,GAAG,CAAC,CAAC;gBACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,EAAE,EAAE;oBACrC,IAAI;wBACF,aAAa;wBACb,OAAO,MAAM,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;qBAC9B;oBAAC,OAAO,KAAK,EAAE;wBACd,IACG,KAAe,EAAE,OAAO,EAAE,QAAQ,CAAC,kBAAkB,CAAC;4BACrD,KAAK;4BACP,CAAC,KAAK,WAAW,EACjB;4BACA,MAAM,KAAK,CAAC;yBACb;qBACF;iBACF;YACH,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,KAAK,MAAM,MAAM,IAAI,qBAAqB,EAAE;YAC1C,OAAO,CAAC,MAAM,CAAC,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;SAC3C;QAED,aAAa;QACb,OAAO,CAAC,SAAS,GAAG,cAAc,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;QACjE,aAAa;QACb,OAAO,CAAC,YAAY,GAAG,cAAc,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC;QACvE,OAAO,CAAC,gBAAgB,GAAG,cAAc;QACvC,aAAa;QACb,eAAe,CAAC,kBAAkB,CAAC,CACpC,CAAC;QAEF,KAAK,MAAM,MAAM,IAAI,wBAAwB,EAAE;YAC7C,aAAa;YACb,OAAO,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;SAC1C;QAED,yBAAyB;QAEzB,KAAK,MAAM,MAAM,IAAI;YACnB,UAAU;YACV,0BAA0B;YAC1B,qBAAqB;SACtB,EAAE;YACD,aAAa;YACb,OAAO,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;SAC1C;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -9,7 +9,7 @@ export const parseSqlError = (e) => {
|
|
|
9
9
|
else if (error?.message?.includes("violates unique constraint")) {
|
|
10
10
|
error = new UniqueConstraintError(error.message);
|
|
11
11
|
}
|
|
12
|
-
else if (error?.message
|
|
12
|
+
else if (error?.message?.includes("violates check constraint")) {
|
|
13
13
|
error = new CheckConstraintError(error.message);
|
|
14
14
|
}
|
|
15
15
|
else if (error?.message?.includes("Do not know how to serialize a BigInt")) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/indexing-store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,YAAY,GACb,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAM,EAAS,EAAE;IAC7C,IAAI,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAE5B,IAAI,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,8BAA8B,CAAC,EAAE;QAC5D,KAAK,GAAG,IAAI,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACnD;SAAM,IAAI,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,4BAA4B,CAAC,EAAE;QACjE,KAAK,GAAG,IAAI,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KAClD;SAAM,IAAI,KAAK,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/indexing-store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,YAAY,GACb,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAM,EAAS,EAAE;IAC7C,IAAI,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAE5B,IAAI,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,8BAA8B,CAAC,EAAE;QAC5D,KAAK,GAAG,IAAI,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACnD;SAAM,IAAI,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,4BAA4B,CAAC,EAAE;QACjE,KAAK,GAAG,IAAI,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KAClD;SAAM,IAAI,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,2BAA2B,CAAC,EAAE;QAChE,KAAK,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACjD;SAAM,IACL,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,uCAAuC,CAAC,EACjE;QACA,KAAK,GAAG,IAAI,wBAAwB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,IAAI,CACb,mMAAmM,CACpM,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,0DAA0D;AAC1D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,KAAY,EACZ,MAA+C,EAC/C,EAAE;IACF,IAAI,KAAK,KAAK,SAAS;QACrB,MAAM,IAAI,mBAAmB,CAC3B,6BAA6B,MAAM,iBAAiB,CACrD,CAAC;IAEJ,IAAI,OAAO,IAAI,KAAK;QAAE,OAAO;IAE7B,MAAM,IAAI,uBAAuB,CAC/B,MAAM,KAAK,MAAM;QACf,CAAC,CAAC,wDAAwD,cAAc,CAAC,KAAK,CAAC,CAAC,IAAI,yBAAyB;QAC7G,CAAC,CAAC,6DAA6D,cAAc,CAAC,KAAK,CAAC,CAAC,IAAI,yBAAyB,CACrH,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/build/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAalD,eAAO,MAAM,WAAW;YAA0B,MAAM;;;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/build/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAalD,eAAO,MAAM,WAAW;YAA0B,MAAM;;;CAoIvD,CAAC;AAEF,eAAO,MAAM,eAAe;YAA0B,MAAM;;;;;;;;CAa3D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ponderActions.d.ts","sourceRoot":"","sources":["../../../src/indexing/ponderActions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ponderActions.d.ts","sourceRoot":"","sources":["../../../src/indexing/ponderActions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ponder",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.9",
|
|
4
4
|
"description": "An open-source framework for crypto application backends",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -95,7 +95,7 @@
|
|
|
95
95
|
"rimraf": "^5.0.5",
|
|
96
96
|
"tsx": "^4.19.2",
|
|
97
97
|
"vitest": "^1.0.2",
|
|
98
|
-
"@ponder/client": "0.10.
|
|
98
|
+
"@ponder/client": "0.10.9"
|
|
99
99
|
},
|
|
100
100
|
"engines": {
|
|
101
101
|
"node": ">=18.14"
|
package/src/build/schema.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getSql } from "@/drizzle/kit/index.js";
|
|
2
2
|
import { BuildError } from "@/internal/errors.js";
|
|
3
3
|
import type { Schema } from "@/internal/types.js";
|
|
4
|
-
import { SQL, getTableColumns, is } from "drizzle-orm";
|
|
4
|
+
import { SQL, getTableColumns, getTableName, is } from "drizzle-orm";
|
|
5
5
|
import {
|
|
6
6
|
PgBigSerial53,
|
|
7
7
|
PgBigSerial64,
|
|
@@ -16,6 +16,8 @@ import {
|
|
|
16
16
|
export const buildSchema = ({ schema }: { schema: Schema }) => {
|
|
17
17
|
const statements = getSql(schema);
|
|
18
18
|
|
|
19
|
+
const tableNames = new Set<string>();
|
|
20
|
+
|
|
19
21
|
for (const [name, s] of Object.entries(schema)) {
|
|
20
22
|
if (is(s, PgTable)) {
|
|
21
23
|
let hasPrimaryKey = false;
|
|
@@ -81,6 +83,14 @@ export const buildSchema = ({ schema }: { schema: Schema }) => {
|
|
|
81
83
|
}
|
|
82
84
|
}
|
|
83
85
|
|
|
86
|
+
if (tableNames.has(getTableName(s))) {
|
|
87
|
+
throw new Error(
|
|
88
|
+
`Schema validation failed: table name '${getTableName(s)}' is used multiple times.`,
|
|
89
|
+
);
|
|
90
|
+
} else {
|
|
91
|
+
tableNames.add(getTableName(s));
|
|
92
|
+
}
|
|
93
|
+
|
|
84
94
|
if (getTableConfig(s).primaryKeys.length > 1) {
|
|
85
95
|
throw new Error(
|
|
86
96
|
`Schema validation failed: '${name}' has multiple primary keys.`,
|
|
@@ -171,7 +171,7 @@ export const getPonderActions = (getBlockNumber: () => bigint) => {
|
|
|
171
171
|
const actions = {} as PonderActions;
|
|
172
172
|
const _publicActions = publicActions(client);
|
|
173
173
|
|
|
174
|
-
const
|
|
174
|
+
const getPonderAction = <
|
|
175
175
|
action extends
|
|
176
176
|
| (typeof blockDependentActions)[number]
|
|
177
177
|
| "multicall"
|
|
@@ -181,7 +181,7 @@ export const getPonderActions = (getBlockNumber: () => bigint) => {
|
|
|
181
181
|
action: action,
|
|
182
182
|
) => {
|
|
183
183
|
// @ts-ignore
|
|
184
|
-
|
|
184
|
+
return ({
|
|
185
185
|
cache,
|
|
186
186
|
blockNumber: userBlockNumber,
|
|
187
187
|
...args
|
|
@@ -195,13 +195,38 @@ export const getPonderActions = (getBlockNumber: () => bigint) => {
|
|
|
195
195
|
} as Parameters<ReturnType<typeof publicActions>[action]>[0]);
|
|
196
196
|
};
|
|
197
197
|
|
|
198
|
+
const getRetryAction = (action: PonderActions[keyof PonderActions]) => {
|
|
199
|
+
return async (...args: Parameters<typeof action>) => {
|
|
200
|
+
const RETRY_COUNT = 3;
|
|
201
|
+
for (let i = 0; i <= RETRY_COUNT; i++) {
|
|
202
|
+
try {
|
|
203
|
+
// @ts-ignore
|
|
204
|
+
return await action(...args);
|
|
205
|
+
} catch (error) {
|
|
206
|
+
if (
|
|
207
|
+
(error as Error)?.message?.includes("returned no data") ===
|
|
208
|
+
false ||
|
|
209
|
+
i === RETRY_COUNT
|
|
210
|
+
) {
|
|
211
|
+
throw error;
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
};
|
|
216
|
+
};
|
|
217
|
+
|
|
198
218
|
for (const action of blockDependentActions) {
|
|
199
|
-
|
|
219
|
+
actions[action] = getPonderAction(action);
|
|
200
220
|
}
|
|
201
221
|
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
222
|
+
// @ts-ignore
|
|
223
|
+
actions.multicall = getRetryAction(getPonderAction("multicall"));
|
|
224
|
+
// @ts-ignore
|
|
225
|
+
actions.readContract = getRetryAction(getPonderAction("readContract"));
|
|
226
|
+
actions.simulateContract = getRetryAction(
|
|
227
|
+
// @ts-ignore
|
|
228
|
+
getPonderAction("simulateContract"),
|
|
229
|
+
);
|
|
205
230
|
|
|
206
231
|
for (const action of nonBlockDependentActions) {
|
|
207
232
|
// @ts-ignore
|
|
@@ -22,7 +22,7 @@ export const parseSqlError = (e: any): Error => {
|
|
|
22
22
|
error = new NotNullConstraintError(error.message);
|
|
23
23
|
} else if (error?.message?.includes("violates unique constraint")) {
|
|
24
24
|
error = new UniqueConstraintError(error.message);
|
|
25
|
-
} else if (error?.message
|
|
25
|
+
} else if (error?.message?.includes("violates check constraint")) {
|
|
26
26
|
error = new CheckConstraintError(error.message);
|
|
27
27
|
} else if (
|
|
28
28
|
error?.message?.includes("Do not know how to serialize a BigInt")
|