@aztec/txe 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2
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/bin/index.js +3 -5
- package/dest/index.js +112 -64
- package/dest/node/txe_node.js +292 -338
- package/dest/oracle/txe_oracle.js +208 -147
- package/dest/txe_service/txe_service.js +194 -118
- package/dest/util/encoding.js +16 -7
- package/dest/util/expected_failure_error.js +1 -2
- package/dest/util/txe_database.js +5 -9
- package/dest/util/txe_public_contract_data_source.js +21 -12
- package/dest/util/txe_world_state_db.js +7 -8
- package/package.json +14 -15
- package/src/index.ts +109 -35
- package/src/node/txe_node.ts +4 -0
- package/src/oracle/txe_oracle.ts +8 -29
- package/src/txe_service/txe_service.ts +14 -46
- package/src/util/encoding.ts +3 -3
- package/dest/bin/index.d.ts +0 -3
- package/dest/bin/index.d.ts.map +0 -1
- package/dest/index.d.ts +0 -8
- package/dest/index.d.ts.map +0 -1
- package/dest/node/txe_node.d.ts +0 -354
- package/dest/node/txe_node.d.ts.map +0 -1
- package/dest/oracle/txe_oracle.d.ts +0 -132
- package/dest/oracle/txe_oracle.d.ts.map +0 -1
- package/dest/txe_service/txe_service.d.ts +0 -204
- package/dest/txe_service/txe_service.d.ts.map +0 -1
- package/dest/util/encoding.d.ts +0 -29
- package/dest/util/encoding.d.ts.map +0 -1
- package/dest/util/expected_failure_error.d.ts +0 -4
- package/dest/util/expected_failure_error.d.ts.map +0 -1
- package/dest/util/txe_database.d.ts +0 -10
- package/dest/util/txe_database.d.ts.map +0 -1
- package/dest/util/txe_public_contract_data_source.d.ts +0 -18
- package/dest/util/txe_public_contract_data_source.d.ts.map +0 -1
- package/dest/util/txe_world_state_db.d.ts +0 -16
- package/dest/util/txe_world_state_db.d.ts.map +0 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
|
|
2
1
|
import { MerkleTreeId, SimulationError } from '@aztec/circuit-types';
|
|
3
|
-
import { Fr, FunctionSelector, PublicDataWrite,
|
|
4
|
-
import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
|
|
2
|
+
import { DEPLOYER_CONTRACT_ADDRESS, Fr, FunctionSelector, PublicDataWrite, computePartialAddress } from '@aztec/circuits.js';
|
|
3
|
+
import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/circuits.js/hash';
|
|
5
4
|
import { NoteSelector } from '@aztec/foundation/abi';
|
|
6
5
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
7
6
|
import { KeyStore } from '@aztec/key-store';
|
|
@@ -12,11 +11,13 @@ import { enrichPublicSimulationError } from '@aztec/pxe';
|
|
|
12
11
|
import { HashedValuesCache } from '@aztec/simulator/server';
|
|
13
12
|
import { NativeWorldStateService } from '@aztec/world-state';
|
|
14
13
|
import { TXE } from '../oracle/txe_oracle.js';
|
|
15
|
-
import { addressFromSingle, fromArray, fromSingle, toArray, toForeignCallResult, toSingle
|
|
14
|
+
import { addressFromSingle, fromArray, fromSingle, toArray, toForeignCallResult, toSingle } from '../util/encoding.js';
|
|
16
15
|
import { ExpectedFailureError } from '../util/expected_failure_error.js';
|
|
17
16
|
import { TXEDatabase } from '../util/txe_database.js';
|
|
18
17
|
export class TXEService {
|
|
19
|
-
|
|
18
|
+
logger;
|
|
19
|
+
typedOracle;
|
|
20
|
+
constructor(logger, typedOracle){
|
|
20
21
|
this.logger = logger;
|
|
21
22
|
this.typedOracle = typedOracle;
|
|
22
23
|
}
|
|
@@ -28,7 +29,7 @@ export class TXEService {
|
|
|
28
29
|
const keyStore = new KeyStore(store);
|
|
29
30
|
const txeDatabase = new TXEDatabase(store);
|
|
30
31
|
// Register protocol contracts.
|
|
31
|
-
for (const name of protocolContractNames)
|
|
32
|
+
for (const name of protocolContractNames){
|
|
32
33
|
const { contractClass, instance, artifact } = await getCanonicalProtocolContract(name);
|
|
33
34
|
await txeDatabase.addContractArtifact(contractClass.id, artifact);
|
|
34
35
|
await txeDatabase.addContractInstance(instance);
|
|
@@ -47,7 +48,7 @@ export class TXEService {
|
|
|
47
48
|
async advanceBlocksBy(blocks) {
|
|
48
49
|
const nBlocks = fromSingle(blocks).toNumber();
|
|
49
50
|
this.logger.debug(`time traveling ${nBlocks} blocks`);
|
|
50
|
-
for
|
|
51
|
+
for(let i = 0; i < nBlocks; i++){
|
|
51
52
|
const blockNumber = await this.typedOracle.getBlockNumber();
|
|
52
53
|
await this.typedOracle.commitState();
|
|
53
54
|
this.typedOracle.setBlockNumber(blockNumber + 1);
|
|
@@ -63,73 +64,54 @@ export class TXEService {
|
|
|
63
64
|
const keys = await this.typedOracle.deriveKeys(fromSingle(secret));
|
|
64
65
|
return toForeignCallResult(keys.publicKeys.toFields().map(toSingle));
|
|
65
66
|
}
|
|
66
|
-
async deploy(artifact,
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
.
|
|
70
|
-
|
|
71
|
-
const publicKeysHashFr = fromSingle(publicKeysHash);
|
|
72
|
-
this.logger.debug(`Deploy ${artifact.name} with initializer ${initializerStr}(${decodedArgs}) and public keys hash ${publicKeysHashFr}`);
|
|
73
|
-
const instance = await getContractInstanceFromDeployParams(artifact, {
|
|
74
|
-
constructorArgs: decodedArgs,
|
|
75
|
-
skipArgsDecoding: true,
|
|
76
|
-
salt: Fr.ONE,
|
|
77
|
-
// TODO: Modify this to allow for passing public keys.
|
|
78
|
-
publicKeys: PublicKeys.default(),
|
|
79
|
-
constructorArtifact: initializerStr ? initializerStr : undefined,
|
|
80
|
-
deployer: AztecAddress.ZERO,
|
|
81
|
-
});
|
|
67
|
+
async deploy(artifact, instance) {
|
|
68
|
+
// Emit deployment nullifier
|
|
69
|
+
this.typedOracle.addSiloedNullifiersFromPublic([
|
|
70
|
+
await siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), instance.address.toField())
|
|
71
|
+
]);
|
|
82
72
|
this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
|
|
83
73
|
await this.typedOracle.addContractInstance(instance);
|
|
84
|
-
await this.typedOracle.addContractArtifact(artifact);
|
|
74
|
+
await this.typedOracle.addContractArtifact(instance.contractClassId, artifact);
|
|
85
75
|
return toForeignCallResult([
|
|
86
76
|
toArray([
|
|
87
77
|
instance.salt,
|
|
88
78
|
instance.deployer.toField(),
|
|
89
79
|
instance.contractClassId,
|
|
90
80
|
instance.initializationHash,
|
|
91
|
-
...instance.publicKeys.toFields()
|
|
92
|
-
])
|
|
81
|
+
...instance.publicKeys.toFields()
|
|
82
|
+
])
|
|
93
83
|
]);
|
|
94
84
|
}
|
|
95
85
|
async directStorageWrite(contractAddress, startStorageSlot, values) {
|
|
96
86
|
const startStorageSlotFr = fromSingle(startStorageSlot);
|
|
97
87
|
const valuesFr = fromArray(values);
|
|
98
88
|
const contractAddressFr = addressFromSingle(contractAddress);
|
|
99
|
-
const publicDataWrites = await Promise.all(valuesFr.map(async (value, i)
|
|
89
|
+
const publicDataWrites = await Promise.all(valuesFr.map(async (value, i)=>{
|
|
100
90
|
const storageSlot = startStorageSlotFr.add(new Fr(i));
|
|
101
91
|
this.logger.debug(`Oracle storage write: slot=${storageSlot.toString()} value=${value}`);
|
|
102
92
|
return new PublicDataWrite(await computePublicDataTreeLeafSlot(contractAddressFr, storageSlot), value);
|
|
103
93
|
}));
|
|
104
94
|
await this.typedOracle.addPublicDataWrites(publicDataWrites);
|
|
105
|
-
return toForeignCallResult([
|
|
95
|
+
return toForeignCallResult([
|
|
96
|
+
toArray(publicDataWrites.map((write)=>write.value))
|
|
97
|
+
]);
|
|
106
98
|
}
|
|
107
|
-
async createAccount() {
|
|
99
|
+
async createAccount(secret) {
|
|
108
100
|
const keyStore = this.typedOracle.getKeyStore();
|
|
109
|
-
const
|
|
101
|
+
const secretFr = fromSingle(secret);
|
|
102
|
+
const completeAddress = await keyStore.addAccount(secretFr, secretFr);
|
|
110
103
|
const accountStore = this.typedOracle.getTXEDatabase();
|
|
111
104
|
await accountStore.setAccount(completeAddress.address, completeAddress);
|
|
112
105
|
this.logger.debug(`Created account ${completeAddress.address}`);
|
|
113
106
|
return toForeignCallResult([
|
|
114
107
|
toSingle(completeAddress.address),
|
|
115
|
-
...completeAddress.publicKeys.toFields().map(toSingle)
|
|
108
|
+
...completeAddress.publicKeys.toFields().map(toSingle)
|
|
116
109
|
]);
|
|
117
110
|
}
|
|
118
|
-
async addAccount(secret) {
|
|
119
|
-
const keys = await this.typedOracle.deriveKeys(fromSingle(secret));
|
|
120
|
-
const args = [keys.publicKeys.masterIncomingViewingPublicKey.x, keys.publicKeys.masterIncomingViewingPublicKey.y];
|
|
121
|
-
const artifact = SchnorrAccountContractArtifact;
|
|
122
|
-
const instance = await getContractInstanceFromDeployParams(artifact, {
|
|
123
|
-
constructorArgs: args,
|
|
124
|
-
skipArgsDecoding: true,
|
|
125
|
-
salt: Fr.ONE,
|
|
126
|
-
publicKeys: keys.publicKeys,
|
|
127
|
-
constructorArtifact: 'constructor',
|
|
128
|
-
deployer: AztecAddress.ZERO,
|
|
129
|
-
});
|
|
111
|
+
async addAccount(artifact, instance, secret) {
|
|
130
112
|
this.logger.debug(`Deployed ${artifact.name} at ${instance.address}`);
|
|
131
113
|
await this.typedOracle.addContractInstance(instance);
|
|
132
|
-
await this.typedOracle.addContractArtifact(artifact);
|
|
114
|
+
await this.typedOracle.addContractArtifact(instance.contractClassId, artifact);
|
|
133
115
|
const keyStore = this.typedOracle.getKeyStore();
|
|
134
116
|
const completeAddress = await keyStore.addAccount(fromSingle(secret), await computePartialAddress(instance));
|
|
135
117
|
const accountStore = this.typedOracle.getTXEDatabase();
|
|
@@ -137,12 +119,14 @@ export class TXEService {
|
|
|
137
119
|
this.logger.debug(`Created account ${completeAddress.address}`);
|
|
138
120
|
return toForeignCallResult([
|
|
139
121
|
toSingle(completeAddress.address),
|
|
140
|
-
...completeAddress.publicKeys.toFields().map(toSingle)
|
|
122
|
+
...completeAddress.publicKeys.toFields().map(toSingle)
|
|
141
123
|
]);
|
|
142
124
|
}
|
|
143
125
|
getSideEffectsCounter() {
|
|
144
126
|
const counter = this.typedOracle.getSideEffectsCounter();
|
|
145
|
-
return toForeignCallResult([
|
|
127
|
+
return toForeignCallResult([
|
|
128
|
+
toSingle(new Fr(counter))
|
|
129
|
+
]);
|
|
146
130
|
}
|
|
147
131
|
async addAuthWitness(address, messageHash) {
|
|
148
132
|
await this.typedOracle.addAuthWitness(addressFromSingle(address), fromSingle(messageHash));
|
|
@@ -151,7 +135,10 @@ export class TXEService {
|
|
|
151
135
|
async assertPublicCallFails(address, functionSelector, _length, args) {
|
|
152
136
|
const parsedAddress = addressFromSingle(address);
|
|
153
137
|
const parsedSelector = fromSingle(functionSelector);
|
|
154
|
-
const extendedArgs = [
|
|
138
|
+
const extendedArgs = [
|
|
139
|
+
parsedSelector,
|
|
140
|
+
...fromArray(args)
|
|
141
|
+
];
|
|
155
142
|
const result = await this.typedOracle.avmOpcodeCall(parsedAddress, extendedArgs, false);
|
|
156
143
|
if (result.revertCode.isOK()) {
|
|
157
144
|
throw new ExpectedFailureError('Public call did not revert');
|
|
@@ -162,8 +149,7 @@ export class TXEService {
|
|
|
162
149
|
try {
|
|
163
150
|
await this.typedOracle.callPrivateFunction(addressFromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool());
|
|
164
151
|
throw new ExpectedFailureError('Private call did not fail');
|
|
165
|
-
}
|
|
166
|
-
catch (e) {
|
|
152
|
+
} catch (e) {
|
|
167
153
|
if (e instanceof ExpectedFailureError) {
|
|
168
154
|
throw e;
|
|
169
155
|
}
|
|
@@ -172,41 +158,53 @@ export class TXEService {
|
|
|
172
158
|
}
|
|
173
159
|
// PXE oracles
|
|
174
160
|
getRandomField() {
|
|
175
|
-
return toForeignCallResult([
|
|
161
|
+
return toForeignCallResult([
|
|
162
|
+
toSingle(this.typedOracle.getRandomField())
|
|
163
|
+
]);
|
|
176
164
|
}
|
|
177
165
|
async getContractAddress() {
|
|
178
166
|
const contractAddress = await this.typedOracle.getContractAddress();
|
|
179
|
-
return toForeignCallResult([
|
|
167
|
+
return toForeignCallResult([
|
|
168
|
+
toSingle(contractAddress.toField())
|
|
169
|
+
]);
|
|
180
170
|
}
|
|
181
171
|
async getBlockNumber() {
|
|
182
172
|
const blockNumber = await this.typedOracle.getBlockNumber();
|
|
183
|
-
return toForeignCallResult([
|
|
173
|
+
return toForeignCallResult([
|
|
174
|
+
toSingle(new Fr(blockNumber))
|
|
175
|
+
]);
|
|
184
176
|
}
|
|
185
177
|
// Since the argument is a slice, noir automatically adds a length field to oracle call.
|
|
186
178
|
async storeInExecutionCache(_length, values) {
|
|
187
179
|
const returnsHash = await this.typedOracle.storeInExecutionCache(fromArray(values));
|
|
188
|
-
return toForeignCallResult([
|
|
180
|
+
return toForeignCallResult([
|
|
181
|
+
toSingle(returnsHash)
|
|
182
|
+
]);
|
|
189
183
|
}
|
|
190
184
|
async loadFromExecutionCache(hash) {
|
|
191
185
|
const returns = await this.typedOracle.loadFromExecutionCache(fromSingle(hash));
|
|
192
|
-
return toForeignCallResult([
|
|
186
|
+
return toForeignCallResult([
|
|
187
|
+
toArray(returns)
|
|
188
|
+
]);
|
|
193
189
|
}
|
|
194
190
|
// Since the argument is a slice, noir automatically adds a length field to oracle call.
|
|
195
191
|
debugLog(message, _length, fields) {
|
|
196
|
-
const messageStr = fromArray(message)
|
|
197
|
-
.map(field => String.fromCharCode(field.toNumber()))
|
|
198
|
-
.join('');
|
|
192
|
+
const messageStr = fromArray(message).map((field)=>String.fromCharCode(field.toNumber())).join('');
|
|
199
193
|
const fieldsFr = fromArray(fields);
|
|
200
194
|
this.typedOracle.debugLog(messageStr, fieldsFr);
|
|
201
195
|
return toForeignCallResult([]);
|
|
202
196
|
}
|
|
203
197
|
async storageRead(contractAddress, startStorageSlot, blockNumber, numberOfElements) {
|
|
204
198
|
const values = await this.typedOracle.storageRead(addressFromSingle(contractAddress), fromSingle(startStorageSlot), fromSingle(blockNumber).toNumber(), fromSingle(numberOfElements).toNumber());
|
|
205
|
-
return toForeignCallResult([
|
|
199
|
+
return toForeignCallResult([
|
|
200
|
+
toArray(values)
|
|
201
|
+
]);
|
|
206
202
|
}
|
|
207
203
|
async storageWrite(startStorageSlot, values) {
|
|
208
204
|
const newValues = await this.typedOracle.storageWrite(fromSingle(startStorageSlot), fromArray(values));
|
|
209
|
-
return toForeignCallResult([
|
|
205
|
+
return toForeignCallResult([
|
|
206
|
+
toArray(newValues)
|
|
207
|
+
]);
|
|
210
208
|
}
|
|
211
209
|
async getPublicDataTreeWitness(blockNumber, leafSlot) {
|
|
212
210
|
const parsedBlockNumber = fromSingle(blockNumber).toNumber();
|
|
@@ -215,48 +213,67 @@ export class TXEService {
|
|
|
215
213
|
if (!witness) {
|
|
216
214
|
throw new Error(`Public data witness not found for slot ${parsedLeafSlot} at block ${parsedBlockNumber}.`);
|
|
217
215
|
}
|
|
218
|
-
return toForeignCallResult([
|
|
216
|
+
return toForeignCallResult([
|
|
217
|
+
toArray(witness.toFields())
|
|
218
|
+
]);
|
|
219
219
|
}
|
|
220
220
|
async getNotes(storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status, returnSize) {
|
|
221
|
-
const noteDatas = await this.typedOracle.getNotes(fromSingle(storageSlot), fromSingle(numSelects).toNumber(), fromArray(selectByIndexes).map(fr
|
|
221
|
+
const noteDatas = await this.typedOracle.getNotes(fromSingle(storageSlot), fromSingle(numSelects).toNumber(), fromArray(selectByIndexes).map((fr)=>fr.toNumber()), fromArray(selectByOffsets).map((fr)=>fr.toNumber()), fromArray(selectByLengths).map((fr)=>fr.toNumber()), fromArray(selectValues), fromArray(selectComparators).map((fr)=>fr.toNumber()), fromArray(sortByIndexes).map((fr)=>fr.toNumber()), fromArray(sortByOffsets).map((fr)=>fr.toNumber()), fromArray(sortByLengths).map((fr)=>fr.toNumber()), fromArray(sortOrder).map((fr)=>fr.toNumber()), fromSingle(limit).toNumber(), fromSingle(offset).toNumber(), fromSingle(status).toNumber());
|
|
222
222
|
const noteLength = noteDatas?.[0]?.note.items.length ?? 0;
|
|
223
|
-
if (!noteDatas.every(({ note })
|
|
223
|
+
if (!noteDatas.every(({ note })=>noteLength === note.items.length)) {
|
|
224
224
|
throw new Error('Notes should all be the same length.');
|
|
225
225
|
}
|
|
226
226
|
const contractAddress = noteDatas[0]?.contractAddress ?? Fr.ZERO;
|
|
227
227
|
// Values indicates whether the note is settled or transient.
|
|
228
228
|
const noteTypes = {
|
|
229
229
|
isSettled: new Fr(0),
|
|
230
|
-
isTransient: new Fr(1)
|
|
230
|
+
isTransient: new Fr(1)
|
|
231
231
|
};
|
|
232
|
-
const flattenData = noteDatas.flatMap(({ nonce, note, index })
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
232
|
+
const flattenData = noteDatas.flatMap(({ nonce, note, index })=>[
|
|
233
|
+
nonce,
|
|
234
|
+
index === undefined ? noteTypes.isTransient : noteTypes.isSettled,
|
|
235
|
+
...note.items
|
|
236
|
+
]);
|
|
237
237
|
const returnFieldSize = fromSingle(returnSize).toNumber();
|
|
238
|
-
const returnData = [
|
|
238
|
+
const returnData = [
|
|
239
|
+
noteDatas.length,
|
|
240
|
+
contractAddress.toField(),
|
|
241
|
+
...flattenData
|
|
242
|
+
].map((v)=>new Fr(v));
|
|
239
243
|
if (returnData.length > returnFieldSize) {
|
|
240
244
|
throw new Error(`Return data size too big. Maximum ${returnFieldSize} fields. Got ${flattenData.length}.`);
|
|
241
245
|
}
|
|
242
246
|
const paddedZeros = Array(returnFieldSize - returnData.length).fill(new Fr(0));
|
|
243
|
-
return toForeignCallResult([
|
|
247
|
+
return toForeignCallResult([
|
|
248
|
+
toArray([
|
|
249
|
+
...returnData,
|
|
250
|
+
...paddedZeros
|
|
251
|
+
])
|
|
252
|
+
]);
|
|
244
253
|
}
|
|
245
254
|
notifyCreatedNote(storageSlot, noteTypeId, note, noteHash, counter) {
|
|
246
255
|
this.typedOracle.notifyCreatedNote(fromSingle(storageSlot), NoteSelector.fromField(fromSingle(noteTypeId)), fromArray(note), fromSingle(noteHash), fromSingle(counter).toNumber());
|
|
247
|
-
return toForeignCallResult([
|
|
256
|
+
return toForeignCallResult([
|
|
257
|
+
toSingle(new Fr(0))
|
|
258
|
+
]);
|
|
248
259
|
}
|
|
249
260
|
async notifyNullifiedNote(innerNullifier, noteHash, counter) {
|
|
250
261
|
await this.typedOracle.notifyNullifiedNote(fromSingle(innerNullifier), fromSingle(noteHash), fromSingle(counter).toNumber());
|
|
251
|
-
return toForeignCallResult([
|
|
262
|
+
return toForeignCallResult([
|
|
263
|
+
toSingle(new Fr(0))
|
|
264
|
+
]);
|
|
252
265
|
}
|
|
253
266
|
async notifyCreatedNullifier(innerNullifier) {
|
|
254
267
|
await this.typedOracle.notifyCreatedNullifier(fromSingle(innerNullifier));
|
|
255
|
-
return toForeignCallResult([
|
|
268
|
+
return toForeignCallResult([
|
|
269
|
+
toSingle(new Fr(0))
|
|
270
|
+
]);
|
|
256
271
|
}
|
|
257
272
|
async checkNullifierExists(innerNullifier) {
|
|
258
273
|
const exists = await this.typedOracle.checkNullifierExists(fromSingle(innerNullifier));
|
|
259
|
-
return toForeignCallResult([
|
|
274
|
+
return toForeignCallResult([
|
|
275
|
+
toSingle(new Fr(exists))
|
|
276
|
+
]);
|
|
260
277
|
}
|
|
261
278
|
async getContractInstance(address) {
|
|
262
279
|
const instance = await this.typedOracle.getContractInstance(addressFromSingle(address));
|
|
@@ -266,22 +283,34 @@ export class TXEService {
|
|
|
266
283
|
instance.deployer.toField(),
|
|
267
284
|
instance.contractClassId,
|
|
268
285
|
instance.initializationHash,
|
|
269
|
-
...instance.publicKeys.toFields()
|
|
270
|
-
])
|
|
286
|
+
...instance.publicKeys.toFields()
|
|
287
|
+
])
|
|
271
288
|
]);
|
|
272
289
|
}
|
|
273
290
|
async getPublicKeysAndPartialAddress(address) {
|
|
274
291
|
const parsedAddress = addressFromSingle(address);
|
|
275
292
|
const { publicKeys, partialAddress } = await this.typedOracle.getCompleteAddress(parsedAddress);
|
|
276
|
-
return toForeignCallResult([
|
|
293
|
+
return toForeignCallResult([
|
|
294
|
+
toArray([
|
|
295
|
+
...publicKeys.toFields(),
|
|
296
|
+
partialAddress
|
|
297
|
+
])
|
|
298
|
+
]);
|
|
277
299
|
}
|
|
278
300
|
async getKeyValidationRequest(pkMHash) {
|
|
279
301
|
const keyValidationRequest = await this.typedOracle.getKeyValidationRequest(fromSingle(pkMHash));
|
|
280
|
-
return toForeignCallResult([
|
|
302
|
+
return toForeignCallResult([
|
|
303
|
+
toArray(keyValidationRequest.toFields())
|
|
304
|
+
]);
|
|
281
305
|
}
|
|
282
306
|
async callPrivateFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
283
307
|
const result = await this.typedOracle.callPrivateFunction(addressFromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool());
|
|
284
|
-
return toForeignCallResult([
|
|
308
|
+
return toForeignCallResult([
|
|
309
|
+
toArray([
|
|
310
|
+
result.endSideEffectCounter,
|
|
311
|
+
result.returnsHash
|
|
312
|
+
])
|
|
313
|
+
]);
|
|
285
314
|
}
|
|
286
315
|
async getNullifierMembershipWitness(blockNumber, nullifier) {
|
|
287
316
|
const parsedBlockNumber = fromSingle(blockNumber).toNumber();
|
|
@@ -289,7 +318,9 @@ export class TXEService {
|
|
|
289
318
|
if (!witness) {
|
|
290
319
|
throw new Error(`Nullifier membership witness not found at block ${parsedBlockNumber}.`);
|
|
291
320
|
}
|
|
292
|
-
return toForeignCallResult([
|
|
321
|
+
return toForeignCallResult([
|
|
322
|
+
toArray(witness.toFields())
|
|
323
|
+
]);
|
|
293
324
|
}
|
|
294
325
|
async getAuthWitness(messageHash) {
|
|
295
326
|
const parsedMessageHash = fromSingle(messageHash);
|
|
@@ -297,31 +328,43 @@ export class TXEService {
|
|
|
297
328
|
if (!authWitness) {
|
|
298
329
|
throw new Error(`Auth witness not found for message hash ${parsedMessageHash}.`);
|
|
299
330
|
}
|
|
300
|
-
return toForeignCallResult([
|
|
331
|
+
return toForeignCallResult([
|
|
332
|
+
toArray(authWitness)
|
|
333
|
+
]);
|
|
301
334
|
}
|
|
302
335
|
async enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
303
336
|
const newArgsHash = await this.typedOracle.enqueuePublicFunctionCall(addressFromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool());
|
|
304
|
-
return toForeignCallResult([
|
|
337
|
+
return toForeignCallResult([
|
|
338
|
+
toSingle(newArgsHash)
|
|
339
|
+
]);
|
|
305
340
|
}
|
|
306
341
|
async setPublicTeardownFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
307
342
|
const newArgsHash = await this.typedOracle.setPublicTeardownFunctionCall(addressFromSingle(targetContractAddress), FunctionSelector.fromField(fromSingle(functionSelector)), fromSingle(argsHash), fromSingle(sideEffectCounter).toNumber(), fromSingle(isStaticCall).toBool());
|
|
308
|
-
return toForeignCallResult([
|
|
343
|
+
return toForeignCallResult([
|
|
344
|
+
toSingle(newArgsHash)
|
|
345
|
+
]);
|
|
309
346
|
}
|
|
310
347
|
notifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter) {
|
|
311
348
|
this.typedOracle.notifySetMinRevertibleSideEffectCounter(fromSingle(minRevertibleSideEffectCounter).toNumber());
|
|
312
349
|
}
|
|
313
350
|
async getChainId() {
|
|
314
|
-
return toForeignCallResult([
|
|
351
|
+
return toForeignCallResult([
|
|
352
|
+
toSingle(await this.typedOracle.getChainId())
|
|
353
|
+
]);
|
|
315
354
|
}
|
|
316
355
|
async getVersion() {
|
|
317
|
-
return toForeignCallResult([
|
|
356
|
+
return toForeignCallResult([
|
|
357
|
+
toSingle(await this.typedOracle.getVersion())
|
|
358
|
+
]);
|
|
318
359
|
}
|
|
319
360
|
async getBlockHeader(blockNumber) {
|
|
320
361
|
const header = await this.typedOracle.getBlockHeader(fromSingle(blockNumber).toNumber());
|
|
321
362
|
if (!header) {
|
|
322
363
|
throw new Error(`Block header not found for block ${blockNumber}.`);
|
|
323
364
|
}
|
|
324
|
-
return toForeignCallResult([
|
|
365
|
+
return toForeignCallResult([
|
|
366
|
+
toArray(header.toFields())
|
|
367
|
+
]);
|
|
325
368
|
}
|
|
326
369
|
async getMembershipWitness(blockNumber, treeId, leafValue) {
|
|
327
370
|
const parsedBlockNumber = fromSingle(blockNumber).toNumber();
|
|
@@ -331,7 +374,9 @@ export class TXEService {
|
|
|
331
374
|
if (!witness) {
|
|
332
375
|
throw new Error(`Membership witness in tree ${MerkleTreeId[parsedTreeId]} not found for value ${parsedLeafValue} at block ${parsedBlockNumber}.`);
|
|
333
376
|
}
|
|
334
|
-
return toForeignCallResult([
|
|
377
|
+
return toForeignCallResult([
|
|
378
|
+
toArray(witness)
|
|
379
|
+
]);
|
|
335
380
|
}
|
|
336
381
|
async getLowNullifierMembershipWitness(blockNumber, nullifier) {
|
|
337
382
|
const parsedBlockNumber = fromSingle(blockNumber).toNumber();
|
|
@@ -339,11 +384,15 @@ export class TXEService {
|
|
|
339
384
|
if (!witness) {
|
|
340
385
|
throw new Error(`Low nullifier witness not found for nullifier ${nullifier} at block ${parsedBlockNumber}.`);
|
|
341
386
|
}
|
|
342
|
-
return toForeignCallResult([
|
|
387
|
+
return toForeignCallResult([
|
|
388
|
+
toArray(witness.toFields())
|
|
389
|
+
]);
|
|
343
390
|
}
|
|
344
391
|
async getIndexedTaggingSecretAsSender(sender, recipient) {
|
|
345
392
|
const secret = await this.typedOracle.getIndexedTaggingSecretAsSender(AztecAddress.fromField(fromSingle(sender)), AztecAddress.fromField(fromSingle(recipient)));
|
|
346
|
-
return toForeignCallResult([
|
|
393
|
+
return toForeignCallResult([
|
|
394
|
+
toArray(secret.toFields())
|
|
395
|
+
]);
|
|
347
396
|
}
|
|
348
397
|
async syncNotes() {
|
|
349
398
|
await this.typedOracle.syncNotes();
|
|
@@ -359,11 +408,16 @@ export class TXEService {
|
|
|
359
408
|
// with two fields: `some` (a boolean) and `value` (a field array in this case).
|
|
360
409
|
if (values === null) {
|
|
361
410
|
// No data was found so we set `some` to 0 and pad `value` with zeros get the correct return size.
|
|
362
|
-
return toForeignCallResult([
|
|
363
|
-
|
|
364
|
-
|
|
411
|
+
return toForeignCallResult([
|
|
412
|
+
toSingle(new Fr(0)),
|
|
413
|
+
toArray(Array(fromSingle(tSize).toNumber()).fill(new Fr(0)))
|
|
414
|
+
]);
|
|
415
|
+
} else {
|
|
365
416
|
// Data was found so we set `some` to 1 and return it along with `value`.
|
|
366
|
-
return toForeignCallResult([
|
|
417
|
+
return toForeignCallResult([
|
|
418
|
+
toSingle(new Fr(1)),
|
|
419
|
+
toArray(values)
|
|
420
|
+
]);
|
|
367
421
|
}
|
|
368
422
|
}
|
|
369
423
|
async dbDelete(contractAddress, slot) {
|
|
@@ -381,10 +435,14 @@ export class TXEService {
|
|
|
381
435
|
}
|
|
382
436
|
async avmOpcodeStorageRead(slot) {
|
|
383
437
|
const value = await this.typedOracle.avmOpcodeStorageRead(fromSingle(slot));
|
|
384
|
-
return toForeignCallResult([
|
|
438
|
+
return toForeignCallResult([
|
|
439
|
+
toSingle(value)
|
|
440
|
+
]);
|
|
385
441
|
}
|
|
386
442
|
async avmOpcodeStorageWrite(slot, value) {
|
|
387
|
-
await this.typedOracle.storageWrite(fromSingle(slot), [
|
|
443
|
+
await this.typedOracle.storageWrite(fromSingle(slot), [
|
|
444
|
+
fromSingle(value)
|
|
445
|
+
]);
|
|
388
446
|
return toForeignCallResult([]);
|
|
389
447
|
}
|
|
390
448
|
async avmOpcodeGetContractInstanceDeployer(address) {
|
|
@@ -392,7 +450,7 @@ export class TXEService {
|
|
|
392
450
|
return toForeignCallResult([
|
|
393
451
|
toSingle(instance.deployer),
|
|
394
452
|
// AVM requires an extra boolean indicating the instance was found
|
|
395
|
-
toSingle(new Fr(1))
|
|
453
|
+
toSingle(new Fr(1))
|
|
396
454
|
]);
|
|
397
455
|
}
|
|
398
456
|
async avmOpcodeGetContractInstanceClassId(address) {
|
|
@@ -400,7 +458,7 @@ export class TXEService {
|
|
|
400
458
|
return toForeignCallResult([
|
|
401
459
|
toSingle(instance.contractClassId),
|
|
402
460
|
// AVM requires an extra boolean indicating the instance was found
|
|
403
|
-
toSingle(new Fr(1))
|
|
461
|
+
toSingle(new Fr(1))
|
|
404
462
|
]);
|
|
405
463
|
}
|
|
406
464
|
async avmOpcodeGetContractInstanceInitializationHash(address) {
|
|
@@ -408,12 +466,14 @@ export class TXEService {
|
|
|
408
466
|
return toForeignCallResult([
|
|
409
467
|
toSingle(instance.initializationHash),
|
|
410
468
|
// AVM requires an extra boolean indicating the instance was found
|
|
411
|
-
toSingle(new Fr(1))
|
|
469
|
+
toSingle(new Fr(1))
|
|
412
470
|
]);
|
|
413
471
|
}
|
|
414
472
|
avmOpcodeSender() {
|
|
415
473
|
const sender = this.typedOracle.getMsgSender();
|
|
416
|
-
return toForeignCallResult([
|
|
474
|
+
return toForeignCallResult([
|
|
475
|
+
toSingle(sender)
|
|
476
|
+
]);
|
|
417
477
|
}
|
|
418
478
|
async avmOpcodeEmitNullifier(nullifier) {
|
|
419
479
|
await this.typedOracle.avmOpcodeEmitNullifier(fromSingle(nullifier));
|
|
@@ -425,66 +485,82 @@ export class TXEService {
|
|
|
425
485
|
}
|
|
426
486
|
async avmOpcodeNullifierExists(innerNullifier, targetAddress) {
|
|
427
487
|
const exists = await this.typedOracle.avmOpcodeNullifierExists(fromSingle(innerNullifier), AztecAddress.fromField(fromSingle(targetAddress)));
|
|
428
|
-
return toForeignCallResult([
|
|
488
|
+
return toForeignCallResult([
|
|
489
|
+
toSingle(new Fr(exists))
|
|
490
|
+
]);
|
|
429
491
|
}
|
|
430
492
|
async avmOpcodeAddress() {
|
|
431
493
|
const contractAddress = await this.typedOracle.getContractAddress();
|
|
432
|
-
return toForeignCallResult([
|
|
494
|
+
return toForeignCallResult([
|
|
495
|
+
toSingle(contractAddress.toField())
|
|
496
|
+
]);
|
|
433
497
|
}
|
|
434
498
|
async avmOpcodeBlockNumber() {
|
|
435
499
|
const blockNumber = await this.typedOracle.getBlockNumber();
|
|
436
|
-
return toForeignCallResult([
|
|
500
|
+
return toForeignCallResult([
|
|
501
|
+
toSingle(new Fr(blockNumber))
|
|
502
|
+
]);
|
|
437
503
|
}
|
|
438
504
|
avmOpcodeIsStaticCall() {
|
|
439
505
|
const isStaticCall = this.typedOracle.getIsStaticCall();
|
|
440
|
-
return toForeignCallResult([
|
|
506
|
+
return toForeignCallResult([
|
|
507
|
+
toSingle(new Fr(isStaticCall ? 1 : 0))
|
|
508
|
+
]);
|
|
441
509
|
}
|
|
442
510
|
async avmOpcodeChainId() {
|
|
443
511
|
const chainId = await this.typedOracle.getChainId();
|
|
444
|
-
return toForeignCallResult([
|
|
512
|
+
return toForeignCallResult([
|
|
513
|
+
toSingle(chainId)
|
|
514
|
+
]);
|
|
445
515
|
}
|
|
446
516
|
async avmOpcodeVersion() {
|
|
447
517
|
const version = await this.typedOracle.getVersion();
|
|
448
|
-
return toForeignCallResult([
|
|
518
|
+
return toForeignCallResult([
|
|
519
|
+
toSingle(version)
|
|
520
|
+
]);
|
|
449
521
|
}
|
|
450
522
|
avmOpcodeReturndataSize() {
|
|
451
523
|
const size = this.typedOracle.avmOpcodeReturndataSize();
|
|
452
|
-
return toForeignCallResult([
|
|
524
|
+
return toForeignCallResult([
|
|
525
|
+
toSingle(new Fr(size))
|
|
526
|
+
]);
|
|
453
527
|
}
|
|
454
528
|
avmOpcodeReturndataCopy(rdOffset, copySize) {
|
|
455
529
|
const returndata = this.typedOracle.avmOpcodeReturndataCopy(fromSingle(rdOffset).toNumber(), fromSingle(copySize).toNumber());
|
|
456
530
|
// This is a slice, so we need to return the length as well.
|
|
457
|
-
return toForeignCallResult([
|
|
531
|
+
return toForeignCallResult([
|
|
532
|
+
toSingle(new Fr(returndata.length)),
|
|
533
|
+
toArray(returndata)
|
|
534
|
+
]);
|
|
458
535
|
}
|
|
459
536
|
async avmOpcodeCall(_gas, address, _length, args) {
|
|
460
|
-
const result = await this.typedOracle.avmOpcodeCall(addressFromSingle(address), fromArray(args),
|
|
461
|
-
/* isStaticCall */ false);
|
|
537
|
+
const result = await this.typedOracle.avmOpcodeCall(addressFromSingle(address), fromArray(args), /* isStaticCall */ false);
|
|
462
538
|
// Poor man's revert handling
|
|
463
539
|
if (!result.revertCode.isOK()) {
|
|
464
540
|
if (result.revertReason && result.revertReason instanceof SimulationError) {
|
|
465
541
|
await enrichPublicSimulationError(result.revertReason, this.typedOracle.getContractDataOracle(), this.typedOracle.getTXEDatabase(), this.logger);
|
|
466
542
|
throw new Error(result.revertReason.message);
|
|
467
|
-
}
|
|
468
|
-
else {
|
|
543
|
+
} else {
|
|
469
544
|
throw new Error(`Public function call reverted: ${result.revertReason}`);
|
|
470
545
|
}
|
|
471
546
|
}
|
|
472
|
-
return toForeignCallResult([
|
|
547
|
+
return toForeignCallResult([
|
|
548
|
+
toSingle(new Fr(result.revertCode.isOK()))
|
|
549
|
+
]);
|
|
473
550
|
}
|
|
474
551
|
async avmOpcodeStaticCall(_gas, address, _length, args) {
|
|
475
|
-
const result = await this.typedOracle.avmOpcodeCall(addressFromSingle(address), fromArray(args),
|
|
476
|
-
/* isStaticCall */ true);
|
|
552
|
+
const result = await this.typedOracle.avmOpcodeCall(addressFromSingle(address), fromArray(args), /* isStaticCall */ true);
|
|
477
553
|
// Poor man's revert handling
|
|
478
554
|
if (!result.revertCode.isOK()) {
|
|
479
555
|
if (result.revertReason && result.revertReason instanceof SimulationError) {
|
|
480
556
|
await enrichPublicSimulationError(result.revertReason, this.typedOracle.getContractDataOracle(), this.typedOracle.getTXEDatabase(), this.logger);
|
|
481
557
|
throw new Error(result.revertReason.message);
|
|
482
|
-
}
|
|
483
|
-
else {
|
|
558
|
+
} else {
|
|
484
559
|
throw new Error(`Public function call reverted: ${result.revertReason}`);
|
|
485
560
|
}
|
|
486
561
|
}
|
|
487
|
-
return toForeignCallResult([
|
|
562
|
+
return toForeignCallResult([
|
|
563
|
+
toSingle(new Fr(result.revertCode.isOK()))
|
|
564
|
+
]);
|
|
488
565
|
}
|
|
489
566
|
}
|
|
490
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"txe_service.js","sourceRoot":"","sources":["../../src/txe_service/txe_service.ts"],"names":[],"mappings":"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"}
|