@ercworldio/blockchain-shared 1.0.1-dev.15 → 1.0.1-dev.17
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/build/chains/networks_dev.json +25 -20
- package/build/services/quicknode-notifications/SetupNotifications.d.ts.map +1 -1
- package/build/services/quicknode-notifications/SetupNotifications.js +13 -0
- package/build/utils/solana.d.ts +2 -1
- package/build/utils/solana.d.ts.map +1 -1
- package/build/utils/solana.js +28 -3
- package/package.json +1 -1
|
@@ -125,11 +125,6 @@
|
|
|
125
125
|
"name": "qn-custodial-webhook-sol-dev",
|
|
126
126
|
"network": "solana-devnet",
|
|
127
127
|
"template": "solanaWalletFilter"
|
|
128
|
-
},
|
|
129
|
-
{
|
|
130
|
-
"name": "qn-custodial-webhook-sol-local",
|
|
131
|
-
"network": "solana-devnet",
|
|
132
|
-
"template": "solanaWalletFilter"
|
|
133
128
|
}
|
|
134
129
|
],
|
|
135
130
|
"contracts": [
|
|
@@ -213,12 +208,14 @@
|
|
|
213
208
|
],
|
|
214
209
|
"quicknodeNotificationConfig": [
|
|
215
210
|
{
|
|
216
|
-
"name": "
|
|
211
|
+
"name": "escrow-bnb-dev",
|
|
217
212
|
"network": "bnbchain-testnet",
|
|
218
|
-
"template": "evmWalletFilter"
|
|
213
|
+
"template": "evmWalletFilter",
|
|
214
|
+
"source": "contract",
|
|
215
|
+
"chain_id": 97
|
|
219
216
|
},
|
|
220
217
|
{
|
|
221
|
-
"name": "qn-custodial-webhook-bsc-
|
|
218
|
+
"name": "qn-custodial-webhook-bsc-dev",
|
|
222
219
|
"network": "bnbchain-testnet",
|
|
223
220
|
"template": "evmWalletFilter"
|
|
224
221
|
}
|
|
@@ -377,12 +374,14 @@
|
|
|
377
374
|
],
|
|
378
375
|
"quicknodeNotificationConfig": [
|
|
379
376
|
{
|
|
380
|
-
"name": "
|
|
377
|
+
"name": "escrow-avax-dev",
|
|
381
378
|
"network": "avalanche-fuji",
|
|
382
|
-
"template": "evmWalletFilter"
|
|
379
|
+
"template": "evmWalletFilter",
|
|
380
|
+
"source": "contract",
|
|
381
|
+
"chain_id": 43113
|
|
383
382
|
},
|
|
384
383
|
{
|
|
385
|
-
"name": "qn-custodial-webhook-avax-
|
|
384
|
+
"name": "qn-custodial-webhook-avax-dev",
|
|
386
385
|
"network": "avalanche-fuji",
|
|
387
386
|
"template": "evmWalletFilter"
|
|
388
387
|
}
|
|
@@ -483,12 +482,14 @@
|
|
|
483
482
|
],
|
|
484
483
|
"quicknodeNotificationConfig": [
|
|
485
484
|
{
|
|
486
|
-
"name": "
|
|
485
|
+
"name": "escrow-eth-dev",
|
|
487
486
|
"network": "ethereum-sepolia",
|
|
488
|
-
"template": "evmWalletFilter"
|
|
487
|
+
"template": "evmWalletFilter",
|
|
488
|
+
"source": "contract",
|
|
489
|
+
"chain_id": 11155111
|
|
489
490
|
},
|
|
490
491
|
{
|
|
491
|
-
"name": "qn-custodial-webhook-eth-
|
|
492
|
+
"name": "qn-custodial-webhook-eth-dev",
|
|
492
493
|
"network": "ethereum-sepolia",
|
|
493
494
|
"template": "evmWalletFilter"
|
|
494
495
|
}
|
|
@@ -575,12 +576,14 @@
|
|
|
575
576
|
],
|
|
576
577
|
"quicknodeNotificationConfig": [
|
|
577
578
|
{
|
|
578
|
-
"name": "
|
|
579
|
+
"name": "escrow-pol-dev",
|
|
579
580
|
"network": "polygon-amoy",
|
|
580
|
-
"template": "evmWalletFilter"
|
|
581
|
+
"template": "evmWalletFilter",
|
|
582
|
+
"source": "contract",
|
|
583
|
+
"chain_id": 80002
|
|
581
584
|
},
|
|
582
585
|
{
|
|
583
|
-
"name": "qn-custodial-webhook-pol-
|
|
586
|
+
"name": "qn-custodial-webhook-pol-dev",
|
|
584
587
|
"network": "polygon-amoy",
|
|
585
588
|
"template": "evmWalletFilter"
|
|
586
589
|
}
|
|
@@ -666,12 +669,14 @@
|
|
|
666
669
|
],
|
|
667
670
|
"quicknodeNotificationConfig": [
|
|
668
671
|
{
|
|
669
|
-
"name": "
|
|
672
|
+
"name": "escrow-mon-dev",
|
|
670
673
|
"network": "monad-testnet",
|
|
671
|
-
"template": "evmWalletFilter"
|
|
674
|
+
"template": "evmWalletFilter",
|
|
675
|
+
"source": "contract",
|
|
676
|
+
"chain_id": 10143
|
|
672
677
|
},
|
|
673
678
|
{
|
|
674
|
-
"name": "qn-custodial-webhook-mon-
|
|
679
|
+
"name": "qn-custodial-webhook-mon-dev",
|
|
675
680
|
"network": "monad-testnet",
|
|
676
681
|
"template": "evmWalletFilter"
|
|
677
682
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SetupNotifications.d.ts","sourceRoot":"","sources":["../../../src/services/quicknode-notifications/SetupNotifications.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SetupNotifications.d.ts","sourceRoot":"","sources":["../../../src/services/quicknode-notifications/SetupNotifications.ts"],"names":[],"mappings":"AAEA,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAUlE,MAAM,WAAW,wBAAwB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAWD,cAAM,kBAAmB,SAAQ,UAAU;IACvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAqB;IAC5C,OAAO,CAAC,GAAG,CAAqB;IAEhC,OAAO,CAAC,WAAW,CAAoD;IAEvE,OAAO,CAAC,aAAa,CAA8D;IAEnF,OAAO,CAAC,eAAe,CAAqD;IAC5E,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,EAAE,CAAgB;IAC1B,OAAO;IAOP,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,kBAAkB,GAAG,kBAAkB;IAO5F,mBAAmB,IAAI,MAAM,EAAE;IAI/B,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS;IAOhF;;;;OAIG;YACW,wBAAwB;YAoBxB,sBAAsB;IAuBpC;;OAEG;IACH,OAAO,CAAC,cAAc;IAOT,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0H3B,WAAW,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyDvE,cAAc,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAe1F;AAED,eAAe,kBAAkB,CAAC"}
|
|
@@ -12,11 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
16
|
+
const constants_1 = require("../../constants");
|
|
15
17
|
const errors_1 = __importDefault(require("../../errors/errors"));
|
|
16
18
|
const ChainManager_1 = __importDefault(require("../ChainManager"));
|
|
17
19
|
const DepositAddressService_1 = __importDefault(require("../DepositAddressService"));
|
|
18
20
|
const QuicknodeWebhookSignature_1 = __importDefault(require("../QuicknodeWebhookSignature"));
|
|
19
21
|
const QnNotificationsApi_1 = __importDefault(require("./QnNotificationsApi"));
|
|
22
|
+
const Wallets_1 = require("../../utils/Wallets");
|
|
23
|
+
const __1 = require("../..");
|
|
20
24
|
const ADDRESS_SYNC_BATCH_SIZE = 500;
|
|
21
25
|
const ADDRESS_LOG_THRESHOLD = 1000;
|
|
22
26
|
class SetupNotifications extends errors_1.default {
|
|
@@ -62,6 +66,15 @@ class SetupNotifications extends errors_1.default {
|
|
|
62
66
|
}
|
|
63
67
|
const chain_manager = ChainManager_1.default.getInstance(this.config);
|
|
64
68
|
const escrow_config = chain_manager.getEscrowContractForChain(notif_config.chain_id);
|
|
69
|
+
// Derive vault authority for solana escrow program
|
|
70
|
+
if (notif_config.chain_id !== undefined && notif_config.blockchain === constants_1.BLOCKCHAINS.SOLANA) {
|
|
71
|
+
const chain_manager = ChainManager_1.default.getInstance(this.config);
|
|
72
|
+
const escrow_config = chain_manager.getEscrowContractForChain(parseInt(notif_config.chain_id.toString()));
|
|
73
|
+
// TODO handle multiple escrow contracts on solana
|
|
74
|
+
const escrow_program_pubkey = new web3_js_1.PublicKey((0, Wallets_1.normalizeAddress)(escrow_config.addresses[0], "solana"));
|
|
75
|
+
const vault_authority = __1.EscrowService.findVaultAuthorityPda(escrow_program_pubkey);
|
|
76
|
+
return [vault_authority.toString()];
|
|
77
|
+
}
|
|
65
78
|
return (_a = escrow_config === null || escrow_config === void 0 ? void 0 : escrow_config.addresses) !== null && _a !== void 0 ? _a : [];
|
|
66
79
|
});
|
|
67
80
|
}
|
package/build/utils/solana.d.ts
CHANGED
|
@@ -70,7 +70,8 @@ export declare const handle_transfer_batch: (payloads: SolanaTransactionRequest[
|
|
|
70
70
|
success: SolanaTransactionSuccessRequest[];
|
|
71
71
|
failed: SolanaTransactionRequest[];
|
|
72
72
|
}>;
|
|
73
|
-
export declare const find_transfer_instruction: (tx: SolanaTransactionLog) => TransferInstructionRecord;
|
|
73
|
+
export declare const find_transfer_instruction: (tx: SolanaTransactionLog, receiver?: string) => TransferInstructionRecord;
|
|
74
|
+
export declare const find_transfer_instruction_depr: (tx: SolanaTransactionLog) => TransferInstructionRecord;
|
|
74
75
|
export declare const getSolanaConnection: (chainId: string, config: IConfig) => web3.Connection;
|
|
75
76
|
export declare const getSolanaArchivalConnection: (chainId: string, config: IConfig) => web3.Connection;
|
|
76
77
|
export declare const getSolanaConnectionPublic: (chainId: string) => web3.Connection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/utils/solana.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/utils/solana.ts"],"names":[],"mappings":"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"}
|
package/build/utils/solana.js
CHANGED
|
@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
45
45
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
46
46
|
};
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
|
-
exports.check_approve_delegate = exports.handle_create_versioned_transaction_spl = exports.estimate_withdraw_gas_cost = exports.create_versioned_transaction_solana = exports.get_token_account_info = exports.getSolanaConnectionPublic = exports.getSolanaArchivalConnection = exports.getSolanaConnection = exports.find_transfer_instruction = exports.handle_transfer_batch = exports.handle_sweep = exports.SplTransferCheckedLayout = exports.SolTransferInstructionLayout = exports.usdc_program_address = exports.solana_program_address = exports.min_solana_funding_lamports = void 0;
|
|
48
|
+
exports.check_approve_delegate = exports.handle_create_versioned_transaction_spl = exports.estimate_withdraw_gas_cost = exports.create_versioned_transaction_solana = exports.get_token_account_info = exports.getSolanaConnectionPublic = exports.getSolanaArchivalConnection = exports.getSolanaConnection = exports.find_transfer_instruction_depr = exports.find_transfer_instruction = exports.handle_transfer_batch = exports.handle_sweep = exports.SplTransferCheckedLayout = exports.SolTransferInstructionLayout = exports.usdc_program_address = exports.solana_program_address = exports.min_solana_funding_lamports = void 0;
|
|
49
49
|
const buffer_layout_utils_1 = require("@solana/buffer-layout-utils");
|
|
50
50
|
const buffer_layout_1 = require("@solana/buffer-layout");
|
|
51
51
|
const web3_js_1 = __importStar(require("@solana/web3.js"));
|
|
@@ -182,7 +182,32 @@ const handle_transfer_batch = (payloads_1, chain_id_1, token_type_1, connection_
|
|
|
182
182
|
return { status: true, signatures, success, failed };
|
|
183
183
|
});
|
|
184
184
|
exports.handle_transfer_batch = handle_transfer_batch;
|
|
185
|
-
const find_transfer_instruction = (tx) => {
|
|
185
|
+
const find_transfer_instruction = (tx, receiver) => {
|
|
186
|
+
const message = tx.transaction[0].message[0];
|
|
187
|
+
const target_instruction = message.instructions.find(i => {
|
|
188
|
+
const program = message.account_keys[parseInt(i.program_id_index)];
|
|
189
|
+
if (!token_program_addresses.some(a => a === program))
|
|
190
|
+
return false;
|
|
191
|
+
// If a receiver is specified and this is a native SOL transfer, match by
|
|
192
|
+
// the destination account (accounts[1]) to find the exact instruction for
|
|
193
|
+
// that recipient. Needed for batch sends where one tx has many transfers.
|
|
194
|
+
if (receiver && program === exports.solana_program_address) {
|
|
195
|
+
if (!i.accounts || i.accounts.length < 2)
|
|
196
|
+
return false;
|
|
197
|
+
return message.account_keys[i.accounts[1]] === receiver;
|
|
198
|
+
}
|
|
199
|
+
return true; // original behaviour: first matching program
|
|
200
|
+
});
|
|
201
|
+
if (!target_instruction)
|
|
202
|
+
throw new Error(`Cannot find program index for accepted payment tokens: ${token_program_addresses}`);
|
|
203
|
+
const program_index = target_instruction.program_id_index;
|
|
204
|
+
return {
|
|
205
|
+
instruction: target_instruction,
|
|
206
|
+
is_native: message.account_keys[parseInt(program_index)] === exports.solana_program_address
|
|
207
|
+
};
|
|
208
|
+
};
|
|
209
|
+
exports.find_transfer_instruction = find_transfer_instruction;
|
|
210
|
+
const find_transfer_instruction_depr = (tx) => {
|
|
186
211
|
const message = tx.transaction[0].message[0];
|
|
187
212
|
const target_instruction = message.instructions.find(i => token_program_addresses.some(a => a === message.account_keys[parseInt(i.program_id_index)]));
|
|
188
213
|
if (!target_instruction)
|
|
@@ -190,7 +215,7 @@ const find_transfer_instruction = (tx) => {
|
|
|
190
215
|
const program_index = target_instruction === null || target_instruction === void 0 ? void 0 : target_instruction.program_id_index;
|
|
191
216
|
return { instruction: target_instruction, is_native: tx.transaction[0].message[0].account_keys[parseInt(program_index)] === exports.solana_program_address };
|
|
192
217
|
};
|
|
193
|
-
exports.
|
|
218
|
+
exports.find_transfer_instruction_depr = find_transfer_instruction_depr;
|
|
194
219
|
const getSolanaConnection = (chainId, config) => {
|
|
195
220
|
const network = ChainManager_1.default.getInstance(config).getChainConfigForChainIdSync(parseInt(chainId));
|
|
196
221
|
if (!network)
|