Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

web-client: Fix proofs being always set to empty string in Transaction.fromPlain #3192

Merged
merged 1 commit into from
Dec 24, 2024
Merged

web-client: Fix proofs being always set to empty string in Transaction.fromPlain #3192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions web-client/extras/tests/Transaction.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,13 @@ describe('Transaction', () => {
},
};

expect(() => Transaction.fromPlain(plain as PlainTransactionDetails)).not.toThrow();
let tx: Transaction | undefined;
expect(() => tx = Transaction.fromPlain(plain as PlainTransactionDetails)).not.toThrow();
if (!tx) throw new Error('Transaction.fromPlain returned undefined');
const plain2 = tx.toPlain();
expect(plain2.proof).toEqual(plain.proof);
expect(plain2.size).toEqual(plain.size);
expect(plain2.valid).toEqual(plain.valid);
});

it('can deserialize PoW style plain transaction details', () => {
Expand Down Expand Up @@ -116,7 +122,7 @@ describe('Transaction', () => {
"pathLength": 0,
"raw": "4490c883a95fc7c44e45043108436973b071851ed2a203111ddb2f088056f0fc0098be457841e99d998cc54e96306a82e106bc5306271cd2194eba1d8e7653baff6e5e3b3344c11da401d4f42ab5763e4f3147662f07ac4c32addd3e15da469707"
},
"size": 201,
"size": 200,
"valid": true,
"state": "confirmed",
"blockHash": "f8a0d2a34352368bbb07590434b58f1c23c31b12b8b6368eb92cb84928968575",
Expand All @@ -129,6 +135,14 @@ describe('Transaction', () => {
},
};

expect(() => Transaction.fromPlain(plain as unknown as PlainTransactionDetails)).not.toThrow();
let tx: Transaction | undefined;
expect(() => tx = Transaction.fromPlain(plain as unknown as PlainTransactionDetails)).not.toThrow();
if (!tx) throw new Error('Transaction.fromPlain returned undefined');

const plain2 = tx.toPlain();
// Cannot compare proof field yet, as re-serialization creates a PoS proof with a a leading 0x00-byte
// expect(plain2.proof).toEqual(plain.proof);
expect(plain2.size).toEqual(plain.size);
expect(plain2.valid).toEqual(plain.valid);
});
});
2 changes: 1 addition & 1 deletion web-client/src/common/transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ impl Transaction {
from_network_id(NetworkId::from_str(&plain.network)?),
)?;
tx.set_proof(hex::decode(match plain.proof {
PlainTransactionProof::Raw(_) => "",
PlainTransactionProof::Raw(ref data) => &data.raw,
PlainTransactionProof::Standard(ref data) => &data.raw,
PlainTransactionProof::RegularTransfer(ref data) => &data.raw,
PlainTransactionProof::TimeoutResolve(ref data) => &data.raw,
Expand Down
Loading