Skip to content

Commit ec5d9bf

Browse files
committedFeb 28, 2024
solana sdk refactor
1 parent 4be004b commit ec5d9bf

File tree

6 files changed

+501
-899
lines changed

6 files changed

+501
-899
lines changed
 

‎wormhole-connect/src/hooks/useDeliveryStatus.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { useDispatch, useSelector } from 'react-redux';
66
import { RootState } from 'store';
77
import { setRedeemTx, setDeliveryStatus } from 'store/redeem';
88
import { sleep } from 'utils';
9+
import { isEvmChain } from 'utils/sdk';
910
import { getEmitterAndSequence } from 'utils/vaa';
1011

1112
const BASE_URL = `https://api.${
@@ -22,7 +23,12 @@ const useDeliveryStatus = () => {
2223
(state: RootState) => state.redeem.signedMessage,
2324
);
2425
useEffect(() => {
25-
if (!signedMessage || route !== Route.NttRelay) return;
26+
if (
27+
!signedMessage ||
28+
route !== Route.NttRelay ||
29+
!isEvmChain(signedMessage.toChain) // Currently, only EVM chains support standard relayer
30+
)
31+
return;
2632
const { emitterChain, emitterAddress, sequence } =
2733
getEmitterAndSequence(signedMessage);
2834
let active = true;

‎wormhole-connect/src/routes/ntt/payloads/common.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ export class TransceiverMessage<A> {
1010
constructor(
1111
sourceNttManager: Buffer,
1212
recipientNttManager: Buffer,
13-
ntt_managerPayload: NttManagerMessage<A>,
13+
nttManagerPayload: NttManagerMessage<A>,
1414
transceiverPayload: Buffer,
1515
) {
1616
this.sourceNttManager = sourceNttManager;
1717
this.recipientNttManager = recipientNttManager;
18-
this.nttManagerPayload = ntt_managerPayload;
18+
this.nttManagerPayload = nttManagerPayload;
1919
this.transceiverPayload = transceiverPayload;
2020
}
2121

@@ -32,14 +32,14 @@ export class TransceiverMessage<A> {
3232
}
3333
const sourceNttManager = data.subarray(4, 36);
3434
const recipientNttManager = data.subarray(36, 68);
35-
const ntt_managerPayloadLen = data.readUInt16BE(68);
35+
const nttManagerPayloadLen = data.readUInt16BE(68);
3636
const ntt_managerPayload = deserializer(
37-
data.subarray(70, 70 + ntt_managerPayloadLen),
37+
data.subarray(70, 70 + nttManagerPayloadLen),
3838
);
39-
const transceiverPayloadLen = data.readUInt16BE(70 + ntt_managerPayloadLen);
39+
const transceiverPayloadLen = data.readUInt16BE(70 + nttManagerPayloadLen);
4040
const transceiverPayload = data.subarray(
41-
72 + ntt_managerPayloadLen,
42-
72 + ntt_managerPayloadLen + transceiverPayloadLen,
41+
72 + nttManagerPayloadLen,
42+
72 + nttManagerPayloadLen + transceiverPayloadLen,
4343
);
4444
return new TransceiverMessage(
4545
sourceNttManager,

‎wormhole-connect/src/routes/ntt/platforms/evm/getMessage.ts

+15
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,21 @@ export const getMessageEvm = async (
3939
const wormholeLog = await getWormholeLogEvm(fromChain, receipt);
4040
const parsedWormholeLog =
4141
Implementation__factory.createInterface().parseLog(wormholeLog);
42+
43+
//const relayingInfoEvent = receipt.logs.find((log) => log.topics[0] === '');
44+
//if (!relayingInfoEvent) {
45+
// throw new Error('RelayingInfo event not found');
46+
//}
47+
//const relayingInfoIface = new ethers.utils.Interface([
48+
// 'event RelayingInfo(uint8 relayingType, uint256 deliveryPayment)',
49+
//]);
50+
//const parsedRelayingInfo = relayingInfoIface.parseLog(relayingInfoEvent);
51+
//const { relayingType, deliveryPayment } = parsedRelayingInfo.args;
52+
//if (relayingType !== RelayingType.Standard {
53+
//} else if (relayingType === relayingType.Manual || relayingType === relayingType.Special) {
54+
//} else {
55+
// throw new Error(`Unexpected relaying type ${relayingType}`);
56+
//}
4257
let payload: Buffer;
4358
let relayerFee = '';
4459
if (parsedWormholeLog.args.sender === token.ntt?.wormholeTransceiver) {

‎wormhole-connect/src/routes/ntt/platforms/solana/abis/example_native_token_transfers.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// NOTE: The generics have been removed from the IDL to prevent
2+
// runtime errors when the IDL is used in the browser.
13
export type ExampleNativeTokenTransfers = {
24
version: '0.1.0';
35
name: 'example_native_token_transfers';

0 commit comments

Comments
 (0)