@pushchain/core 2.0.3 → 2.0.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 (16) hide show
  1. package/package.json +1 -1
  2. package/src/lib/constants/abi/pushsolanagateway.json +1129 -253
  3. package/src/lib/constants/abi/universalGatewayV0.evm.js +2 -2
  4. package/src/lib/constants/abi/universalGatewayV0.evm.js.map +1 -1
  5. package/src/lib/constants/tokens.js +6 -1
  6. package/src/lib/constants/tokens.js.map +1 -1
  7. package/src/lib/orchestrator/orchestrator.d.ts +2 -1
  8. package/src/lib/orchestrator/orchestrator.js +187 -109
  9. package/src/lib/orchestrator/orchestrator.js.map +1 -1
  10. package/src/lib/progress-hook/progress-hook.js +4 -11
  11. package/src/lib/progress-hook/progress-hook.js.map +1 -1
  12. package/src/lib/progress-hook/progress-hook.types.d.ts +0 -1
  13. package/src/lib/progress-hook/progress-hook.types.js +0 -1
  14. package/src/lib/progress-hook/progress-hook.types.js.map +1 -1
  15. package/src/lib/vm-client/svm-client.js +83 -4
  16. package/src/lib/vm-client/svm-client.js.map +1 -1
package/src/lib/constants/abi/universalGatewayV0.evm.js CHANGED
@@ -84,7 +84,7 @@ exports.UNIVERSAL_GATEWAY_V0 = [
84
84
  { name: 'revertMsg', type: 'bytes', internalType: 'bytes' },
85
85
  ],
86
86
  },
87
- { name: 'signatureData', type: 'bytes32', internalType: 'bytes32' },
87
+ { name: 'signatureData', type: 'bytes', internalType: 'bytes' },
88
88
  ],
89
89
  outputs: [],
90
90
  stateMutability: 'payable',
@@ -132,7 +132,7 @@ exports.UNIVERSAL_GATEWAY_V0 = [
132
132
  { name: 'revertMsg', type: 'bytes', internalType: 'bytes' },
133
133
  ],
134
134
  },
135
- { name: 'signatureData', type: 'bytes32', internalType: 'bytes32' },
135
+ { name: 'signatureData', type: 'bytes', internalType: 'bytes' },
136
136
  ],
137
137
  outputs: [],
138
138
  stateMutability: 'nonpayable',
package/src/lib/constants/abi/universalGatewayV0.evm.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"universalGatewayV0.evm.js","sourceRoot":"","sources":["../../../../../../../packages/core/src/lib/constants/abi/universalGatewayV0.evm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"universalGatewayV0.evm.js","sourceRoot":"","sources":["../../../../../../../packages/core/src/lib/constants/abi/universalGatewayV0.evm.ts"],"names":[],"mappings":"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"}
package/src/lib/constants/tokens.js CHANGED
@@ -107,7 +107,12 @@ exports.MOVEABLE_TOKENS = {
107
107
  mechanism: 'native',
108
108
  },
109
109
  // Example SPL USDT mint address on Devnet (placeholder or set via config if needed)
110
- { symbol: 'USDT', decimals: 6, address: 'TBD', mechanism: 'approve' },
110
+ {
111
+ symbol: 'USDT',
112
+ decimals: 6,
113
+ address: 'EiXDnrAg9ea2Q6vEPV7E5TpTU1vh41jcuZqKjU5Dc4ZF',
114
+ mechanism: 'approve',
115
+ },
111
116
  ],
112
117
  };
