@debridge-finance/solana-utils 4.5.3 → 4.5.5

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.
Files changed (9) hide show
  1. package/dist/browser/index.js +33 -11
  2. package/dist/browser/index.js.map +1 -1
  3. package/dist/cjs/crypto.js +29 -8
  4. package/dist/cjs/crypto.js.map +1 -1
  5. package/dist/esm/crypto.js +33 -11
  6. package/dist/esm/crypto.js.map +1 -1
  7. package/dist/types/crypto.d.ts +9 -7
  8. package/dist/types/crypto.d.ts.map +1 -1
  9. package/package.json +2 -1
package/dist/cjs/crypto.js CHANGED
@@ -67,6 +67,31 @@ function hashExternalCallBytes(data) {
67
67
  return (0, helpers_1.hexToBuffer)((0, exports.solidityKeccak256)(["bytes"], [data ? data : buffer_1.Buffer.from([])]), 32);
68
68
  }
69
69
  exports.hashExternalCallBytes = hashExternalCallBytes;
70
+ function isSendHashedFlagSet(packedFlags) {
71
+ const SEND_HASHED_DATA_FLAG_BIT_NUMBER = BigInt(3);
72
+ const result = (packedFlags >> SEND_HASHED_DATA_FLAG_BIT_NUMBER) & BigInt(1);
73
+ return result === BigInt(1);
74
+ }
75
+ function getShortcutFromAutoParams(params) {
76
+ const shortcut = params.autoParams?.shortcut;
77
+ if (shortcut) {
78
+ return (0, interfaces_1.isBuffer)(shortcut) ? shortcut : (0, helpers_1.hexToBuffer)(shortcut);
79
+ }
80
+ else {
81
+ const flags = BigInt(new bn_js_1.default(params.autoParams?.flags || 0).toNumber());
82
+ const data = params.autoParams?.data;
83
+ if (!data)
84
+ return hashExternalCallBytes(data);
85
+ if (isSendHashedFlagSet(flags)) {
86
+ const result = (0, interfaces_1.isBuffer)(data) ? data : (0, helpers_1.hexToBuffer)(data);
87
+ if (result.length !== 32) {
88
+ throw new Error(`Incorrect autoParams.data length for SEND_HASHED_DATA_FLAG`);
89
+ }
90
+ return result;
91
+ }
92
+ return hashExternalCallBytes(data);
93
+ }
94
+ }
70
95
  /**
71
96
  * Hashes submission for provided data
72
97
  * @param params data to hash
@@ -75,7 +100,7 @@ exports.hashExternalCallBytes = hashExternalCallBytes;
75
100
  function hashSubmissionIdRaw(params) {
76
101
  let packParams = [
77
102
  "uint256", // submission prefix
78
- "uint256", // bridge_id
103
+ "bytes32", // bridge_id
79
104
  "uint256", // source_chain_id
80
105
  "uint256", // target_chain_id
81
106
  "uint256", // amount
@@ -87,7 +112,7 @@ function hashSubmissionIdRaw(params) {
87
112
  : typeof params.receiver === "string"
88
113
  ? params.receiver.startsWith("0x")
89
114
  ? (0, helpers_1.hexToBuffer)(params.receiver)
90
- : new web3_js_1.PublicKey(params.receiver)
115
+ : new web3_js_1.PublicKey(params.receiver).toBuffer()
91
116
  : new web3_js_1.PublicKey(params.receiver).toBuffer();
92
117
  let packData = [
93
118
  constants_1.SUBMISSION_PREFIX,
@@ -102,15 +127,11 @@ function hashSubmissionIdRaw(params) {
102
127
  packParams = packParams.concat([
103
128
  "uint256", // execution fee
104
129
  "uint256", // flag
105
- "uint256", // fallback hash
130
+ "bytes32", // fallback hash
106
131
  "uint256", // ext call data hash
107
132
  "uint256", // native sender hash
108
133
  ]);
109
- const shortcut = params.autoParams?.shortcut
110
- ? (0, interfaces_1.isBuffer)(params.autoParams.shortcut)
111
- ? params.autoParams.shortcut
112
- : (0, helpers_1.hexToBuffer)(params.autoParams.shortcut)
113
- : hashExternalCallBytes(params?.autoParams?.data);
134
+ const shortcut = getShortcutFromAutoParams(params);
114
135
  const fallback = params.autoParams.fallbackAddress.startsWith("0x")
115
136
  ? (0, helpers_1.hexToBuffer)(params.autoParams.fallbackAddress)
116
137
  : new web3_js_1.PublicKey(params.autoParams.fallbackAddress).toBuffer();
package/dist/cjs/crypto.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"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"}
package/dist/esm/crypto.js CHANGED
@@ -56,16 +56,42 @@ export function hashExternalCallBytes(data) {
56
56
  }
57
57
  return hexToBuffer(solidityKeccak256(["bytes"], [data ? data : Buffer.from([])]), 32);
58
58
  }
59
+ function isSendHashedFlagSet(packedFlags) {
60
+ const SEND_HASHED_DATA_FLAG_BIT_NUMBER = BigInt(3);
61
+ const result = (packedFlags >> SEND_HASHED_DATA_FLAG_BIT_NUMBER) & BigInt(1);
62
+ return result === BigInt(1);
63
+ }
64
+ function getShortcutFromAutoParams(params) {
65
+ var _a, _b, _c;
66
+ const shortcut = (_a = params.autoParams) === null || _a === void 0 ? void 0 : _a.shortcut;
67
+ if (shortcut) {
68
+ return isBuffer(shortcut) ? shortcut : hexToBuffer(shortcut);
69
+ }
70
+ else {
71
+ const flags = BigInt(new BN(((_b = params.autoParams) === null || _b === void 0 ? void 0 : _b.flags) || 0).toNumber());
72
+ const data = (_c = params.autoParams) === null || _c === void 0 ? void 0 : _c.data;
73
+ if (!data)
74
+ return hashExternalCallBytes(data);
75
+ if (isSendHashedFlagSet(flags)) {
76
+ const result = isBuffer(data) ? data : hexToBuffer(data);
77
+ if (result.length !== 32) {
78
+ throw new Error(`Incorrect autoParams.data length for SEND_HASHED_DATA_FLAG`);
79
+ }
80
+ return result;
81
+ }
82
+ return hashExternalCallBytes(data);
83
+ }
84
+ }
59
85
  /**
60
86
  * Hashes submission for provided data
61
87
  * @param params data to hash
62
88
  * @returns submissionId from provided params
63
89
  */
