@ledgerhq/coin-solana 0.33.0 → 0.33.1-nightly.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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +23 -0
- package/lib/buildTransaction.d.ts +0 -2
- package/lib/buildTransaction.d.ts.map +1 -1
- package/lib/buildTransaction.js +4 -3
- package/lib/buildTransaction.js.map +1 -1
- package/lib/buildTransaction.test.js +127 -17
- package/lib/buildTransaction.test.js.map +1 -1
- package/lib/network/chain/index.d.ts +0 -2
- package/lib/network/chain/index.d.ts.map +1 -1
- package/lib/offchainMessage/format.d.ts +0 -2
- package/lib/offchainMessage/format.d.ts.map +1 -1
- package/lib/signer.d.ts +0 -2
- package/lib/signer.d.ts.map +1 -1
- package/lib/utils.d.ts +1 -2
- package/lib/utils.d.ts.map +1 -1
- package/lib/utils.js +4 -1
- package/lib/utils.js.map +1 -1
- package/lib-es/buildTransaction.d.ts +0 -2
- package/lib-es/buildTransaction.d.ts.map +1 -1
- package/lib-es/buildTransaction.js +5 -4
- package/lib-es/buildTransaction.js.map +1 -1
- package/lib-es/buildTransaction.test.js +127 -17
- package/lib-es/buildTransaction.test.js.map +1 -1
- package/lib-es/network/chain/index.d.ts +0 -2
- package/lib-es/network/chain/index.d.ts.map +1 -1
- package/lib-es/offchainMessage/format.d.ts +0 -2
- package/lib-es/offchainMessage/format.d.ts.map +1 -1
- package/lib-es/signer.d.ts +0 -2
- package/lib-es/signer.d.ts.map +1 -1
- package/lib-es/utils.d.ts +1 -2
- package/lib-es/utils.d.ts.map +1 -1
- package/lib-es/utils.js +3 -0
- package/lib-es/utils.js.map +1 -1
- package/package.json +8 -8
- package/src/buildTransaction.test.ts +188 -31
- package/src/buildTransaction.ts +5 -4
- package/src/utils.ts +4 -0
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
> @ledgerhq/coin-solana@0.33.0 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-solana
|
|
2
|
+
> @ledgerhq/coin-solana@0.33.1-nightly.0 build /home/runner/work/ledger-live/ledger-live/libs/coin-modules/coin-solana
|
|
3
3
|
> tsc --outDir lib --module commonjs --moduleResolution node10 && tsc -m ES6 --outDir lib-es
|
|
4
4
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# @ledgerhq/coin-solana
|
|
2
2
|
|
|
3
|
+
## 0.33.1-nightly.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`af64263`](https://github.com/LedgerHQ/ledger-live/commit/af642634bd4536183f766323d0ec5b9b99841dc6), [`13ac4d7`](https://github.com/LedgerHQ/ledger-live/commit/13ac4d7ed05f0fc448cc0a013688c917cb73e0f5)]:
|
|
8
|
+
- @ledgerhq/cryptoassets@13.28.1-nightly.1
|
|
9
|
+
- @ledgerhq/types-live@6.85.0-nightly.1
|
|
10
|
+
- @ledgerhq/coin-framework@6.4.1-nightly.1
|
|
11
|
+
|
|
12
|
+
## 0.33.1-nightly.0
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#11857](https://github.com/LedgerHQ/ledger-live/pull/11857) [`173073d`](https://github.com/LedgerHQ/ledger-live/commit/173073da1f9a0a899fdb4d5fa3625554bf7c41dd) Thanks [@Justkant](https://github.com/Justkant)! - fix(sol): add support for signing raw Solana multisig transactions
|
|
17
|
+
|
|
18
|
+
- Updated dependencies [[`38a172c`](https://github.com/LedgerHQ/ledger-live/commit/38a172c23035040d077433c7f4fce60f72962ae0), [`c8fe586`](https://github.com/LedgerHQ/ledger-live/commit/c8fe586f1427d4d7a9fad092b51221ec8221399d), [`3b5576e`](https://github.com/LedgerHQ/ledger-live/commit/3b5576e0b67fedad0f5dbbd6b9546281af4e6111), [`fe97131`](https://github.com/LedgerHQ/ledger-live/commit/fe971313776194e5942dfa9a95d6082950c3111e)]:
|
|
19
|
+
- @ledgerhq/devices@8.5.2-nightly.0
|
|
20
|
+
- @ledgerhq/types-live@6.85.0-nightly.0
|
|
21
|
+
- @ledgerhq/live-env@2.17.0-nightly.0
|
|
22
|
+
- @ledgerhq/coin-framework@6.4.1-nightly.0
|
|
23
|
+
- @ledgerhq/cryptoassets@13.28.1-nightly.0
|
|
24
|
+
- @ledgerhq/live-network@2.0.18-nightly.0
|
|
25
|
+
|
|
3
26
|
## 0.33.0
|
|
4
27
|
|
|
5
28
|
### Minor Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAcpD,OAAO,EAEL,oBAAoB,IAAI,kBAAkB,EAG1C,8BAA8B,EAE/B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC,eAAO,MAAM,uBAAuB,YACzB,MAAM,eACF,WAAW,OACnB,QAAQ;;;gBAKC,MAAM,KAAK,kBAAkB,EAiC5C,CAAC"}
|
package/lib/buildTransaction.js
CHANGED
|
@@ -10,9 +10,10 @@ const buildTransactionWithAPI = async (address, transaction, api) => {
|
|
|
10
10
|
let web3SolanaTransaction;
|
|
11
11
|
if (transaction.raw) {
|
|
12
12
|
web3SolanaTransaction = web3_js_1.VersionedTransaction.deserialize(Buffer.from(transaction.raw, "base64"));
|
|
13
|
-
//
|
|
14
|
-
//
|
|
15
|
-
|
|
13
|
+
// Update the recent blockhash if no real signatures are present
|
|
14
|
+
// This ensures the transaction uses a fresh blockhash for submission
|
|
15
|
+
// NOTE: we could also make use of the isBlockHashValid rpc method to check the validity
|
|
16
|
+
if (web3SolanaTransaction.signatures.every(sig => Buffer.from(sig).equals(utils_1.DUMMY_SIGNATURE))) {
|
|
16
17
|
web3SolanaTransaction.message.recentBlockhash = recentBlockhash.blockhash;
|
|
17
18
|
}
|
|
18
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":";;;AACA,+CAW8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":";;;AACA,+CAW8B;AAC9B,mCAA6D;AAC7D,6CAOyB;AAEzB,yCAAuC;AAEhC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,OAAe,EACf,WAAwB,EACxB,GAAa,EAOb,EAAE;IACF,MAAM,eAAe,GAAG,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC;IAEvD,IAAI,qBAA2C,CAAC;IAChD,IAAI,WAAW,CAAC,GAAG,EAAE,CAAC;QACpB,qBAAqB,GAAG,8BAAkB,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC/F,gEAAgE;QAChE,qEAAqE;QACrE,wFAAwF;QACxF,IAAI,qBAAqB,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,uBAAe,CAAC,CAAC,EAAE,CAAC;YAC5F,qBAAqB,CAAC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAC,SAAS,CAAC;QAC5E,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC/D,MAAM,kBAAkB,GAAG,IAAI,4BAAkB,CAAC;YAChD,QAAQ,EAAE,IAAI,mBAAS,CAAC,OAAO,CAAC;YAChC,eAAe,EAAE,eAAe,CAAC,SAAS;YAC1C,YAAY;SACb,CAAC,CAAC;QAEH,qBAAqB,GAAG,IAAI,8BAAkB,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED,OAAO;QACL,qBAAqB;QACrB,eAAe;QACf,CAAC,SAAiB,EAAE,EAAE;YACpB,qBAAqB,CAAC,YAAY,CAAC,IAAI,mBAAS,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;YACtE,OAAO,qBAAqB,CAAC;QAC/B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAzCW,QAAA,uBAAuB,2BAyClC;AAEF,KAAK,UAAU,iBAAiB,CAC9B,GAAa,EACb,EAAe;IAEf,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACvC,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC9D,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,IAAA,YAAK,EAAC;YACJ,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE,+BAA+B;YACxC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAClF,OAAO,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE;SACzD,CAAC,CAAC;QACH,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,2BAA2B,CAAC,GAAG,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACrE,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,GAAa,EACb,OAAgB;IAEhB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,UAAU;YACb,OAAO,IAAA,gCAAyB,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACjD,KAAK,gBAAgB;YACnB,OAAO,IAAA,qCAA8B,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACtD,KAAK,iBAAiB;YACpB,OAAO,IAAA,mDAA4C,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpE,KAAK,eAAe;YAClB,OAAO,IAAA,0CAAmC,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3D,KAAK,cAAc;YACjB,OAAO,IAAA,yCAAkC,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1D,KAAK,qBAAqB;YACxB,OAAO,IAAA,0CAAmC,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3D,KAAK,gBAAgB;YACnB,OAAO,IAAA,qCAA8B,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACtD,KAAK,kBAAkB;YACrB,OAAO,IAAA,uCAAgC,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACxD,KAAK,gBAAgB;YACnB,OAAO,IAAA,qCAA8B,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACtD,KAAK,aAAa;YAChB,OAAO,IAAA,kCAA2B,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACnD,KAAK,KAAK;YACR,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC7E;YACE,OAAO,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;IACtC,CAAC;AACH,CAAC"}
|
|
@@ -3,16 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const web3_js_1 = require("@solana/web3.js");
|
|
4
4
|
const buildTransaction_1 = require("./buildTransaction");
|
|
5
5
|
const helpers_fixture_1 = require("./__tests__/fixtures/helpers.fixture");
|
|
6
|
+
const utils_1 = require("./utils");
|
|
7
|
+
// Mock VersionedTransaction
|
|
8
|
+
const mockAddSignature = jest.fn();
|
|
9
|
+
const mockSerialize = jest.fn().mockReturnValue(new Uint8Array([1, 2, 3]));
|
|
10
|
+
let spiedDeserialize = undefined;
|
|
11
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12
|
+
function setDeserialize(tx) {
|
|
13
|
+
return jest.spyOn(web3_js_1.VersionedTransaction, "deserialize").mockReturnValue(tx);
|
|
14
|
+
}
|
|
6
15
|
describe("Testing buildTransaction", () => {
|
|
7
16
|
const ADDRESS = "Hj69wRzkrFuf1Nby4yzPEFHdsmQdMoVYjvDKZSLjZFEp";
|
|
8
17
|
const BLOCKHASH = "DJRuRgQP3BeBNH8WVdF9cppBDj7pQNiVr4ZDnqupRtTC";
|
|
9
18
|
const LAST_VALID_BLOCK_HEIGHT = 1;
|
|
10
19
|
const SIGNATURE = Buffer.from("any random value");
|
|
11
|
-
|
|
20
|
+
const OLD_BLOCKHASH = "8RgQBB8zzKkv4iuHMo5F9Ku3rRDGjXbQxd1FgiFzqQ97";
|
|
21
|
+
const VALID_SIGNATURE = Buffer.from("validSignatureData12345678901234567890123456789012345678901234567890123456789012345678901234567890");
|
|
22
|
+
const createMockVersionedTransaction = () => ({
|
|
23
|
+
signatures: [utils_1.DUMMY_SIGNATURE],
|
|
24
|
+
message: {
|
|
25
|
+
recentBlockhash: BLOCKHASH,
|
|
26
|
+
},
|
|
27
|
+
addSignature: mockAddSignature,
|
|
28
|
+
serialize: mockSerialize,
|
|
29
|
+
});
|
|
30
|
+
afterEach(() => {
|
|
31
|
+
spiedDeserialize?.mockReset();
|
|
32
|
+
jest.clearAllMocks();
|
|
33
|
+
});
|
|
12
34
|
it("should decode raw transaction and use it when user provide it", async () => {
|
|
13
|
-
const expectedSolanaTransaction =
|
|
14
|
-
|
|
15
|
-
web3_js_1.VersionedTransaction.deserialize = jest.fn((_serializedTransaction) => expectedSolanaTransaction);
|
|
35
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
36
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
16
37
|
const rawTransaction = (0, helpers_fixture_1.transaction)({ raw: "test" });
|
|
17
38
|
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await (0, buildTransaction_1.buildTransactionWithAPI)(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
18
39
|
expect(solanaTransaction).toEqual(expectedSolanaTransaction);
|
|
@@ -21,13 +42,13 @@ describe("Testing buildTransaction", () => {
|
|
|
21
42
|
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
22
43
|
}));
|
|
23
44
|
addSignatureCallback(SIGNATURE);
|
|
24
|
-
expect(
|
|
25
|
-
expect(
|
|
26
|
-
expect(
|
|
27
|
-
expect(
|
|
45
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
46
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new web3_js_1.PublicKey(ADDRESS), SIGNATURE);
|
|
47
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
48
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
28
49
|
});
|
|
29
50
|
it("should build the transaction when user does not provide raw", async () => {
|
|
30
|
-
|
|
51
|
+
spiedDeserialize = setDeserialize(createMockVersionedTransaction());
|
|
31
52
|
const nonRawTransaction = (0, helpers_fixture_1.transaction)();
|
|
32
53
|
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await (0, buildTransaction_1.buildTransactionWithAPI)(ADDRESS, nonRawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
33
54
|
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
@@ -38,17 +59,106 @@ describe("Testing buildTransaction", () => {
|
|
|
38
59
|
addSignatureCallback(SIGNATURE);
|
|
39
60
|
expect(solanaTransaction.addSignature).toHaveBeenCalledTimes(1);
|
|
40
61
|
expect(solanaTransaction.addSignature).toHaveBeenCalledWith(new web3_js_1.PublicKey(ADDRESS), SIGNATURE);
|
|
41
|
-
expect(
|
|
62
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(0);
|
|
63
|
+
});
|
|
64
|
+
it("should update blockhash for raw transaction with different blockhash when only dummy signatures are present", async () => {
|
|
65
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
66
|
+
// Set the transaction to have a different blockhash initially
|
|
67
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
68
|
+
// Ensure only dummy signatures are present
|
|
69
|
+
expectedSolanaTransaction.signatures = [utils_1.DUMMY_SIGNATURE];
|
|
70
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
71
|
+
const rawTransaction = (0, helpers_fixture_1.transaction)({ raw: "test" });
|
|
72
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await (0, buildTransaction_1.buildTransactionWithAPI)(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
73
|
+
// The blockhash should be updated to the fresh one from the API
|
|
74
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(BLOCKHASH);
|
|
75
|
+
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
76
|
+
blockhash: BLOCKHASH,
|
|
77
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
78
|
+
}));
|
|
79
|
+
addSignatureCallback(SIGNATURE);
|
|
80
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
81
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new web3_js_1.PublicKey(ADDRESS), SIGNATURE);
|
|
82
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
83
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
84
|
+
});
|
|
85
|
+
it("should NOT update blockhash for raw transaction with different blockhash when valid signatures are present", async () => {
|
|
86
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
87
|
+
// Set the transaction to have a different blockhash initially
|
|
88
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
89
|
+
// Set a valid (non-dummy) signature
|
|
90
|
+
expectedSolanaTransaction.signatures = [VALID_SIGNATURE];
|
|
91
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
92
|
+
const rawTransaction = (0, helpers_fixture_1.transaction)({ raw: "test" });
|
|
93
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await (0, buildTransaction_1.buildTransactionWithAPI)(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
94
|
+
// The blockhash should remain unchanged because there's a valid signature
|
|
95
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(OLD_BLOCKHASH);
|
|
96
|
+
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
97
|
+
blockhash: BLOCKHASH,
|
|
98
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
99
|
+
}));
|
|
100
|
+
addSignatureCallback(SIGNATURE);
|
|
101
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
102
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new web3_js_1.PublicKey(ADDRESS), SIGNATURE);
|
|
103
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
104
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
105
|
+
});
|
|
106
|
+
it("should NOT update blockhash for raw transaction when mix of dummy and valid signatures are present", async () => {
|
|
107
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
108
|
+
// Set the transaction to have a different blockhash initially
|
|
109
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
110
|
+
// Set a mix of dummy and valid signatures (multisig scenario)
|
|
111
|
+
expectedSolanaTransaction.signatures = [utils_1.DUMMY_SIGNATURE, VALID_SIGNATURE];
|
|
112
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
113
|
+
const rawTransaction = (0, helpers_fixture_1.transaction)({ raw: "test" });
|
|
114
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await (0, buildTransaction_1.buildTransactionWithAPI)(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
115
|
+
// The blockhash should remain unchanged because there's at least one valid signature
|
|
116
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(OLD_BLOCKHASH);
|
|
117
|
+
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
118
|
+
blockhash: BLOCKHASH,
|
|
119
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
120
|
+
}));
|
|
121
|
+
addSignatureCallback(SIGNATURE);
|
|
122
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
123
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new web3_js_1.PublicKey(ADDRESS), SIGNATURE);
|
|
124
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
125
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
126
|
+
});
|
|
127
|
+
it("should update blockhash for raw transaction when all signatures are dummy (multiple dummy signatures)", async () => {
|
|
128
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
129
|
+
// Set the transaction to have a different blockhash initially
|
|
130
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
131
|
+
// Set multiple dummy signatures (multisig scenario with all dummy)
|
|
132
|
+
expectedSolanaTransaction.signatures = [utils_1.DUMMY_SIGNATURE, utils_1.DUMMY_SIGNATURE, utils_1.DUMMY_SIGNATURE];
|
|
133
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
134
|
+
const rawTransaction = (0, helpers_fixture_1.transaction)({ raw: "test" });
|
|
135
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await (0, buildTransaction_1.buildTransactionWithAPI)(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
136
|
+
// The blockhash should be updated because all signatures are dummy
|
|
137
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(BLOCKHASH);
|
|
138
|
+
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
139
|
+
blockhash: BLOCKHASH,
|
|
140
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
141
|
+
}));
|
|
142
|
+
addSignatureCallback(SIGNATURE);
|
|
143
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
144
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new web3_js_1.PublicKey(ADDRESS), SIGNATURE);
|
|
145
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
146
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
42
147
|
});
|
|
43
148
|
});
|
|
44
149
|
function api(blockhash, lastValidBlockHeight) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
150
|
+
const mockBlockhash = {
|
|
151
|
+
blockhash: blockhash,
|
|
152
|
+
lastValidBlockHeight: lastValidBlockHeight,
|
|
153
|
+
};
|
|
154
|
+
const mockRecentPrioritizationFees = [];
|
|
155
|
+
// Create a mock ChainAPI with only the methods we need
|
|
156
|
+
const mockChainApi = {
|
|
157
|
+
getLatestBlockhash: jest.fn().mockResolvedValue(mockBlockhash),
|
|
158
|
+
getSimulationComputeUnits: jest.fn().mockResolvedValue(null),
|
|
159
|
+
getRecentPrioritizationFees: jest.fn().mockResolvedValue(mockRecentPrioritizationFees),
|
|
52
160
|
};
|
|
161
|
+
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
|
|
162
|
+
return mockChainApi;
|
|
53
163
|
}
|
|
54
164
|
//# sourceMappingURL=buildTransaction.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.test.js","sourceRoot":"","sources":["../src/buildTransaction.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"buildTransaction.test.js","sourceRoot":"","sources":["../src/buildTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
1
|
import { Connection, VersionedMessage, PublicKey, SignaturesForAddressOptions, TransactionInstruction, BlockhashWithExpiryBlockHeight, Commitment, GetLatestBlockhashConfig } from "@solana/web3.js";
|
|
4
2
|
import { Awaited } from "../../logic";
|
|
5
3
|
import { SolanaTokenProgram } from "../../types";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/network/chain/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/network/chain/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,5 @@
|
|
|
3
3
|
* Thus, have not been fully tested (unit tests + manual tests)
|
|
4
4
|
* We should add more tests in the future
|
|
5
5
|
*/
|
|
6
|
-
/// <reference types="node" />
|
|
7
|
-
/// <reference types="node" />
|
|
8
6
|
export declare function toOffChainMessage(message: string, signerAddress: string, isLegacy: boolean): Buffer;
|
|
9
7
|
//# sourceMappingURL=format.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/offchainMessage/format.ts"],"names":[],"mappings":"AAAA;;;;GAIG
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/offchainMessage/format.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAkEH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,OAAO,GAChB,MAAM,CAuBR"}
|
package/lib/signer.d.ts
CHANGED
package/lib/signer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC1C,wBAAwB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACvD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAEF,oBAAY,iBAAiB;IAC3B,IAAI,IAAA;IACJ,KAAK,IAAA;CACN;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1C,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACpE,eAAe,CACb,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACzE"}
|
package/lib/utils.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
1
|
import { AccountInfo, Cluster, ConfirmedSignatureInfo, ParsedAccountData, PublicKey } from "@solana/web3.js";
|
|
4
2
|
import { ValidatorsAppValidator } from "./network/validator-app";
|
|
3
|
+
export declare const DUMMY_SIGNATURE: Buffer;
|
|
5
4
|
export declare const LEDGER_VALIDATOR_BY_FIGMENT: ValidatorsAppValidator;
|
|
6
5
|
export declare const LEDGER_VALIDATOR_BY_CHORUS_ONE: ValidatorsAppValidator;
|
|
7
6
|
export declare const LEDGER_VALIDATOR_DEFAULT: ValidatorsAppValidator;
|
package/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.js
CHANGED
|
@@ -3,11 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.isSignaturesForAddressResponse = exports.isHistoryEntry = exports.isParsedAccount = exports.median = exports.sweetch = exports.tupleOfUnion = exports.profitableValidators = exports.ledgerFirstValidators = exports.swap = exports.asyncQueue = exports.defaultVoteAccAddrByCurrencyId = exports.clusterByCurrencyId = exports.endpointByCurrencyId = exports.drainSeq = exports.drainSeqAsyncGen = exports.assertUnreachable = exports.SYSTEM_ACCOUNT_RENT_EXEMPT = exports.SOLANA_DELEGATION_RESERVE = exports.LEDGER_VALIDATORS_VOTE_ACCOUNTS = exports.LEDGER_VALIDATOR_LIST = exports.LEDGER_VALIDATOR_DEFAULT = exports.LEDGER_VALIDATOR_BY_CHORUS_ONE = exports.LEDGER_VALIDATOR_BY_FIGMENT = void 0;
|
|
6
|
+
exports.isSignaturesForAddressResponse = exports.isHistoryEntry = exports.isParsedAccount = exports.median = exports.sweetch = exports.tupleOfUnion = exports.profitableValidators = exports.ledgerFirstValidators = exports.swap = exports.asyncQueue = exports.defaultVoteAccAddrByCurrencyId = exports.clusterByCurrencyId = exports.endpointByCurrencyId = exports.drainSeq = exports.drainSeqAsyncGen = exports.assertUnreachable = exports.SYSTEM_ACCOUNT_RENT_EXEMPT = exports.SOLANA_DELEGATION_RESERVE = exports.LEDGER_VALIDATORS_VOTE_ACCOUNTS = exports.LEDGER_VALIDATOR_LIST = exports.LEDGER_VALIDATOR_DEFAULT = exports.LEDGER_VALIDATOR_BY_CHORUS_ONE = exports.LEDGER_VALIDATOR_BY_FIGMENT = exports.DUMMY_SIGNATURE = void 0;
|
|
7
7
|
const web3_js_1 = require("@solana/web3.js");
|
|
8
8
|
const fp_1 = require("lodash/fp");
|
|
9
9
|
const live_env_1 = require("@ledgerhq/live-env");
|
|
10
10
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
11
|
+
const SIGNATURE_SIZE = 64;
|
|
12
|
+
const DUMMY_SIGNATURE_FILL = 1;
|
|
13
|
+
exports.DUMMY_SIGNATURE = Buffer.alloc(SIGNATURE_SIZE, DUMMY_SIGNATURE_FILL);
|
|
11
14
|
// Hardcoding the Ledger validators info as backup,
|
|
12
15
|
// because backend is flaky and sometimes doesn't return it anymore
|
|
13
16
|
exports.LEDGER_VALIDATOR_BY_FIGMENT = {
|
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAcpD,OAAO,EAEL,oBAAoB,IAAI,kBAAkB,EAG1C,8BAA8B,EAE/B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC,eAAO,MAAM,uBAAuB,YACzB,MAAM,eACF,WAAW,OACnB,QAAQ;;;gBAKC,MAAM,KAAK,kBAAkB,EAiC5C,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { buildTransferInstructions, buildTokenTransferInstructions, buildCreateAssociatedTokenAccountInstruction, buildApproveTransactionInstructions, buildRevokeTransactionInstructions, buildStakeCreateAccountInstructions, buildStakeDelegateInstructions, buildStakeUndelegateInstructions, buildStakeWithdrawInstructions, buildStakeSplitInstructions, } from "./network/chain/web3";
|
|
2
|
-
import { assertUnreachable } from "./utils";
|
|
2
|
+
import { assertUnreachable, DUMMY_SIGNATURE } from "./utils";
|
|
3
3
|
import { PublicKey, VersionedTransaction as OnChainTransaction, TransactionMessage, } from "@solana/web3.js";
|
|
4
4
|
import { trace } from "@ledgerhq/logs";
|
|
5
5
|
export const buildTransactionWithAPI = async (address, transaction, api) => {
|
|
@@ -7,9 +7,10 @@ export const buildTransactionWithAPI = async (address, transaction, api) => {
|
|
|
7
7
|
let web3SolanaTransaction;
|
|
8
8
|
if (transaction.raw) {
|
|
9
9
|
web3SolanaTransaction = OnChainTransaction.deserialize(Buffer.from(transaction.raw, "base64"));
|
|
10
|
-
//
|
|
11
|
-
//
|
|
12
|
-
|
|
10
|
+
// Update the recent blockhash if no real signatures are present
|
|
11
|
+
// This ensures the transaction uses a fresh blockhash for submission
|
|
12
|
+
// NOTE: we could also make use of the isBlockHashValid rpc method to check the validity
|
|
13
|
+
if (web3SolanaTransaction.signatures.every(sig => Buffer.from(sig).equals(DUMMY_SIGNATURE))) {
|
|
13
14
|
web3SolanaTransaction.message.recentBlockhash = recentBlockhash.blockhash;
|
|
14
15
|
}
|
|
15
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EACL,yBAAyB,EACzB,8BAA8B,EAC9B,4CAA4C,EAC5C,mCAAmC,EACnC,kCAAkC,EAClC,mCAAmC,EACnC,8BAA8B,EAC9B,gCAAgC,EAChC,8BAA8B,EAC9B,2BAA2B,GAC5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,37 @@
|
|
|
1
1
|
import { PublicKey, VersionedTransaction, } from "@solana/web3.js";
|
|
2
2
|
import { buildTransactionWithAPI } from "./buildTransaction";
|
|
3
3
|
import { transaction } from "./__tests__/fixtures/helpers.fixture";
|
|
4
|
+
import { DUMMY_SIGNATURE } from "./utils";
|
|
5
|
+
// Mock VersionedTransaction
|
|
6
|
+
const mockAddSignature = jest.fn();
|
|
7
|
+
const mockSerialize = jest.fn().mockReturnValue(new Uint8Array([1, 2, 3]));
|
|
8
|
+
let spiedDeserialize = undefined;
|
|
9
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
10
|
+
function setDeserialize(tx) {
|
|
11
|
+
return jest.spyOn(VersionedTransaction, "deserialize").mockReturnValue(tx);
|
|
12
|
+
}
|
|
4
13
|
describe("Testing buildTransaction", () => {
|
|
5
14
|
const ADDRESS = "Hj69wRzkrFuf1Nby4yzPEFHdsmQdMoVYjvDKZSLjZFEp";
|
|
6
15
|
const BLOCKHASH = "DJRuRgQP3BeBNH8WVdF9cppBDj7pQNiVr4ZDnqupRtTC";
|
|
7
16
|
const LAST_VALID_BLOCK_HEIGHT = 1;
|
|
8
17
|
const SIGNATURE = Buffer.from("any random value");
|
|
9
|
-
|
|
18
|
+
const OLD_BLOCKHASH = "8RgQBB8zzKkv4iuHMo5F9Ku3rRDGjXbQxd1FgiFzqQ97";
|
|
19
|
+
const VALID_SIGNATURE = Buffer.from("validSignatureData12345678901234567890123456789012345678901234567890123456789012345678901234567890");
|
|
20
|
+
const createMockVersionedTransaction = () => ({
|
|
21
|
+
signatures: [DUMMY_SIGNATURE],
|
|
22
|
+
message: {
|
|
23
|
+
recentBlockhash: BLOCKHASH,
|
|
24
|
+
},
|
|
25
|
+
addSignature: mockAddSignature,
|
|
26
|
+
serialize: mockSerialize,
|
|
27
|
+
});
|
|
28
|
+
afterEach(() => {
|
|
29
|
+
spiedDeserialize?.mockReset();
|
|
30
|
+
jest.clearAllMocks();
|
|
31
|
+
});
|
|
10
32
|
it("should decode raw transaction and use it when user provide it", async () => {
|
|
11
|
-
const expectedSolanaTransaction =
|
|
12
|
-
|
|
13
|
-
VersionedTransaction.deserialize = jest.fn((_serializedTransaction) => expectedSolanaTransaction);
|
|
33
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
34
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
14
35
|
const rawTransaction = transaction({ raw: "test" });
|
|
15
36
|
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await buildTransactionWithAPI(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
16
37
|
expect(solanaTransaction).toEqual(expectedSolanaTransaction);
|
|
@@ -19,13 +40,13 @@ describe("Testing buildTransaction", () => {
|
|
|
19
40
|
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
20
41
|
}));
|
|
21
42
|
addSignatureCallback(SIGNATURE);
|
|
22
|
-
expect(
|
|
23
|
-
expect(
|
|
24
|
-
expect(
|
|
25
|
-
expect(
|
|
43
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
44
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
45
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
46
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
26
47
|
});
|
|
27
48
|
it("should build the transaction when user does not provide raw", async () => {
|
|
28
|
-
|
|
49
|
+
spiedDeserialize = setDeserialize(createMockVersionedTransaction());
|
|
29
50
|
const nonRawTransaction = transaction();
|
|
30
51
|
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await buildTransactionWithAPI(ADDRESS, nonRawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
31
52
|
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
@@ -36,17 +57,106 @@ describe("Testing buildTransaction", () => {
|
|
|
36
57
|
addSignatureCallback(SIGNATURE);
|
|
37
58
|
expect(solanaTransaction.addSignature).toHaveBeenCalledTimes(1);
|
|
38
59
|
expect(solanaTransaction.addSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
39
|
-
expect(
|
|
60
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(0);
|
|
61
|
+
});
|
|
62
|
+
it("should update blockhash for raw transaction with different blockhash when only dummy signatures are present", async () => {
|
|
63
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
64
|
+
// Set the transaction to have a different blockhash initially
|
|
65
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
66
|
+
// Ensure only dummy signatures are present
|
|
67
|
+
expectedSolanaTransaction.signatures = [DUMMY_SIGNATURE];
|
|
68
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
69
|
+
const rawTransaction = transaction({ raw: "test" });
|
|
70
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await buildTransactionWithAPI(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
71
|
+
// The blockhash should be updated to the fresh one from the API
|
|
72
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(BLOCKHASH);
|
|
73
|
+
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
74
|
+
blockhash: BLOCKHASH,
|
|
75
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
76
|
+
}));
|
|
77
|
+
addSignatureCallback(SIGNATURE);
|
|
78
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
79
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
80
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
81
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
82
|
+
});
|
|
83
|
+
it("should NOT update blockhash for raw transaction with different blockhash when valid signatures are present", async () => {
|
|
84
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
85
|
+
// Set the transaction to have a different blockhash initially
|
|
86
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
87
|
+
// Set a valid (non-dummy) signature
|
|
88
|
+
expectedSolanaTransaction.signatures = [VALID_SIGNATURE];
|
|
89
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
90
|
+
const rawTransaction = transaction({ raw: "test" });
|
|
91
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await buildTransactionWithAPI(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
92
|
+
// The blockhash should remain unchanged because there's a valid signature
|
|
93
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(OLD_BLOCKHASH);
|
|
94
|
+
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
95
|
+
blockhash: BLOCKHASH,
|
|
96
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
97
|
+
}));
|
|
98
|
+
addSignatureCallback(SIGNATURE);
|
|
99
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
100
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
101
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
102
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
103
|
+
});
|
|
104
|
+
it("should NOT update blockhash for raw transaction when mix of dummy and valid signatures are present", async () => {
|
|
105
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
106
|
+
// Set the transaction to have a different blockhash initially
|
|
107
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
108
|
+
// Set a mix of dummy and valid signatures (multisig scenario)
|
|
109
|
+
expectedSolanaTransaction.signatures = [DUMMY_SIGNATURE, VALID_SIGNATURE];
|
|
110
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
111
|
+
const rawTransaction = transaction({ raw: "test" });
|
|
112
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await buildTransactionWithAPI(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
113
|
+
// The blockhash should remain unchanged because there's at least one valid signature
|
|
114
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(OLD_BLOCKHASH);
|
|
115
|
+
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
116
|
+
blockhash: BLOCKHASH,
|
|
117
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
118
|
+
}));
|
|
119
|
+
addSignatureCallback(SIGNATURE);
|
|
120
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
121
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
122
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
123
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
124
|
+
});
|
|
125
|
+
it("should update blockhash for raw transaction when all signatures are dummy (multiple dummy signatures)", async () => {
|
|
126
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
127
|
+
// Set the transaction to have a different blockhash initially
|
|
128
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
129
|
+
// Set multiple dummy signatures (multisig scenario with all dummy)
|
|
130
|
+
expectedSolanaTransaction.signatures = [DUMMY_SIGNATURE, DUMMY_SIGNATURE, DUMMY_SIGNATURE];
|
|
131
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
132
|
+
const rawTransaction = transaction({ raw: "test" });
|
|
133
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] = await buildTransactionWithAPI(ADDRESS, rawTransaction, api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT));
|
|
134
|
+
// The blockhash should be updated because all signatures are dummy
|
|
135
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(BLOCKHASH);
|
|
136
|
+
expect(recentBlockhash).toEqual(expect.objectContaining({
|
|
137
|
+
blockhash: BLOCKHASH,
|
|
138
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
139
|
+
}));
|
|
140
|
+
addSignatureCallback(SIGNATURE);
|
|
141
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
142
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
143
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
144
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw, "base64"));
|
|
40
145
|
});
|
|
41
146
|
});
|
|
42
147
|
function api(blockhash, lastValidBlockHeight) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
148
|
+
const mockBlockhash = {
|
|
149
|
+
blockhash: blockhash,
|
|
150
|
+
lastValidBlockHeight: lastValidBlockHeight,
|
|
151
|
+
};
|
|
152
|
+
const mockRecentPrioritizationFees = [];
|
|
153
|
+
// Create a mock ChainAPI with only the methods we need
|
|
154
|
+
const mockChainApi = {
|
|
155
|
+
getLatestBlockhash: jest.fn().mockResolvedValue(mockBlockhash),
|
|
156
|
+
getSimulationComputeUnits: jest.fn().mockResolvedValue(null),
|
|
157
|
+
getRecentPrioritizationFees: jest.fn().mockResolvedValue(mockRecentPrioritizationFees),
|
|
50
158
|
};
|
|
159
|
+
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
|
|
160
|
+
return mockChainApi;
|
|
51
161
|
}
|
|
52
162
|
//# sourceMappingURL=buildTransaction.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTransaction.test.js","sourceRoot":"","sources":["../src/buildTransaction.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,
|
|
1
|
+
{"version":3,"file":"buildTransaction.test.js","sourceRoot":"","sources":["../src/buildTransaction.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
1
|
import { Connection, VersionedMessage, PublicKey, SignaturesForAddressOptions, TransactionInstruction, BlockhashWithExpiryBlockHeight, Commitment, GetLatestBlockhashConfig } from "@solana/web3.js";
|
|
4
2
|
import { Awaited } from "../../logic";
|
|
5
3
|
import { SolanaTokenProgram } from "../../types";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/network/chain/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/network/chain/index.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,UAAU,EAEV,gBAAgB,EAChB,SAAS,EACT,2BAA2B,EAE3B,sBAAsB,EAKtB,8BAA8B,EAC9B,UAAU,EACV,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,eAAO,MAAM,qBAAqB,iDAAiD,CAAC;AACpF,eAAO,MAAM,4BAA4B,YAAY,CAAC;AAEtD,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,QAAQ,CAAC;IAC9B,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAEjD,kBAAkB,EAAE,CAClB,kBAAkB,CAAC,EAAE,UAAU,GAAG,wBAAwB,KACvD,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAE7C,gBAAgB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAExE,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,UAAU,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAE1F,6BAA6B,EAAE,CAC7B,OAAO,EAAE,MAAM,KACZ,UAAU,CAAC,UAAU,CAAC,+BAA+B,CAAC,CAAC,CAAC;IAE7D,iCAAiC,EAAE,CACjC,OAAO,EAAE,MAAM,KACZ,UAAU,CAAC,UAAU,CAAC,+BAA+B,CAAC,CAAC,CAAC;IAE7D,2BAA2B,EAAE,CAC3B,QAAQ,EAAE,MAAM,KACb,UAAU,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAExD,8BAA8B,EAAE,CAC9B,QAAQ,EAAE,MAAM,KACb,UAAU,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAExD,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,UAAU,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE1F,eAAe,EAAE,MAAM,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAEjE,uBAAuB,EAAE,CACvB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,2BAA2B,KAC/B,UAAU,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAEvD,qBAAqB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,UAAU,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAEjG,cAAc,EAAE,CACd,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAE/E,mBAAmB,EAAE,CACnB,SAAS,EAAE,MAAM,EAAE,KAChB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAEpF,kBAAkB,EAAE,CAClB,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,8BAA8B,KAC7C,UAAU,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAElD,wBAAwB,EAAE,CACxB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,KACxB,OAAO,CAAC,MAAM,CAAC,CAAC;IAErB,gCAAgC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAExD,iCAAiC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3E,YAAY,EAAE,MAAM,UAAU,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC;IAE3D,2BAA2B,EAAE,CAC3B,QAAQ,EAAE,MAAM,EAAE,KACf,UAAU,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAC,CAAC;IAE3D,yBAAyB,EAAE,CACzB,YAAY,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAC3C,KAAK,EAAE,SAAS,KACb,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAE5B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC,CAAC;AAiCH,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,IAAI,GAC3C,QAAQ,CAkNV"}
|
|
@@ -3,7 +3,5 @@
|
|
|
3
3
|
* Thus, have not been fully tested (unit tests + manual tests)
|
|
4
4
|
* We should add more tests in the future
|
|
5
5
|
*/
|
|
6
|
-
/// <reference types="node" />
|
|
7
|
-
/// <reference types="node" />
|
|
8
6
|
export declare function toOffChainMessage(message: string, signerAddress: string, isLegacy: boolean): Buffer;
|
|
9
7
|
//# sourceMappingURL=format.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/offchainMessage/format.ts"],"names":[],"mappings":"AAAA;;;;GAIG
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/offchainMessage/format.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAkEH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,OAAO,GAChB,MAAM,CAuBR"}
|
package/lib-es/signer.d.ts
CHANGED
package/lib-es/signer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC1C,wBAAwB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACvD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAEF,oBAAY,iBAAiB;IAC3B,IAAI,IAAA;IACJ,KAAK,IAAA;CACN;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1C,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACpE,eAAe,CACb,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACzE"}
|
package/lib-es/utils.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
1
|
import { AccountInfo, Cluster, ConfirmedSignatureInfo, ParsedAccountData, PublicKey } from "@solana/web3.js";
|
|
4
2
|
import { ValidatorsAppValidator } from "./network/validator-app";
|
|
3
|
+
export declare const DUMMY_SIGNATURE: Buffer;
|
|
5
4
|
export declare const LEDGER_VALIDATOR_BY_FIGMENT: ValidatorsAppValidator;
|
|
6
5
|
export declare const LEDGER_VALIDATOR_BY_CHORUS_ONE: ValidatorsAppValidator;
|
|
7
6
|
export declare const LEDGER_VALIDATOR_DEFAULT: ValidatorsAppValidator;
|
package/lib-es/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/lib-es/utils.js
CHANGED
|
@@ -2,6 +2,9 @@ import { clusterApiUrl, } from "@solana/web3.js";
|
|
|
2
2
|
import { partition } from "lodash/fp";
|
|
3
3
|
import { getEnv } from "@ledgerhq/live-env";
|
|
4
4
|
import BigNumber from "bignumber.js";
|
|
5
|
+
const SIGNATURE_SIZE = 64;
|
|
6
|
+
const DUMMY_SIGNATURE_FILL = 1;
|
|
7
|
+
export const DUMMY_SIGNATURE = Buffer.alloc(SIGNATURE_SIZE, DUMMY_SIGNATURE_FILL);
|
|
5
8
|
// Hardcoding the Ledger validators info as backup,
|
|
6
9
|
// because backend is flaky and sometimes doesn't return it anymore
|
|
7
10
|
export const LEDGER_VALIDATOR_BY_FIGMENT = {
|
package/lib-es/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/coin-solana",
|
|
3
|
-
"version": "0.33.
|
|
3
|
+
"version": "0.33.1-nightly.1",
|
|
4
4
|
"description": "Ledger Solana Coin integration",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -56,15 +56,15 @@
|
|
|
56
56
|
"rxjs": "^7.8.1",
|
|
57
57
|
"semver": "7.7.1",
|
|
58
58
|
"superstruct": "0.16.7",
|
|
59
|
-
"@ledgerhq/coin-framework": "^6.4.
|
|
60
|
-
"@ledgerhq/cryptoassets": "^13.28.
|
|
61
|
-
"@ledgerhq/devices": "8.5.
|
|
59
|
+
"@ledgerhq/coin-framework": "^6.4.1-nightly.1",
|
|
60
|
+
"@ledgerhq/cryptoassets": "^13.28.1-nightly.1",
|
|
61
|
+
"@ledgerhq/devices": "8.5.2-nightly.0",
|
|
62
62
|
"@ledgerhq/errors": "^6.25.0",
|
|
63
|
-
"@ledgerhq/live-env": "^2.
|
|
64
|
-
"@ledgerhq/live-network": "^2.0.
|
|
63
|
+
"@ledgerhq/live-env": "^2.17.0-nightly.0",
|
|
64
|
+
"@ledgerhq/live-network": "^2.0.18-nightly.0",
|
|
65
65
|
"@ledgerhq/logs": "^6.13.0",
|
|
66
|
-
"@ledgerhq/types-cryptoassets": "^7.
|
|
67
|
-
"@ledgerhq/types-live": "^6.
|
|
66
|
+
"@ledgerhq/types-cryptoassets": "^7.27.0-nightly.0",
|
|
67
|
+
"@ledgerhq/types-live": "^6.85.0-nightly.1"
|
|
68
68
|
},
|
|
69
69
|
"devDependencies": {
|
|
70
70
|
"@faker-js/faker": "^8.4.1",
|
|
@@ -2,28 +2,50 @@ import {
|
|
|
2
2
|
BlockhashWithExpiryBlockHeight,
|
|
3
3
|
PublicKey,
|
|
4
4
|
RecentPrioritizationFees,
|
|
5
|
-
TransactionInstruction,
|
|
6
5
|
VersionedTransaction,
|
|
7
6
|
} from "@solana/web3.js";
|
|
8
7
|
import { buildTransactionWithAPI } from "./buildTransaction";
|
|
9
8
|
import { ChainAPI } from "./network";
|
|
10
9
|
import { transaction } from "./__tests__/fixtures/helpers.fixture";
|
|
10
|
+
import { DUMMY_SIGNATURE } from "./utils";
|
|
11
|
+
|
|
12
|
+
// Mock VersionedTransaction
|
|
13
|
+
const mockAddSignature = jest.fn();
|
|
14
|
+
const mockSerialize = jest.fn().mockReturnValue(new Uint8Array([1, 2, 3]));
|
|
15
|
+
let spiedDeserialize: jest.Spied<typeof VersionedTransaction.deserialize> | undefined = undefined;
|
|
16
|
+
|
|
17
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
18
|
+
function setDeserialize(tx: any): jest.Spied<typeof VersionedTransaction.deserialize> {
|
|
19
|
+
return jest.spyOn(VersionedTransaction, "deserialize").mockReturnValue(tx);
|
|
20
|
+
}
|
|
11
21
|
|
|
12
22
|
describe("Testing buildTransaction", () => {
|
|
13
23
|
const ADDRESS = "Hj69wRzkrFuf1Nby4yzPEFHdsmQdMoVYjvDKZSLjZFEp";
|
|
14
24
|
const BLOCKHASH = "DJRuRgQP3BeBNH8WVdF9cppBDj7pQNiVr4ZDnqupRtTC";
|
|
15
25
|
const LAST_VALID_BLOCK_HEIGHT = 1;
|
|
16
26
|
const SIGNATURE = Buffer.from("any random value");
|
|
27
|
+
const OLD_BLOCKHASH = "8RgQBB8zzKkv4iuHMo5F9Ku3rRDGjXbQxd1FgiFzqQ97";
|
|
28
|
+
const VALID_SIGNATURE = Buffer.from(
|
|
29
|
+
"validSignatureData12345678901234567890123456789012345678901234567890123456789012345678901234567890",
|
|
30
|
+
);
|
|
17
31
|
|
|
18
|
-
|
|
32
|
+
const createMockVersionedTransaction = () => ({
|
|
33
|
+
signatures: [DUMMY_SIGNATURE],
|
|
34
|
+
message: {
|
|
35
|
+
recentBlockhash: BLOCKHASH,
|
|
36
|
+
},
|
|
37
|
+
addSignature: mockAddSignature,
|
|
38
|
+
serialize: mockSerialize,
|
|
39
|
+
});
|
|
19
40
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
41
|
+
afterEach(() => {
|
|
42
|
+
spiedDeserialize?.mockReset();
|
|
43
|
+
jest.clearAllMocks();
|
|
44
|
+
});
|
|
23
45
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
);
|
|
46
|
+
it("should decode raw transaction and use it when user provide it", async () => {
|
|
47
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
48
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
27
49
|
|
|
28
50
|
const rawTransaction = transaction({ raw: "test" });
|
|
29
51
|
const [solanaTransaction, recentBlockhash, addSignatureCallback] =
|
|
@@ -42,22 +64,15 @@ describe("Testing buildTransaction", () => {
|
|
|
42
64
|
);
|
|
43
65
|
|
|
44
66
|
addSignatureCallback(SIGNATURE);
|
|
45
|
-
expect(
|
|
46
|
-
expect(
|
|
47
|
-
new PublicKey(ADDRESS),
|
|
48
|
-
SIGNATURE,
|
|
49
|
-
);
|
|
67
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
68
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
50
69
|
|
|
51
|
-
expect(
|
|
52
|
-
expect(
|
|
53
|
-
Buffer.from(rawTransaction.raw!, "base64"),
|
|
54
|
-
);
|
|
70
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
71
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw!, "base64"));
|
|
55
72
|
});
|
|
56
73
|
|
|
57
74
|
it("should build the transaction when user does not provide raw", async () => {
|
|
58
|
-
|
|
59
|
-
(_serializedTransaction: Uint8Array) => ({}) as VersionedTransaction,
|
|
60
|
-
);
|
|
75
|
+
spiedDeserialize = setDeserialize(createMockVersionedTransaction());
|
|
61
76
|
|
|
62
77
|
const nonRawTransaction = transaction();
|
|
63
78
|
const [solanaTransaction, recentBlockhash, addSignatureCallback] =
|
|
@@ -79,19 +94,161 @@ describe("Testing buildTransaction", () => {
|
|
|
79
94
|
expect(solanaTransaction.addSignature).toHaveBeenCalledTimes(1);
|
|
80
95
|
expect(solanaTransaction.addSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
81
96
|
|
|
82
|
-
expect(
|
|
97
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(0);
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
it("should update blockhash for raw transaction with different blockhash when only dummy signatures are present", async () => {
|
|
101
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
102
|
+
// Set the transaction to have a different blockhash initially
|
|
103
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
104
|
+
// Ensure only dummy signatures are present
|
|
105
|
+
expectedSolanaTransaction.signatures = [DUMMY_SIGNATURE];
|
|
106
|
+
|
|
107
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
108
|
+
|
|
109
|
+
const rawTransaction = transaction({ raw: "test" });
|
|
110
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] =
|
|
111
|
+
await buildTransactionWithAPI(
|
|
112
|
+
ADDRESS,
|
|
113
|
+
rawTransaction,
|
|
114
|
+
api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT),
|
|
115
|
+
);
|
|
116
|
+
|
|
117
|
+
// The blockhash should be updated to the fresh one from the API
|
|
118
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(BLOCKHASH);
|
|
119
|
+
expect(recentBlockhash).toEqual(
|
|
120
|
+
expect.objectContaining({
|
|
121
|
+
blockhash: BLOCKHASH,
|
|
122
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
123
|
+
}),
|
|
124
|
+
);
|
|
125
|
+
|
|
126
|
+
addSignatureCallback(SIGNATURE);
|
|
127
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
128
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
129
|
+
|
|
130
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
131
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw!, "base64"));
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
it("should NOT update blockhash for raw transaction with different blockhash when valid signatures are present", async () => {
|
|
135
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
136
|
+
// Set the transaction to have a different blockhash initially
|
|
137
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
138
|
+
// Set a valid (non-dummy) signature
|
|
139
|
+
expectedSolanaTransaction.signatures = [VALID_SIGNATURE];
|
|
140
|
+
|
|
141
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
142
|
+
|
|
143
|
+
const rawTransaction = transaction({ raw: "test" });
|
|
144
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] =
|
|
145
|
+
await buildTransactionWithAPI(
|
|
146
|
+
ADDRESS,
|
|
147
|
+
rawTransaction,
|
|
148
|
+
api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT),
|
|
149
|
+
);
|
|
150
|
+
|
|
151
|
+
// The blockhash should remain unchanged because there's a valid signature
|
|
152
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(OLD_BLOCKHASH);
|
|
153
|
+
expect(recentBlockhash).toEqual(
|
|
154
|
+
expect.objectContaining({
|
|
155
|
+
blockhash: BLOCKHASH,
|
|
156
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
157
|
+
}),
|
|
158
|
+
);
|
|
159
|
+
|
|
160
|
+
addSignatureCallback(SIGNATURE);
|
|
161
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
162
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
163
|
+
|
|
164
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
165
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw!, "base64"));
|
|
166
|
+
});
|
|
167
|
+
|
|
168
|
+
it("should NOT update blockhash for raw transaction when mix of dummy and valid signatures are present", async () => {
|
|
169
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
170
|
+
// Set the transaction to have a different blockhash initially
|
|
171
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
172
|
+
// Set a mix of dummy and valid signatures (multisig scenario)
|
|
173
|
+
expectedSolanaTransaction.signatures = [DUMMY_SIGNATURE, VALID_SIGNATURE];
|
|
174
|
+
|
|
175
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
176
|
+
|
|
177
|
+
const rawTransaction = transaction({ raw: "test" });
|
|
178
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] =
|
|
179
|
+
await buildTransactionWithAPI(
|
|
180
|
+
ADDRESS,
|
|
181
|
+
rawTransaction,
|
|
182
|
+
api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT),
|
|
183
|
+
);
|
|
184
|
+
|
|
185
|
+
// The blockhash should remain unchanged because there's at least one valid signature
|
|
186
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(OLD_BLOCKHASH);
|
|
187
|
+
expect(recentBlockhash).toEqual(
|
|
188
|
+
expect.objectContaining({
|
|
189
|
+
blockhash: BLOCKHASH,
|
|
190
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
191
|
+
}),
|
|
192
|
+
);
|
|
193
|
+
|
|
194
|
+
addSignatureCallback(SIGNATURE);
|
|
195
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
196
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
197
|
+
|
|
198
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
199
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw!, "base64"));
|
|
200
|
+
});
|
|
201
|
+
|
|
202
|
+
it("should update blockhash for raw transaction when all signatures are dummy (multiple dummy signatures)", async () => {
|
|
203
|
+
const expectedSolanaTransaction = createMockVersionedTransaction();
|
|
204
|
+
// Set the transaction to have a different blockhash initially
|
|
205
|
+
expectedSolanaTransaction.message.recentBlockhash = OLD_BLOCKHASH;
|
|
206
|
+
// Set multiple dummy signatures (multisig scenario with all dummy)
|
|
207
|
+
expectedSolanaTransaction.signatures = [DUMMY_SIGNATURE, DUMMY_SIGNATURE, DUMMY_SIGNATURE];
|
|
208
|
+
|
|
209
|
+
spiedDeserialize = setDeserialize(expectedSolanaTransaction);
|
|
210
|
+
|
|
211
|
+
const rawTransaction = transaction({ raw: "test" });
|
|
212
|
+
const [solanaTransaction, recentBlockhash, addSignatureCallback] =
|
|
213
|
+
await buildTransactionWithAPI(
|
|
214
|
+
ADDRESS,
|
|
215
|
+
rawTransaction,
|
|
216
|
+
api(BLOCKHASH, LAST_VALID_BLOCK_HEIGHT),
|
|
217
|
+
);
|
|
218
|
+
|
|
219
|
+
// The blockhash should be updated because all signatures are dummy
|
|
220
|
+
expect(solanaTransaction.message.recentBlockhash).toBe(BLOCKHASH);
|
|
221
|
+
expect(recentBlockhash).toEqual(
|
|
222
|
+
expect.objectContaining({
|
|
223
|
+
blockhash: BLOCKHASH,
|
|
224
|
+
lastValidBlockHeight: LAST_VALID_BLOCK_HEIGHT,
|
|
225
|
+
}),
|
|
226
|
+
);
|
|
227
|
+
|
|
228
|
+
addSignatureCallback(SIGNATURE);
|
|
229
|
+
expect(mockAddSignature).toHaveBeenCalledTimes(1);
|
|
230
|
+
expect(mockAddSignature).toHaveBeenCalledWith(new PublicKey(ADDRESS), SIGNATURE);
|
|
231
|
+
|
|
232
|
+
expect(spiedDeserialize).toHaveBeenCalledTimes(1);
|
|
233
|
+
expect(spiedDeserialize).toHaveBeenCalledWith(Buffer.from(rawTransaction.raw!, "base64"));
|
|
83
234
|
});
|
|
84
235
|
});
|
|
85
236
|
|
|
86
237
|
function api(blockhash: string, lastValidBlockHeight: number) {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
238
|
+
const mockBlockhash: BlockhashWithExpiryBlockHeight = {
|
|
239
|
+
blockhash: blockhash,
|
|
240
|
+
lastValidBlockHeight: lastValidBlockHeight,
|
|
241
|
+
};
|
|
242
|
+
|
|
243
|
+
const mockRecentPrioritizationFees: RecentPrioritizationFees[] = [];
|
|
244
|
+
|
|
245
|
+
// Create a mock ChainAPI with only the methods we need
|
|
246
|
+
const mockChainApi = {
|
|
247
|
+
getLatestBlockhash: jest.fn().mockResolvedValue(mockBlockhash),
|
|
248
|
+
getSimulationComputeUnits: jest.fn().mockResolvedValue(null),
|
|
249
|
+
getRecentPrioritizationFees: jest.fn().mockResolvedValue(mockRecentPrioritizationFees),
|
|
250
|
+
};
|
|
251
|
+
|
|
252
|
+
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
|
|
253
|
+
return mockChainApi as unknown as ChainAPI;
|
|
97
254
|
}
|
package/src/buildTransaction.ts
CHANGED
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
buildStakeWithdrawInstructions,
|
|
12
12
|
buildStakeSplitInstructions,
|
|
13
13
|
} from "./network/chain/web3";
|
|
14
|
-
import { assertUnreachable } from "./utils";
|
|
14
|
+
import { assertUnreachable, DUMMY_SIGNATURE } from "./utils";
|
|
15
15
|
import {
|
|
16
16
|
PublicKey,
|
|
17
17
|
VersionedTransaction as OnChainTransaction,
|
|
@@ -39,9 +39,10 @@ export const buildTransactionWithAPI = async (
|
|
|
39
39
|
let web3SolanaTransaction: VersionedTransaction;
|
|
40
40
|
if (transaction.raw) {
|
|
41
41
|
web3SolanaTransaction = OnChainTransaction.deserialize(Buffer.from(transaction.raw, "base64"));
|
|
42
|
-
//
|
|
43
|
-
//
|
|
44
|
-
|
|
42
|
+
// Update the recent blockhash if no real signatures are present
|
|
43
|
+
// This ensures the transaction uses a fresh blockhash for submission
|
|
44
|
+
// NOTE: we could also make use of the isBlockHashValid rpc method to check the validity
|
|
45
|
+
if (web3SolanaTransaction.signatures.every(sig => Buffer.from(sig).equals(DUMMY_SIGNATURE))) {
|
|
45
46
|
web3SolanaTransaction.message.recentBlockhash = recentBlockhash.blockhash;
|
|
46
47
|
}
|
|
47
48
|
} else {
|
package/src/utils.ts
CHANGED
|
@@ -11,6 +11,10 @@ import { getEnv } from "@ledgerhq/live-env";
|
|
|
11
11
|
import { ValidatorsAppValidator } from "./network/validator-app";
|
|
12
12
|
import BigNumber from "bignumber.js";
|
|
13
13
|
|
|
14
|
+
const SIGNATURE_SIZE = 64;
|
|
15
|
+
const DUMMY_SIGNATURE_FILL = 1;
|
|
16
|
+
export const DUMMY_SIGNATURE = Buffer.alloc(SIGNATURE_SIZE, DUMMY_SIGNATURE_FILL);
|
|
17
|
+
|
|
14
18
|
// Hardcoding the Ledger validators info as backup,
|
|
15
19
|
// because backend is flaky and sometimes doesn't return it anymore
|
|
16
20
|
export const LEDGER_VALIDATOR_BY_FIGMENT: ValidatorsAppValidator = {
|