113
118
  exports.PAYABLE_TOKENS = {
package/src/lib/constants/tokens.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/constants/tokens.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/constants/tokens.ts"],"names":[],"mappings":"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"}
package/src/lib/orchestrator/orchestrator.d.ts CHANGED
@@ -79,7 +79,7 @@ export declare class Orchestrator {
79
79
  /**
80
80
  * Ensures we're on Sepolia, returns EVM client and gateway address.
81
81
  */
82
- private ensureSepoliaGateway;
82
+ private getOriginGatewayContext;
83
83
  /**
84
84
  * Computes UEA and fetches its nonce if deployed; returns 0 otherwise.
85
85
  */
@@ -113,5 +113,6 @@ export declare class Orchestrator {
113
113
  private validateMainnetConnection;
114
114
  private printLog;
115
115
  private executeProgressHook;
116
+ private queryUniversalTxStatusFromEvmGatewayTx;
116
117
  private waitForEvmConfirmationsWithCountdown;
117
118
  }
package/src/lib/orchestrator/orchestrator.js CHANGED
@@ -79,8 +79,8 @@ class Orchestrator {
79
79
  }
80
80
  const chain = this.universalSigner.account.chain;
81
81
  const { vm } = chain_1.CHAIN_INFO[chain];
82
- if (!(chain === enums_1.CHAIN.ETHEREUM_SEPOLIA)) {
83
- throw new Error('Funds bridging is only supported on Ethereum Sepolia for now');
82
+ if (!(chain === enums_1.CHAIN.ETHEREUM_SEPOLIA || chain === enums_1.CHAIN.SOLANA_DEVNET)) {
83
+ throw new Error('Funds bridging is only supported on Ethereum Sepolia and Solana Devnet for now');
84
84
  }
85
85
  // Progress: Origin chain detected
86
86
  this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain);
@@ -153,92 +153,50 @@ class Orchestrator {
153
153
  this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol);
154
154
  yield this.waitForEvmConfirmationsWithCountdown(evmClient, txHash, 14, 210000);
155
155
  // After origin confirmations, query Push Chain for UniversalTx status
156
- try {
157
- const receipt = yield evmClient.publicClient.getTransactionReceipt({
158
- hash: txHash,
159
- });
160
- const gatewayLogs = (receipt.logs || []).filter((l) => (l.address || '').toLowerCase() ===
161
- gatewayAddress.toLowerCase());
162
- const firstLog = (gatewayLogs[0] || ((_a = receipt.logs) === null || _a === void 0 ? void 0 : _a[0]));
163
- const logIndexVal = (_b = firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex) !== null && _b !== void 0 ? _b : 0;
164
- const logIndexStr = typeof logIndexVal === 'bigint'
165
- ? logIndexVal.toString()
166
- : String(logIndexVal);
167
- const sourceChain = `${chain_1.VM_NAMESPACE[vm]}:${chain_1.CHAIN_INFO[this.universalSigner.account.chain].chainId}`;
168
- // ID = sha256("${sourceChain}:${txHash}:${logIndex}") as hex string (no 0x)
169
- const idInput = `${sourceChain}:${txHash}:${logIndexStr}`;
170
- const idHex = (0, viem_1.sha256)((0, viem_1.stringToBytes)(idInput)).slice(2);
171
- // Fetch UniversalTx via gRPC with a brief retry window
172
- let universalTxObj;
173
- for (let attempt = 0; attempt < 10; attempt++) {
174
- try {
175
- const universalTxResp = yield this.pushClient.getUniversalTxById(idHex);
176
- universalTxObj = universalTxResp === null || universalTxResp === void 0 ? void 0 : universalTxResp.universalTx;
177
- if (universalTxObj)
178
- break;
179
- }
180
- catch (_d) {
181
- // ignore and retry
182
- }
183
- yield new Promise((r) => setTimeout(r, 1500));
184
- }
185
- this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06, (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universalStatus) ||
186
- (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universal_status));
187
- }
188
- catch (_e) {
189
- // Best-effort; do not fail flow if PC query is unavailable
190
- this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
191
- }
156
+ yield this.queryUniversalTxStatusFromEvmGatewayTx(evmClient, gatewayAddress, txHash, 'sendFunds');
192
157
  const tx = yield evmClient.getTransaction(txHash);
193
158
  return yield this.transformToUniversalTxResponse(tx);
194
159
  }
195
160
  else {
196
161
  // SVM path (Solana Devnet)
197
162
  const svmClient = new svm_client_1.SvmClient({ rpcUrls });
198
- const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.metadata.address);
163
+ const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.address);
199
164
  const [configPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('config')], programId);
200
165
  const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
