@subsquid/solana-normalization 1.0.0-portal-api.d5861e → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/archive.d.ts +57 -0
- package/lib/archive.d.ts.map +1 -0
- package/lib/archive.js +95 -0
- package/lib/archive.js.map +1 -0
- package/lib/data.d.ts +1 -0
- package/lib/data.d.ts.map +1 -1
- package/lib/index.d.ts +1 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +14 -0
- package/lib/index.js.map +1 -1
- package/lib/instruction-parser.d.ts.map +1 -1
- package/lib/instruction-parser.js +2 -3
- package/lib/instruction-parser.js.map +1 -1
- package/lib/mapping.d.ts +2 -1
- package/lib/mapping.d.ts.map +1 -1
- package/lib/mapping.js +11 -10
- package/lib/mapping.js.map +1 -1
- package/lib/mapping.lfs.test.d.ts +2 -0
- package/lib/mapping.lfs.test.d.ts.map +1 -0
- package/lib/mapping.lfs.test.js +79 -0
- package/lib/mapping.lfs.test.js.map +1 -0
- package/lib/transaction-context.d.ts.map +1 -1
- package/lib/transaction-context.js +2 -2
- package/lib/transaction-context.js.map +1 -1
- package/package.json +12 -7
- package/src/archive.ts +178 -0
- package/src/data.ts +1 -0
- package/src/index.ts +1 -0
- package/src/instruction-parser.ts +6 -5
- package/src/mapping.lfs.test.ts +74 -0
- package/src/mapping.ts +16 -13
- package/src/transaction-context.ts +14 -17
package/lib/archive.d.ts
ADDED
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { Base58Bytes } from '@subsquid/solana-rpc-data';
|
|
2
|
+
import * as norm from './data';
|
|
3
|
+
/**
|
|
4
|
+
* Block account index
|
|
5
|
+
*/
|
|
6
|
+
export type AccountIndex = number;
|
|
7
|
+
export interface Block {
|
|
8
|
+
header: BlockHeader;
|
|
9
|
+
accounts: Base58Bytes[];
|
|
10
|
+
transactions: Transaction[];
|
|
11
|
+
instructions: Instruction[];
|
|
12
|
+
logs: LogMessage[];
|
|
13
|
+
balances: Balance[];
|
|
14
|
+
tokenBalances: TokenBalance[];
|
|
15
|
+
rewards: Reward[];
|
|
16
|
+
}
|
|
17
|
+
export interface BlockHeader {
|
|
18
|
+
number: number;
|
|
19
|
+
hash: string;
|
|
20
|
+
parentNumber: number;
|
|
21
|
+
parentHash: string;
|
|
22
|
+
height?: number;
|
|
23
|
+
timestamp?: number;
|
|
24
|
+
}
|
|
25
|
+
export type Transaction = Omit<norm.Transaction, 'accountKeys' | 'addressTableLookups' | 'loadedAddresses'> & {
|
|
26
|
+
accountKeys: AccountIndex[];
|
|
27
|
+
addressTableLookups: AddressTableLookup[];
|
|
28
|
+
loadedAddresses: {
|
|
29
|
+
readonly: AccountIndex[];
|
|
30
|
+
writable: AccountIndex[];
|
|
31
|
+
};
|
|
32
|
+
};
|
|
33
|
+
export interface AddressTableLookup {
|
|
34
|
+
accountKey: AccountIndex;
|
|
35
|
+
readonlyIndexes: number[];
|
|
36
|
+
writableIndexes: number[];
|
|
37
|
+
}
|
|
38
|
+
export type Instruction = Omit<norm.Instruction, 'programId' | 'accounts'> & {
|
|
39
|
+
programId: AccountIndex;
|
|
40
|
+
accounts: AccountIndex[];
|
|
41
|
+
};
|
|
42
|
+
export type LogMessage = Omit<norm.LogMessage, 'programId'> & {
|
|
43
|
+
programId: AccountIndex;
|
|
44
|
+
};
|
|
45
|
+
export type Balance = Omit<norm.Balance, 'account'> & {
|
|
46
|
+
account: AccountIndex;
|
|
47
|
+
};
|
|
48
|
+
export type TokenBalance = PatchAccounts<norm.TokenBalance>;
|
|
49
|
+
type PatchAccounts<T> = {
|
|
50
|
+
[K in keyof T]: T[K] extends string ? AccountIndex : T[K];
|
|
51
|
+
};
|
|
52
|
+
export type Reward = Omit<norm.Reward, 'pubkey'> & {
|
|
53
|
+
pubkey: AccountIndex;
|
|
54
|
+
};
|
|
55
|
+
export declare function toArchiveBlock(block: norm.Block): Block;
|
|
56
|
+
export {};
|
|
57
|
+
//# sourceMappingURL=archive.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../src/archive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAA;AACrD,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAA;AAG9B;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,CAAA;AAGjC,MAAM,WAAW,KAAK;IAClB,MAAM,EAAE,WAAW,CAAA;IACnB,QAAQ,EAAE,WAAW,EAAE,CAAA;IACvB,YAAY,EAAE,WAAW,EAAE,CAAA;IAC3B,YAAY,EAAE,WAAW,EAAE,CAAA;IAC3B,IAAI,EAAE,UAAU,EAAE,CAAA;IAClB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,OAAO,EAAE,MAAM,EAAE,CAAA;CACpB;AAGD,MAAM,WAAW,WAAW;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB;AAGD,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,GAAG,qBAAqB,GAAG,iBAAiB,CAAC,GAAG;IAC1G,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,mBAAmB,EAAE,kBAAkB,EAAE,CAAA;IACzC,eAAe,EAAE;QACb,QAAQ,EAAE,YAAY,EAAE,CAAA;QACxB,QAAQ,EAAE,YAAY,EAAE,CAAA;KAC3B,CAAA;CACJ,CAAA;AAGD,MAAM,WAAW,kBAAkB;IAC/B,UAAU,EAAE,YAAY,CAAA;IACxB,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,eAAe,EAAE,MAAM,EAAE,CAAA;CAC5B;AAGD,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,UAAU,CAAC,GAAG;IACzE,SAAS,EAAE,YAAY,CAAA;IACvB,QAAQ,EAAE,YAAY,EAAE,CAAA;CAC3B,CAAA;AAGD,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG;IAC1D,SAAS,EAAE,YAAY,CAAA;CAC1B,CAAA;AAGD,MAAM,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG;IAClD,OAAO,EAAE,YAAY,CAAA;CACxB,CAAA;AAGD,MAAM,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;AAG3D,KAAK,aAAa,CAAC,CAAC,IAAI;KACnB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC;CAC5D,CAAA;AAGD,MAAM,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG;IAC/C,MAAM,EAAE,YAAY,CAAA;CACvB,CAAA;AAGD,wBAAgB,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAiFvD"}
|
package/lib/archive.js
ADDED
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.toArchiveBlock = toArchiveBlock;
|
|
4
|
+
function toArchiveBlock(block) {
|
|
5
|
+
let dict = new AccountDict();
|
|
6
|
+
let header = { ...block.header };
|
|
7
|
+
let transactions = block.transactions.map(tx => {
|
|
8
|
+
let { accountKeys, addressTableLookups, loadedAddresses, ...props } = tx;
|
|
9
|
+
return {
|
|
10
|
+
...props,
|
|
11
|
+
accountKeys: accountKeys.map(a => dict.get(a)),
|
|
12
|
+
addressTableLookups: addressTableLookups.map(lookup => {
|
|
13
|
+
return {
|
|
14
|
+
accountKey: dict.get(lookup.accountKey),
|
|
15
|
+
readonlyIndexes: lookup.readonlyIndexes,
|
|
16
|
+
writableIndexes: lookup.writableIndexes
|
|
17
|
+
};
|
|
18
|
+
}),
|
|
19
|
+
loadedAddresses: {
|
|
20
|
+
readonly: loadedAddresses.readonly.map(a => dict.get(a)),
|
|
21
|
+
writable: loadedAddresses.writable.map(a => dict.get(a))
|
|
22
|
+
}
|
|
23
|
+
};
|
|
24
|
+
});
|
|
25
|
+
let instructions = block.instructions.map(ins => {
|
|
26
|
+
let { programId, accounts, ...props } = ins;
|
|
27
|
+
return {
|
|
28
|
+
...props,
|
|
29
|
+
programId: dict.get(programId),
|
|
30
|
+
accounts: accounts.map(a => dict.get(a))
|
|
31
|
+
};
|
|
32
|
+
});
|
|
33
|
+
let logs = block.logs.map(rec => {
|
|
34
|
+
let { programId, ...props } = rec;
|
|
35
|
+
return {
|
|
36
|
+
...props,
|
|
37
|
+
programId: dict.get(programId)
|
|
38
|
+
};
|
|
39
|
+
});
|
|
40
|
+
let balances = block.balances.map(b => {
|
|
41
|
+
let { account, ...props } = b;
|
|
42
|
+
return {
|
|
43
|
+
...props,
|
|
44
|
+
account: dict.get(account)
|
|
45
|
+
};
|
|
46
|
+
});
|
|
47
|
+
let tokenBalances = block.tokenBalances.map(b => {
|
|
48
|
+
let res = {};
|
|
49
|
+
let key;
|
|
50
|
+
for (key in b) {
|
|
51
|
+
let val = b[key];
|
|
52
|
+
if (typeof val == 'string') {
|
|
53
|
+
res[key] = dict.get(val);
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
res[key] = val;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
return res;
|
|
60
|
+
});
|
|
61
|
+
let rewards = block.rewards.map(reward => {
|
|
62
|
+
let { pubkey, ...props } = reward;
|
|
63
|
+
return {
|
|
64
|
+
pubkey: dict.get(pubkey),
|
|
65
|
+
...props
|
|
66
|
+
};
|
|
67
|
+
});
|
|
68
|
+
return {
|
|
69
|
+
header,
|
|
70
|
+
accounts: dict.list(),
|
|
71
|
+
transactions,
|
|
72
|
+
instructions,
|
|
73
|
+
logs,
|
|
74
|
+
balances,
|
|
75
|
+
tokenBalances,
|
|
76
|
+
rewards
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
class AccountDict {
|
|
80
|
+
constructor() {
|
|
81
|
+
this.map = new Map;
|
|
82
|
+
}
|
|
83
|
+
get(account) {
|
|
84
|
+
let idx = this.map.get(account);
|
|
85
|
+
if (idx == null) {
|
|
86
|
+
idx = this.map.size;
|
|
87
|
+
this.map.set(account, idx);
|
|
88
|
+
}
|
|
89
|
+
return idx;
|
|
90
|
+
}
|
|
91
|
+
list() {
|
|
92
|
+
return Array.from(this.map.keys());
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=archive.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../src/archive.ts"],"names":[],"mappings":"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"}
|
package/lib/data.d.ts
CHANGED
package/lib/data.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../src/data.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../src/data.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA"}
|
package/lib/index.js
CHANGED
|
@@ -10,10 +10,24 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
11
|
o[k2] = m[k];
|
|
12
12
|
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
13
25
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
26
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
27
|
};
|
|
16
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.archive = void 0;
|
|
30
|
+
exports.archive = __importStar(require("./archive"));
|
|
17
31
|
__exportStar(require("./data"), exports);
|
|
18
32
|
__exportStar(require("./mapping"), exports);
|
|
19
33
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAoC;AACpC,yCAAsB;AACtB,4CAAyB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instruction-parser.d.ts","sourceRoot":"","sources":["../src/instruction-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,2BAA2B,CAAA;AAGhD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAC,MAAM,QAAQ,CAAA;AAC9C,OAAO,EAAC,OAAO,EAAkB,MAAM,cAAc,CAAA;AACrD,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAA;AAgBxD,qBAAa,YAAY;IAMF,GAAG,EAAE,MAAM;IAL9B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,CAAC,EAAE,MAAM,CAAA;gBAEL,GAAG,EAAE,MAAM;CACjC;AAED,qBAAa,aAAa;IACtB,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,GAAG,CAAI;gBAEH,QAAQ,EAAE,MAAM,EAAE;IAI9B,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,OAAO,IAAI,OAAO,CAGrB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,OAAO,IAAI,OAAO;CAKrB;
|
|
1
|
+
{"version":3,"file":"instruction-parser.d.ts","sourceRoot":"","sources":["../src/instruction-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,2BAA2B,CAAA;AAGhD,OAAO,EAAC,WAAW,EAAE,UAAU,EAAC,MAAM,QAAQ,CAAA;AAC9C,OAAO,EAAC,OAAO,EAAkB,MAAM,cAAc,CAAA;AACrD,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAA;AAgBxD,qBAAa,YAAY;IAMF,GAAG,EAAE,MAAM;IAL9B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,CAAC,EAAE,MAAM,CAAA;gBAEL,GAAG,EAAE,MAAM;CACjC;AAED,qBAAa,aAAa;IACtB,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,GAAG,CAAI;gBAEH,QAAQ,EAAE,MAAM,EAAE;IAI9B,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,OAAO,IAAI,OAAO,CAGrB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,OAAO,IAAI,OAAO;CAKrB;AAGD,qBAAa,wBAAwB;IAM7B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,gBAAgB;IAGxB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,GAAG;IAXf,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,GAAG,CAAI;gBAGH,EAAE,EAAE,kBAAkB,EACtB,QAAQ,EAAE,aAAa,EACvB,gBAAgB,EAAE,MAAM,EAChC,WAAW,EAAE,GAAG,CAAC,WAAW,EAC5B,KAAK,EAAE,GAAG,CAAC,WAAW,EAAE,EAChB,MAAM,EAAE,WAAW,EAAE,EACrB,GAAG,EAAE,UAAU,EAAE;IAc7B,OAAO,CAAC,IAAI;IA4CZ,OAAO,CAAC,MAAM;IA8Bd,OAAO,CAAC,qBAAqB;IAqC7B,OAAO,CAAC,uBAAuB;IAqC/B,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,aAAa;IAMrB,OAAO,KAAK,OAAO,GAGlB;IAED,OAAO,KAAK,UAAU,GAErB;IAED,OAAO,KAAK,KAAK,GAEhB;IAED,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,KAAK;IAab,OAAO,CAAC,IAAI;IAKZ,OAAO,CAAC,IAAI;CAqCf"}
|
|
@@ -18,7 +18,6 @@ const PROGRAMS_MISSING_INVOKE_LOG = new Set([
|
|
|
18
18
|
'ZkTokenProof1111111111111111111111111111111',
|
|
19
19
|
'Secp256r1SigVerify1111111111111111111111111',
|
|
20
20
|
'ComputeBudget111111111111111111111111111111',
|
|
21
|
-
'11111111111111111111111111111111',
|
|
22
21
|
]);
|
|
23
22
|
class ParsingError {
|
|
24
23
|
constructor(msg) {
|
|
@@ -119,7 +118,7 @@ class InstructionTreeTraversal {
|
|
|
119
118
|
}
|
|
120
119
|
let result = this.messages.current;
|
|
121
120
|
(0, assert_1.default)(result.kind === 'invoke-result');
|
|
122
|
-
this.assert(result.programId === ins.programId,
|
|
121
|
+
this.assert(result.programId === ins.programId, 'invoke result message and instruction program ids don\'t match', pos);
|
|
123
122
|
ins.error = result.error;
|
|
124
123
|
this.messages.advance();
|
|
125
124
|
// consume invoke-less subcalls,
|
|
@@ -274,7 +273,7 @@ class InstructionTreeTraversal {
|
|
|
274
273
|
transactionIndex: this.tx.transactionIndex,
|
|
275
274
|
instructionAddress: address,
|
|
276
275
|
programId: this.tx.getAccount(ins.programIdIndex),
|
|
277
|
-
accounts: ins.accounts.map(
|
|
276
|
+
accounts: ins.accounts.map(a => this.tx.getAccount(a)),
|
|
278
277
|
data: ins.data,
|
|
279
278
|
isCommitted: this.tx.isCommitted,
|
|
280
279
|
hasDroppedLogMessages: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instruction-parser.js","sourceRoot":"","sources":["../src/instruction-parser.ts"],"names":[],"mappings":";;;;;;AACA,2DAAsD;AACtD,oDAA2B;AAE3B,6CAAqD;
|
|
1
|
+
{"version":3,"file":"instruction-parser.js","sourceRoot":"","sources":["../src/instruction-parser.ts"],"names":[],"mappings":"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"}
|
package/lib/mapping.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type * as rpc from '@subsquid/solana-rpc-data';
|
|
2
2
|
import { Block } from './data';
|
|
3
3
|
import { Journal } from './transaction-context';
|
|
4
|
-
export
|
|
4
|
+
export { Journal };
|
|
5
|
+
export declare function mapRpcBlock(slot: number, src: rpc.GetBlock, journal: Journal): Block;
|
|
5
6
|
//# sourceMappingURL=mapping.d.ts.map
|
package/lib/mapping.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapping.d.ts","sourceRoot":"","sources":["../src/mapping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"mapping.d.ts","sourceRoot":"","sources":["../src/mapping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,2BAA2B,CAAA;AAGrD,OAAO,EAAU,KAAK,EAA0E,MAAM,QAAQ,CAAA;AAG9G,OAAO,EAAC,OAAO,EAAqB,MAAM,uBAAuB,CAAA;AAGjE,OAAO,EAAC,OAAO,EAAC,CAAA;AAGhB,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,CAuCpF"}
|
package/lib/mapping.js
CHANGED
|
@@ -6,20 +6,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.mapRpcBlock = mapRpcBlock;
|
|
7
7
|
const util_internal_1 = require("@subsquid/util-internal");
|
|
8
8
|
const assert_1 = __importDefault(require("assert"));
|
|
9
|
+
const instruction_parser_1 = require("./instruction-parser");
|
|
9
10
|
const log_parser_1 = require("./log-parser");
|
|
10
11
|
const transaction_context_1 = require("./transaction-context");
|
|
11
|
-
|
|
12
|
-
function mapRpcBlock(src, journal) {
|
|
12
|
+
function mapRpcBlock(slot, src, journal) {
|
|
13
13
|
let header = {
|
|
14
|
-
hash: src.
|
|
15
|
-
height: src.
|
|
16
|
-
number:
|
|
17
|
-
parentNumber: src.
|
|
18
|
-
parentHash: src.
|
|
19
|
-
timestamp: src.
|
|
14
|
+
hash: src.blockhash,
|
|
15
|
+
height: (0, util_internal_1.assertNotNull)(src.blockHeight, '.blockHeight is not available'),
|
|
16
|
+
number: slot,
|
|
17
|
+
parentNumber: src.parentSlot,
|
|
18
|
+
parentHash: src.previousBlockhash,
|
|
19
|
+
timestamp: src.blockTime ?? 0
|
|
20
20
|
};
|
|
21
|
-
let items = new ItemMapping(journal, src
|
|
22
|
-
let rewards = src.
|
|
21
|
+
let items = new ItemMapping(journal, src);
|
|
22
|
+
let rewards = src.rewards?.map(s => {
|
|
23
23
|
let reward = {
|
|
24
24
|
pubkey: s.pubkey,
|
|
25
25
|
lamports: BigInt(s.lamports),
|
|
@@ -124,6 +124,7 @@ function mapTransaction(transactionIndex, src) {
|
|
|
124
124
|
signatures: src.transaction.signatures,
|
|
125
125
|
err: src.meta.err,
|
|
126
126
|
computeUnitsConsumed: BigInt(src.meta.computeUnitsConsumed ?? 0),
|
|
127
|
+
costUnits: BigInt(src.meta.costUnits ?? 0),
|
|
127
128
|
fee: BigInt(src.meta.fee),
|
|
128
129
|
loadedAddresses: src.meta.loadedAddresses ?? { readonly: [], writable: [] },
|
|
129
130
|
hasDroppedLogMessages: false
|
package/lib/mapping.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapping.js","sourceRoot":"","sources":["../src/mapping.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"mapping.js","sourceRoot":"","sources":["../src/mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mapping.lfs.test.d.ts","sourceRoot":"","sources":["../src/mapping.lfs.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
const solana_rpc_data_1 = require("@subsquid/solana-rpc-data");
|
|
27
|
+
const util_internal_json_1 = require("@subsquid/util-internal-json");
|
|
28
|
+
const assert_1 = __importStar(require("assert"));
|
|
29
|
+
const fs = __importStar(require("fs"));
|
|
30
|
+
const vitest_1 = require("vitest");
|
|
31
|
+
const Path = __importStar(require("path"));
|
|
32
|
+
const mapping_1 = require("./mapping");
|
|
33
|
+
const FIXTURES_DIR = Path.resolve(__dirname, '../fixtures');
|
|
34
|
+
function* listFixtures() {
|
|
35
|
+
for (let name of fs.readdirSync(FIXTURES_DIR)) {
|
|
36
|
+
let blocksPath = Path.join(FIXTURES_DIR, name, 'block.json');
|
|
37
|
+
let resultPath = Path.join(FIXTURES_DIR, name, 'result.json');
|
|
38
|
+
if (fs.existsSync(blocksPath) && fs.existsSync(resultPath)) {
|
|
39
|
+
yield {
|
|
40
|
+
name,
|
|
41
|
+
readBlock() {
|
|
42
|
+
return JSON.parse(fs.readFileSync(blocksPath, 'utf-8'));
|
|
43
|
+
},
|
|
44
|
+
readResult() {
|
|
45
|
+
return JSON.parse(fs.readFileSync(resultPath, 'utf-8'));
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
const failingJournal = {
|
|
52
|
+
warn(props, msg) {
|
|
53
|
+
throw new Error(`got warning: ${msg}, props: ${JSON.stringify(props)}`);
|
|
54
|
+
},
|
|
55
|
+
error(props, msg) {
|
|
56
|
+
throw new Error(`got error: ${msg}, props: ${JSON.stringify(props)}`);
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
for (let fix of listFixtures()) {
|
|
60
|
+
(0, vitest_1.it)(fix.name, () => {
|
|
61
|
+
let block = fix.readBlock();
|
|
62
|
+
let expected = fix.readResult();
|
|
63
|
+
(0, solana_rpc_data_1.removeVoteTransactions)(block);
|
|
64
|
+
let actual = (0, mapping_1.mapRpcBlock)(0, block, failingJournal);
|
|
65
|
+
actual = normalizeJson(actual);
|
|
66
|
+
try {
|
|
67
|
+
assert_1.default.deepStrictEqual(actual, expected);
|
|
68
|
+
}
|
|
69
|
+
catch (err) {
|
|
70
|
+
// diff, that comes from deepStrictEqual is not useful for large objects
|
|
71
|
+
fs.writeFileSync(Path.join(FIXTURES_DIR, fix.name, 'result.temp.json'), JSON.stringify(actual, null, 2));
|
|
72
|
+
(0, assert_1.fail)('result is different from a reference');
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
function normalizeJson(obj) {
|
|
77
|
+
return JSON.parse(JSON.stringify((0, util_internal_json_1.toJSON)(obj)));
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=mapping.lfs.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mapping.lfs.test.js","sourceRoot":"","sources":["../src/mapping.lfs.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA0E;AAC1E,qEAAmD;AACnD,iDAAmC;AACnC,uCAAwB;AACxB,mCAA2B;AAC3B,2CAA4B;AAC5B,uCAA8C;AAG9C,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;AAU3D,QAAQ,CAAC,CAAC,YAAY;IAClB,KAAK,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QAC5C,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA;QAC5D,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;QAC7D,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACzD,MAAM;gBACF,IAAI;gBACJ,SAAS;oBACL,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;gBAC3D,CAAC;gBACD,UAAU;oBACN,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;gBAC3D,CAAC;aACJ,CAAA;QACL,CAAC;IACL,CAAC;AACL,CAAC;AAGD,MAAM,cAAc,GAAY;IAC5B,IAAI,CAAC,KAAU,EAAE,GAAW;QACxB,MAAM,IAAI,KAAK,CAAC,gBAAgB,GAAG,YAAY,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC3E,CAAC;IACD,KAAK,CAAC,KAAU,EAAE,GAAW;QACzB,MAAM,IAAI,KAAK,CAAC,cAAc,GAAG,YAAY,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IACzE,CAAC;CACJ,CAAA;AAGD,KAAK,IAAI,GAAG,IAAI,YAAY,EAAE,EAAE,CAAC;IAC7B,IAAA,WAAE,EAAC,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE;QACd,IAAI,KAAK,GAAG,GAAG,CAAC,SAAS,EAAE,CAAA;QAC3B,IAAI,QAAQ,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;QAE/B,IAAA,wCAAsB,EAAC,KAAK,CAAC,CAAA;QAE7B,IAAI,MAAM,GAAG,IAAA,qBAAW,EAAC,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;QAClD,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;QAC9B,IAAI,CAAC;YACD,gBAAM,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC5C,CAAC;QAAC,OAAM,GAAQ,EAAE,CAAC;YACf,wEAAwE;YACxE,EAAE,CAAC,aAAa,CACZ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,EACrD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAClC,CAAA;YACD,IAAA,aAAI,EAAC,sCAAsC,CAAC,CAAA;QAChD,CAAC;IACL,CAAC,CAAC,CAAA;AACN,CAAC;AAGD,SAAS,aAAa,CAAC,GAAQ;IAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAA,2BAAM,EAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAClD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction-context.d.ts","sourceRoot":"","sources":["../src/transaction-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,2BAA2B,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"transaction-context.d.ts","sourceRoot":"","sources":["../src/transaction-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,2BAA2B,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAA;AAIrD,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IACnC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CACvC;AAGD,qBAAa,kBAAkB;aAOP,gBAAgB,EAAE,MAAM;aACxB,EAAE,EAAE,GAAG,CAAC,WAAW;IACnC,OAAO,CAAC,OAAO;IARnB,SAAgB,kBAAkB,EAAE,MAAM,CAAA;IAC1C,SAAgB,4BAA4B,EAAE,OAAO,CAAA;IAErD,OAAO,CAAC,QAAQ,CAAe;gBAGX,gBAAgB,EAAE,MAAM,EACxB,EAAE,EAAE,GAAG,CAAC,WAAW,EAC3B,OAAO,EAAE,OAAO;IA2C5B,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;IAKtC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAQnC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;CAOvC"}
|
|
@@ -64,14 +64,14 @@ class TransactionContext {
|
|
|
64
64
|
this.journal.warn({
|
|
65
65
|
transactionHash: this.transactionHash,
|
|
66
66
|
transactionIndex: this.transactionIndex,
|
|
67
|
-
...props
|
|
67
|
+
...props
|
|
68
68
|
}, msg);
|
|
69
69
|
}
|
|
70
70
|
error(props, msg) {
|
|
71
71
|
this.journal.error({
|
|
72
72
|
transactionHash: this.transactionHash,
|
|
73
73
|
transactionIndex: this.transactionIndex,
|
|
74
|
-
...props
|
|
74
|
+
...props
|
|
75
75
|
}, msg);
|
|
76
76
|
}
|
|
77
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction-context.js","sourceRoot":"","sources":["../src/transaction-context.ts"],"names":[],"mappings":";;;;;;AAEA,oDAA2B;
|
|
1
|
+
{"version":3,"file":"transaction-context.js","sourceRoot":"","sources":["../src/transaction-context.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@subsquid/solana-normalization",
|
|
3
|
-
"version": "1.0.0
|
|
3
|
+
"version": "1.0.0",
|
|
4
4
|
"description": "Solana data model",
|
|
5
5
|
"license": "GPL-3.0-or-later",
|
|
6
6
|
"repository": "git@github.com:subsquid/squid-sdk.git",
|
|
@@ -13,15 +13,20 @@
|
|
|
13
13
|
],
|
|
14
14
|
"main": "lib/index.js",
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@subsquid/solana-rpc-data": "^0.
|
|
17
|
-
"@subsquid/util-internal": "^3.
|
|
18
|
-
"@subsquid/util-internal-validation": "^0.
|
|
16
|
+
"@subsquid/solana-rpc-data": "^1.0.0",
|
|
17
|
+
"@subsquid/util-internal": "^3.3.0",
|
|
18
|
+
"@subsquid/util-internal-validation": "^0.9.0"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
|
-
"@
|
|
22
|
-
"
|
|
21
|
+
"@subsquid/util-internal-json": "^1.2.3",
|
|
22
|
+
"@subsquid/util-internal-json-fix-unsafe-integers": "^0.0.0",
|
|
23
|
+
"@types/node": "^24.0.0",
|
|
24
|
+
"typescript": "5.5.4",
|
|
25
|
+
"vitest": "4.1.5"
|
|
23
26
|
},
|
|
24
27
|
"scripts": {
|
|
25
|
-
"build": "rm -rf lib && tsc"
|
|
28
|
+
"build": "rm -rf lib && tsc",
|
|
29
|
+
"test": "vitest --run",
|
|
30
|
+
"test:lfs": "VITEST_LFS=1 vitest --run"
|
|
26
31
|
}
|
|
27
32
|
}
|
package/src/archive.ts
ADDED
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
import {Base58Bytes} from '@subsquid/solana-rpc-data'
|
|
2
|
+
import * as norm from './data'
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Block account index
|
|
7
|
+
*/
|
|
8
|
+
export type AccountIndex = number
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
export interface Block {
|
|
12
|
+
header: BlockHeader
|
|
13
|
+
accounts: Base58Bytes[]
|
|
14
|
+
transactions: Transaction[]
|
|
15
|
+
instructions: Instruction[]
|
|
16
|
+
logs: LogMessage[]
|
|
17
|
+
balances: Balance[]
|
|
18
|
+
tokenBalances: TokenBalance[]
|
|
19
|
+
rewards: Reward[]
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
export interface BlockHeader {
|
|
24
|
+
number: number
|
|
25
|
+
hash: string
|
|
26
|
+
parentNumber: number
|
|
27
|
+
parentHash: string
|
|
28
|
+
height?: number
|
|
29
|
+
timestamp?: number
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
export type Transaction = Omit<norm.Transaction, 'accountKeys' | 'addressTableLookups' | 'loadedAddresses'> & {
|
|
34
|
+
accountKeys: AccountIndex[]
|
|
35
|
+
addressTableLookups: AddressTableLookup[]
|
|
36
|
+
loadedAddresses: {
|
|
37
|
+
readonly: AccountIndex[]
|
|
38
|
+
writable: AccountIndex[]
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
export interface AddressTableLookup {
|
|
44
|
+
accountKey: AccountIndex
|
|
45
|
+
readonlyIndexes: number[]
|
|
46
|
+
writableIndexes: number[]
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
export type Instruction = Omit<norm.Instruction, 'programId' | 'accounts'> & {
|
|
51
|
+
programId: AccountIndex
|
|
52
|
+
accounts: AccountIndex[]
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
export type LogMessage = Omit<norm.LogMessage, 'programId'> & {
|
|
57
|
+
programId: AccountIndex
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
|
|
61
|
+
export type Balance = Omit<norm.Balance, 'account'> & {
|
|
62
|
+
account: AccountIndex
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
|
|
66
|
+
export type TokenBalance = PatchAccounts<norm.TokenBalance>
|
|
67
|
+
|
|
68
|
+
|
|
69
|
+
type PatchAccounts<T> = {
|
|
70
|
+
[K in keyof T]: T[K] extends string ? AccountIndex : T[K]
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
export type Reward = Omit<norm.Reward, 'pubkey'> & {
|
|
75
|
+
pubkey: AccountIndex
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
export function toArchiveBlock(block: norm.Block): Block {
|
|
80
|
+
let dict = new AccountDict()
|
|
81
|
+
|
|
82
|
+
let header: BlockHeader = {...block.header}
|
|
83
|
+
|
|
84
|
+
let transactions = block.transactions.map(tx => {
|
|
85
|
+
let {accountKeys, addressTableLookups, loadedAddresses, ...props} = tx
|
|
86
|
+
return {
|
|
87
|
+
...props,
|
|
88
|
+
accountKeys: accountKeys.map(a => dict.get(a)),
|
|
89
|
+
addressTableLookups: addressTableLookups.map(lookup => {
|
|
90
|
+
return {
|
|
91
|
+
accountKey: dict.get(lookup.accountKey),
|
|
92
|
+
readonlyIndexes: lookup.readonlyIndexes,
|
|
93
|
+
writableIndexes: lookup.writableIndexes
|
|
94
|
+
}
|
|
95
|
+
}),
|
|
96
|
+
loadedAddresses: {
|
|
97
|
+
readonly: loadedAddresses.readonly.map(a => dict.get(a)),
|
|
98
|
+
writable: loadedAddresses.writable.map(a => dict.get(a))
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
})
|
|
102
|
+
|
|
103
|
+
let instructions = block.instructions.map(ins => {
|
|
104
|
+
let {programId, accounts, ...props} = ins
|
|
105
|
+
return {
|
|
106
|
+
...props,
|
|
107
|
+
programId: dict.get(programId),
|
|
108
|
+
accounts: accounts.map(a => dict.get(a))
|
|
109
|
+
}
|
|
110
|
+
})
|
|
111
|
+
|
|
112
|
+
let logs = block.logs.map(rec => {
|
|
113
|
+
let {programId, ...props} = rec
|
|
114
|
+
return {
|
|
115
|
+
...props,
|
|
116
|
+
programId: dict.get(programId)
|
|
117
|
+
}
|
|
118
|
+
})
|
|
119
|
+
|
|
120
|
+
let balances = block.balances.map(b => {
|
|
121
|
+
let {account, ...props} = b
|
|
122
|
+
return {
|
|
123
|
+
...props,
|
|
124
|
+
account: dict.get(account)
|
|
125
|
+
}
|
|
126
|
+
})
|
|
127
|
+
|
|
128
|
+
let tokenBalances: TokenBalance[] = block.tokenBalances.map(b => {
|
|
129
|
+
let res: any = {}
|
|
130
|
+
let key: keyof norm.TokenBalance
|
|
131
|
+
for (key in b) {
|
|
132
|
+
let val = b[key]
|
|
133
|
+
if (typeof val == 'string') {
|
|
134
|
+
res[key] = dict.get(val)
|
|
135
|
+
} else {
|
|
136
|
+
res[key] = val
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
return res
|
|
140
|
+
})
|
|
141
|
+
|
|
142
|
+
let rewards = block.rewards.map(reward => {
|
|
143
|
+
let {pubkey, ...props} = reward
|
|
144
|
+
return {
|
|
145
|
+
pubkey: dict.get(pubkey),
|
|
146
|
+
...props
|
|
147
|
+
}
|
|
148
|
+
})
|
|
149
|
+
|
|
150
|
+
return {
|
|
151
|
+
header,
|
|
152
|
+
accounts: dict.list(),
|
|
153
|
+
transactions,
|
|
154
|
+
instructions,
|
|
155
|
+
logs,
|
|
156
|
+
balances,
|
|
157
|
+
tokenBalances,
|
|
158
|
+
rewards
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
|
|
163
|
+
class AccountDict {
|
|
164
|
+
private map = new Map<Base58Bytes, AccountIndex>
|
|
165
|
+
|
|
166
|
+
get(account: Base58Bytes): AccountIndex {
|
|
167
|
+
let idx = this.map.get(account)
|
|
168
|
+
if (idx == null) {
|
|
169
|
+
idx = this.map.size
|
|
170
|
+
this.map.set(account, idx)
|
|
171
|
+
}
|
|
172
|
+
return idx
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
list(): Base58Bytes[] {
|
|
176
|
+
return Array.from(this.map.keys())
|
|
177
|
+
}
|
|
178
|
+
}
|
package/src/data.ts
CHANGED
package/src/index.ts
CHANGED
|
@@ -5,6 +5,7 @@ import {Instruction, LogMessage} from './data'
|
|
|
5
5
|
import {Message, parseLogMessage} from './log-parser'
|
|
6
6
|
import {TransactionContext} from './transaction-context'
|
|
7
7
|
|
|
8
|
+
|
|
8
9
|
const PROGRAMS_MISSING_INVOKE_LOG = new Set([
|
|
9
10
|
'AddressLookupTab1e1111111111111111111111111',
|
|
10
11
|
'BPFLoader1111111111111111111111111111111111',
|
|
@@ -16,7 +17,6 @@ const PROGRAMS_MISSING_INVOKE_LOG = new Set([
|
|
|
16
17
|
'ZkTokenProof1111111111111111111111111111111',
|
|
17
18
|
'Secp256r1SigVerify1111111111111111111111111',
|
|
18
19
|
'ComputeBudget111111111111111111111111111111',
|
|
19
|
-
'11111111111111111111111111111111',
|
|
20
20
|
])
|
|
21
21
|
|
|
22
22
|
export class ParsingError {
|
|
@@ -64,6 +64,7 @@ export class MessageStream {
|
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
+
|
|
67
68
|
export class InstructionTreeTraversal {
|
|
68
69
|
private lastAddress: number[]
|
|
69
70
|
private instructions: rpc.Instruction[]
|
|
@@ -153,7 +154,7 @@ export class InstructionTreeTraversal {
|
|
|
153
154
|
assert(result.kind === 'invoke-result')
|
|
154
155
|
this.assert(
|
|
155
156
|
result.programId === ins.programId,
|
|
156
|
-
|
|
157
|
+
'invoke result message and instruction program ids don\'t match',
|
|
157
158
|
pos
|
|
158
159
|
)
|
|
159
160
|
ins.error = result.error
|
|
@@ -204,7 +205,7 @@ export class InstructionTreeTraversal {
|
|
|
204
205
|
private takeInstructionMessages(ins: Instruction, pos: number): void {
|
|
205
206
|
while (this.messages.unfinished) {
|
|
206
207
|
let msg = this.messages.current
|
|
207
|
-
switch
|
|
208
|
+
switch(msg.kind) {
|
|
208
209
|
case 'log':
|
|
209
210
|
case 'data':
|
|
210
211
|
case 'other':
|
|
@@ -241,7 +242,7 @@ export class InstructionTreeTraversal {
|
|
|
241
242
|
private dropNonInvokeMessages(): void {
|
|
242
243
|
while (this.messages.unfinished) {
|
|
243
244
|
let msg = this.messages.current
|
|
244
|
-
switch
|
|
245
|
+
switch(msg.kind) {
|
|
245
246
|
case 'log':
|
|
246
247
|
case 'data':
|
|
247
248
|
case 'cu':
|
|
@@ -325,7 +326,7 @@ export class InstructionTreeTraversal {
|
|
|
325
326
|
transactionIndex: this.tx.transactionIndex,
|
|
326
327
|
instructionAddress: address,
|
|
327
328
|
programId: this.tx.getAccount(ins.programIdIndex),
|
|
328
|
-
accounts: ins.accounts.map(
|
|
329
|
+
accounts: ins.accounts.map(a => this.tx.getAccount(a)),
|
|
329
330
|
data: ins.data,
|
|
330
331
|
isCommitted: this.tx.isCommitted,
|
|
331
332
|
hasDroppedLogMessages: false,
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import {GetBlock, removeVoteTransactions} from '@subsquid/solana-rpc-data'
|
|
2
|
+
import {toJSON} from '@subsquid/util-internal-json'
|
|
3
|
+
import assert, {fail} from 'assert'
|
|
4
|
+
import * as fs from 'fs'
|
|
5
|
+
import { it } from 'vitest'
|
|
6
|
+
import * as Path from 'path'
|
|
7
|
+
import {Journal, mapRpcBlock} from './mapping'
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
const FIXTURES_DIR = Path.resolve(__dirname, '../fixtures')
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
interface Fixture {
|
|
14
|
+
name: string
|
|
15
|
+
readBlock(): GetBlock
|
|
16
|
+
readResult(): any
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
function* listFixtures(): Iterable<Fixture> {
|
|
21
|
+
for (let name of fs.readdirSync(FIXTURES_DIR)) {
|
|
22
|
+
let blocksPath = Path.join(FIXTURES_DIR, name, 'block.json')
|
|
23
|
+
let resultPath = Path.join(FIXTURES_DIR, name, 'result.json')
|
|
24
|
+
if (fs.existsSync(blocksPath) && fs.existsSync(resultPath)) {
|
|
25
|
+
yield {
|
|
26
|
+
name,
|
|
27
|
+
readBlock(): GetBlock {
|
|
28
|
+
return JSON.parse(fs.readFileSync(blocksPath, 'utf-8'))
|
|
29
|
+
},
|
|
30
|
+
readResult(): any {
|
|
31
|
+
return JSON.parse(fs.readFileSync(resultPath, 'utf-8'))
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
const failingJournal: Journal = {
|
|
40
|
+
warn(props: any, msg: string) {
|
|
41
|
+
throw new Error(`got warning: ${msg}, props: ${JSON.stringify(props)}`)
|
|
42
|
+
},
|
|
43
|
+
error(props: any, msg: string) {
|
|
44
|
+
throw new Error(`got error: ${msg}, props: ${JSON.stringify(props)}`)
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
for (let fix of listFixtures()) {
|
|
50
|
+
it(fix.name, () => {
|
|
51
|
+
let block = fix.readBlock()
|
|
52
|
+
let expected = fix.readResult()
|
|
53
|
+
|
|
54
|
+
removeVoteTransactions(block)
|
|
55
|
+
|
|
56
|
+
let actual = mapRpcBlock(0, block, failingJournal)
|
|
57
|
+
actual = normalizeJson(actual)
|
|
58
|
+
try {
|
|
59
|
+
assert.deepStrictEqual(actual, expected)
|
|
60
|
+
} catch(err: any) {
|
|
61
|
+
// diff, that comes from deepStrictEqual is not useful for large objects
|
|
62
|
+
fs.writeFileSync(
|
|
63
|
+
Path.join(FIXTURES_DIR, fix.name, 'result.temp.json'),
|
|
64
|
+
JSON.stringify(actual, null, 2)
|
|
65
|
+
)
|
|
66
|
+
fail('result is different from a reference')
|
|
67
|
+
}
|
|
68
|
+
})
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
|
|
72
|
+
function normalizeJson(obj: any): any {
|
|
73
|
+
return JSON.parse(JSON.stringify(toJSON(obj)))
|
|
74
|
+
}
|
package/src/mapping.ts
CHANGED
|
@@ -1,26 +1,28 @@
|
|
|
1
1
|
import type * as rpc from '@subsquid/solana-rpc-data'
|
|
2
|
-
import
|
|
3
|
-
import {addErrorContext, unexpectedCase} from '@subsquid/util-internal'
|
|
2
|
+
import {addErrorContext, assertNotNull} from '@subsquid/util-internal'
|
|
4
3
|
import assert from 'assert'
|
|
5
4
|
import {Balance, Block, BlockHeader, Instruction, LogMessage, Reward, TokenBalance, Transaction} from './data'
|
|
6
|
-
import {InvokeMessage, InvokeResultMessage, LogTruncatedMessage, Message, parseLogMessage} from './log-parser'
|
|
7
|
-
import {Journal, TransactionContext} from './transaction-context'
|
|
8
5
|
import {InstructionTreeTraversal, MessageStream, ParsingError} from './instruction-parser'
|
|
6
|
+
import {LogTruncatedMessage} from './log-parser'
|
|
7
|
+
import {Journal, TransactionContext} from './transaction-context'
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
export {Journal}
|
|
9
11
|
|
|
10
12
|
|
|
11
|
-
export function mapRpcBlock(src: rpc.
|
|
13
|
+
export function mapRpcBlock(slot: number, src: rpc.GetBlock, journal: Journal): Block {
|
|
12
14
|
let header: BlockHeader = {
|
|
13
|
-
hash: src.
|
|
14
|
-
height: src.
|
|
15
|
-
number:
|
|
16
|
-
parentNumber: src.
|
|
17
|
-
parentHash: src.
|
|
18
|
-
timestamp: src.
|
|
15
|
+
hash: src.blockhash,
|
|
16
|
+
height: assertNotNull(src.blockHeight, '.blockHeight is not available'),
|
|
17
|
+
number: slot,
|
|
18
|
+
parentNumber: src.parentSlot,
|
|
19
|
+
parentHash: src.previousBlockhash,
|
|
20
|
+
timestamp: src.blockTime ?? 0
|
|
19
21
|
}
|
|
20
22
|
|
|
21
|
-
let items = new ItemMapping(journal, src
|
|
23
|
+
let items = new ItemMapping(journal, src)
|
|
22
24
|
|
|
23
|
-
let rewards = src.
|
|
25
|
+
let rewards = src.rewards?.map(s => {
|
|
24
26
|
let reward: Reward = {
|
|
25
27
|
pubkey: s.pubkey,
|
|
26
28
|
lamports: BigInt(s.lamports),
|
|
@@ -152,6 +154,7 @@ function mapTransaction(transactionIndex: number, src: rpc.Transaction): Transac
|
|
|
152
154
|
signatures: src.transaction.signatures,
|
|
153
155
|
err: src.meta.err,
|
|
154
156
|
computeUnitsConsumed: BigInt(src.meta.computeUnitsConsumed ?? 0),
|
|
157
|
+
costUnits: BigInt(src.meta.costUnits ?? 0),
|
|
155
158
|
fee: BigInt(src.meta.fee),
|
|
156
159
|
loadedAddresses: src.meta.loadedAddresses ?? {readonly: [], writable: []},
|
|
157
160
|
hasDroppedLogMessages: false
|
|
@@ -2,11 +2,13 @@ import * as rpc from '@subsquid/solana-rpc-data'
|
|
|
2
2
|
import {Base58Bytes} from '@subsquid/solana-rpc-data'
|
|
3
3
|
import assert from 'assert'
|
|
4
4
|
|
|
5
|
+
|
|
5
6
|
export interface Journal {
|
|
6
7
|
warn(props: any, msg: string): void
|
|
7
8
|
error(props: any, msg: string): void
|
|
8
9
|
}
|
|
9
10
|
|
|
11
|
+
|
|
10
12
|
export class TransactionContext {
|
|
11
13
|
public readonly erroredInstruction: number
|
|
12
14
|
public readonly couldFailBeforeInvokeMessage: boolean
|
|
@@ -37,7 +39,7 @@ export class TransactionContext {
|
|
|
37
39
|
this.erroredInstruction = tx.transaction.message.instructions.length
|
|
38
40
|
this.warn({transactionError: err}, 'got InstructionError of unrecognized shape')
|
|
39
41
|
}
|
|
40
|
-
switch
|
|
42
|
+
switch(type) {
|
|
41
43
|
case 'AccountNotExecutable':
|
|
42
44
|
case 'CallDepth':
|
|
43
45
|
case 'MissingAccount':
|
|
@@ -73,28 +75,23 @@ export class TransactionContext {
|
|
|
73
75
|
}
|
|
74
76
|
|
|
75
77
|
warn(props: any, msg: string): void {
|
|
76
|
-
this.journal.warn(
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
},
|
|
82
|
-
msg
|
|
83
|
-
)
|
|
78
|
+
this.journal.warn({
|
|
79
|
+
transactionHash: this.transactionHash,
|
|
80
|
+
transactionIndex: this.transactionIndex,
|
|
81
|
+
...props
|
|
82
|
+
}, msg)
|
|
84
83
|
}
|
|
85
84
|
|
|
86
85
|
error(props: any, msg: string): void {
|
|
87
|
-
this.journal.error(
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
},
|
|
93
|
-
msg
|
|
94
|
-
)
|
|
86
|
+
this.journal.error({
|
|
87
|
+
transactionHash: this.transactionHash,
|
|
88
|
+
transactionIndex: this.transactionIndex,
|
|
89
|
+
...props
|
|
90
|
+
}, msg)
|
|
95
91
|
}
|
|
96
92
|
}
|
|
97
93
|
|
|
94
|
+
|
|
98
95
|
function isInstructionError(err: unknown): err is {InstructionError: [number, string]} {
|
|
99
96
|
return typeof err == 'object' && err != null && 'InstructionError' in err
|
|
100
97
|
}
|