64
90
  export function hashSubmissionIdRaw(params) {
65
- var _a, _b, _c, _d;
91
+ var _a, _b;
66
92
  let packParams = [
67
93
  "uint256", // submission prefix
68
- "uint256", // bridge_id
94
+ "bytes32", // bridge_id
69
95
  "uint256", // source_chain_id
70
96
  "uint256", // target_chain_id
71
97
  "uint256", // amount
@@ -77,7 +103,7 @@ export function hashSubmissionIdRaw(params) {
77
103
  : typeof params.receiver === "string"
78
104
  ? params.receiver.startsWith("0x")
79
105
  ? hexToBuffer(params.receiver)
80
- : new PublicKey(params.receiver)
106
+ : new PublicKey(params.receiver).toBuffer()
81
107
  : new PublicKey(params.receiver).toBuffer();
82
108
  let packData = [
83
109
  SUBMISSION_PREFIX,
@@ -92,21 +118,17 @@ export function hashSubmissionIdRaw(params) {
92
118
  packParams = packParams.concat([
93
119
  "uint256", // execution fee
94
120
  "uint256", // flag
95
- "uint256", // fallback hash
121
+ "bytes32", // fallback hash
96
122
  "uint256", // ext call data hash
97
123
  "uint256", // native sender hash
98
124
  ]);
99
- const shortcut = ((_a = params.autoParams) === null || _a === void 0 ? void 0 : _a.shortcut)
100
- ? isBuffer(params.autoParams.shortcut)
101
- ? params.autoParams.shortcut
102
- : hexToBuffer(params.autoParams.shortcut)
103
- : hashExternalCallBytes((_b = params === null || params === void 0 ? void 0 : params.autoParams) === null || _b === void 0 ? void 0 : _b.data);
125
+ const shortcut = getShortcutFromAutoParams(params);
104
126
  const fallback = params.autoParams.fallbackAddress.startsWith("0x")
105
127
  ? hexToBuffer(params.autoParams.fallbackAddress)
106
128
  : new PublicKey(params.autoParams.fallbackAddress).toBuffer();
107
129
  packData = packData.concat([
108
- new BN(((_c = params === null || params === void 0 ? void 0 : params.autoParams) === null || _c === void 0 ? void 0 : _c.executionFee) || 0).toArray("be", 32),
109
- new BN(((_d = params.autoParams) === null || _d === void 0 ? void 0 : _d.flags) || 0).toArray("be", 32),
130
+ new BN(((_a = params === null || params === void 0 ? void 0 : params.autoParams) === null || _a === void 0 ? void 0 : _a.executionFee) || 0).toArray("be", 32),
131
+ new BN(((_b = params.autoParams) === null || _b === void 0 ? void 0 : _b.flags) || 0).toArray("be", 32),
110
132
  hashExternalCallBytes(fallback),
111
133
  shortcut,
112
134
  hashExternalCallBytes(params.autoParams.nativeSender),
package/dist/esm/crypto.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"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"}
package/dist/types/crypto.d.ts CHANGED
@@ -20,12 +20,7 @@ export declare function hashDeployInfo(params: HashDeployInfoParams): HexString;
20
20
  */
21
21
  export declare function hashDebridgeId(nativeChainId: BNable, nativeTokenAddress: HexString | Buffer): HexString;
22
22
  export declare function hashExternalCallBytes(data?: Buffer | string): Buffer;
23
- /**
24
- * Hashes submission for provided data
25
- * @param params data to hash
26
- * @returns submissionId from provided params
27
- */
28
- export declare function hashSubmissionIdRaw(params: {
23
+ type HashSubmissionIdParams = {
29
24
  receiver: SolanaPubkey | Buffer;
30
25
  debridgeId: HexString | Buffer;
31
26
  sourceChainId: BNable;
@@ -33,5 +28,12 @@ export declare function hashSubmissionIdRaw(params: {
33
28
  amount: BNable;
34
29
  nonce: number;
35
30
  autoParams?: AutoParamsType;
36
- }): string;
31
+ };
32
+ /**
33
+ * Hashes submission for provided data
34
+ * @param params data to hash
35
+ * @returns submissionId from provided params
36
+ */
37
+ export declare function hashSubmissionIdRaw(params: HashSubmissionIdParams): string;
38
+ export {};
37
39
  //# sourceMappingURL=crypto.d.ts.map
package/dist/types/crypto.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,MAAM,OAAO,CAAC;AAIvB,OAAO,EACL,cAAc,EACd,MAAM,EACN,oBAAoB,EACpB,SAAS,EACT,YAAY,EAEb,MAAM,cAAc,CAAC;AAItB,eAAO,MAAM,SAAS,SAAU,UAAU,WAA8B,CAAC;AACzE,eAAO,MAAM,iBAAiB,UAAW,MAAM,EAAE,UAAU,OAAO,EAAE,WAGnE,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAIzE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAOxD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,CAetE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,SAAS,GAAG,MAAM,GACrC,SAAS,CAQX;AAED,wBAAgB,qBAAqB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAYpE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,QAAQ,EAAE,YAAY,GAAG,MAAM,CAAC;IAChC,UAAU,EAAE,SAAS,GAAG,MAAM,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B,UA0DA"}
1
+ {"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,MAAM,OAAO,CAAC;AAIvB,OAAO,EACL,cAAc,EACd,MAAM,EACN,oBAAoB,EACpB,SAAS,EACT,YAAY,EAEb,MAAM,cAAc,CAAC;AAItB,eAAO,MAAM,SAAS,SAAU,UAAU,WAA8B,CAAC;AACzE,eAAO,MAAM,iBAAiB,UAAW,MAAM,EAAE,UAAU,OAAO,EAAE,WAGnE,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAIzE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAOxD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,CAetE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,SAAS,GAAG,MAAM,GACrC,SAAS,CAQX;AAED,wBAAgB,qBAAqB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAYpE;AAED,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,EAAE,YAAY,GAAG,MAAM,CAAC;IAChC,UAAU,EAAE,SAAS,GAAG,MAAM,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B,CAAC;AA8BF;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAsD1E"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@debridge-finance/solana-utils",
3
3
  "description": "Common utils package to power communication with Solana contracts at deBridge",
4
- "version": "4.5.3",
4
+ "version": "4.5.5",
5
5
  "author": "deBridge",
6
6
  "license": "BUSL-1.1",
7
7
  "homepage": "https://debridge.finance",
@@ -30,6 +30,7 @@
30
30
  "README.md"
31
31
  ],
32
32
  "scripts": {
33
+ "test:calculate-submission-id": "mocha -r ts-node/register -b -t 200000 ./tests/calculate-submission-id.test.ts",
33
34
  "test:crypto": "mocha -r ts-node/register -b -t 200000 ./tests/crypto.test.ts",
34
35
  "test:accounts": "mocha -r ts-node/register -b -t 200000 ./tests/accounts.test.ts",
35
36
  "test:spl": "mocha -r dotenv/config -r ts-node/register -b -t 200000 ./tests/spl.test.ts",