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

refactor(crypto-transaction): use keccak256 to generate transaction id #845

Merged
merged 4 commits into from
Jan 30, 2025
Merged

refactor(crypto-transaction): use keccak256 to generate transaction id #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
421b813
Use keccak
sebastijankuzner Jan 29, 2025
760225b
Fix tests
sebastijankuzner Jan 30, 2025
8511d83
Regenerate network
sebastijankuzner Jan 30, 2025
1598029
Update e2e
sebastijankuzner Jan 30, 2025
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
2,090 changes: 1,045 additions & 1,045 deletions packages/core/bin/config/testnet/core/crypto.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions packages/core/bin/config/testnet/core/genesis-wallet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"address": "0x19603a3aD6F0b3A447c2623dD6653452914e55f3",
"address": "0xE7E5Cb3c09EAe2f19CB0d8c346F8C13b1836fb92",
"consensusKeys": {
"compressed": true,
"privateKey": "00e7f2c2d3e91f82ff12e3567754e27882d007cafd6f7dc5d73b2670d3dc39c9",
"publicKey": "a1309ae4359975d11850d9adccb305b8ac0698b27153031751a72152367ecf6a29717243a52831e714467870b48d51a5"
"privateKey": "5e2d389fb489bf74a1a319f763116d0c39c43a26ef0de3ebe2ce0d95f52952d2",
"publicKey": "ade9a14bc17af974517df08dad45229d91252bd8ca12ffca24fc1b8bcc3683860bef68cef3dbf714a8e5804989b7429b"
},
"keys": {
"compressed": true,
"privateKey": "ad2a550d732084e1216819867d6a5a5074608d175b51f62ee13eb6c9577cc7de",
"publicKey": "02362e32d794f9c01287c21109777cb2dc7c81a28b37859825dd688baaa04dc831"
"privateKey": "bcda9eb5b18b4604c0d506c6a586466a1ce9f290bd1f447881834dea6e08b1fc",
"publicKey": "03504f475e55de354b15509157b2e0c3e7e3d05a6218aa288d7eb51ec961f69366"
},
"passphrase": "scale spare auction actual chase border village scrub payment benefit will depend rely solve pelican weekend outside spend margin rifle coin ribbon leader whip"
"passphrase": "cabbage path depth busy review helmet online accident rapid canoe polar surround isolate mushroom sad adapt arm obey strong luxury target sentence trial fly"
}
106 changes: 53 additions & 53 deletions packages/core/bin/config/testnet/core/validators.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/crypto-block/source/serializer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe<{
});

it("#size - should return size with transactions", async ({ serializer, sandbox }) => {
assert.equal(serializer.totalSize(blockDataWithTransactions), 446);
assert.equal(serializer.totalSize(blockDataWithTransactions), 449);
});