166
+ const [whitelistPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
201
167
  const userPk = new web3_js_1.PublicKey(this.universalSigner.account.address);
202
168
  let txSignature;
203
169
  // SVM-specific RevertSettings: bytes must be a Buffer
204
170
  const revertSvm = {
205
171
  fundRecipient: userPk,
206
- revertMsg: Buffer.alloc(0),
172
+ revertMsg: Buffer.from([]),
207
173
  };
174
+ // New gateway expects EVM recipient as [u8; 20]
175
+ const recipientEvm20 = Array.from(Buffer.from(execute.to.slice(2).padStart(40, '0'), 'hex').subarray(0, 20));
208
176
  if (execute.funds.token.mechanism === 'native') {
209
177
  // Native SOL funds-only
210
- const recipientPk = userPk; // must be non-default per program checks
211
- console.log('recipientPk', recipientPk);
212
- console.log('bridgeAmount', bridgeAmount);
213
- console.log('userPk', userPk);
214
- console.log('configPda', configPda);
215
- console.log('vaultPda', vaultPda);
216
- console.log('systemProgram', web3_js_1.SystemProgram.programId);
217
- console.log('programId', programId.toBase58());
218
- console.log('SVM_GATEWAY_IDL', abi_1.SVM_GATEWAY_IDL);
219
- console.log('sendFundsNative', 'sendFundsNative');
220
- console.log('args', [
221
- recipientPk,
222
- bridgeAmount,
223
- { fundRecipient: userPk, revertMsg: new Uint8Array([]) },
224
- ]);
225
- console.log('signer', this.universalSigner);
226
- console.log('accounts', {
227
- config: configPda,
228
- vault: vaultPda,
229
- user: userPk,
230
- systemProgram: web3_js_1.SystemProgram.programId,
231
- });
178
+ // Compute a local whitelist PDA to avoid TS scope issues
179
+ const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
232
180
  txSignature = yield svmClient.writeContract({
233
181
  abi: abi_1.SVM_GATEWAY_IDL,
234
182
  address: programId.toBase58(),
235
- functionName: 'sendFundsNative',
236
- args: [recipientPk, bridgeAmount, revertSvm],
183
+ functionName: 'sendFunds', // -> unified sendFunds(recipient, bridge_token, bridge_amount, revert_cfg)
184
+ args: [
185
+ recipientEvm20,
186
+ web3_js_1.PublicKey.default,
187
+ bridgeAmount,
188
+ revertSvm,
189
+ ],
237
190
  signer: this.universalSigner,
238
191
  accounts: {
239
192
  config: configPda,
240
193
  vault: vaultPda,
241
194
  user: userPk,
195
+ tokenWhitelist: whitelistPdaLocal,
196
+ userTokenAccount: userPk,
197
+ gatewayTokenAccount: vaultPda,
198
+ bridgeToken: web3_js_1.PublicKey.default,
199
+ tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
242
200
  systemProgram: web3_js_1.SystemProgram.programId,
243
201
  },
244
202
  });
@@ -246,7 +204,6 @@ class Orchestrator {
246
204
  else if (execute.funds.token.mechanism === 'approve') {
247
205
  // SPL token funds-only (requires pre-existing ATAs)
248
206
  const mintPk = new web3_js_1.PublicKey(execute.funds.token.address);
249
- const [whitelistPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
250
207
  // Associated Token Accounts
251
208
  const TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
252
209
  const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
@@ -260,12 +217,11 @@ class Orchestrator {
260
217
  TOKEN_PROGRAM_ID.toBuffer(),
261
218
  mintPk.toBuffer(),
262
219
  ], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
263
- const recipientPk = userPk; // must be non-default per program checks
264
220
  txSignature = yield svmClient.writeContract({
265
221
  abi: abi_1.SVM_GATEWAY_IDL,
266
222
  address: programId.toBase58(),
267
223
  functionName: 'sendFunds',
268
- args: [recipientPk, mintPk, bridgeAmount, revertSvm],
224
+ args: [recipientEvm20, mintPk, bridgeAmount, revertSvm],
269
225
  signer: this.universalSigner,
270
226
  accounts: {
271
227
  config: configPda,
@@ -350,7 +306,8 @@ class Orchestrator {
350
306
  // Bridge funds + execute payload. Support:
351
307
  // - EVM (Sepolia): ERC-20 approve path + native gas via msg.value
352
308
  // - SVM (Solana Devnet): SPL or native SOL with gas_amount
353
- const { chain, evmClient, gatewayAddress } = this.ensureSepoliaGateway();
309
+ const { chain, evmClient, gatewayAddress } = this.getOriginGatewayContext();
310
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain);
354
311
  // Default token to native ETH if none provided
355
312
  if (!execute.funds.token) {
356
313
  const available = tokens_1.MOVEABLE_TOKENS[chain] || [];
@@ -367,16 +324,19 @@ class Orchestrator {
367
324
  const mechanism = execute.funds.token.mechanism;
368
325
  const { deployed, nonce } = yield this.getUeaStatusAndNonce();
369
326
  const { payload: universalPayload } = yield this.buildGatewayPayloadAndGas(execute, nonce);
327
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_01);
370
328
  // Compute required gas funding on Push Chain and current UEA balance
371
329
  const gasEstimate = execute.gasLimit || BigInt(1e7);
372
330
  const gasPrice = yield this.pushClient.getGasPrice();
373
331
  const requiredGasFee = gasEstimate * gasPrice;
374
- const payloadValue = (_c = execute.value) !== null && _c !== void 0 ? _c : BigInt(0);
332
+ const payloadValue = (_a = execute.value) !== null && _a !== void 0 ? _a : BigInt(0);
375
333
  const requiredFunds = requiredGasFee + payloadValue;
376
334
  const ueaAddress = this.computeUEAOffchain();
377
335
  const [ueaBalance] = yield Promise.all([
378
336
  this.pushClient.getBalance(ueaAddress),
379
337
  ]);
338
+ // UEA resolved (address, deployment status, balance, nonce)
339
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
380
340
  // Determine USD to deposit via gateway (8 decimals) with caps: min=$1, max=$10
381
341
  const oneUsd = push_chain_1.PushChain.utils.helpers.parseUnits('1', 8);
382
342
  const tenUsd = push_chain_1.PushChain.utils.helpers.parseUnits('10', 8);
@@ -386,10 +346,48 @@ class Orchestrator {
386
346
  depositUsd = oneUsd;
387
347
  if (depositUsd > tenUsd)
388
348
  throw new Error('Deposit value exceeds max $10 worth of native token');
389
- // Convert USD(8) -> native wei using the same pricing path as fee locking
349
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_02, depositUsd);
350
+ // If SVM, clamp depositUsd to on-chain Config caps
351
+ if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM) {
352
+ const svmClient = new svm_client_1.SvmClient({
353
+ rpcUrls: this.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] ||
354
+ chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
355
+ });
356
+ const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.address);
357
+ const [configPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('config')], programId);
358
+ try {
359
+ const cfg = yield svmClient.readContract({
360
+ abi: abi_1.SVM_GATEWAY_IDL,
361
+ address: abi_1.SVM_GATEWAY_IDL.address,
362
+ functionName: 'config',
363
+ args: [configPda.toBase58()],
364
+ });
365
+ const minField = (_b = cfg.minCapUniversalTxUsd) !== null && _b !== void 0 ? _b : cfg.min_cap_universal_tx_usd;
366
+ const maxField = (_c = cfg.maxCapUniversalTxUsd) !== null && _c !== void 0 ? _c : cfg.max_cap_universal_tx_usd;
367
+ const minCapUsd = BigInt(minField.toString());
368
+ const maxCapUsd = BigInt(maxField.toString());
369
+ if (depositUsd < minCapUsd)
370
+ depositUsd = minCapUsd;
371
+ // Add 20% safety margin to avoid BelowMinCap due to price drift
372
+ const withMargin = (minCapUsd * BigInt(12)) / BigInt(10);
373
+ if (depositUsd < withMargin)
374
+ depositUsd = withMargin;
375
+ if (depositUsd > maxCapUsd)
376
+ depositUsd = maxCapUsd;
377
+ }
378
+ catch (_d) {
379
+ // best-effort; fallback to previous bounds if read fails
380
+ }
381
+ }
382
+ // Convert USD(8) -> native units using pricing path
390
383
  const nativeTokenUsdPrice = yield new price_fetch_1.PriceFetch(this.rpcUrls).getPrice(chain); // 8 decimals
391
- const oneEthWei = push_chain_1.PushChain.utils.helpers.parseUnits('1', 18);
392
- const nativeAmount = (depositUsd * oneEthWei) / nativeTokenUsdPrice;
384
+ const nativeDecimals = chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM ? 9 : 18;
385
+ const oneNativeUnit = push_chain_1.PushChain.utils.helpers.parseUnits('1', nativeDecimals);
386
+ // Ceil division to avoid rounding below min USD on-chain
387
+ let nativeAmount = (depositUsd * oneNativeUnit + (nativeTokenUsdPrice - BigInt(1))) /
388
+ nativeTokenUsdPrice;
389
+ // Add 1 unit safety to avoid BelowMinCap from rounding differences
390
+ nativeAmount = nativeAmount + BigInt(1);
393
391
  const revertCFG = {
394
392
  fundRecipient: this.universalSigner.account
395
393
  .address,
@@ -404,31 +402,37 @@ class Orchestrator {
404
402
  if (mechanism !== 'approve') {
405
403
  throw new Error('Only ERC-20 tokens are supported for funds+payload on EVM; native and permit2 are not supported yet');
406
404
  }
407
- yield this.ensureErc20Allowance(evmClient, tokenAddr, gatewayAddress, bridgeAmount);
405
+ const evmClientEvm = evmClient;
406
+ const gatewayAddressEvm = gatewayAddress;
407
+ yield this.ensureErc20Allowance(evmClientEvm, tokenAddr, gatewayAddressEvm, bridgeAmount);
408
408
  }
409
409
  let txHash;
410
410
  try {
411
411
  if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
412
412
  const tokenAddr = execute.funds.token.address;
413
413
  // Compute EIP-712 signature for the universal payload and hash to bytes32
414
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_01);
414
415
  const ueaAddress = this.computeUEAOffchain();
415
- const eip712Signature = yield this.signUniversalPayload(universalPayload,
416
- // execute.to
417
- ueaAddress);
416
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
417
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_01);
418
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_02);
419
+ const eip712Signature = yield this.signUniversalPayload(universalPayload, ueaAddress);
420
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03);
418
421
  const eip712SignatureHex = typeof eip712Signature === 'string'
419
422
  ? eip712Signature
420
423
  : (0, viem_1.bytesToHex)(eip712Signature);
421
- const signatureData = (0, viem_1.keccak256)(eip712SignatureHex);
422
- txHash = yield evmClient.writeContract({
424
+ const evmClientEvm = evmClient;
425
+ const gatewayAddressEvm = gatewayAddress;
426
+ txHash = yield evmClientEvm.writeContract({
423
427
  abi: abi_1.UNIVERSAL_GATEWAY_V0,
424
- address: gatewayAddress,
428
+ address: gatewayAddressEvm,
425
429
  functionName: 'sendTxWithFunds',
426
430
  args: [
427
431
  tokenAddr,
428
432
  bridgeAmount,
429
433
  universalPayload,
430
434
  revertCFG,
431
- signatureData,
435
+ eip712SignatureHex,
432
436
  ],
433
437
  signer: this.universalSigner,
434
438
  value: nativeAmount,
@@ -440,19 +444,20 @@ class Orchestrator {
440
444
  rpcUrls: this.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] ||
441
445
  chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
442
446
  });
443
- const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.metadata.address);
447
+ const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.address);
444
448
  const [configPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('config')], programId);
445
449
  const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
446
- const [whitelistPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
450
+ // whitelistPda already computed above
447
451
  const userPk = new web3_js_1.PublicKey(this.universalSigner.account.address);
448
452
  const priceUpdatePk = new web3_js_1.PublicKey('7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE');
449
453
  const isNative = mechanism === 'native' || execute.funds.token.symbol === 'SOL';
450
454
  const revertSvm2 = {
451
455
  fundRecipient: userPk,
452
- revertMsg: Buffer.alloc(0),
456
+ revertMsg: Buffer.from([]),
453
457
  };
454
458
  if (isNative) {
455
459
  // Native SOL as bridge + gas
460
+ const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
456
461
  txHash = yield svmClient.writeContract({
457
462
  abi: abi_1.SVM_GATEWAY_IDL,
458
463
  address: programId.toBase58(),
@@ -469,9 +474,9 @@ class Orchestrator {
469
474
  accounts: {
470
475
  config: configPda,
471
476
  vault: vaultPda,
472
- tokenWhitelist: whitelistPda,
473
- userTokenAccount: web3_js_1.PublicKey.default, // not used for native
474
- gatewayTokenAccount: web3_js_1.PublicKey.default, // not used for native
477
+ tokenWhitelist: whitelistPdaLocal,
478
+ userTokenAccount: userPk, // for native SOL, can be any valid account
479
+ gatewayTokenAccount: vaultPda, // for native SOL, can be any valid account
475
480
  user: userPk,
476
481
  priceUpdate: priceUpdatePk,
477
482
  bridgeToken: web3_js_1.PublicKey.default,
@@ -495,6 +500,7 @@ class Orchestrator {
495
500
  TOKEN_PROGRAM_ID.toBuffer(),
496
501
  mintPk.toBuffer(),
497
502
  ], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
503
+ const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
498
504
  txHash = yield svmClient.writeContract({
499
505
  abi: abi_1.SVM_GATEWAY_IDL,
500
506
  address: programId.toBase58(),
@@ -511,7 +517,7 @@ class Orchestrator {
511
517
  accounts: {
512
518
  config: configPda,
513
519
  vault: vaultPda,
514
- tokenWhitelist: whitelistPda,
520
+ tokenWhitelist: whitelistPdaLocal,
515
521
  userTokenAccount: userAta,
516
522
  gatewayTokenAccount: vaultAta,
517
523
  user: userPk,
@@ -534,7 +540,8 @@ class Orchestrator {
534
540
  this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol);
535
541
  // Awaiting confirmations
536
542
  if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
537
- yield this.waitForEvmConfirmationsWithCountdown(evmClient, txHash, 14, 300000);
543
+ const evmClientEvm = evmClient;
544
+ yield this.waitForEvmConfirmationsWithCountdown(evmClientEvm, txHash, 14, 300000);
538
545
  }
539
546
  else {
540
547
  const svmClient = new svm_client_1.SvmClient({
@@ -548,11 +555,23 @@ class Orchestrator {
548
555
  });
549
556
  }
550
557
  // Funds Flow: Confirmed on origin
558
+ if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
559
+ yield this.sendUniversalTx(deployed, txHash);
560
+ }
561
+ else {
562
+ // skip
563
+ }
551
564
  this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
552
- // If UEA is not deployed yet, deploy it now using the gateway tx hash
553
- yield this.sendUniversalTx(deployed, txHash);
565
+ // After sending Cosmos tx to Push Chain, query UniversalTx status (Sepolia only)
554
566
  if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
555
- const evmTx = yield evmClient.getTransaction(txHash);
567
+ const evmClientEvm = evmClient;
568
+ const gatewayAddressEvm = gatewayAddress;
569
+ yield this.queryUniversalTxStatusFromEvmGatewayTx(evmClientEvm, gatewayAddressEvm, txHash, 'sendTxWithFunds');
570
+ }
571
+ if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
572
+ const evmClientEvm = evmClient;
573
+ const evmTx = yield evmClientEvm.getTransaction(txHash);
574
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_07, bridgeAmount, execute.funds.token.decimals, symbol);
556
575
  return yield this.transformToUniversalTxResponse(evmTx);
557
576
  }
558
577
  else {
@@ -652,7 +671,7 @@ class Orchestrator {
652
671
  ]);
653
672
  const isUEADeployed = code !== undefined;
654
673
  const nonce = isUEADeployed ? yield this.getUEANonce(UEA) : BigInt(0);
655
- this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, UEA, isUEADeployed, funds, nonce);
674
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, UEA, isUEADeployed);
656
675
  /**
657
676
  * Compute Universal Payload Hash
658
677
  */
@@ -660,7 +679,7 @@ class Orchestrator {
660
679
  if (feeLockTxHash && !feeLockTxHash.startsWith('0x')) {
661
680
  // decode svm base58
662
681
  const decoded = anchor_1.utils.bytes.bs58.decode(feeLockTxHash);
663
- feeLockTxHash = (0, viem_1.bytesToHex)(Uint8Array.from(decoded));
682
+ feeLockTxHash = (0, viem_1.bytesToHex)(new Uint8Array(decoded));
664
683
  }
665
684
  // Fee locking is required if UEA is not deployed OR insufficient funds
666
685
  const feeLockingRequired = (!isUEADeployed || funds < requiredFunds) && !feeLockTxHash;
@@ -847,7 +866,7 @@ class Orchestrator {
847
866
  systemProgram: web3_js_1.SystemProgram.programId,
848
867
  },
849
868
  });
850
- return anchor_1.utils.bytes.bs58.decode(txHash);
869
+ return new Uint8Array(anchor_1.utils.bytes.bs58.decode(txHash));
851
870
  }
852
871
  default:
853
872
  throw new Error(`Unsupported VM type: ${vm}`);
@@ -914,7 +933,7 @@ class Orchestrator {
914
933
  owner: vm === enums_1.VM.EVM
915
934
  ? address
916
935
  : vm === enums_1.VM.SVM
917
- ? (0, viem_1.bytesToHex)(anchor_1.utils.bytes.bs58.decode(address))
936
+ ? (0, viem_1.bytesToHex)(new Uint8Array(anchor_1.utils.bytes.bs58.decode(address)))
918
937
  : address,
919
938
  };
920
939
  const { cosmosAddress: signer } = this.pushClient.getSignerAddress();
@@ -1080,7 +1099,7 @@ class Orchestrator {
1080
1099
  owner: vm === enums_1.VM.EVM
1081
1100
  ? address
1082
1101
  : vm === enums_1.VM.SVM
1083
- ? (0, viem_1.bytesToHex)(anchor_1.utils.bytes.bs58.decode(address))
1102
+ ? (0, viem_1.bytesToHex)(new Uint8Array(anchor_1.utils.bytes.bs58.decode(address)))
1084
1103
  : address,
1085
1104
  },
1086
1105
  ],
@@ -1104,7 +1123,7 @@ class Orchestrator {
1104
1123
  ownerKey = address;
1105
1124
  }
1106
1125
  else if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM) {
1107
- ownerKey = (0, viem_1.bytesToHex)(anchor_1.utils.bytes.bs58.decode(address));
1126
+ ownerKey = (0, viem_1.bytesToHex)(new Uint8Array(anchor_1.utils.bytes.bs58.decode(address)));
1108
1127
  }
1109
1128
  else {
1110
1129
  throw new Error(`Unsupported VM type: ${chain_1.CHAIN_INFO[chain].vm}`);
@@ -1262,19 +1281,24 @@ class Orchestrator {
1262
1281
  /**
1263
1282
  * Ensures we're on Sepolia, returns EVM client and gateway address.
1264
1283
  */
1265
- ensureSepoliaGateway() {
1284
+ getOriginGatewayContext() {
1266
1285
  const chain = this.universalSigner.account.chain;
1267
- if (chain !== enums_1.CHAIN.ETHEREUM_SEPOLIA) {
1268
- throw new Error('Funds + payload bridging is only supported on Ethereum Sepolia for now');
1286
+ if (chain !== enums_1.CHAIN.ETHEREUM_SEPOLIA && chain !== enums_1.CHAIN.SOLANA_DEVNET) {
1287
+ throw new Error('Funds + payload bridging is only supported on Ethereum Sepolia and Solana Devnet for now');
1269
1288
  }
1270
- const { defaultRPC, lockerContract } = chain_1.CHAIN_INFO[chain];
1271
- const rpcUrls = this.rpcUrls[chain] || defaultRPC;
1272
- const evmClient = new evm_client_1.EvmClient({ rpcUrls });
1273
- const gatewayAddress = lockerContract;
1274
- if (!gatewayAddress) {
1275
- throw new Error('Universal Gateway address not configured');
1289
+ // For EVM (Sepolia), return client and gateway address. For SVM (Solana Devnet), only chain is needed here.
1290
+ if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.EVM) {
1291
+ const { defaultRPC, lockerContract } = chain_1.CHAIN_INFO[chain];
1292
+ const rpcUrls = this.rpcUrls[chain] || defaultRPC;
1293
+ const evmClient = new evm_client_1.EvmClient({ rpcUrls });
1294
+ const gatewayAddress = lockerContract;
1295
+ if (!gatewayAddress) {
1296
+ throw new Error('Universal Gateway address not configured');
1297
+ }
1298
+ return { chain, evmClient, gatewayAddress };
1276
1299
  }
1277
- return { chain, evmClient, gatewayAddress };
1300
+ // SVM path (Solana Devnet) does not require evmClient/gatewayAddress
1301
+ return { chain };
1278
1302
  }
1279
1303
  /**
1280
1304
  * Computes UEA and fetches its nonce if deployed; returns 0 otherwise.
@@ -1320,7 +1344,7 @@ class Orchestrator {
1320
1344
  maxPriorityFeePerGas: execute.maxPriorityFeePerGas || BigInt(0),
1321
1345
  nonce,
1322
1346
  deadline: execute.deadline || BigInt(9999999999),
1323
- vType: tx_1.VerificationType.universalTxVerification,
1347
+ vType: tx_1.VerificationType.signedVerification,
1324
1348
  };
1325
1349
  return { payload: universalPayload, gasAmount };
1326
1350
  });
@@ -1545,6 +1569,59 @@ class Orchestrator {
1545
1569
  // invoke the user-provided callback
1546
1570
  this.progressHook(hookPayload);
1547
1571
  }
1572
+ // Query Push Chain for UniversalTx status given an EVM gateway tx
1573
+ queryUniversalTxStatusFromEvmGatewayTx(evmClient, gatewayAddress, txHash, fromBranch) {
1574
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
1575
+ var _a, _b;
1576
+ try {
1577
+ const receipt = yield evmClient.publicClient.getTransactionReceipt({
1578
+ hash: txHash,
1579
+ });
1580
+ const gatewayLogs = (receipt.logs || []).filter((l) => (l.address || '').toLowerCase() === gatewayAddress.toLowerCase());
1581
+ const logIndexToUse = fromBranch === 'sendTxWithFunds' ? 1 : 0;
1582
+ const firstLog = (gatewayLogs[logIndexToUse] ||
1583
+ ((_a = receipt.logs) === null || _a === void 0 ? void 0 : _a[logIndexToUse]));
1584
+ const logIndexVal = (_b = firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex) !== null && _b !== void 0 ? _b : 0;
1585
+ const logIndexStr = typeof logIndexVal === 'bigint'
1586
+ ? logIndexVal.toString()
1587
+ : String(logIndexVal);
1588
+ const chain = this.universalSigner.account.chain;
1589
+ const { vm } = chain_1.CHAIN_INFO[chain];
1590
+ const sourceChain = `${chain_1.VM_NAMESPACE[vm]}:${chain_1.CHAIN_INFO[chain].chainId}`;
1591
+ // ID = sha256("${sourceChain}:${txHash}:${logIndex}") as hex string (no 0x)
1592
+ const idInput = `${sourceChain}:${txHash}:${logIndexStr}`;
1593
+ const idHex = (0, viem_1.sha256)((0, viem_1.stringToBytes)(idInput)).slice(2);
1594
+ // Fetch UniversalTx via gRPC with a brief retry window
1595
+ let universalTxObj;
1596
+ for (let attempt = 0; attempt < 10; attempt++) {
1597
+ try {
1598
+ const universalTxResp = yield this.pushClient.getUniversalTxById(idHex);
1599
+ universalTxObj = universalTxResp === null || universalTxResp === void 0 ? void 0 : universalTxResp.universalTx;
1600
+ if (universalTxObj)
1601
+ break;
1602
+ }
1603
+ catch (error) {
1604
+ // ignore and retry
1605
+ console.log(error);
1606
+ }
1607
+ yield new Promise((r) => setTimeout(r, 1500));
1608
+ }
1609
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06, (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universalStatus) || (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universal_status));
1610
+ this.printLog(`UniversalTx fetched via gRPC: ${JSON.stringify({
1611
+ gatewayTx: txHash,
1612
+ id: idHex,
1613
+ status: (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universalStatus) ||
1614
+ (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universal_status),
1615
+ }, this.bigintReplacer, 2)}`);
1616
+ return universalTxObj;
1617
+ }
1618
+ catch (_c) {
1619
+ // Best-effort; do not fail flow if PC query is unavailable
1620
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
1621
+ return undefined;
1622
+ }
1623
+ });
1624
+ }
1548
1625
  // Emit countdown updates while waiting for EVM confirmations
1549
1626
  waitForEvmConfirmationsWithCountdown(evmClient, txHash, confirmations, timeoutMs) {
1550
1627
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -1563,7 +1640,8 @@ class Orchestrator {
1563
1640
  if (currentBlock >= targetBlock)
1564
1641
  return;
1565
1642
  const remaining = Number(targetBlock - currentBlock);
1566
- this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03, remaining);
1643
+ const completed = Math.max(1, confirmations - remaining + 1);
1644
+ this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04, completed, confirmations);
1567
1645
  if (Date.now() - start > timeoutMs) {
1568
1646
  throw new Error(`Timeout: transaction ${txHash} not confirmed with ${confirmations} confirmations within ${timeoutMs} ms`);
1569
1647
  }