@hyperlane-xyz/sdk 19.3.0 → 19.5.0
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/app/MultiProtocolApp.d.ts +2 -0
- package/dist/app/MultiProtocolApp.d.ts.map +1 -1
- package/dist/app/MultiProtocolApp.js +9 -3
- package/dist/app/MultiProtocolApp.js.map +1 -1
- package/dist/consts/multisigIsm.d.ts.map +1 -1
- package/dist/consts/multisigIsm.js +0 -18
- package/dist/consts/multisigIsm.js.map +1 -1
- package/dist/consts/numbers.d.ts +2 -0
- package/dist/consts/numbers.d.ts.map +1 -0
- package/dist/consts/numbers.js +3 -0
- package/dist/consts/numbers.js.map +1 -0
- package/dist/core/types.d.ts +2 -1
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js.map +1 -1
- package/dist/gas/adapters/SealevelIgpAdapter.d.ts +29 -2
- package/dist/gas/adapters/SealevelIgpAdapter.d.ts.map +1 -1
- package/dist/gas/adapters/SealevelIgpAdapter.js +109 -5
- package/dist/gas/adapters/SealevelIgpAdapter.js.map +1 -1
- package/dist/gas/adapters/SealevelIgpAdapter.test.d.ts +2 -0
- package/dist/gas/adapters/SealevelIgpAdapter.test.d.ts.map +1 -0
- package/dist/gas/adapters/SealevelIgpAdapter.test.js +189 -0
- package/dist/gas/adapters/SealevelIgpAdapter.test.js.map +1 -0
- package/dist/gas/adapters/serialization.d.ts +69 -2
- package/dist/gas/adapters/serialization.d.ts.map +1 -1
- package/dist/gas/adapters/serialization.js +150 -15
- package/dist/gas/adapters/serialization.js.map +1 -1
- package/dist/index.d.ts +7 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -7
- package/dist/index.js.map +1 -1
- package/dist/ism/AltVMIsmModule.d.ts.map +1 -1
- package/dist/ism/AltVMIsmModule.js +7 -1
- package/dist/ism/AltVMIsmModule.js.map +1 -1
- package/dist/ism/EvmIsmModule.d.ts +13 -1
- package/dist/ism/EvmIsmModule.d.ts.map +1 -1
- package/dist/ism/EvmIsmModule.js +92 -38
- package/dist/ism/EvmIsmModule.js.map +1 -1
- package/dist/ism/types.js +1 -1
- package/dist/ism/types.js.map +1 -1
- package/dist/metadata/agentConfig.d.ts +41 -0
- package/dist/metadata/agentConfig.d.ts.map +1 -1
- package/dist/metadata/chainMetadataTypes.d.ts +18 -0
- package/dist/metadata/chainMetadataTypes.d.ts.map +1 -1
- package/dist/metadata/chainMetadataTypes.js +4 -0
- package/dist/metadata/chainMetadataTypes.js.map +1 -1
- package/dist/signers/signers.d.ts.map +1 -1
- package/dist/signers/signers.js +2 -2
- package/dist/signers/signers.js.map +1 -1
- package/dist/signers/svm/solana-web3js.d.ts +74 -6
- package/dist/signers/svm/solana-web3js.d.ts.map +1 -1
- package/dist/signers/svm/solana-web3js.js +178 -30
- package/dist/signers/svm/solana-web3js.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.d.ts.map +1 -1
- package/dist/token/EvmERC20WarpModule.hardhat-test.js +19 -17
- package/dist/token/EvmERC20WarpModule.hardhat-test.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.js +12 -7
- package/dist/token/EvmERC20WarpModule.js.map +1 -1
- package/dist/token/adapters/EvmTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/EvmTokenAdapter.js +16 -2
- package/dist/token/adapters/EvmTokenAdapter.js.map +1 -1
- package/dist/token/config.d.ts +1 -1
- package/dist/token/config.js +1 -1
- package/dist/token/types.d.ts +1 -1
- package/dist/utils/cosmos.d.ts +3 -3
- package/dist/utils/gnosisSafe.d.ts +11 -0
- package/dist/utils/gnosisSafe.d.ts.map +1 -0
- package/dist/utils/gnosisSafe.js +118 -119
- package/dist/utils/gnosisSafe.js.map +1 -0
- package/package.json +12 -13
|
@@ -1,18 +1,86 @@
|
|
|
1
|
+
import { PublicKey, Transaction, TransactionConfirmationStatus, TransactionInstruction } from '@solana/web3.js';
|
|
1
2
|
import { Address, ProtocolType } from '@hyperlane-xyz/utils';
|
|
2
3
|
import { MultiProtocolProvider } from '../../providers/MultiProtocolProvider.js';
|
|
3
4
|
import { SolanaWeb3Transaction } from '../../providers/ProviderType.js';
|
|
4
5
|
import { ChainName } from '../../types.js';
|
|
5
6
|
import { IMultiProtocolSigner } from '../types.js';
|
|
6
|
-
|
|
7
|
+
/**
|
|
8
|
+
* Interface for SVM transaction signers
|
|
9
|
+
*/
|
|
10
|
+
export interface SvmTransactionSigner {
|
|
11
|
+
readonly publicKey: PublicKey;
|
|
12
|
+
signTransaction(transaction: Transaction): Promise<Transaction>;
|
|
13
|
+
}
|
|
14
|
+
export interface SvmSignerConfig {
|
|
15
|
+
/** Max polling attempts before timeout (default: 30) */
|
|
16
|
+
maxConfirmationAttempts?: number;
|
|
17
|
+
/** Delay between polling attempts in ms (default: 1000) */
|
|
18
|
+
pollingDelayMs?: number;
|
|
19
|
+
/** Commitment level for confirmation (default: 'confirmed') */
|
|
20
|
+
commitment?: TransactionConfirmationStatus;
|
|
21
|
+
/** Whether to automatically resubmit on blockhash expiry (default: true) */
|
|
22
|
+
enableBlockhashResubmit?: boolean;
|
|
23
|
+
/** Whether to retry on RPC errors during polling (default: true) */
|
|
24
|
+
retryOnRpcErrors?: boolean;
|
|
25
|
+
}
|
|
26
|
+
export interface TransactionBuildOptions {
|
|
27
|
+
/** Optional priority fee override (microLamports) */
|
|
28
|
+
priorityFee?: number;
|
|
29
|
+
/** Whether to include priority fee instruction (default: true) */
|
|
30
|
+
includePriorityFee?: boolean;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Keypair-based SVM transaction signer
|
|
34
|
+
*/
|
|
35
|
+
export declare class KeypairSvmTransactionSigner implements SvmTransactionSigner {
|
|
36
|
+
readonly publicKey: PublicKey;
|
|
37
|
+
private readonly keypair;
|
|
38
|
+
constructor(privateKey: Uint8Array);
|
|
39
|
+
signTransaction(transaction: Transaction): Promise<Transaction>;
|
|
40
|
+
}
|
|
41
|
+
export declare class SvmMultiProtocolSignerAdapter implements IMultiProtocolSigner<ProtocolType.Sealevel> {
|
|
7
42
|
private readonly chainName;
|
|
8
|
-
private readonly privateKey;
|
|
9
|
-
private readonly multiProtocolProvider;
|
|
10
43
|
private readonly signer;
|
|
11
44
|
private readonly svmProvider;
|
|
12
|
-
private readonly
|
|
13
|
-
|
|
45
|
+
private readonly config;
|
|
46
|
+
private readonly logger;
|
|
47
|
+
constructor(chainName: ChainName, signer: SvmTransactionSigner, multiProtocolProvider: MultiProtocolProvider, config?: SvmSignerConfig);
|
|
48
|
+
publicKey(): PublicKey;
|
|
14
49
|
address(): Promise<Address>;
|
|
50
|
+
/**
|
|
51
|
+
* Build and send a transaction from raw instructions
|
|
52
|
+
*/
|
|
53
|
+
buildAndSendTransaction(instructions: TransactionInstruction[], options?: TransactionBuildOptions): Promise<string>;
|
|
54
|
+
/**
|
|
55
|
+
* Send and confirm a pre-built transaction (IMultiProtocolSigner interface)
|
|
56
|
+
*/
|
|
15
57
|
sendAndConfirmTransaction(tx: SolanaWeb3Transaction): Promise<string>;
|
|
16
|
-
|
|
58
|
+
/**
|
|
59
|
+
* Build transaction from instructions with optional priority fees
|
|
60
|
+
*/
|
|
61
|
+
private buildTransaction;
|
|
62
|
+
/**
|
|
63
|
+
* Sign and confirm transaction with blockhash resubmit on expiry
|
|
64
|
+
*/
|
|
65
|
+
private signAndConfirm;
|
|
66
|
+
/**
|
|
67
|
+
* Poll for transaction confirmation with blockhash expiry handling
|
|
68
|
+
*/
|
|
69
|
+
private pollForConfirmation;
|
|
70
|
+
/**
|
|
71
|
+
* Check if blockhash expired and resubmit transaction if needed
|
|
72
|
+
* Returns new signature and lastValidBlockHeight if resubmitted, null otherwise
|
|
73
|
+
*/
|
|
74
|
+
private checkAndResubmitIfExpired;
|
|
75
|
+
/**
|
|
76
|
+
* Check if transaction is confirmed
|
|
77
|
+
* Returns true if confirmed, false if pending
|
|
78
|
+
* Throws if transaction failed
|
|
79
|
+
*/
|
|
80
|
+
private checkTransactionConfirmation;
|
|
81
|
+
/**
|
|
82
|
+
* Send signed transaction to network
|
|
83
|
+
*/
|
|
84
|
+
private sendRawTransaction;
|
|
17
85
|
}
|
|
18
86
|
//# sourceMappingURL=solana-web3js.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana-web3js.d.ts","sourceRoot":"","sources":["../../../src/signers/svm/solana-web3js.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"solana-web3js.d.ts","sourceRoot":"","sources":["../../../src/signers/svm/solana-web3js.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,SAAS,EACT,WAAW,EACX,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,OAAO,EAAE,YAAY,EAAqB,MAAM,sBAAsB,CAAC;AAGhF,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,eAAe;IAC9B,wDAAwD;IACxD,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+DAA+D;IAC/D,UAAU,CAAC,EAAE,6BAA6B,CAAC;IAC3C,4EAA4E;IAC5E,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,oEAAoE;IACpE,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,uBAAuB;IACtC,qDAAqD;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;GAEG;AACH,qBAAa,2BAA4B,YAAW,oBAAoB;IACtE,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,UAAU,EAAE,UAAU;IAK5B,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAItE;AAED,qBAAa,6BACX,YAAW,oBAAoB,CAAC,YAAY,CAAC,QAAQ,CAAC;IAUpD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAR5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAEpB;gBAGgB,SAAS,EAAE,SAAS,EACrC,MAAM,EAAE,oBAAoB,EAC5B,qBAAqB,EAAE,qBAAqB,EAC5C,MAAM,CAAC,EAAE,eAAe;IAa1B,SAAS,IAAI,SAAS;IAIhB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC;;OAEG;IACG,uBAAuB,CAC3B,YAAY,EAAE,sBAAsB,EAAE,EACtC,OAAO,CAAC,EAAE,uBAAuB,GAChC,OAAO,CAAC,MAAM,CAAC;IAKlB;;OAEG;IACG,yBAAyB,CAAC,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAM3E;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAgCxB;;OAEG;YACW,cAAc;IAqB5B;;OAEG;YACW,mBAAmB;IA0DjC;;;OAGG;YACW,yBAAyB;IAmCvC;;;;OAIG;YACW,4BAA4B;IA0B1C;;OAEG;YACW,kBAAkB;CAMjC"}
|
|
@@ -1,44 +1,192 @@
|
|
|
1
|
-
import { Keypair, } from '@solana/web3.js';
|
|
2
|
-
import {
|
|
3
|
-
|
|
1
|
+
import { ComputeBudgetProgram, Keypair, Transaction, } from '@solana/web3.js';
|
|
2
|
+
import { rootLogger, sleep } from '@hyperlane-xyz/utils';
|
|
3
|
+
import { SEALEVEL_PRIORITY_FEES } from '../../consts/sealevel.js';
|
|
4
|
+
/**
|
|
5
|
+
* Keypair-based SVM transaction signer
|
|
6
|
+
*/
|
|
7
|
+
export class KeypairSvmTransactionSigner {
|
|
8
|
+
publicKey;
|
|
9
|
+
keypair;
|
|
10
|
+
constructor(privateKey) {
|
|
11
|
+
this.keypair = Keypair.fromSecretKey(privateKey);
|
|
12
|
+
this.publicKey = this.keypair.publicKey;
|
|
13
|
+
}
|
|
14
|
+
async signTransaction(transaction) {
|
|
15
|
+
transaction.sign(this.keypair);
|
|
16
|
+
return transaction;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export class SvmMultiProtocolSignerAdapter {
|
|
4
20
|
chainName;
|
|
5
|
-
privateKey;
|
|
6
|
-
multiProtocolProvider;
|
|
7
21
|
signer;
|
|
8
22
|
svmProvider;
|
|
9
|
-
|
|
10
|
-
|
|
23
|
+
config;
|
|
24
|
+
logger = rootLogger.child({
|
|
25
|
+
module: 'SvmMultiProtocolSignerAdapter',
|
|
26
|
+
});
|
|
27
|
+
constructor(chainName, signer, multiProtocolProvider, config) {
|
|
11
28
|
this.chainName = chainName;
|
|
12
|
-
this.
|
|
13
|
-
this.
|
|
14
|
-
this.
|
|
15
|
-
|
|
29
|
+
this.signer = signer;
|
|
30
|
+
this.svmProvider = multiProtocolProvider.getSolanaWeb3Provider(chainName);
|
|
31
|
+
this.config = {
|
|
32
|
+
maxConfirmationAttempts: config?.maxConfirmationAttempts ?? 30,
|
|
33
|
+
pollingDelayMs: config?.pollingDelayMs ?? 1000,
|
|
34
|
+
commitment: config?.commitment ?? 'confirmed',
|
|
35
|
+
enableBlockhashResubmit: config?.enableBlockhashResubmit ?? true,
|
|
36
|
+
retryOnRpcErrors: config?.retryOnRpcErrors ?? true,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
publicKey() {
|
|
40
|
+
return this.signer.publicKey;
|
|
16
41
|
}
|
|
17
42
|
async address() {
|
|
18
43
|
return this.signer.publicKey.toBase58();
|
|
19
44
|
}
|
|
45
|
+
/**
|
|
46
|
+
* Build and send a transaction from raw instructions
|
|
47
|
+
*/
|
|
48
|
+
async buildAndSendTransaction(instructions, options) {
|
|
49
|
+
const tx = this.buildTransaction(instructions, options);
|
|
50
|
+
return this.signAndConfirm(tx);
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Send and confirm a pre-built transaction (IMultiProtocolSigner interface)
|
|
54
|
+
*/
|
|
20
55
|
async sendAndConfirmTransaction(tx) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
56
|
+
return this.signAndConfirm(tx.transaction);
|
|
57
|
+
}
|
|
58
|
+
// ============ Private Methods ============
|
|
59
|
+
/**
|
|
60
|
+
* Build transaction from instructions with optional priority fees
|
|
61
|
+
*/
|
|
62
|
+
buildTransaction(instructions, options) {
|
|
63
|
+
const tx = new Transaction();
|
|
64
|
+
// Add priority fee if enabled and not already present
|
|
65
|
+
const includePriorityFee = options?.includePriorityFee ?? true;
|
|
66
|
+
if (includePriorityFee) {
|
|
67
|
+
const hasPriorityFeeIx = instructions.some((ix) => ix.programId.equals(ComputeBudgetProgram.programId));
|
|
68
|
+
if (!hasPriorityFeeIx) {
|
|
69
|
+
const priorityFee = options?.priorityFee ?? SEALEVEL_PRIORITY_FEES[this.chainName];
|
|
70
|
+
if (priorityFee) {
|
|
71
|
+
tx.add(ComputeBudgetProgram.setComputeUnitPrice({
|
|
72
|
+
microLamports: priorityFee,
|
|
73
|
+
}));
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
// Add all instructions
|
|
78
|
+
instructions.forEach((ix) => tx.add(ix));
|
|
79
|
+
tx.feePayer = this.signer.publicKey;
|
|
80
|
+
return tx;
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Sign and confirm transaction with blockhash resubmit on expiry
|
|
84
|
+
*/
|
|
85
|
+
async signAndConfirm(transaction) {
|
|
86
|
+
// Get initial blockhash
|
|
87
|
+
const { blockhash, lastValidBlockHeight } = await this.svmProvider.getLatestBlockhash(this.config.commitment);
|
|
88
|
+
transaction.recentBlockhash = blockhash;
|
|
89
|
+
const signedTx = await this.signer.signTransaction(transaction);
|
|
90
|
+
// Send initial transaction
|
|
91
|
+
const signature = await this.sendRawTransaction(signedTx);
|
|
92
|
+
// Poll for confirmation with optional resubmit
|
|
93
|
+
const result = await this.pollForConfirmation(signature, signedTx, lastValidBlockHeight);
|
|
94
|
+
return result;
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* Poll for transaction confirmation with blockhash expiry handling
|
|
98
|
+
*/
|
|
99
|
+
async pollForConfirmation(initialSignature, transaction, lastValidBlockHeight) {
|
|
100
|
+
let signature = initialSignature;
|
|
101
|
+
let attempts = 0;
|
|
102
|
+
let currentLastValidBlockHeight = lastValidBlockHeight;
|
|
103
|
+
while (attempts < this.config.maxConfirmationAttempts) {
|
|
104
|
+
await sleep(this.config.pollingDelayMs);
|
|
105
|
+
attempts++;
|
|
106
|
+
try {
|
|
107
|
+
// Check and handle blockhash expiry
|
|
108
|
+
const resubmitResult = await this.checkAndResubmitIfExpired(signature, transaction, currentLastValidBlockHeight);
|
|
109
|
+
if (resubmitResult) {
|
|
110
|
+
signature = resubmitResult.signature;
|
|
111
|
+
currentLastValidBlockHeight = resubmitResult.lastValidBlockHeight;
|
|
112
|
+
continue;
|
|
113
|
+
}
|
|
114
|
+
// Check if transaction is confirmed
|
|
115
|
+
const isConfirmed = await this.checkTransactionConfirmation(signature);
|
|
116
|
+
if (isConfirmed) {
|
|
117
|
+
this.logger.info(`Transaction ${signature} confirmed after ${attempts} attempts`);
|
|
118
|
+
return signature;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
catch (error) {
|
|
122
|
+
// If it's a transaction failure error, rethrow immediately
|
|
123
|
+
if (error instanceof Error &&
|
|
124
|
+
error.message.includes('Transaction failed')) {
|
|
125
|
+
throw error;
|
|
126
|
+
}
|
|
127
|
+
// Handle RPC errors based on config
|
|
128
|
+
if (!this.config.retryOnRpcErrors) {
|
|
129
|
+
throw error;
|
|
130
|
+
}
|
|
131
|
+
// Log RPC errors but continue polling (temporary issues)
|
|
132
|
+
this.logger.warn(`Polling attempt ${attempts} failed: ${error}`);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
throw new Error(`Transaction confirmation timeout after ${this.config.maxConfirmationAttempts} attempts`);
|
|
136
|
+
}
|
|
137
|
+
/**
|
|
138
|
+
* Check if blockhash expired and resubmit transaction if needed
|
|
139
|
+
* Returns new signature and lastValidBlockHeight if resubmitted, null otherwise
|
|
140
|
+
*/
|
|
141
|
+
async checkAndResubmitIfExpired(signature, transaction, lastValidBlockHeight) {
|
|
142
|
+
if (!this.config.enableBlockhashResubmit) {
|
|
143
|
+
return null;
|
|
144
|
+
}
|
|
145
|
+
const currentBlockHeight = await this.svmProvider.getBlockHeight();
|
|
146
|
+
if (currentBlockHeight <= lastValidBlockHeight) {
|
|
147
|
+
return null; // Blockhash still valid
|
|
148
|
+
}
|
|
149
|
+
this.logger.warn(`Blockhash expired at block ${lastValidBlockHeight}, current ${currentBlockHeight}. Resubmitting...`);
|
|
150
|
+
// Get fresh blockhash and resubmit
|
|
151
|
+
const { blockhash, lastValidBlockHeight: newLastValid } = await this.svmProvider.getLatestBlockhash(this.config.commitment);
|
|
152
|
+
transaction.recentBlockhash = blockhash;
|
|
153
|
+
const signedTx = await this.signer.signTransaction(transaction);
|
|
154
|
+
const newSignature = await this.sendRawTransaction(signedTx);
|
|
155
|
+
this.logger.info(`Resubmitted with signature: ${newSignature}`);
|
|
156
|
+
return {
|
|
157
|
+
signature: newSignature,
|
|
158
|
+
lastValidBlockHeight: newLastValid,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
/**
|
|
162
|
+
* Check if transaction is confirmed
|
|
163
|
+
* Returns true if confirmed, false if pending
|
|
164
|
+
* Throws if transaction failed
|
|
165
|
+
*/
|
|
166
|
+
async checkTransactionConfirmation(signature) {
|
|
167
|
+
const status = await this.svmProvider.getSignatureStatus(signature, {
|
|
168
|
+
searchTransactionHistory: true,
|
|
169
|
+
});
|
|
170
|
+
if (!status.value) {
|
|
171
|
+
return false; // Transaction not yet seen
|
|
172
|
+
}
|
|
173
|
+
// Check for transaction error
|
|
174
|
+
if (status.value.err) {
|
|
175
|
+
throw new Error(`Transaction failed: ${JSON.stringify(status.value.err)}`);
|
|
176
|
+
}
|
|
177
|
+
// Check if confirmed at required commitment level
|
|
178
|
+
const confirmationStatus = status.value.confirmationStatus;
|
|
179
|
+
return (confirmationStatus === this.config.commitment ||
|
|
180
|
+
confirmationStatus === 'finalized');
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
* Send signed transaction to network
|
|
184
|
+
*/
|
|
185
|
+
async sendRawTransaction(transaction) {
|
|
186
|
+
return await this.svmProvider.sendRawTransaction(transaction.serialize(), {
|
|
187
|
+
skipPreflight: false,
|
|
28
188
|
maxRetries: 3,
|
|
29
|
-
preflightCommitment: this.commitment,
|
|
30
189
|
});
|
|
31
|
-
// Manually checking if the transaction has been confirmed on chain
|
|
32
|
-
await this.waitForTransaction(txSignature);
|
|
33
|
-
return txSignature;
|
|
34
|
-
}
|
|
35
|
-
async waitForTransaction(transactionHash) {
|
|
36
|
-
await retryAsync(async () => {
|
|
37
|
-
const res = await this.svmProvider.getSignatureStatus(transactionHash);
|
|
38
|
-
if (res.value?.confirmationStatus !== this.commitment) {
|
|
39
|
-
throw new Error(`Transaction ${transactionHash} is not yet in the expected commitment state: "${this.commitment}"`);
|
|
40
|
-
}
|
|
41
|
-
}, 5, 1500);
|
|
42
190
|
}
|
|
43
191
|
}
|
|
44
192
|
//# sourceMappingURL=solana-web3js.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana-web3js.js","sourceRoot":"","sources":["../../../src/signers/svm/solana-web3js.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"solana-web3js.js","sourceRoot":"","sources":["../../../src/signers/svm/solana-web3js.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmERC20WarpModule.d.ts","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EvmERC20WarpModule.d.ts","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import chai from 'chai';
|
|
2
2
|
import chaiAsPromised from 'chai-as-promised';
|
|
3
|
+
import { ethers } from 'ethers';
|
|
3
4
|
import hre from 'hardhat';
|
|
4
5
|
import sinon from 'sinon';
|
|
5
6
|
import { UINT_256_MAX } from 'starknet';
|
|
@@ -249,6 +250,7 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
|
|
|
249
250
|
owner: owner,
|
|
250
251
|
paused: false,
|
|
251
252
|
},
|
|
253
|
+
ethers.constants.AddressZero,
|
|
252
254
|
];
|
|
253
255
|
const hookConfigToUpdate = [
|
|
254
256
|
{
|
|
@@ -270,21 +272,21 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
|
|
|
270
272
|
type: HookType.MERKLE_TREE,
|
|
271
273
|
},
|
|
272
274
|
];
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
275
|
+
for (const interchainSecurityModule of ismConfigToUpdate) {
|
|
276
|
+
it(`should deploy and set a new Ism (${typeof interchainSecurityModule === 'string' ? interchainSecurityModule : interchainSecurityModule.type})`, async () => {
|
|
277
|
+
const config = {
|
|
278
|
+
...baseConfig,
|
|
279
|
+
type: TokenType.native,
|
|
280
|
+
interchainSecurityModule: ismAddress,
|
|
281
|
+
};
|
|
282
|
+
// Deploy using WarpModule
|
|
283
|
+
const evmERC20WarpModule = await EvmERC20WarpModule.create({
|
|
284
|
+
chain,
|
|
285
|
+
config,
|
|
286
|
+
multiProvider,
|
|
287
|
+
proxyFactoryFactories: ismFactoryAddresses,
|
|
288
|
+
});
|
|
289
|
+
const actualConfig = await evmERC20WarpModule.read();
|
|
288
290
|
const expectedConfig = {
|
|
289
291
|
...actualConfig,
|
|
290
292
|
interchainSecurityModule,
|
|
@@ -292,8 +294,8 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
|
|
|
292
294
|
await sendTxs(await evmERC20WarpModule.update(expectedConfig));
|
|
293
295
|
const updatedConfig = normalizeConfig((await evmERC20WarpModule.read()).interchainSecurityModule);
|
|
294
296
|
expect(updatedConfig).to.deep.equal(interchainSecurityModule);
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
+
});
|
|
298
|
+
}
|
|
297
299
|
it('should not deploy and set a new Ism if the config is the same', async () => {
|
|
298
300
|
const config = {
|
|
299
301
|
...baseConfig,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmERC20WarpModule.hardhat-test.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.hardhat-test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EvmERC20WarpModule.hardhat-test.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.hardhat-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
// import { expect } from 'chai';
|
|
2
2
|
import { compareVersions } from 'compare-versions';
|
|
3
3
|
import { UINT_256_MAX } from 'starknet';
|
|
4
|
-
import { zeroAddress } from 'viem';
|
|
5
4
|
import { GasRouter__factory, IERC20__factory, MailboxClient__factory, MovableCollateralRouter__factory, ProxyAdmin__factory, TokenRouter__factory, } from '@hyperlane-xyz/core';
|
|
6
5
|
import { buildArtifact as coreBuildArtifact } from '@hyperlane-xyz/core/buildArtifact.js';
|
|
7
|
-
import { addressToBytes32, assert, deepEquals, difference, isObjEmpty, normalizeAddressEvm, objMap, promiseObjAll, rootLogger, } from '@hyperlane-xyz/utils';
|
|
6
|
+
import { addressToBytes32, assert, deepEquals, difference, eqAddress, isObjEmpty, isZeroishAddress, normalizeAddressEvm, objMap, promiseObjAll, rootLogger, } from '@hyperlane-xyz/utils';
|
|
8
7
|
import { ExplorerLicenseType } from '../block-explorer/etherscan.js';
|
|
9
8
|
import { transferOwnershipTransactions } from '../contracts/contracts.js';
|
|
10
9
|
import { HyperlaneModule, } from '../core/AbstractHyperlaneModule.js';
|
|
@@ -313,8 +312,7 @@ export class EvmERC20WarpModule extends HyperlaneModule {
|
|
|
313
312
|
*/
|
|
314
313
|
async createIsmUpdateTxs(actualConfig, expectedConfig) {
|
|
315
314
|
const updateTransactions = [];
|
|
316
|
-
if (!expectedConfig.interchainSecurityModule
|
|
317
|
-
expectedConfig.interchainSecurityModule === zeroAddress) {
|
|
315
|
+
if (!expectedConfig.interchainSecurityModule) {
|
|
318
316
|
return [];
|
|
319
317
|
}
|
|
320
318
|
const actualDeployedIsm = derivedIsmAddress(actualConfig);
|
|
@@ -323,7 +321,7 @@ export class EvmERC20WarpModule extends HyperlaneModule {
|
|
|
323
321
|
// If an ISM is updated in-place, push the update txs
|
|
324
322
|
updateTransactions.push(...ismUpdateTransactions);
|
|
325
323
|
// If a new ISM is deployed, push the setInterchainSecurityModule tx
|
|
326
|
-
if (actualDeployedIsm
|
|
324
|
+
if (!eqAddress(actualDeployedIsm, expectedDeployedIsm)) {
|
|
327
325
|
const contractToUpdate = MailboxClient__factory.connect(this.args.addresses.deployedTokenRoute, this.multiProvider.getProvider(this.domainId));
|
|
328
326
|
updateTransactions.push({
|
|
329
327
|
chainId: this.chainId,
|
|
@@ -371,12 +369,19 @@ export class EvmERC20WarpModule extends HyperlaneModule {
|
|
|
371
369
|
*/
|
|
372
370
|
async deployOrUpdateIsm(actualConfig, expectedConfig) {
|
|
373
371
|
assert(expectedConfig.interchainSecurityModule, 'Ism derived incorrectly');
|
|
372
|
+
if (typeof expectedConfig.interchainSecurityModule === 'string' &&
|
|
373
|
+
isZeroishAddress(expectedConfig.interchainSecurityModule)) {
|
|
374
|
+
return {
|
|
375
|
+
deployedIsm: expectedConfig.interchainSecurityModule,
|
|
376
|
+
updateTransactions: [],
|
|
377
|
+
};
|
|
378
|
+
}
|
|
374
379
|
const ismModule = new EvmIsmModule(this.multiProvider, {
|
|
375
380
|
chain: this.args.chain,
|
|
376
|
-
config:
|
|
381
|
+
config: actualConfig.interchainSecurityModule,
|
|
377
382
|
addresses: {
|
|
378
383
|
...this.args.addresses,
|
|
379
|
-
mailbox:
|
|
384
|
+
mailbox: actualConfig.mailbox,
|
|
380
385
|
deployedIsm: derivedIsmAddress(actualConfig),
|
|
381
386
|
},
|
|
382
387
|
}, this.ccipContractCache, this.contractVerifier);
|