Skip to content

Commit a8fccc9

Browse files
alexpitsikoulisalexpitsikoulis
committed
fixed failing record provider tests
1 parent 6427fa2 commit a8fccc9

File tree

6 files changed

+51
-58
lines changed

6 files changed

+51
-58
lines changed

‎sdk/src/browser.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ import {
4545
BlockHeightSearch,
4646
NetworkRecordProvider,
4747
RecordProvider,
48-
RecordSearchParams,
4948
} from "./record-provider.js";
49+
import {
50+
RecordSearchParams,
51+
} from "./models/record-provider/recordSearchParams.js";
5052

5153
// @TODO: This function is no longer needed, remove it.
5254
async function initializeWasm() {

‎sdk/src/program-manager.ts‎

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Account } from "./account.js";
22
import { AleoNetworkClient, AleoNetworkClientOptions, ProgramImports } from "./network-client.js";
33
import { ImportedPrograms, ImportedVerifyingKeys } from "./models/imports.js";
4-
import { RecordProvider, RecordSearchParams } from "./record-provider.js";
4+
import { RecordProvider } from "./record-provider.js";
5+
import { RecordSearchParams } from "./models/record-provider/recordSearchParams.js";
56

67
import {
78
AleoKeyProvider,
@@ -35,6 +36,7 @@ import {
3536
} from "./constants.js";
3637

3738
import { logAndThrow } from "./utils.js";
39+
import { OwnedRecord } from "./models/record-provider/ownedRecord.js";
3840

3941
/**
4042
* Represents the options for executing a transaction in the Aleo network.
@@ -350,14 +352,12 @@ class ProgramManager {
350352
// Get the fee record from the account if it is not provided in the parameters
351353
try {
352354
feeRecord = privateFee
353-
? <RecordPlaintext>(
354-
await this.getCreditsRecord(
355+
? RecordPlaintext.fromString((await this.getCreditsRecord(
355356
priorityFee,
356357
[],
357358
feeRecord,
358359
recordSearchParams,
359-
)
360-
)
360+
)).recordPlaintext?? '')
361361
: undefined;
362362
} catch (e: any) {
363363
logAndThrow(
@@ -564,14 +564,12 @@ class ProgramManager {
564564
// Get the fee record from the account if it is not provided in the parameters
565565
try {
566566
feeRecord = privateFee
567-
? <RecordPlaintext>(
568-
await this.getCreditsRecord(
567+
? RecordPlaintext.fromString((await this.getCreditsRecord(
569568
priorityFee,
570569
[],
571570
feeRecord,
572571
recordSearchParams,
573-
)
574-
)
572+
)).recordPlaintext?? '')
575573
: undefined;
576574
} catch (e: any) {
577575
logAndThrow(
@@ -909,14 +907,12 @@ class ProgramManager {
909907
// Get the fee record from the account if it is not provided in the parameters.
910908
try {
911909
feeRecord = privateFee
912-
? <RecordPlaintext>(
913-
await this.getCreditsRecord(
910+
? RecordPlaintext.fromString((await this.getCreditsRecord(
914911
priorityFee,
915912
[],
916913
feeRecord,
917914
recordSearchParams,
918-
)
919-
)
915+
)).recordPlaintext?? '')
920916
: undefined;
921917
} catch (e: any) {
922918
logAndThrow(
@@ -1244,14 +1240,12 @@ class ProgramManager {
12441240
// Get the fee record from the account if it is not provided in the parameters
12451241
try {
12461242
feeRecord = privateFee
1247-
? <RecordPlaintext>(
1248-
await this.getCreditsRecord(
1243+
? RecordPlaintext.fromString((await this.getCreditsRecord(
12491244
priorityFee,
12501245
[],
12511246
feeRecord,
12521247
recordSearchParams,
1253-
)
1254-
)
1248+
)).recordPlaintext?? '')
12551249
: undefined;
12561250
} catch (e: any) {
12571251
logAndThrow(
@@ -1517,27 +1511,23 @@ class ProgramManager {
15171511
const nonces: string[] = [];
15181512
if (requiresAmountRecord(transferType)) {
15191513
// If the transfer type is private and requires an amount record, get it from the record provider
1520-
amountRecord = <RecordPlaintext>(
1521-
await this.getCreditsRecord(
1514+
amountRecord = RecordPlaintext.fromString((await this.getCreditsRecord(
15221515
priorityFee,
15231516
[],
15241517
amountRecord,
15251518
recordSearchParams,
1526-
)
1527-
);
1519+
)).recordPlaintext?? '');
15281520
nonces.push(amountRecord.nonce());
15291521
} else {
15301522
amountRecord = undefined;
15311523
}
15321524
feeRecord = privateFee
1533-
? <RecordPlaintext>(
1534-
await this.getCreditsRecord(
1525+
? RecordPlaintext.fromString((await this.getCreditsRecord(
15351526
priorityFee,
15361527
nonces,
15371528
feeRecord,
15381529
recordSearchParams,
1539-
)
1540-
)
1530+
)).recordPlaintext?? '')
15411531
: undefined;
15421532
} catch (e: any) {
15431533
logAndThrow(
@@ -2504,21 +2494,25 @@ class ProgramManager {
25042494
nonces: string[],
25052495
record?: RecordPlaintext | string,
25062496
params?: RecordSearchParams,
2507-
): Promise<RecordPlaintext> {
2497+
): Promise<OwnedRecord> {
25082498
try {
2509-
return record instanceof RecordPlaintext
2510-
? record
2511-
: RecordPlaintext.fromString(<string>record);
2499+
// return record instanceof RecordPlaintext
2500+
// ? record
2501+
// : RecordPlaintext.fromString(<string>record);
2502+
if (record && record instanceof RecordPlaintext) {
2503+
record = record.toString();
2504+
}
2505+
return <OwnedRecord>({
2506+
recordPlaintext: record,
2507+
programName: 'credits.aleo',
2508+
recordName: 'credits',
2509+
})
25122510
} catch (e) {
25132511
try {
25142512
const recordProvider = <RecordProvider>this.recordProvider;
2515-
return <RecordPlaintext>(
2516-
await recordProvider.findCreditsRecord(
2517-
amount,
2518-
true,
2519-
nonces,
2520-
params,
2521-
)
2513+
return await recordProvider.findCreditsRecord(
2514+
amount,
2515+
{ ...params, unspent: true, nonces }
25222516
);
25232517
} catch (e: any) {
25242518
logAndThrow(

‎sdk/src/record-provider.ts‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,10 @@ class NetworkRecordProvider implements RecordProvider {
261261

262262
const recordsPts = await this.networkClient.findRecords(startHeight, endHeight, searchParameters.unspent, ["credits.aleo"], microcredits, maxAmount, searchParameters.nonces, this.account.privateKey());
263263
return recordsPts.map((record) => ({
264-
commitment: record.commitment().toString(),
265-
owner: record.owner().toString(),
266-
programName: 'credits.aleo',
267-
recordName: 'credits',
268-
recordPlaintext: record.to_string(),
269-
tag: record.tag().toString(),
264+
owner: record.owner().toString(),
265+
programName: 'credits.aleo',
266+
recordName: 'credits',
267+
recordPlaintext: record.toString(),
270268
}));
271269
}
272270

@@ -381,10 +379,7 @@ class NetworkRecordProvider implements RecordProvider {
381379

382380
const recordPts = await this.networkClient.findRecords(startHeight, endHeight, searchParameters.unspent, programs, amounts, maxAmount, searchParameters.nonces, this.account.privateKey());
383381
return recordPts.map((record) => ({
384-
commitment: record.commitment().toString(),
385-
owner: record.owner().toString(),
386-
programName: record.program().toString(),
387-
recordName: record.name().toString(),
382+
recordPlaintext: record.toString(),
388383
}));
389384
}
390385

@@ -423,10 +418,10 @@ class BlockHeightSearch implements RecordSearchParams {
423418
startHeight: number;
424419
endHeight: number;
425420
unspent: boolean;
426-
constructor(startHeight: number, endHeight: number, unspent: boolean) {
421+
constructor(startHeight: number, endHeight: number, unspent?: boolean) {
427422
this.startHeight = startHeight;
428423
this.endHeight = endHeight;
429-
this.unspent = unspent;
424+
this.unspent = !!unspent;
430425
}
431426
}
432427

‎sdk/src/record-scanner.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class RecordScanner implements RecordProvider {
6969
throw new Error("Account not set");
7070
} else {
7171
request = {
72-
viewKey: this.account.viewKey(),
72+
viewKey: this.account.viewKey().toString(),
7373
start: startBlock,
7474
};
7575
}
@@ -228,7 +228,7 @@ class RecordScanner implements RecordProvider {
228228
});
229229

230230
const record = records.find(record => {
231-
const plaintext = RecordPlaintext.fromString(record.recordPlaintext);
231+
const plaintext = RecordPlaintext.fromString(record.recordPlaintext ?? '');
232232
const amountStr = plaintext.getMember("microcredits").toString();
233233
const amount = parseInt(amountStr.replace("u64", ""));
234234
return amount >= microcredits;
@@ -261,7 +261,7 @@ class RecordScanner implements RecordProvider {
261261
decrypt: true,
262262
});
263263
return records.filter(record => {
264-
const plaintext = RecordPlaintext.fromString(record.recordPlaintext);
264+
const plaintext = RecordPlaintext.fromString(record.recordPlaintext ?? '');
265265
const amount = plaintext.getMember("microcredits").toString();
266266
return microcreditAmounts.includes(parseInt(amount.replace("u64", "")));
267267
});

‎sdk/tests/record-provider.integration.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,25 @@ describe('RecordProvider', () => {
1818
try {
1919
// Find two records with findCreditsRecords
2020
const nonces: string[] = [];
21-
const records = await recordProvider.findCreditsRecords([100, 200], true, []);
21+
const records = await recordProvider.findCreditsRecords([100, 200], { unspent: true, nonces });
2222
if (Array.isArray(records)) {
2323
expect(records.length).equal(2);
2424
records.forEach((record) => {
25-
nonces.push(record.nonce());
25+
let pt = new RecordPlaintext(record.recordPlaintext);
26+
nonces.push(pt.nonce());
2627
});
2728
} else {
2829
expect(Array.isArray(records)).equal(true);
2930
}
3031

3132
// Get another two records with findCreditsRecords and ensure they are unique
32-
const records2 = await recordProvider.findCreditsRecords([100, 200], true, nonces);
33+
const records2 = await recordProvider.findCreditsRecords([100, 200], { unspent: true, nonces });
3334
if (Array.isArray(records2)) {
3435
expect(records2.length).equal(2);
3536
records2.forEach((record) => {
36-
expect(nonces.includes(record.nonce())).equal(false);
37-
nonces.push(record.nonce());
37+
let pt = new RecordPlaintext(record.recordPlaintext);
38+
expect(nonces.includes(pt.nonce())).equal(false);
39+
nonces.push(pt.nonce());
3840
});
3941
} else {
4042
expect(Array.isArray(records2)).equal(true);

‎sdk/tests/record-provider.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe.skip('RecordProvider', () => {
1616
describe('Record provider', () => {
1717
it('should not find records where there are none', async () => {
1818
const params = new BlockHeightSearch(0, 100);
19-
const records = await recordProvider.findCreditsRecords([100, 200], true, [], params);
19+
const records = await recordProvider.findCreditsRecords([100, 200], params);
2020
expect(<object>records).equal([]);
2121
});
2222
});

0 commit comments

Comments
 (0)