@wormhole-foundation/sdk-evm 0.7.0-beta.7 → 0.7.1-beta.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/cjs/signer.d.ts +8 -11
- package/dist/cjs/signer.d.ts.map +1 -1
- package/dist/cjs/signer.js +22 -32
- package/dist/cjs/signer.js.map +1 -1
- package/dist/esm/signer.d.ts +8 -11
- package/dist/esm/signer.d.ts.map +1 -1
- package/dist/esm/signer.js +22 -32
- package/dist/esm/signer.js.map +1 -1
- package/package.json +2 -2
package/dist/cjs/signer.d.ts
CHANGED
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
import type { Network, SignOnlySigner, SignedTx, Signer, UnsignedTransaction } from '@wormhole-foundation/sdk-connect';
|
|
2
2
|
import { PlatformNativeSigner } from '@wormhole-foundation/sdk-connect';
|
|
3
|
-
import type { Signer as EthersSigner, Provider } from 'ethers';
|
|
3
|
+
import type { Signer as EthersSigner, Provider, TransactionRequest } from 'ethers';
|
|
4
4
|
import type { EvmChains } from './types.js';
|
|
5
|
-
export
|
|
5
|
+
export type EvmSignerOptions = {
|
|
6
|
+
debug?: boolean;
|
|
6
7
|
maxGasLimit?: bigint;
|
|
8
|
+
overrides?: Partial<TransactionRequest>;
|
|
9
|
+
};
|
|
10
|
+
export declare function getEvmSigner(rpc: Provider, key: string | EthersSigner, opts?: EvmSignerOptions & {
|
|
7
11
|
chain?: EvmChains;
|
|
8
|
-
debug?: boolean;
|
|
9
12
|
}): Promise<Signer>;
|
|
10
13
|
export declare function getEvmSignerForKey(rpc: Provider, privateKey: string): Promise<Signer>;
|
|
11
14
|
export declare function getEvmSignerForSigner(signer: EthersSigner): Promise<Signer>;
|
|
12
15
|
export declare class EvmNativeSigner<N extends Network, C extends EvmChains = EvmChains> extends PlatformNativeSigner<EthersSigner, N, C> implements SignOnlySigner<N, C> {
|
|
13
|
-
readonly opts?:
|
|
14
|
-
|
|
15
|
-
debug?: boolean | undefined;
|
|
16
|
-
} | undefined;
|
|
17
|
-
constructor(_chain: C, _address: string, _signer: EthersSigner, opts?: {
|
|
18
|
-
maxGasLimit?: bigint | undefined;
|
|
19
|
-
debug?: boolean | undefined;
|
|
20
|
-
} | undefined);
|
|
16
|
+
readonly opts?: EvmSignerOptions | undefined;
|
|
17
|
+
constructor(_chain: C, _address: string, _signer: EthersSigner, opts?: EvmSignerOptions | undefined);
|
|
21
18
|
chain(): C;
|
|
22
19
|
address(): string;
|
|
23
20
|
sign(tx: UnsignedTransaction<N, C>[]): Promise<SignedTx[]>;
|
package/dist/cjs/signer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,QAAQ,EACR,MAAM,EACN,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,oBAAoB,EAGrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EACV,MAAM,IAAI,YAAY,EACtB,QAAQ,
|
|
1
|
+
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,QAAQ,EACR,MAAM,EACN,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,oBAAoB,EAGrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EACV,MAAM,IAAI,YAAY,EACtB,QAAQ,EACR,kBAAkB,EACnB,MAAM,QAAQ,CAAC;AAGhB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C,MAAM,MAAM,gBAAgB,GAAG;IAE7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACzC,CAAC;AAEF,wBAAsB,YAAY,CAChC,GAAG,EAAE,QAAQ,EACb,GAAG,EAAE,MAAM,GAAG,YAAY,EAC1B,IAAI,CAAC,EAAE,gBAAgB,GAAG;IAAE,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,GAC9C,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAGD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAEjB;AAGD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,qBAAa,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,SAAS,GAAG,SAAS,CAC7E,SAAQ,oBAAoB,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,CAC/C,YAAW,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAM7B,QAAQ,CAAC,IAAI,CAAC;gBAHd,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,YAAY,EACZ,IAAI,CAAC,8BAAkB;IAKlC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IAIX,IAAI,CAAC,EAAE,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CAuDjE;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,OAAO,EACjD,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,MAAM,IAAI,eAAe,CAAC,CAAC,CAAC,CAM9B"}
|
package/dist/cjs/signer.js
CHANGED
|
@@ -47,33 +47,33 @@ class EvmNativeSigner extends sdk_connect_1.PlatformNativeSigner {
|
|
|
47
47
|
async sign(tx) {
|
|
48
48
|
const chain = this.chain();
|
|
49
49
|
const signed = [];
|
|
50
|
-
//
|
|
51
|
-
|
|
50
|
+
// Default gas values
|
|
51
|
+
let gasLimit = 500000n;
|
|
52
52
|
let gasPrice = 100000000000n; // 100gwei
|
|
53
53
|
let maxFeePerGas = 1500000000n; // 1.5gwei
|
|
54
54
|
let maxPriorityFeePerGas = 100000000n; // 0.1gwei
|
|
55
|
-
//
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
feeData.
|
|
55
|
+
// If no overrides were passed, we can get better
|
|
56
|
+
// gas values from the provider
|
|
57
|
+
if (this.opts?.overrides === undefined) {
|
|
58
|
+
// Celo does not support this call
|
|
59
|
+
if (chain !== 'Celo') {
|
|
60
|
+
const feeData = await this._signer.provider.getFeeData();
|
|
61
|
+
gasPrice = feeData.gasPrice ?? gasPrice;
|
|
62
|
+
maxFeePerGas = feeData.maxFeePerGas ?? maxFeePerGas;
|
|
63
|
+
maxPriorityFeePerGas =
|
|
64
|
+
feeData.maxPriorityFeePerGas ?? maxPriorityFeePerGas;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
if (this.opts?.maxGasLimit !== undefined) {
|
|
68
|
+
// why doesnt math.min work for bigints?
|
|
69
|
+
gasLimit =
|
|
70
|
+
gasLimit > this.opts?.maxGasLimit ? this.opts?.maxGasLimit : gasLimit;
|
|
62
71
|
}
|
|
63
72
|
// Oasis throws malformed errors unless we
|
|
64
73
|
// set it to use legacy transaction parameters
|
|
65
74
|
const gasOpts = chain === 'Oasis'
|
|
66
|
-
? {
|
|
67
|
-
|
|
68
|
-
gasPrice: gasPrice,
|
|
69
|
-
// Hardcode type
|
|
70
|
-
type: 0,
|
|
71
|
-
}
|
|
72
|
-
: {
|
|
73
|
-
maxFeePerGas,
|
|
74
|
-
maxPriorityFeePerGas,
|
|
75
|
-
gasLimit,
|
|
76
|
-
};
|
|
75
|
+
? { gasLimit, gasPrice, type: 0 } // Hardcoded to legacy transaction type
|
|
76
|
+
: { gasLimit, maxFeePerGas, maxPriorityFeePerGas };
|
|
77
77
|
for (const txn of tx) {
|
|
78
78
|
const { transaction, description } = txn;
|
|
79
79
|
if (this.opts?.debug)
|
|
@@ -83,19 +83,9 @@ class EvmNativeSigner extends sdk_connect_1.PlatformNativeSigner {
|
|
|
83
83
|
...gasOpts,
|
|
84
84
|
from: this.address(),
|
|
85
85
|
nonce: await this._signer.getNonce(),
|
|
86
|
+
// Override any existing values with those passed in the constructor
|
|
87
|
+
...this.opts?.overrides,
|
|
86
88
|
};
|
|
87
|
-
// try {
|
|
88
|
-
// const estimate = await this._signer.provider!.estimateGas(t);
|
|
89
|
-
// t.gasLimit = estimate + estimate / 10n; // Add 10% buffer
|
|
90
|
-
// if (this.opts?.maxGasLimit && t.gasLimit > this.opts?.maxGasLimit) {
|
|
91
|
-
// throw new Error(
|
|
92
|
-
// `Gas limit ${t.gasLimit} exceeds maxGasLimit ${this.opts?.maxGasLimit}`,
|
|
93
|
-
// );
|
|
94
|
-
// }
|
|
95
|
-
// } catch (e) {
|
|
96
|
-
// console.info('Failed to estimate gas for transaction: ', e);
|
|
97
|
-
// console.info('Using gas limit: ', t.gasLimit);
|
|
98
|
-
// }
|
|
99
89
|
signed.push(await this._signer.signTransaction(t));
|
|
100
90
|
}
|
|
101
91
|
return signed;
|
package/dist/cjs/signer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":";;;AAOA,kEAI0C;AAM1C,mCAA8C;AAC9C,+CAA4C;AAE5C,yCAAuC;
|
|
1
|
+
{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/signer.d.ts
CHANGED
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
import type { Network, SignOnlySigner, SignedTx, Signer, UnsignedTransaction } from '@wormhole-foundation/sdk-connect';
|
|
2
2
|
import { PlatformNativeSigner } from '@wormhole-foundation/sdk-connect';
|
|
3
|
-
import type { Signer as EthersSigner, Provider } from 'ethers';
|
|
3
|
+
import type { Signer as EthersSigner, Provider, TransactionRequest } from 'ethers';
|
|
4
4
|
import type { EvmChains } from './types.js';
|
|
5
|
-
export
|
|
5
|
+
export type EvmSignerOptions = {
|
|
6
|
+
debug?: boolean;
|
|
6
7
|
maxGasLimit?: bigint;
|
|
8
|
+
overrides?: Partial<TransactionRequest>;
|
|
9
|
+
};
|
|
10
|
+
export declare function getEvmSigner(rpc: Provider, key: string | EthersSigner, opts?: EvmSignerOptions & {
|
|
7
11
|
chain?: EvmChains;
|
|
8
|
-
debug?: boolean;
|
|
9
12
|
}): Promise<Signer>;
|
|
10
13
|
export declare function getEvmSignerForKey(rpc: Provider, privateKey: string): Promise<Signer>;
|
|
11
14
|
export declare function getEvmSignerForSigner(signer: EthersSigner): Promise<Signer>;
|
|
12
15
|
export declare class EvmNativeSigner<N extends Network, C extends EvmChains = EvmChains> extends PlatformNativeSigner<EthersSigner, N, C> implements SignOnlySigner<N, C> {
|
|
13
|
-
readonly opts?:
|
|
14
|
-
|
|
15
|
-
debug?: boolean | undefined;
|
|
16
|
-
} | undefined;
|
|
17
|
-
constructor(_chain: C, _address: string, _signer: EthersSigner, opts?: {
|
|
18
|
-
maxGasLimit?: bigint | undefined;
|
|
19
|
-
debug?: boolean | undefined;
|
|
20
|
-
} | undefined);
|
|
16
|
+
readonly opts?: EvmSignerOptions | undefined;
|
|
17
|
+
constructor(_chain: C, _address: string, _signer: EthersSigner, opts?: EvmSignerOptions | undefined);
|
|
21
18
|
chain(): C;
|
|
22
19
|
address(): string;
|
|
23
20
|
sign(tx: UnsignedTransaction<N, C>[]): Promise<SignedTx[]>;
|
package/dist/esm/signer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,QAAQ,EACR,MAAM,EACN,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,oBAAoB,EAGrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EACV,MAAM,IAAI,YAAY,EACtB,QAAQ,
|
|
1
|
+
{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,QAAQ,EACR,MAAM,EACN,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,oBAAoB,EAGrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EACV,MAAM,IAAI,YAAY,EACtB,QAAQ,EACR,kBAAkB,EACnB,MAAM,QAAQ,CAAC;AAGhB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C,MAAM,MAAM,gBAAgB,GAAG;IAE7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACzC,CAAC;AAEF,wBAAsB,YAAY,CAChC,GAAG,EAAE,QAAQ,EACb,GAAG,EAAE,MAAM,GAAG,YAAY,EAC1B,IAAI,CAAC,EAAE,gBAAgB,GAAG;IAAE,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,GAC9C,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAGD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAEjB;AAGD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,qBAAa,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,SAAS,GAAG,SAAS,CAC7E,SAAQ,oBAAoB,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,CAC/C,YAAW,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAM7B,QAAQ,CAAC,IAAI,CAAC;gBAHd,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,YAAY,EACZ,IAAI,CAAC,8BAAkB;IAKlC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IAIX,IAAI,CAAC,EAAE,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CAuDjE;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,OAAO,EACjD,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,MAAM,IAAI,eAAe,CAAC,CAAC,CAAC,CAM9B"}
|
package/dist/esm/signer.js
CHANGED
|
@@ -41,33 +41,33 @@ export class EvmNativeSigner extends PlatformNativeSigner {
|
|
|
41
41
|
async sign(tx) {
|
|
42
42
|
const chain = this.chain();
|
|
43
43
|
const signed = [];
|
|
44
|
-
//
|
|
45
|
-
|
|
44
|
+
// Default gas values
|
|
45
|
+
let gasLimit = 500000n;
|
|
46
46
|
let gasPrice = 100000000000n; // 100gwei
|
|
47
47
|
let maxFeePerGas = 1500000000n; // 1.5gwei
|
|
48
48
|
let maxPriorityFeePerGas = 100000000n; // 0.1gwei
|
|
49
|
-
//
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
feeData.
|
|
49
|
+
// If no overrides were passed, we can get better
|
|
50
|
+
// gas values from the provider
|
|
51
|
+
if (this.opts?.overrides === undefined) {
|
|
52
|
+
// Celo does not support this call
|
|
53
|
+
if (chain !== 'Celo') {
|
|
54
|
+
const feeData = await this._signer.provider.getFeeData();
|
|
55
|
+
gasPrice = feeData.gasPrice ?? gasPrice;
|
|
56
|
+
maxFeePerGas = feeData.maxFeePerGas ?? maxFeePerGas;
|
|
57
|
+
maxPriorityFeePerGas =
|
|
58
|
+
feeData.maxPriorityFeePerGas ?? maxPriorityFeePerGas;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
if (this.opts?.maxGasLimit !== undefined) {
|
|
62
|
+
// why doesnt math.min work for bigints?
|
|
63
|
+
gasLimit =
|
|
64
|
+
gasLimit > this.opts?.maxGasLimit ? this.opts?.maxGasLimit : gasLimit;
|
|
56
65
|
}
|
|
57
66
|
// Oasis throws malformed errors unless we
|
|
58
67
|
// set it to use legacy transaction parameters
|
|
59
68
|
const gasOpts = chain === 'Oasis'
|
|
60
|
-
? {
|
|
61
|
-
|
|
62
|
-
gasPrice: gasPrice,
|
|
63
|
-
// Hardcode type
|
|
64
|
-
type: 0,
|
|
65
|
-
}
|
|
66
|
-
: {
|
|
67
|
-
maxFeePerGas,
|
|
68
|
-
maxPriorityFeePerGas,
|
|
69
|
-
gasLimit,
|
|
70
|
-
};
|
|
69
|
+
? { gasLimit, gasPrice, type: 0 } // Hardcoded to legacy transaction type
|
|
70
|
+
: { gasLimit, maxFeePerGas, maxPriorityFeePerGas };
|
|
71
71
|
for (const txn of tx) {
|
|
72
72
|
const { transaction, description } = txn;
|
|
73
73
|
if (this.opts?.debug)
|
|
@@ -77,19 +77,9 @@ export class EvmNativeSigner extends PlatformNativeSigner {
|
|
|
77
77
|
...gasOpts,
|
|
78
78
|
from: this.address(),
|
|
79
79
|
nonce: await this._signer.getNonce(),
|
|
80
|
+
// Override any existing values with those passed in the constructor
|
|
81
|
+
...this.opts?.overrides,
|
|
80
82
|
};
|
|
81
|
-
// try {
|
|
82
|
-
// const estimate = await this._signer.provider!.estimateGas(t);
|
|
83
|
-
// t.gasLimit = estimate + estimate / 10n; // Add 10% buffer
|
|
84
|
-
// if (this.opts?.maxGasLimit && t.gasLimit > this.opts?.maxGasLimit) {
|
|
85
|
-
// throw new Error(
|
|
86
|
-
// `Gas limit ${t.gasLimit} exceeds maxGasLimit ${this.opts?.maxGasLimit}`,
|
|
87
|
-
// );
|
|
88
|
-
// }
|
|
89
|
-
// } catch (e) {
|
|
90
|
-
// console.info('Failed to estimate gas for transaction: ', e);
|
|
91
|
-
// console.info('Using gas limit: ', t.gasLimit);
|
|
92
|
-
// }
|
|
93
83
|
signed.push(await this._signer.signTransaction(t));
|
|
94
84
|
}
|
|
95
85
|
return signed;
|
package/dist/esm/signer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,cAAc,GACf,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,cAAc,GACf,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAWvC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAa,EACb,GAA0B,EAC1B,IAA+C;IAE/C,MAAM,MAAM,GACV,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAEvD,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,CAAC,MAAM,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;IAE/C,IAAI,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,CAAC,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,OAAO,IAAI,eAAe,CACxB,KAAK,EACL,MAAM,MAAM,CAAC,UAAU,EAAE,EACzB,aAAa,EACb,IAAI,CACL,CAAC;AACJ,CAAC;AAED,4CAA4C;AAC5C,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAa,EACb,UAAkB;IAElB,OAAO,YAAY,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;AACvC,CAAC;AAED,4CAA4C;AAC5C,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,MAAoB;IAEpB,IAAI,CAAC,MAAM,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,OAAO,YAAY,CAAC,MAAM,CAAC,QAAS,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,OAAO,eACX,SAAQ,oBAAwC;IAOrC;IAJX,YACE,MAAS,EACT,QAAgB,EAChB,OAAqB,EACZ,IAAuB;QAEhC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAFxB,SAAI,GAAJ,IAAI,CAAmB;IAGlC,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAA+B;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAE3B,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,qBAAqB;QACrB,IAAI,QAAQ,GAAG,OAAQ,CAAC;QACxB,IAAI,QAAQ,GAAG,aAAgB,CAAC,CAAC,UAAU;QAC3C,IAAI,YAAY,GAAG,WAAc,CAAC,CAAC,UAAU;QAC7C,IAAI,oBAAoB,GAAG,UAAY,CAAC,CAAC,UAAU;QAEnD,iDAAiD;QACjD,+BAA+B;QAC/B,IAAI,IAAI,CAAC,IAAI,EAAE,SAAS,KAAK,SAAS,EAAE,CAAC;YACvC,kCAAkC;YAClC,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;gBACrB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAS,CAAC,UAAU,EAAE,CAAC;gBAC1D,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC;gBACxC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,YAAY,CAAC;gBACpD,oBAAoB;oBAClB,OAAO,CAAC,oBAAoB,IAAI,oBAAoB,CAAC;YACzD,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,WAAW,KAAK,SAAS,EAAE,CAAC;YACzC,wCAAwC;YACxC,QAAQ;gBACN,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC1E,CAAC;QAED,0CAA0C;QAC1C,8CAA8C;QAC9C,MAAM,OAAO,GACX,KAAK,KAAK,OAAO;YACf,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,uCAAuC;YACzE,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC;QAEvD,KAAK,MAAM,GAAG,IAAI,EAAE,EAAE,CAAC;YACrB,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC;YACzC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK;gBAClB,OAAO,CAAC,GAAG,CAAC,YAAY,WAAW,QAAQ,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAE/D,MAAM,CAAC,GAAuB;gBAC5B,GAAG,WAAW;gBACd,GAAG,OAAO;gBACV,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;gBACpB,KAAK,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;gBACpC,oEAAoE;gBACpE,GAAG,IAAI,CAAC,IAAI,EAAE,SAAS;aACxB,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,MAAM,UAAU,iBAAiB,CAC/B,MAAiB;IAEjB,OAAO,CACL,cAAc,CAAC,MAAM,CAAC;QACtB,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,SAAS;QAC7C,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAChC,CAAC;AACJ,CAAC;AAED,8GAA8G;AAC9G,SAAS,cAAc,CAAC,KAAU;IAChC,OAAO,CACL,UAAU,IAAI,KAAK;QACnB,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU;QACnC,OAAO,KAAK,CAAC,UAAU,KAAK,UAAU;QACtC,OAAO,KAAK,CAAC,QAAQ,KAAK,UAAU;QACpC,OAAO,KAAK,CAAC,YAAY,KAAK,UAAU;QACxC,OAAO,KAAK,CAAC,mBAAmB,KAAK,UAAU;QAC/C,OAAO,KAAK,CAAC,WAAW,KAAK,UAAU;QACvC,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU;QAChC,OAAO,KAAK,CAAC,WAAW,KAAK,UAAU;QACvC,OAAO,KAAK,CAAC,eAAe,KAAK,UAAU;QAC3C,OAAO,KAAK,CAAC,eAAe,KAAK,UAAU;QAC3C,OAAO,KAAK,CAAC,WAAW,KAAK,UAAU;QACvC,OAAO,KAAK,CAAC,aAAa,KAAK,UAAU,CAC1C,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wormhole-foundation/sdk-evm",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.1-beta.0",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/wormhole-foundation/connect-sdk.git"
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"nock": "13.3.8"
|
|
58
58
|
},
|
|
59
59
|
"dependencies": {
|
|
60
|
-
"@wormhole-foundation/sdk-connect": "0.7.
|
|
60
|
+
"@wormhole-foundation/sdk-connect": "0.7.1-beta.0",
|
|
61
61
|
"ethers": "^6.5.1"
|
|
62
62
|
},
|
|
63
63
|
"type": "module",
|