it("#serialize - should serialize and deserialize block", async ({ serializer, deserializer }) => {
Expand Down
115 changes: 58 additions & 57 deletions packages/crypto-block/test/fixtures/block.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,111 +43,112 @@ export const serialized =
"0174ba618a8c0102000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855b559f4fbb75c378cdd3dd7ccbfeff9c5c2094e55";

export const blockDataWithTransactions: Contracts.Crypto.BlockData = {
generatorAddress: "0xd1AD6bfA3540F25E21e6be808FB7F12562111CE5",
height: 1,
id: "2846da9ddb343be71b6fc0b938254e40c351ebafd1d94e4a40adfcec229228da",
generatorAddress: "0xB559F4FbB75c378CDd3Dd7CcbFeff9c5c2094E55",
height: 2,
id: "c78f743e91b06f046d49468510c156cd01a66bff05e94a79fec6f7ec491f7658",
numberOfTransactions: 2,
payloadHash: "0d053ecf6de04d76e15fd431a417d0585e04bb421ca8d4d95b232442ef4ddbd2",
payloadLength: 209,
previousBlock: "0d053ecf6de04d76e15fd431a417d0585e04bb421ca8d4d95b232442ef4ddbd2",
payloadHash: "04a34e14bf3d47244d0477a2f1899042c6909520b421f0d00aa98f296bef41d8",
payloadLength: 212,
previousBlock: "0000000000000000000000000000000000000000000000000000000000000000",
reward: BigNumber.ZERO,
round: 0,
stateHash: "0d053ecf6de04d76e15fd431a417d0585e04bb421ca8d4d95b232442ef4ddbd2",
timestamp: 1_000_000,
totalAmount: BigNumber.make("300"),
round: 1,
stateHash: "0000000000000000000000000000000000000000000000000000000000000000",
timestamp: 1_703_128_709_748,
totalAmount: BigNumber.ZERO,
totalFee: BigNumber.make("20"),
totalGasUsed: 2_000_000,
totalGasUsed: 2000,
transactions: [
{
data: "",
gasLimit: 1_000_000,
gasPrice: 10,
id: "2f73e1f2f37c40488511418a2d939cc5a932bb725856acc65e616b73e3d1483c",
network: 30,
id: "a82b0f2dd35510467579881b6a69bb4edbf14962b7c209077f72004c9b494195",
network: 10_000,
nonce: BigNumber.ZERO,
r: "880618343e206a7518fd970c4232440546b77d991976acb4c6a7040e10d668de",
r: "d73285e3822bdfb7fce2a9af508ba9ac3b09af960854e22d4c5759b63d6959fe",
recipientAddress: "0xBe89811e15f611C1db12e59679b6F3DC1F430155",
s: "5dd454bd405a43d530826e9223882bcb42bd9134a57e429617f15b130216bb31",
senderAddress: "0xd1AD6bfA3540F25E21e6be808FB7F12562111CE5",
senderPublicKey: "03dc6981461d4b82df3e7db49b20a674745cef0dc5e7165168fe26490f5a24895a",
s: "00699e2f9ef3d8ccdd1f799ddc0d5a92ba44a6ad86323096046e3f1f8b2e63b1",
senderAddress: "0x976c59b8E92bBfB496521842a3b8Ac878f1a1499",
senderPublicKey: "02e7f40c24306200c7832ecef3c2115a848717ca8e7be16547ebee15b72156fd0d",
sequence: 0,
timestamp: 1_000_000,
timestamp: 1_703_128_709_748,
v: 27,
value: BigNumber.make("100"),
value: BigNumber.ZERO,
},
{
data: "",
gasLimit: 1_000_000,
gasPrice: 10,
id: "d5a7bda555ca7a1ffb0fd605197b71a0c5e20f91eb992065a522085d9d1e8370",
network: 30,
id: "7641499c1609d90a40904b00d38f17484f86479e61ff7579d4748d36342e8558",
network: 10_000,
nonce: BigNumber.ONE,
r: "9867329ee177952b05c56471d94dcf3a2fcd63b1164d1698ac50beb9793c5687",
r: "2fbcaa2544d76a9031ede17e98f1a6d68bcef75945d72cfcc5ec8e7e4a78df57",
recipientAddress: "0xBe89811e15f611C1db12e59679b6F3DC1F430155",
s: "2e27a586b3a935255d8f57eae63c97aef430f3c55a6a63db7185c0d8ff5c6a2c",
senderAddress: "0xd1AD6bfA3540F25E21e6be808FB7F12562111CE5",
senderPublicKey: "03dc6981461d4b82df3e7db49b20a674745cef0dc5e7165168fe26490f5a24895a",
s: "601822899df2db1755b502606f0f058835e67a9690525c17631bc63343e856a4",
senderAddress: "0x976c59b8E92bBfB496521842a3b8Ac878f1a1499",
senderPublicKey: "02e7f40c24306200c7832ecef3c2115a848717ca8e7be16547ebee15b72156fd0d",
sequence: 1,
timestamp: 1_000_000,
v: 28,
value: BigNumber.make("200"),
timestamp: 1_703_128_709_748,
v: 27,
value: BigNumber.ZERO,
},
],
version: 1,
};

export const blockDataWithTransactionsJson: Contracts.Crypto.BlockJson = {
generatorAddress: "0xd1AD6bfA3540F25E21e6be808FB7F12562111CE5",
height: 1,
id: "2846da9ddb343be71b6fc0b938254e40c351ebafd1d94e4a40adfcec229228da",
generatorAddress: "0xB559F4FbB75c378CDd3Dd7CcbFeff9c5c2094E55",
height: 2,
id: "c78f743e91b06f046d49468510c156cd01a66bff05e94a79fec6f7ec491f7658",
numberOfTransactions: 2,
payloadHash: "0d053ecf6de04d76e15fd431a417d0585e04bb421ca8d4d95b232442ef4ddbd2",
payloadLength: 209,
previousBlock: "0d053ecf6de04d76e15fd431a417d0585e04bb421ca8d4d95b232442ef4ddbd2",
payloadHash: "04a34e14bf3d47244d0477a2f1899042c6909520b421f0d00aa98f296bef41d8",
payloadLength: 212,
previousBlock: "0000000000000000000000000000000000000000000000000000000000000000",
reward: "0",
round: 0,
stateHash: "0d053ecf6de04d76e15fd431a417d0585e04bb421ca8d4d95b232442ef4ddbd2",
timestamp: 1_000_000,
totalAmount: "300",
round: 1,
stateHash: "0000000000000000000000000000000000000000000000000000000000000000",
timestamp: 1_703_128_709_748,
totalAmount: "0",
totalFee: "20",
totalGasUsed: 2_000_000,
totalGasUsed: 2000,

transactions: [
{
data: "",
gasLimit: 1_000_000,
gasPrice: 10,
id: "2f73e1f2f37c40488511418a2d939cc5a932bb725856acc65e616b73e3d1483c",
network: 30,
id: "a82b0f2dd35510467579881b6a69bb4edbf14962b7c209077f72004c9b494195",
network: 10_000,
nonce: "0",
r: "880618343e206a7518fd970c4232440546b77d991976acb4c6a7040e10d668de",
r: "d73285e3822bdfb7fce2a9af508ba9ac3b09af960854e22d4c5759b63d6959fe",
recipientAddress: "0xBe89811e15f611C1db12e59679b6F3DC1F430155",
s: "5dd454bd405a43d530826e9223882bcb42bd9134a57e429617f15b130216bb31",
senderAddress: "0xd1AD6bfA3540F25E21e6be808FB7F12562111CE5",
senderPublicKey: "03dc6981461d4b82df3e7db49b20a674745cef0dc5e7165168fe26490f5a24895a",
s: "00699e2f9ef3d8ccdd1f799ddc0d5a92ba44a6ad86323096046e3f1f8b2e63b1",
senderAddress: "0x976c59b8E92bBfB496521842a3b8Ac878f1a1499",
senderPublicKey: "02e7f40c24306200c7832ecef3c2115a848717ca8e7be16547ebee15b72156fd0d",
sequence: 0,
timestamp: 1_000_000,
timestamp: 1_703_128_709_748,
v: 27,
value: "100",
value: "0",
},
{
data: "",
gasLimit: 1_000_000,
gasPrice: 10,
id: "d5a7bda555ca7a1ffb0fd605197b71a0c5e20f91eb992065a522085d9d1e8370",
network: 30,
id: "7641499c1609d90a40904b00d38f17484f86479e61ff7579d4748d36342e8558",
network: 10_000,
nonce: "1",
r: "9867329ee177952b05c56471d94dcf3a2fcd63b1164d1698ac50beb9793c5687",
r: "2fbcaa2544d76a9031ede17e98f1a6d68bcef75945d72cfcc5ec8e7e4a78df57",
recipientAddress: "0xBe89811e15f611C1db12e59679b6F3DC1F430155",
s: "2e27a586b3a935255d8f57eae63c97aef430f3c55a6a63db7185c0d8ff5c6a2c",
senderAddress: "0xd1AD6bfA3540F25E21e6be808FB7F12562111CE5",
senderPublicKey: "03dc6981461d4b82df3e7db49b20a674745cef0dc5e7165168fe26490f5a24895a",
s: "601822899df2db1755b502606f0f058835e67a9690525c17631bc63343e856a4",
senderAddress: "0x976c59b8E92bBfB496521842a3b8Ac878f1a1499",
senderPublicKey: "02e7f40c24306200c7832ecef3c2115a848717ca8e7be16547ebee15b72156fd0d",
sequence: 1,
timestamp: 1_000_000,
v: 28,
value: "200",
timestamp: 1_703_128_709_748,
v: 27,
value: "0",
},
],
version: 1,
};
export const serializedWithTransactions =
"0140420f00000001000000000000000d053ecf6de04d76e15fd431a417d0585e04bb421ca8d4d95b232442ef4ddbd20d053ecf6de04d76e15fd431a417d0585e04bb421ca8d4d95b232442ef4ddbd2020080841e00000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000d10000000d053ecf6de04d76e15fd431a417d0585e04bb421ca8d4d95b232442ef4ddbd2d1ad6bfa3540f25e21e6be808fb7f12562111ce5660002f8631e80800a830f424094be89811e15f611c1db12e59679b6f3dc1f4301556480c080a0880618343e206a7518fd970c4232440546b77d991976acb4c6a7040e10d668dea05dd454bd405a43d530826e9223882bcb42bd9134a57e429617f15b130216bb31670002f8641e01800a830f424094be89811e15f611c1db12e59679b6f3dc1f43015581c880c001a09867329ee177952b05c56471d94dcf3a2fcd63b1164d1698ac50beb9793c5687a02e27a586b3a935255d8f57eae63c97aef430f3c55a6a63db7185c0d8ff5c6a2c";
"0174ba618a8c010200000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200d0070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000d400000004a34e14bf3d47244d0477a2f1899042c6909520b421f0d00aa98f296bef41d8b559f4fbb75c378cdd3dd7ccbfeff9c5c2094e55680002f86582271080800a830f424094be89811e15f611c1db12e59679b6f3dc1f4301558080c080a0d73285e3822bdfb7fce2a9af508ba9ac3b09af960854e22d4c5759b63d6959fea000699e2f9ef3d8ccdd1f799ddc0d5a92ba44a6ad86323096046e3f1f8b2e63b1680002f86582271001800a830f424094be89811e15f611c1db12e59679b6f3dc1f4301558080c080a02fbcaa2544d76a9031ede17e98f1a6d68bcef75945d72cfcc5ec8e7e4a78df57a0601822899df2db1755b502606f0f058835e67a9690525c17631bc63343e856a4";
Loading
Loading