@debridge-finance/solana-utils 4.2.1 → 4.3.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/dist/browser/index.js +216 -129
- package/dist/browser/index.js.map +1 -1
- package/dist/cjs/accounts.js +62 -27
- package/dist/cjs/accounts.js.map +1 -1
- package/dist/cjs/constants.js +3 -3
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/crypto.js +7 -1
- package/dist/cjs/crypto.js.map +1 -1
- package/dist/cjs/helpers.js +75 -64
- package/dist/cjs/helpers.js.map +1 -1
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/interfaces.js.map +1 -1
- package/dist/cjs/programs.js +9 -0
- package/dist/cjs/programs.js.map +1 -0
- package/dist/cjs/solidityPack.js +10 -8
- package/dist/cjs/solidityPack.js.map +1 -1
- package/dist/cjs/spl.js +31 -16
- package/dist/cjs/spl.js.map +1 -1
- package/dist/esm/accounts.js +59 -24
- package/dist/esm/accounts.js.map +1 -1
- package/dist/esm/constants.js +2 -2
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/crypto.js +8 -2
- package/dist/esm/crypto.js.map +1 -1
- package/dist/esm/helpers.js +81 -68
- package/dist/esm/helpers.js.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/interfaces.js.map +1 -1
- package/dist/esm/programs.js +6 -0
- package/dist/esm/programs.js.map +1 -0
- package/dist/esm/solidityPack.js +10 -8
- package/dist/esm/solidityPack.js.map +1 -1
- package/dist/esm/spl.js +33 -18
- package/dist/esm/spl.js.map +1 -1
- package/dist/types/accounts.d.ts +2 -2
- package/dist/types/accounts.d.ts.map +1 -1
- package/dist/types/constants.d.ts +2 -2
- package/dist/types/crypto.d.ts.map +1 -1
- package/dist/types/helpers.d.ts +4 -5
- package/dist/types/helpers.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/interfaces.d.ts.map +1 -1
- package/dist/types/programs.d.ts +6 -0
- package/dist/types/programs.d.ts.map +1 -0
- package/dist/types/solidityPack.d.ts.map +1 -1
- package/dist/types/spl.d.ts.map +1 -1
- package/package.json +3 -3
package/dist/cjs/solidityPack.js
CHANGED
|
@@ -8,8 +8,8 @@ const helpers_1 = require("./helpers");
|
|
|
8
8
|
* All functions are copied from ethers. This is optimization to reduce dependencies
|
|
9
9
|
*/
|
|
10
10
|
function concat(items) {
|
|
11
|
-
const objects = items.map(item => arrayify(item));
|
|
12
|
-
const length = objects.reduce((accum, item) =>
|
|
11
|
+
const objects = items.map((item) => arrayify(item));
|
|
12
|
+
const length = objects.reduce((accum, item) => accum + item.length, 0);
|
|
13
13
|
const result = new Uint8Array(length);
|
|
14
14
|
objects.reduce((offset, object) => {
|
|
15
15
|
result.set(object, offset);
|
|
@@ -18,7 +18,7 @@ function concat(items) {
|
|
|
18
18
|
return result;
|
|
19
19
|
}
|
|
20
20
|
function arrayify(value) {
|
|
21
|
-
if (typeof
|
|
21
|
+
if (typeof value === "number") {
|
|
22
22
|
const numValue = value;
|
|
23
23
|
const result = [];
|
|
24
24
|
while (value) {
|
|
@@ -33,7 +33,7 @@ function arrayify(value) {
|
|
|
33
33
|
if (bn_js_1.default.isBN(value)) {
|
|
34
34
|
value = `0x${value.toString("hex")}`;
|
|
35
35
|
}
|
|
36
|
-
if (typeof
|
|
36
|
+
if (typeof value === "string" && value.startsWith("0x")) {
|
|
37
37
|
return (0, helpers_1.hexToBuffer)(value);
|
|
38
38
|
}
|
|
39
39
|
if (Array.isArray(value) || ArrayBuffer.isView(value)) {
|
|
@@ -74,7 +74,6 @@ function toUtf8Bytes(str) {
|
|
|
74
74
|
}
|
|
75
75
|
return arrayify(result);
|
|
76
76
|
}
|
|
77
|
-
;
|
|
78
77
|
const zeroPad = (value, length) => {
|
|
79
78
|
const bufValue = arrayify(value);
|
|
80
79
|
if (bufValue.length > length) {
|
|
@@ -84,7 +83,7 @@ const zeroPad = (value, length) => {
|
|
|
84
83
|
result.set(bufValue, length - bufValue.length);
|
|
85
84
|
return result;
|
|
86
85
|
};
|
|
87
|
-
const isHexString = (data) => typeof
|
|
86
|
+
const isHexString = (data) => typeof data === "string" && data.startsWith("0x");
|
|
88
87
|
const _pack = (type, value, isArray) => {
|
|
89
88
|
const regexBytes = new RegExp("^bytes([0-9]+)$");
|
|
90
89
|
const regexNumber = new RegExp("^(u?int)([0-9]*)$");
|
|
@@ -101,7 +100,7 @@ const _pack = (type, value, isArray) => {
|
|
|
101
100
|
case "bytes":
|
|
102
101
|
return arrayify(value);
|
|
103
102
|
case "bool":
|
|
104
|
-
value =
|
|
103
|
+
value = value ? "0x01" : "0x00";
|
|
105
104
|
if (isArray) {
|
|
106
105
|
return zeroPad(value, 32);
|
|
107
106
|
}
|
|
@@ -111,7 +110,10 @@ const _pack = (type, value, isArray) => {
|
|
|
111
110
|
if (match) {
|
|
112
111
|
//let signed = (match[1] === "int")
|
|
113
112
|
let size = parseInt(match[2] || "256");
|
|
114
|
-
if ((match[2] && String(size) !== match[2]) ||
|
|
113
|
+
if ((match[2] && String(size) !== match[2]) ||
|
|
114
|
+
size % 8 !== 0 ||
|
|
115
|
+
size === 0 ||
|
|
116
|
+
size > 256) {
|
|
115
117
|
throw new Error("invalid number type");
|
|
116
118
|
}
|
|
117
119
|
if (isArray) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solidityPack.js","sourceRoot":"","sources":["../../src/solidityPack.ts"],"names":[],"mappings":";;;;AAAA,0DAAuB;AACvB,uCAAwC;AAExC;;GAEG;
|
|
1
|
+
{"version":3,"file":"solidityPack.js","sourceRoot":"","sources":["../../src/solidityPack.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/spl.js
CHANGED
|
@@ -16,17 +16,17 @@ var AccountState;
|
|
|
16
16
|
AccountState[AccountState["Frozen"] = 2] = "Frozen";
|
|
17
17
|
})(AccountState || (AccountState = {}));
|
|
18
18
|
const AccountLayout = bl.struct([
|
|
19
|
-
blu.publicKey(
|
|
20
|
-
blu.publicKey(
|
|
21
|
-
blu.u64(
|
|
22
|
-
bl.u32(
|
|
23
|
-
blu.publicKey(
|
|
24
|
-
bl.u8(
|
|
25
|
-
bl.u32(
|
|
26
|
-
blu.u64(
|
|
27
|
-
blu.u64(
|
|
28
|
-
bl.u32(
|
|
29
|
-
blu.publicKey(
|
|
19
|
+
blu.publicKey("mint"),
|
|
20
|
+
blu.publicKey("owner"),
|
|
21
|
+
blu.u64("amount"),
|
|
22
|
+
bl.u32("delegateOption"),
|
|
23
|
+
blu.publicKey("delegate"),
|
|
24
|
+
bl.u8("state"),
|
|
25
|
+
bl.u32("isNativeOption"),
|
|
26
|
+
blu.u64("isNative"),
|
|
27
|
+
blu.u64("delegatedAmount"),
|
|
28
|
+
bl.u32("closeAuthorityOption"),
|
|
29
|
+
blu.publicKey("closeAuthority"),
|
|
30
30
|
]);
|
|
31
31
|
var AccountType;
|
|
32
32
|
(function (AccountType) {
|
|
@@ -44,7 +44,11 @@ var AccountType;
|
|
|
44
44
|
*/
|
|
45
45
|
async function getTokenInfo(connection, tokenAddress) {
|
|
46
46
|
const tokenMetaProgramId = new web3_js_1.PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
|
|
47
|
-
const findMetaplexMetadataPda = (tokenMint) => web3_js_1.PublicKey.findProgramAddressSync([
|
|
47
|
+
const findMetaplexMetadataPda = (tokenMint) => web3_js_1.PublicKey.findProgramAddressSync([
|
|
48
|
+
buffer_1.Buffer.from("metadata", "utf-8"),
|
|
49
|
+
tokenMetaProgramId.toBuffer(),
|
|
50
|
+
tokenMint.toBuffer(),
|
|
51
|
+
], tokenMetaProgramId)[0];
|
|
48
52
|
const decodeMetaplexMetadataPartial = (data) => {
|
|
49
53
|
const rawName = data.subarray(65 + 4, 65 + 36); // omit first 4 bytes, size is already hardcoded
|
|
50
54
|
const rawSymbol = data.subarray(101 + 4, 115); // omit first 4 bytes, size is already hardcoded
|
|
@@ -56,8 +60,13 @@ async function getTokenInfo(connection, tokenAddress) {
|
|
|
56
60
|
};
|
|
57
61
|
};
|
|
58
62
|
const pda = findMetaplexMetadataPda(tokenAddress);
|
|
59
|
-
const [tokenAccount, pdaAccount] = await connection.getMultipleAccountsInfo([
|
|
60
|
-
|
|
63
|
+
const [tokenAccount, pdaAccount] = await connection.getMultipleAccountsInfo([
|
|
64
|
+
tokenAddress,
|
|
65
|
+
pda,
|
|
66
|
+
]);
|
|
67
|
+
if (tokenAccount === null ||
|
|
68
|
+
pdaAccount === null ||
|
|
69
|
+
pdaAccount?.lamports === 0) {
|
|
61
70
|
return null;
|
|
62
71
|
}
|
|
63
72
|
// parse token account
|
|
@@ -156,7 +165,9 @@ async function getAccountWithType(connection, account) {
|
|
|
156
165
|
if (!accountData)
|
|
157
166
|
return [null, AccountType.NotExists];
|
|
158
167
|
if (accountData.owner.equals(accounts_1.TOKEN_PROGRAM_ID)) {
|
|
159
|
-
return isWalletCorrectATA(account, accountData.data)
|
|
168
|
+
return isWalletCorrectATA(account, accountData.data)
|
|
169
|
+
? [accountData, AccountType.CorrectATA]
|
|
170
|
+
: [accountData, AccountType.Token];
|
|
160
171
|
}
|
|
161
172
|
if (accountData.owner.equals(web3_js_1.SystemProgram.programId))
|
|
162
173
|
return [accountData, AccountType.System];
|
|
@@ -252,7 +263,11 @@ function buildReplenishWsolBalanceTransaction(amount, transferFrom, transferTo)
|
|
|
252
263
|
transferFrom = new web3_js_1.PublicKey(transferFrom);
|
|
253
264
|
transferTo = new web3_js_1.PublicKey(transferTo);
|
|
254
265
|
const tx = new web3_js_1.Transaction();
|
|
255
|
-
tx.add(web3_js_1.SystemProgram.transfer({
|
|
266
|
+
tx.add(web3_js_1.SystemProgram.transfer({
|
|
267
|
+
fromPubkey: transferFrom,
|
|
268
|
+
toPubkey: transferTo,
|
|
269
|
+
lamports: new bn_js_1.default(amount).toNumber(),
|
|
270
|
+
}));
|
|
256
271
|
tx.add(
|
|
257
272
|
// sync native
|
|
258
273
|
new web3_js_1.TransactionInstruction({
|
package/dist/cjs/spl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spl.js","sourceRoot":"","sources":["../../src/spl.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"spl.js","sourceRoot":"","sources":["../../src/spl.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/accounts.js
CHANGED
|
@@ -17,7 +17,11 @@ export function findAssociatedTokenAddressSync(wallet, tokenMint, tokenProgramId
|
|
|
17
17
|
return PublicKey.findProgramAddressSync([wallet.toBytes(), tokenProgramId.toBytes(), tokenMint.toBytes()], associatedTokenProramId);
|
|
18
18
|
}
|
|
19
19
|
export function getTokenMetadataAddress(tokenMint, tokenMetedataProgramId) {
|
|
20
|
-
return PublicKey.findProgramAddressSync([
|
|
20
|
+
return PublicKey.findProgramAddressSync([
|
|
21
|
+
Buffer.from("metadata"),
|
|
22
|
+
tokenMetedataProgramId.toBytes(),
|
|
23
|
+
tokenMint.toBytes(),
|
|
24
|
+
], tokenMetedataProgramId);
|
|
21
25
|
}
|
|
22
26
|
const deBridge = {
|
|
23
27
|
getClaimMarkerAddress: (DEBRIDGE_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.deBridge.Seeds.CLAIM_MARKER)], DEBRIDGE_PROGRAM_ID),
|
|
@@ -27,39 +31,70 @@ const deBridge = {
|
|
|
27
31
|
new PublicKey(executorPubkey).toBytes(),
|
|
28
32
|
normalizeChainId(sourceChainId),
|
|
29
33
|
], DEBRIDGE_PROGRAM_ID),
|
|
30
|
-
getExternalCallMetaAddress: (externalCallStorage, DEBRIDGE_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
34
|
+
getExternalCallMetaAddress: (externalCallStorage, DEBRIDGE_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
35
|
+
Buffer.from(constants.deBridge.Seeds.EXTERNAL_CALL_META),
|
|
36
|
+
new PublicKey(externalCallStorage).toBytes(),
|
|
37
|
+
], DEBRIDGE_PROGRAM_ID),
|
|
31
38
|
getNonceAddress: (DEBRIDGE_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.deBridge.Seeds.NONCE)], DEBRIDGE_PROGRAM_ID),
|
|
32
39
|
getSubmissionAddress: (submissionId, DEBRIDGE_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.deBridge.Seeds.SUBMISSION), submissionId], DEBRIDGE_PROGRAM_ID),
|
|
33
|
-
getSubmissionAuthAddress: (submissionAddress, DEBRIDGE_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
34
|
-
|
|
40
|
+
getSubmissionAuthAddress: (submissionAddress, DEBRIDGE_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
41
|
+
Buffer.from(constants.deBridge.Seeds.SUBMISSION_AUTH),
|
|
42
|
+
new PublicKey(submissionAddress).toBytes(),
|
|
43
|
+
], DEBRIDGE_PROGRAM_ID),
|
|
44
|
+
getMintAuthorityAddress: (bridge, DEBRIDGE_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
45
|
+
Buffer.from(constants.deBridge.Seeds.BRIDGE_MINTER),
|
|
46
|
+
new PublicKey(bridge).toBytes(),
|
|
47
|
+
], DEBRIDGE_PROGRAM_ID),
|
|
35
48
|
};
|
|
36
49
|
const deBridgeSettings = {
|
|
37
50
|
getTokenMetadataMasterAddress: (SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.deBridgeSettings.Seeds.TOKEN_METADATA)], SETTINGS_PROGRAM_ID),
|
|
38
51
|
getTokenMintAddress: (debridgeId, SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.deBridgeSettings.Seeds.WRAPPER_TOKEN), debridgeId], SETTINGS_PROGRAM_ID),
|
|
39
52
|
getStateAddress: (SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.deBridgeSettings.Seeds.STATE)], SETTINGS_PROGRAM_ID),
|
|
40
|
-
getConfirmationsStorageAddress: (message, SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
53
|
+
getConfirmationsStorageAddress: (message, SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
54
|
+
Buffer.from(constants.deBridgeSettings.Seeds.CONFIRMATION_STORAGE),
|
|
55
|
+
message,
|
|
56
|
+
], SETTINGS_PROGRAM_ID),
|
|
57
|
+
getBridgeFeeAddress: (bridge, chainId, SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
58
|
+
Buffer.from(constants.deBridgeSettings.Seeds.BRIDGE_FEE_INFO),
|
|
59
|
+
bridge.toBytes(),
|
|
60
|
+
normalizeChainId(chainId),
|
|
61
|
+
], SETTINGS_PROGRAM_ID),
|
|
62
|
+
getChainSupportInfoAddress: (chainId, SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
63
|
+
Buffer.from(constants.deBridgeSettings.Seeds.CHAIN_SUPPORT_INFO),
|
|
64
|
+
normalizeChainId(chainId),
|
|
65
|
+
], SETTINGS_PROGRAM_ID),
|
|
66
|
+
getDiscountInfoAddress: (user, SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
67
|
+
Buffer.from(constants.deBridgeSettings.Seeds.DISCOUNT_INFO),
|
|
68
|
+
user.toBytes(),
|
|
69
|
+
], SETTINGS_PROGRAM_ID),
|
|
70
|
+
getBridgeAddress: (tokenMint, SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
71
|
+
Buffer.from(constants.deBridgeSettings.Seeds.BRIDGE),
|
|
72
|
+
tokenMint.toBytes(),
|
|
73
|
+
], SETTINGS_PROGRAM_ID),
|
|
45
74
|
getBridgeMapAddress: (bridgeId, SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.deBridgeSettings.Seeds.SEND_BRIDGE_MAP), bridgeId], SETTINGS_PROGRAM_ID),
|
|
46
75
|
getNoDiscountAddress: (SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.deBridgeSettings.Seeds.NO_DISCOUNT)], SETTINGS_PROGRAM_ID),
|
|
47
76
|
getNoBridgeFeeAddress: (SETTINGS_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.deBridgeSettings.Seeds.NO_BRIDGE_FEE_INFO)], SETTINGS_PROGRAM_ID),
|
|
48
77
|
};
|
|
49
|
-
const
|
|
50
|
-
getStateAccount: (PMM_SRC_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.
|
|
51
|
-
getNonceAccount: (maker, PMM_SRC_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
78
|
+
const DlnSrc = {
|
|
79
|
+
getStateAccount: (PMM_SRC_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.dlnSrc.Seeds.STATE)], PMM_SRC_PROGRAM_ID),
|
|
80
|
+
getNonceAccount: (maker, PMM_SRC_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
81
|
+
Buffer.from(constants.dlnSrc.Seeds.NONCE),
|
|
82
|
+
isBuffer(maker) ? maker : maker.toBuffer(),
|
|
83
|
+
], PMM_SRC_PROGRAM_ID),
|
|
84
|
+
getGiveOrderStateAccount: (orderId, PMM_SRC_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.dlnSrc.Seeds.ORDER_STATE), orderId], PMM_SRC_PROGRAM_ID),
|
|
85
|
+
getAuthorizedNativeSenderAddress: (chainId, PMM_SRC_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.dlnSrc.Seeds.AUTHORIZED_NATIVE_SENDER), chainId], PMM_SRC_PROGRAM_ID),
|
|
86
|
+
getGiveOrderWalletAddress: (orderId, PMM_SRC_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.dlnSrc.Seeds.GIVE_ORDER_WALLET), orderId], PMM_SRC_PROGRAM_ID),
|
|
87
|
+
getFeeLedgerWalletAddress: (tokenMint, PMM_SRC_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
88
|
+
Buffer.from(constants.dlnSrc.Seeds.FEE_LEDGER_WALLET),
|
|
89
|
+
tokenMint.toBuffer(),
|
|
90
|
+
], PMM_SRC_PROGRAM_ID),
|
|
91
|
+
getFeeLedgerAddress: (PMM_SRC_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.dlnSrc.Seeds.FEE_LEDGER)], PMM_SRC_PROGRAM_ID),
|
|
57
92
|
};
|
|
58
|
-
const
|
|
59
|
-
getAuthorizedSrcContractAddress: (chainId, PMM_DST_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.
|
|
60
|
-
getAuthorizedDstNativeSenderAddress: (PMM_DST_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.
|
|
61
|
-
getTakeOrderStateAddress: (orderId, PMM_DST_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.
|
|
62
|
-
getTakePatchAddress: (orderId, PMM_DST_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.
|
|
93
|
+
const DlnDst = {
|
|
94
|
+
getAuthorizedSrcContractAddress: (chainId, PMM_DST_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.dlnDst.Seeds.AUTHORIZED_SRC_CONTRACT), chainId], PMM_DST_PROGRAM_ID),
|
|
95
|
+
getAuthorizedDstNativeSenderAddress: (PMM_DST_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.dlnDst.Seeds.AUTHORIZED_DST_NATIVE_SENDER)], PMM_DST_PROGRAM_ID),
|
|
96
|
+
getTakeOrderStateAddress: (orderId, PMM_DST_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.dlnDst.Seeds.ORDER_STATE), orderId], PMM_DST_PROGRAM_ID),
|
|
97
|
+
getTakePatchAddress: (orderId, PMM_DST_PROGRAM_ID) => PublicKey.findProgramAddressSync([Buffer.from(constants.dlnDst.Seeds.TAKE_PATCH), orderId], PMM_DST_PROGRAM_ID),
|
|
63
98
|
};
|
|
64
99
|
function wrapFn(fn, arg) {
|
|
65
100
|
return (...args) => fn(...args, arg);
|
|
@@ -86,6 +121,6 @@ class ResolverContainer2 {
|
|
|
86
121
|
}
|
|
87
122
|
}
|
|
88
123
|
export const DeBridgeResolver = (programId, settingsProgramId) => new ResolverContainer2(new Resolver(programId, deBridge), new Resolver(settingsProgramId, deBridgeSettings));
|
|
89
|
-
export const
|
|
90
|
-
export const
|
|
124
|
+
export const dlnSrcResolver = (programId) => new Resolver(programId, DlnSrc);
|
|
125
|
+
export const dlnDstResolver = (programId) => new Resolver(programId, DlnDst);
|
|
91
126
|
//# sourceMappingURL=accounts.js.map
|
package/dist/esm/accounts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../src/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAU,QAAQ,EAAgB,MAAM,cAAc,CAAC;AAE9D,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,SAAS,
|
|
1
|
+
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../src/accounts.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/constants.js
CHANGED
|
@@ -46,7 +46,7 @@ export const deBridgeSettings = {
|
|
|
46
46
|
SEND_BRIDGE_MAP: "WRAPPER_TOKEN",
|
|
47
47
|
},
|
|
48
48
|
};
|
|
49
|
-
export const
|
|
49
|
+
export const dlnSrc = {
|
|
50
50
|
Seeds: {
|
|
51
51
|
STATE: "STATE",
|
|
52
52
|
NONCE: "NONCE",
|
|
@@ -57,7 +57,7 @@ export const pmmSrc = {
|
|
|
57
57
|
FEE_LEDGER: "FEE LEDGER",
|
|
58
58
|
},
|
|
59
59
|
};
|
|
60
|
-
export const
|
|
60
|
+
export const dlnDst = {
|
|
61
61
|
Seeds: {
|
|
62
62
|
AUTHORIZED_SRC_CONTRACT: "AUTHORIZED_SRC_CONTRACT",
|
|
63
63
|
AUTHORIZED_DST_NATIVE_SENDER: "AUTHORIZED_DST_NATIVE_SENDER",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC;AACrC,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC;AACvC,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC;AAChC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AACpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,QAAQ,GAAG;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC;AACrC,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC;AACvC,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC;AAChC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AACpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,KAAK,EAAE;QACL,KAAK,EAAE,gBAAgB;QACvB,MAAM,EAAE,QAAQ;QAChB,aAAa,EAAE,eAAe;QAC9B,eAAe,EAAE,eAAe;QAChC,aAAa,EAAE,eAAe;QAC9B,kBAAkB,EAAE,oBAAoB;QACxC,eAAe,EAAE,iBAAiB;QAClC,aAAa,EAAE,eAAe;QAC9B,WAAW,EAAE,YAAY;QACzB,qBAAqB,EAAE,uBAAuB;QAC9C,kBAAkB,EAAE,oBAAoB;QACxC,KAAK,EAAE,OAAO;QACd,UAAU,EAAE,YAAY;QACxB,eAAe,EAAE,iBAAiB;QAClC,WAAW,EAAE,aAAa;QAC1B,YAAY,EAAE,cAAc;KAC7B;IACD,KAAK,EAAE;QACL,UAAU,EAAE,CAAC;QACb,uBAAuB,EAAE,CAAC;QAC1B,iBAAiB,EAAE,CAAC;QACpB,gBAAgB,EAAE,CAAC;QACnB,WAAW,EAAE,SAAA,CAAC,EAAI,EAAE,CAAA;KACrB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE;QACL,cAAc,EAAE,gBAAgB;QAChC,aAAa,EAAE,eAAe;QAC9B,KAAK,EAAE,gBAAgB;QACvB,oBAAoB,EAAE,YAAY;QAClC,eAAe,EAAE,iBAAiB;QAClC,kBAAkB,EAAE,oBAAoB;QACxC,aAAa,EAAE,eAAe;QAC9B,MAAM,EAAE,QAAQ;QAChB,kBAAkB,EAAE,yBAAyB;QAC7C,WAAW,EAAE,aAAa;QAC1B,eAAe,EAAE,eAAe;KACjC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,KAAK,EAAE;QACL,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,kBAAkB;QAC/B,wBAAwB,EAAE,0BAA0B;QACpD,iBAAiB,EAAE,mBAAmB;QACtC,iBAAiB,EAAE,mBAAmB;QACtC,UAAU,EAAE,YAAY;KACzB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,KAAK,EAAE;QACL,uBAAuB,EAAE,yBAAyB;QAClD,4BAA4B,EAAE,8BAA8B;QAC5D,WAAW,EAAE,kBAAkB;QAC/B,UAAU,EAAE,kBAAkB;KAC/B;CACF,CAAC"}
|
package/dist/esm/crypto.js
CHANGED
|
@@ -3,7 +3,7 @@ import { PublicKey } from "@solana/web3.js";
|
|
|
3
3
|
import BN from "bn.js";
|
|
4
4
|
import { keccak256 as rawKeccak256 } from "js-sha3";
|
|
5
5
|
import { hexToBuffer } from "./helpers";
|
|
6
|
-
import { isBuffer } from "./interfaces";
|
|
6
|
+
import { isBuffer, } from "./interfaces";
|
|
7
7
|
import { DEPLOY_INFO_PREFIX, SUBMISSION_PREFIX } from "./constants";
|
|
8
8
|
import { solidityPack } from "./solidityPack";
|
|
9
9
|
export const keccak256 = (data) => `0x${rawKeccak256(data)}`;
|
|
@@ -26,7 +26,13 @@ export function normalizeChainId(chainId) {
|
|
|
26
26
|
export function hashDeployInfo(params) {
|
|
27
27
|
const nameHash = solidityKeccak256(["string"], [params.tokenName]);
|
|
28
28
|
const symbolHash = solidityKeccak256(["string"], [params.tokenSymbol]);
|
|
29
|
-
const deployInfoHash = solidityKeccak256(["uint256", "uint256", "uint256", "uint256", "uint8"], [
|
|
29
|
+
const deployInfoHash = solidityKeccak256(["uint256", "uint256", "uint256", "uint256", "uint8"], [
|
|
30
|
+
DEPLOY_INFO_PREFIX,
|
|
31
|
+
params.debridgeId,
|
|
32
|
+
nameHash,
|
|
33
|
+
symbolHash,
|
|
34
|
+
params.decimals,
|
|
35
|
+
]);
|
|
30
36
|
return deployInfoHash;
|
|
31
37
|
}
|
|
32
38
|
/**
|
package/dist/esm/crypto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"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"}
|