@aztec/txe 0.71.0 → 0.72.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +5 -3
- package/dest/node/txe_node.d.ts +7 -7
- package/dest/node/txe_node.d.ts.map +1 -1
- package/dest/node/txe_node.js +35 -31
- package/dest/oracle/txe_oracle.d.ts +7 -7
- package/dest/oracle/txe_oracle.d.ts.map +1 -1
- package/dest/oracle/txe_oracle.js +26 -29
- package/dest/txe_service/txe_service.d.ts +2 -5
- package/dest/txe_service/txe_service.d.ts.map +1 -1
- package/dest/txe_service/txe_service.js +8 -12
- package/package.json +14 -14
- package/src/index.ts +4 -2
- package/src/node/txe_node.ts +49 -43
- package/src/oracle/txe_oracle.ts +44 -32
- package/src/txe_service/txe_service.ts +7 -12
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAmHpD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,iEAIhD"}
|
package/dest/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var _TXEDispatcher_instances, _TXEDispatcher_processDeployInputs;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
3
|
import { loadContractArtifact } from '@aztec/aztec.js';
|
|
4
|
-
import {
|
|
4
|
+
import { createTracedJsonRpcServer } from '@aztec/telemetry-client';
|
|
5
5
|
import { readFile, readdir } from 'fs/promises';
|
|
6
6
|
import { join } from 'path';
|
|
7
7
|
import { z } from 'zod';
|
|
@@ -94,6 +94,8 @@ const TXEDispatcherApiSchema = {
|
|
|
94
94
|
* @returns A TXE RPC server.
|
|
95
95
|
*/
|
|
96
96
|
export function createTXERpcServer(logger) {
|
|
97
|
-
return
|
|
97
|
+
return createTracedJsonRpcServer(new TXEDispatcher(logger), TXEDispatcherApiSchema, {
|
|
98
|
+
http200OnError: true,
|
|
99
|
+
});
|
|
98
100
|
}
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUd2RCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVwRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNoRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQzVCLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzFELE9BQU8sRUFFTCxxQkFBcUIsRUFHckIsdUJBQXVCLEVBQ3ZCLFNBQVMsRUFDVCxtQkFBbUIsR0FDcEIsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QixNQUFNLFdBQVcsR0FBRyxJQUFJLEdBQUcsRUFBc0IsQ0FBQztBQWNsRCxNQUFNLHlCQUF5QixHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUM7SUFDekMscUNBQXFDO0lBQ3JDLFVBQVUsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFO0lBQ3RCLFFBQVEsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUErQztJQUNqRSxxQ0FBcUM7SUFDckMsU0FBUyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7SUFDckIscUNBQXFDO0lBQ3JDLFlBQVksRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFO0lBQ3hCLE1BQU0sRUFBRSxxQkFBcUI7Q0FDOUIsQ0FBdUMsQ0FBQztBQUV6QyxNQUFNLGFBQWE7SUFDakIsWUFBb0IsTUFBYzs7UUFBZCxXQUFNLEdBQU4sTUFBTSxDQUFRO0lBQUcsQ0FBQztJQW1DdEMscUNBQXFDO0lBQ3JDLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxRQUE2QjtRQUN0RCxNQUFNLEVBQUUsVUFBVSxFQUFF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
|
package/dest/node/txe_node.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type AztecNode, type EpochProofQuote, type
|
|
2
|
-
import { type ARCHIVE_HEIGHT, type AztecAddress, type BlockHeader, type ContractClassPublic, type ContractInstanceWithAddress, type GasFees, type L1_TO_L2_MSG_TREE_HEIGHT, type NOTE_HASH_TREE_HEIGHT, type NULLIFIER_TREE_HEIGHT, type NodeInfo, type PUBLIC_DATA_TREE_HEIGHT, type PrivateLog, type ProtocolContractAddresses } from '@aztec/circuits.js';
|
|
1
|
+
import { type AztecNode, type EpochProofQuote, type GetContractClassLogsResponse, type GetPublicLogsResponse, type InBlock, type L2Block, type L2BlockNumber, type L2Tips, type LogFilter, type MerkleTreeId, type NullifierMembershipWitness, type ProverConfig, type PublicDataWitness, type PublicSimulationOutput, type SequencerConfig, type SiblingPath, type Tx, type TxEffect, TxHash, TxReceipt, TxScopedL2Log, type TxValidationResult } from '@aztec/circuit-types';
|
|
2
|
+
import { type ARCHIVE_HEIGHT, type AztecAddress, type BlockHeader, type ContractClassPublic, type ContractInstanceWithAddress, type GasFees, type L1_TO_L2_MSG_TREE_HEIGHT, type NOTE_HASH_TREE_HEIGHT, type NULLIFIER_TREE_HEIGHT, type NodeInfo, type PUBLIC_DATA_TREE_HEIGHT, type PrivateLog, type ProtocolContractAddresses, type PublicLog } from '@aztec/circuits.js';
|
|
3
3
|
import { type L1ContractAddresses } from '@aztec/ethereum';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { type MerkleTrees } from '@aztec/world-state';
|
|
@@ -58,9 +58,9 @@ export declare class TXENode implements AztecNode {
|
|
|
58
58
|
/**
|
|
59
59
|
* Adds public logs to the txe node, given a block
|
|
60
60
|
* @param blockNumber - The block number at which to add the public logs.
|
|
61
|
-
* @param
|
|
61
|
+
* @param publicLogs - The public logs to be added.
|
|
62
62
|
*/
|
|
63
|
-
addPublicLogsByTags(blockNumber: number,
|
|
63
|
+
addPublicLogsByTags(blockNumber: number, publicLogs: PublicLog[]): void;
|
|
64
64
|
/**
|
|
65
65
|
* Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
|
|
66
66
|
* @param tags - The tags to filter the logs by.
|
|
@@ -213,17 +213,17 @@ export declare class TXENode implements AztecNode {
|
|
|
213
213
|
*/
|
|
214
214
|
registerContractFunctionSignatures(_address: AztecAddress, _signatures: string[]): Promise<void>;
|
|
215
215
|
/**
|
|
216
|
-
* Gets
|
|
216
|
+
* Gets public logs based on the provided filter.
|
|
217
217
|
* @param filter - The filter to apply to the logs.
|
|
218
218
|
* @returns The requested logs.
|
|
219
219
|
*/
|
|
220
|
-
|
|
220
|
+
getPublicLogs(_filter: LogFilter): Promise<GetPublicLogsResponse>;
|
|
221
221
|
/**
|
|
222
222
|
* Gets contract class logs based on the provided filter.
|
|
223
223
|
* @param filter - The filter to apply to the logs.
|
|
224
224
|
* @returns The requested logs.
|
|
225
225
|
*/
|
|
226
|
-
getContractClassLogs(_filter: LogFilter): Promise<
|
|
226
|
+
getContractClassLogs(_filter: LogFilter): Promise<GetContractClassLogsResponse>;
|
|
227
227
|
/**
|
|
228
228
|
* Method to submit a transaction to the p2p pool.
|
|
229
229
|
* @param tx - The transaction to be submitted.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"txe_node.d.ts","sourceRoot":"","sources":["../../src/node/txe_node.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,
|
|
1
|
+
{"version":3,"file":"txe_node.d.ts","sourceRoot":"","sources":["../../src/node/txe_node.ts"],"names":[],"mappings":"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"}
|
package/dest/node/txe_node.js
CHANGED
|
@@ -2,6 +2,7 @@ var _TXENode_logsByTags, _TXENode_txEffectsByTxHash, _TXENode_txReceiptsByTxHash
|
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import { createLogger } from '@aztec/aztec.js';
|
|
4
4
|
import { L2BlockHash, TxHash, TxReceipt, TxScopedL2Log, } from '@aztec/circuit-types';
|
|
5
|
+
import { PUBLIC_LOG_DATA_SIZE_IN_FIELDS, } from '@aztec/circuits.js';
|
|
5
6
|
import { poseidon2Hash } from '@aztec/foundation/crypto';
|
|
6
7
|
import { Fr } from '@aztec/foundation/fields';
|
|
7
8
|
import { MerkleTreeSnapshotOperationsFacade } from '@aztec/world-state';
|
|
@@ -115,35 +116,37 @@ export class TXENode {
|
|
|
115
116
|
/**
|
|
116
117
|
* Adds public logs to the txe node, given a block
|
|
117
118
|
* @param blockNumber - The block number at which to add the public logs.
|
|
118
|
-
* @param
|
|
119
|
-
*/
|
|
120
|
-
addPublicLogsByTags(blockNumber,
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
119
|
+
* @param publicLogs - The public logs to be added.
|
|
120
|
+
*/
|
|
121
|
+
addPublicLogsByTags(blockNumber, publicLogs) {
|
|
122
|
+
publicLogs.forEach(log => {
|
|
123
|
+
// Check that each log stores 3 lengths in its first field. If not, it's not a tagged log:
|
|
124
|
+
const firstFieldBuf = log.log[0].toBuffer();
|
|
125
|
+
if (!firstFieldBuf.subarray(0, 24).equals(Buffer.alloc(24)) ||
|
|
126
|
+
firstFieldBuf[26] !== 0 ||
|
|
127
|
+
firstFieldBuf[29] !== 0) {
|
|
128
|
+
// See parseLogFromPublic - the first field of a tagged log is 8 bytes structured:
|
|
129
|
+
// [ publicLen[0], publicLen[1], 0, privateLen[0], privateLen[1], 0, ciphertextLen[0], ciphertextLen[1]]
|
|
130
|
+
__classPrivateFieldGet(this, _TXENode_logger, "f").warn(`Skipping public log with invalid first field: ${log.log[0]}`);
|
|
125
131
|
return;
|
|
126
132
|
}
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
}
|
|
137
|
-
const tag = new Fr(correctedBuffer);
|
|
138
|
-
__classPrivateFieldGet(this, _TXENode_logger, "f").verbose(`Found tagged unencrypted log with tag ${tag.toString()} in block ${this.getBlockNumber()}`);
|
|
139
|
-
const currentLogs = __classPrivateFieldGet(this, _TXENode_logsByTags, "f").get(tag.toString()) ?? [];
|
|
140
|
-
const scopedLog = new TxScopedL2Log(new TxHash(new Fr(blockNumber)), __classPrivateFieldGet(this, _TXENode_noteIndex, "f"), blockNumber, true, log.toBuffer());
|
|
141
|
-
currentLogs.push(scopedLog);
|
|
142
|
-
__classPrivateFieldGet(this, _TXENode_logsByTags, "f").set(tag.toString(), currentLogs);
|
|
143
|
-
}
|
|
144
|
-
catch (err) {
|
|
145
|
-
__classPrivateFieldGet(this, _TXENode_logger, "f").warn(`Failed to add tagged log to store: ${err}`);
|
|
133
|
+
// Check that the length values line up with the log contents
|
|
134
|
+
const publicValuesLength = firstFieldBuf.subarray(-8).readUint16BE();
|
|
135
|
+
const privateValuesLength = firstFieldBuf.subarray(-8).readUint16BE(3);
|
|
136
|
+
// Add 1 for the first field holding lengths
|
|
137
|
+
const totalLogLength = 1 + publicValuesLength + privateValuesLength;
|
|
138
|
+
// Note that zeroes can be valid log values, so we can only assert that we do not go over the given length
|
|
139
|
+
if (totalLogLength > PUBLIC_LOG_DATA_SIZE_IN_FIELDS || log.log.slice(totalLogLength).find(f => !f.isZero())) {
|
|
140
|
+
__classPrivateFieldGet(this, _TXENode_logger, "f").warn(`Skipping invalid tagged public log with first field: ${log.log[0]}`);
|
|
141
|
+
return;
|
|
146
142
|
}
|
|
143
|
+
// The first elt stores lengths => tag is in fields[1]
|
|
144
|
+
const tag = log.log[1];
|
|
145
|
+
__classPrivateFieldGet(this, _TXENode_logger, "f").verbose(`Found tagged public log with tag ${tag.toString()} in block ${this.getBlockNumber()}`);
|
|
146
|
+
const currentLogs = __classPrivateFieldGet(this, _TXENode_logsByTags, "f").get(tag.toString()) ?? [];
|
|
147
|
+
const scopedLog = new TxScopedL2Log(new TxHash(new Fr(blockNumber)), __classPrivateFieldGet(this, _TXENode_noteIndex, "f"), blockNumber, true, log.toBuffer());
|
|
148
|
+
currentLogs.push(scopedLog);
|
|
149
|
+
__classPrivateFieldGet(this, _TXENode_logsByTags, "f").set(tag.toString(), currentLogs);
|
|
147
150
|
});
|
|
148
151
|
}
|
|
149
152
|
/**
|
|
@@ -173,7 +176,8 @@ export class TXENode {
|
|
|
173
176
|
// Temporary workaround to be able to respond this query: the trees are currently stored in the TXE oracle, but we
|
|
174
177
|
// hold a reference to them.
|
|
175
178
|
// We should likely migrate this so that the trees are owned by the node.
|
|
176
|
-
|
|
179
|
+
// TODO: blockNumber is being passed as undefined, figure out why
|
|
180
|
+
if (blockNumber === 'latest' || blockNumber === undefined) {
|
|
177
181
|
blockNumber = await this.getBlockNumber();
|
|
178
182
|
}
|
|
179
183
|
const db = blockNumber === (await this.getBlockNumber())
|
|
@@ -354,12 +358,12 @@ export class TXENode {
|
|
|
354
358
|
throw new Error('TXE Node method addContractArtifact not implemented');
|
|
355
359
|
}
|
|
356
360
|
/**
|
|
357
|
-
* Gets
|
|
361
|
+
* Gets public logs based on the provided filter.
|
|
358
362
|
* @param filter - The filter to apply to the logs.
|
|
359
363
|
* @returns The requested logs.
|
|
360
364
|
*/
|
|
361
|
-
|
|
362
|
-
throw new Error('TXE Node method
|
|
365
|
+
getPublicLogs(_filter) {
|
|
366
|
+
throw new Error('TXE Node method getPublicLogs not implemented');
|
|
363
367
|
}
|
|
364
368
|
/**
|
|
365
369
|
* Gets contract class logs based on the provided filter.
|
|
@@ -542,4 +546,4 @@ export class TXENode {
|
|
|
542
546
|
}
|
|
543
547
|
}
|
|
544
548
|
_TXENode_logsByTags = new WeakMap(), _TXENode_txEffectsByTxHash = new WeakMap(), _TXENode_txReceiptsByTxHash = new WeakMap(), _TXENode_blockNumberToNullifiers = new WeakMap(), _TXENode_noteIndex = new WeakMap(), _TXENode_logger = new WeakMap();
|
|
545
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"txe_node.js","sourceRoot":"","sources":["../../src/node/txe_node.ts"],"names":[],"mappings":"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"}
|
|
549
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"txe_node.js","sourceRoot":"","sources":["../../src/node/txe_node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MerkleTreeId, type NoteStatus, NullifierMembershipWitness, PublicDataWitness, type UnencryptedL2Log } from '@aztec/circuit-types';
|
|
2
|
-
import { BlockHeader, type ContractInstance, type ContractInstanceWithAddress, IndexedTaggingSecret, type KeyValidationRequest, type L1_TO_L2_MSG_TREE_HEIGHT, PrivateContextInputs, type PrivateLog, type PublicDataWrite } from '@aztec/circuits.js';
|
|
2
|
+
import { BlockHeader, type ContractInstance, type ContractInstanceWithAddress, IndexedTaggingSecret, type KeyValidationRequest, type L1_TO_L2_MSG_TREE_HEIGHT, PrivateContextInputs, type PrivateLog, type PublicDataWrite, type PublicLog } from '@aztec/circuits.js';
|
|
3
3
|
import { type ContractArtifact, type FunctionAbi, FunctionSelector, type NoteSelector } from '@aztec/foundation/abi';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
@@ -17,9 +17,9 @@ export declare class TXE implements TypedOracle {
|
|
|
17
17
|
private executionCache;
|
|
18
18
|
private keyStore;
|
|
19
19
|
private txeDatabase;
|
|
20
|
+
private contractAddress;
|
|
20
21
|
private blockNumber;
|
|
21
22
|
private sideEffectCounter;
|
|
22
|
-
private contractAddress;
|
|
23
23
|
private msgSender;
|
|
24
24
|
private functionSelector;
|
|
25
25
|
private isStaticCall;
|
|
@@ -37,7 +37,8 @@ export declare class TXE implements TypedOracle {
|
|
|
37
37
|
private simulationProvider;
|
|
38
38
|
private noteCache;
|
|
39
39
|
debug: LogFn;
|
|
40
|
-
constructor(
|
|
40
|
+
private constructor();
|
|
41
|
+
static create(logger: Logger, trees: MerkleTrees, executionCache: HashedValuesCache, keyStore: KeyStore, txeDatabase: TXEDatabase): Promise<TXE>;
|
|
41
42
|
getChainId(): Promise<Fr>;
|
|
42
43
|
getVersion(): Promise<Fr>;
|
|
43
44
|
getMsgSender(): AztecAddress;
|
|
@@ -55,13 +56,13 @@ export declare class TXE implements TypedOracle {
|
|
|
55
56
|
addContractInstance(contractInstance: ContractInstanceWithAddress): Promise<void>;
|
|
56
57
|
addContractArtifact(artifact: ContractArtifact): Promise<void>;
|
|
57
58
|
getPrivateContextInputs(blockNumber: number, sideEffectsCounter?: number, isStaticCall?: boolean): Promise<PrivateContextInputs>;
|
|
58
|
-
deriveKeys(secret: Fr): {
|
|
59
|
+
deriveKeys(secret: Fr): Promise<{
|
|
59
60
|
masterNullifierSecretKey: import("@aztec/circuits.js").Fq;
|
|
60
61
|
masterIncomingViewingSecretKey: import("@aztec/circuits.js").Fq;
|
|
61
62
|
masterOutgoingViewingSecretKey: import("@aztec/circuits.js").Fq;
|
|
62
63
|
masterTaggingSecretKey: import("@aztec/circuits.js").Fq;
|
|
63
64
|
publicKeys: import("@aztec/circuits.js").PublicKeys;
|
|
64
|
-
}
|
|
65
|
+
}>;
|
|
65
66
|
addAuthWitness(address: AztecAddress, messageHash: Fr): Promise<void>;
|
|
66
67
|
addPublicDataWrites(writes: PublicDataWrite[]): Promise<void>;
|
|
67
68
|
addSiloedNullifiers(siloedNullifiers: Fr[]): Promise<void>;
|
|
@@ -72,13 +73,12 @@ export declare class TXE implements TypedOracle {
|
|
|
72
73
|
addUniqueNoteHashesFromPublic(siloedNoteHashes: Fr[]): Promise<void>;
|
|
73
74
|
addNoteHashes(contractAddress: AztecAddress, noteHashes: Fr[]): Promise<void>;
|
|
74
75
|
addPrivateLogs(contractAddress: AztecAddress, privateLogs: PrivateLog[]): void;
|
|
75
|
-
addPublicLogs(logs:
|
|
76
|
+
addPublicLogs(logs: PublicLog[]): void;
|
|
76
77
|
getBlockNumber(): Promise<number>;
|
|
77
78
|
getContractAddress(): Promise<AztecAddress>;
|
|
78
79
|
setIsStaticCall(isStatic: boolean): void;
|
|
79
80
|
getIsStaticCall(): boolean;
|
|
80
81
|
getRandomField(): Fr;
|
|
81
|
-
storeArrayInExecutionCache(values: Fr[]): Promise<Fr>;
|
|
82
82
|
storeInExecutionCache(values: Fr[]): Promise<Fr>;
|
|
83
83
|
loadFromExecutionCache(returnsHash: Fr): Promise<Fr[]>;
|
|
84
84
|
getKeyValidationRequest(pkMHash: Fr): Promise<KeyValidationRequest>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"txe_oracle.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAEZ,KAAK,UAAU,EACf,0BAA0B,EAC1B,iBAAiB,EAKjB,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,WAAW,EAEX,KAAK,gBAAgB,EACrB,KAAK,2BAA2B,EAKhC,oBAAoB,EACpB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAO7B,oBAAoB,EACpB,KAAK,UAAU,EAGf,KAAK,eAAe,
|
|
1
|
+
{"version":3,"file":"txe_oracle.d.ts","sourceRoot":"","sources":["../../src/oracle/txe_oracle.ts"],"names":[],"mappings":"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"}
|