@across-protocol/sdk 4.2.16-alpha.3 → 4.2.16-alpha.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.
- package/dist/cjs/arch/evm/SpokeUtils.d.ts +2 -6
- package/dist/cjs/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/SpokeUtils.d.ts +1 -1
- package/dist/cjs/arch/svm/SpokeUtils.js +10 -9
- package/dist/cjs/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/eventsClient.js +4 -2
- package/dist/cjs/arch/svm/eventsClient.js.map +1 -1
- package/dist/cjs/arch/svm/utils.d.ts +2 -2
- package/dist/cjs/arch/svm/utils.js +1 -1
- package/dist/cjs/arch/svm/utils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +4 -2
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/cjs/clients/HubPoolClient.js +5 -4
- package/dist/cjs/clients/HubPoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +3 -2
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockHubPoolClient.d.ts +3 -3
- package/dist/cjs/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js +6 -4
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -2
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js +13 -4
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.d.ts +5 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js +18 -5
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/cjs/utils/AddressUtils.d.ts +12 -6
- package/dist/cjs/utils/AddressUtils.js +39 -36
- package/dist/cjs/utils/AddressUtils.js.map +1 -1
- package/dist/cjs/utils/TokenUtils.d.ts +2 -2
- package/dist/cjs/utils/TokenUtils.js +5 -3
- package/dist/cjs/utils/TokenUtils.js.map +1 -1
- package/dist/esm/arch/evm/SpokeUtils.d.ts +2 -6
- package/dist/esm/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/SpokeUtils.d.ts +1 -1
- package/dist/esm/arch/svm/SpokeUtils.js +10 -9
- package/dist/esm/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/eventsClient.js +5 -3
- package/dist/esm/arch/svm/eventsClient.js.map +1 -1
- package/dist/esm/arch/svm/utils.d.ts +2 -2
- package/dist/esm/arch/svm/utils.js +2 -2
- package/dist/esm/arch/svm/utils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +11 -4
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/esm/clients/HubPoolClient.js +5 -4
- package/dist/esm/clients/HubPoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +3 -2
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockHubPoolClient.d.ts +3 -3
- package/dist/esm/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js +7 -5
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -2
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js +13 -4
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.d.ts +7 -2
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js +22 -7
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/esm/utils/AddressUtils.d.ts +12 -6
- package/dist/esm/utils/AddressUtils.js +42 -36
- package/dist/esm/utils/AddressUtils.js.map +1 -1
- package/dist/esm/utils/TokenUtils.d.ts +18 -2
- package/dist/esm/utils/TokenUtils.js +6 -4
- package/dist/esm/utils/TokenUtils.js.map +1 -1
- package/dist/types/arch/evm/SpokeUtils.d.ts +2 -6
- package/dist/types/arch/evm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/SpokeUtils.d.ts +1 -1
- package/dist/types/arch/svm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/eventsClient.d.ts.map +1 -1
- package/dist/types/arch/svm/utils.d.ts +2 -2
- package/dist/types/arch/svm/utils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
- package/dist/types/clients/HubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockHubPoolClient.d.ts +3 -3
- package/dist/types/clients/mocks/MockHubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/types/clients/mocks/MockSvmCpiEventsClient.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -2
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts +7 -2
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts.map +1 -1
- package/dist/types/utils/AddressUtils.d.ts +12 -6
- package/dist/types/utils/AddressUtils.d.ts.map +1 -1
- package/dist/types/utils/TokenUtils.d.ts +18 -2
- package/dist/types/utils/TokenUtils.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/arch/evm/SpokeUtils.ts +1 -6
- package/src/arch/svm/SpokeUtils.ts +10 -6
- package/src/arch/svm/eventsClient.ts +40 -8
- package/src/arch/svm/utils.ts +3 -3
- package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +12 -4
- package/src/clients/HubPoolClient.ts +7 -6
- package/src/clients/SpokePoolClient/SpokePoolClient.ts +5 -2
- package/src/clients/mocks/MockHubPoolClient.ts +3 -3
- package/src/clients/mocks/MockSvmCpiEventsClient.ts +8 -5
- package/src/relayFeeCalculator/chain-queries/baseQuery.ts +21 -3
- package/src/relayFeeCalculator/chain-queries/svmQuery.ts +27 -5
- package/src/utils/AddressUtils.ts +41 -41
- package/src/utils/TokenUtils.ts +8 -6
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import winston from "winston";
|
|
2
2
|
import { Contract } from "ethers";
|
|
3
3
|
import { BigNumber, EvmAddress, Address } from "../../utils";
|
|
4
|
-
import {
|
|
4
|
+
import { Log, PendingRootBundle, RealizedLpFee, L1TokenInfo } from "../../interfaces";
|
|
5
5
|
import { AcrossConfigStoreClient as ConfigStoreClient } from "../AcrossConfigStoreClient";
|
|
6
6
|
import { HubPoolClient, HubPoolUpdate, LpFeeRequest } from "../HubPoolClient";
|
|
7
7
|
import { EventOverrides } from "./MockEvents";
|
|
@@ -19,7 +19,7 @@ export declare class MockHubPoolClient extends HubPoolClient {
|
|
|
19
19
|
batchComputeRealizedLpFeePct(_deposits: LpFeeRequest[]): Promise<RealizedLpFee[]>;
|
|
20
20
|
setCrossChainContracts(chainId: number, contract: string, blockNumber?: number): void;
|
|
21
21
|
setLatestBlockNumber(blockNumber: number): void;
|
|
22
|
-
addL1Token(l1Token:
|
|
22
|
+
addL1Token(l1Token: L1TokenInfo): void;
|
|
23
23
|
getL1Tokens(): L1TokenInfo[];
|
|
24
24
|
setTokenMapping(l1Token: string, chainId: number, l2Token: string): void;
|
|
25
25
|
l2TokenEnabledForL1TokenAtBlock(l1Token: EvmAddress, destinationChainId: number, hubBlockNumber: number): boolean;
|
|
@@ -27,7 +27,7 @@ export declare class MockHubPoolClient extends HubPoolClient {
|
|
|
27
27
|
deleteTokenMapping(l1Token: string, chainId: number): void;
|
|
28
28
|
getL1TokenForL2TokenAtBlock(l2Token: Address, chainId: number, blockNumber: number): EvmAddress;
|
|
29
29
|
getL2TokenForL1TokenAtBlock(l1Token: EvmAddress, chainId: number, blockNumber: number): Address;
|
|
30
|
-
getTokenInfoForL1Token(l1Token: EvmAddress):
|
|
30
|
+
getTokenInfoForL1Token(l1Token: EvmAddress): L1TokenInfo | undefined;
|
|
31
31
|
_update(eventNames: string[]): Promise<HubPoolUpdate>;
|
|
32
32
|
readonly eventSignatures: Record<string, string>;
|
|
33
33
|
setCrossChainContractsEvent(l2ChainId: number, adapter: string, spokePool: string, overrides?: EventOverrides): Log;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockHubPoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockHubPoolClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MockHubPoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockHubPoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare class MockSvmCpiEventsClient extends SvmCpiEventsClient {
|
|
|
6
6
|
private slotHeight;
|
|
7
7
|
chainId: number;
|
|
8
8
|
minBlockRange: number;
|
|
9
|
-
numberOfDeposits: import("
|
|
9
|
+
numberOfDeposits: import("ethers").BigNumber;
|
|
10
10
|
constructor(programId?: Address<"JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq">, chainId?: number);
|
|
11
11
|
setSlotHeight(slotHeight: bigint): void;
|
|
12
12
|
setEvents(events: EventWithData[]): void;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MockSvmCpiEventsClient = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
6
|
+
var ethers_1 = require("ethers");
|
|
6
7
|
var crypto_1 = require("crypto");
|
|
7
8
|
var utils_1 = require("ethers/lib/utils");
|
|
8
9
|
var lodash_1 = require("lodash");
|
|
@@ -13,6 +14,7 @@ var mocks_1 = require("../../providers/mocks");
|
|
|
13
14
|
var svm_1 = require("../../arch/svm");
|
|
14
15
|
var utils_2 = require("../../utils");
|
|
15
16
|
var interfaces_1 = require("../../interfaces");
|
|
17
|
+
var randomBytes = function (n) { return ethers_1.utils.hexlify(ethers_1.utils.randomBytes(n)); };
|
|
16
18
|
var MockSvmCpiEventsClient = (function (_super) {
|
|
17
19
|
tslib_1.__extends(MockSvmCpiEventsClient, _super);
|
|
18
20
|
function MockSvmCpiEventsClient(programId, chainId) {
|
|
@@ -65,9 +67,9 @@ var MockSvmCpiEventsClient = (function (_super) {
|
|
|
65
67
|
this.numberOfDeposits = this.numberOfDeposits.add(utils_2.bnOne);
|
|
66
68
|
destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = BigInt((0, lodash_1.random)(1, 42161, false)));
|
|
67
69
|
var depositor = (_a = deposit.depositor) !== null && _a !== void 0 ? _a : (0, svm_1.getRandomSvmAddress)();
|
|
68
|
-
var recipient = (_b = deposit.recipient) !== null && _b !== void 0 ? _b : utils_2.
|
|
70
|
+
var recipient = (_b = deposit.recipient) !== null && _b !== void 0 ? _b : utils_2.SvmAddress.from(randomBytes(32), "base16").toBase58();
|
|
69
71
|
var inputToken = (_c = deposit.inputToken) !== null && _c !== void 0 ? _c : (0, svm_1.getRandomSvmAddress)();
|
|
70
|
-
var outputToken = (_d = deposit.outputToken) !== null && _d !== void 0 ? _d : utils_2.
|
|
72
|
+
var outputToken = (_d = deposit.outputToken) !== null && _d !== void 0 ? _d : utils_2.SvmAddress.from(randomBytes(32), "base16").toBase58();
|
|
71
73
|
inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = BigInt((0, lodash_1.random)(1, 1000, false)));
|
|
72
74
|
outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = (inputAmount * BigInt(95)) / BigInt(100));
|
|
73
75
|
var message = (_e = deposit.message) !== null && _e !== void 0 ? _e : new Uint8Array(32);
|
|
@@ -142,9 +144,9 @@ var MockSvmCpiEventsClient = (function (_super) {
|
|
|
142
144
|
var depositId = slowFillRequest.depositId, originChainId = slowFillRequest.originChainId;
|
|
143
145
|
depositId !== null && depositId !== void 0 ? depositId : (depositId = Uint8Array.from([(0, lodash_1.random)(1, 100000, false)]));
|
|
144
146
|
originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = BigInt((0, lodash_1.random)(1, 42161, false)));
|
|
145
|
-
var depositor = (_a = slowFillRequest.depositor) !== null && _a !== void 0 ? _a : utils_2.
|
|
147
|
+
var depositor = (_a = slowFillRequest.depositor) !== null && _a !== void 0 ? _a : utils_2.SvmAddress.from(randomBytes(32)).toBase58();
|
|
146
148
|
var recipient = (_b = slowFillRequest.recipient) !== null && _b !== void 0 ? _b : (0, svm_1.getRandomSvmAddress)();
|
|
147
|
-
var inputToken = (_c = slowFillRequest.inputToken) !== null && _c !== void 0 ? _c : utils_2.
|
|
149
|
+
var inputToken = (_c = slowFillRequest.inputToken) !== null && _c !== void 0 ? _c : utils_2.SvmAddress.from(randomBytes(32)).toBase58();
|
|
148
150
|
var outputToken = (_d = slowFillRequest.outputToken) !== null && _d !== void 0 ? _d : (0, svm_1.getRandomSvmAddress)();
|
|
149
151
|
var args = tslib_1.__assign(tslib_1.__assign({}, slowFillRequest), { depositId: depositId, originChainId: originChainId, depositor: depositor, recipient: recipient, inputToken: inputToken, outputToken: outputToken, inputAmount: (_e = slowFillRequest.inputAmount) !== null && _e !== void 0 ? _e : BigInt((0, lodash_1.random)(1, 1000, false)), outputAmount: (_g = (_f = slowFillRequest.outputAmount) !== null && _f !== void 0 ? _f : slowFillRequest.inputAmount) !== null && _g !== void 0 ? _g : BigInt((0, lodash_1.random)(1, 1000, false)), exclusiveRelayer: (_h = slowFillRequest.exclusiveRelayer) !== null && _h !== void 0 ? _h : svm_1.SVM_DEFAULT_ADDRESS });
|
|
150
152
|
return this.generateEvent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockSvmCpiEventsClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmCpiEventsClient.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAC5B,iCAAoC;AACpC,0CAAiE;AACjE,iCAAgC;AAChC,mCAAgE;AAEhE,wDAA4D;AAC5D,wDAAuD;AAEvD,+CAA6D;AAC7D,sCAQwB;AACxB,
|
|
1
|
+
{"version":3,"file":"MockSvmCpiEventsClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmCpiEventsClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { L2Provider } from "@eth-optimism/sdk/dist/interfaces/l2-provider";
|
|
|
2
2
|
import { PopulatedTransaction, providers } from "ethers";
|
|
3
3
|
import { Deposit } from "../../interfaces";
|
|
4
4
|
import { SpokePool } from "../../typechain";
|
|
5
|
-
import { BigNumberish, TransactionCostEstimate, BigNumber, Address } from "../../utils";
|
|
5
|
+
import { BigNumberish, EvmAddress, TransactionCostEstimate, BigNumber, Address } from "../../utils";
|
|
6
6
|
import { Logger, QueryInterface } from "../relayFeeCalculator";
|
|
7
7
|
import { Transport } from "viem";
|
|
8
8
|
import { EvmProvider } from "../../arch/evm/types";
|
|
@@ -29,7 +29,11 @@ export declare class QueryBase implements QueryInterface {
|
|
|
29
29
|
opStackL1GasCostMultiplier: BigNumber;
|
|
30
30
|
transport: Transport;
|
|
31
31
|
}>): Promise<TransactionCostEstimate>;
|
|
32
|
-
getUnsignedTxFromDeposit(deposit: Omit<Deposit, "messageHash"
|
|
32
|
+
getUnsignedTxFromDeposit(deposit: Omit<Deposit, "messageHash"> & {
|
|
33
|
+
recipient: EvmAddress;
|
|
34
|
+
outputToken: EvmAddress;
|
|
35
|
+
exclusiveRelayer: EvmAddress;
|
|
36
|
+
}, relayer?: Address): Promise<PopulatedTransaction>;
|
|
33
37
|
getNativeGasCost(deposit: Omit<Deposit, "messageHash">, relayer?: Address): Promise<BigNumber>;
|
|
34
38
|
getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer: Address | undefined, options: Partial<{
|
|
35
39
|
opStackL2GasUnits: BigNumberish;
|
|
@@ -29,12 +29,16 @@ var QueryBase = (function () {
|
|
|
29
29
|
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId), deposit.destinationChainId); }
|
|
30
30
|
if (options === void 0) { options = {}; }
|
|
31
31
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
32
|
-
var _a, gasPrice, gasUnits, baseFeeMultiplier, priorityFeeMultiplier, opStackL1GasCostMultiplier, transport, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice, opStackL1GasCost;
|
|
32
|
+
var _a, gasPrice, gasUnits, baseFeeMultiplier, priorityFeeMultiplier, opStackL1GasCostMultiplier, transport, recipient, outputToken, exclusiveRelayer, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice, opStackL1GasCost;
|
|
33
33
|
return tslib_1.__generator(this, function (_c) {
|
|
34
34
|
switch (_c.label) {
|
|
35
35
|
case 0:
|
|
36
36
|
_a = options.gasPrice, gasPrice = _a === void 0 ? this.fixedGasPrice : _a, gasUnits = options.gasUnits, baseFeeMultiplier = options.baseFeeMultiplier, priorityFeeMultiplier = options.priorityFeeMultiplier, opStackL1GasCostMultiplier = options.opStackL1GasCostMultiplier, transport = options.transport;
|
|
37
|
-
|
|
37
|
+
recipient = deposit.recipient, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer;
|
|
38
|
+
(0, assert_1.default)(recipient.isEVM(), "getGasCosts: recipient not an EVM address (".concat(recipient, ")"));
|
|
39
|
+
(0, assert_1.default)(outputToken.isEVM(), "getGasCosts: outputToken not an EVM address (".concat(outputToken, ")"));
|
|
40
|
+
(0, assert_1.default)(exclusiveRelayer.isEVM(), "getGasCosts: exclusiveRelayer not an EVM address (".concat(exclusiveRelayer, ")"));
|
|
41
|
+
return [4, this.getUnsignedTxFromDeposit(tslib_1.__assign(tslib_1.__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
|
|
38
42
|
case 1:
|
|
39
43
|
tx = _c.sent();
|
|
40
44
|
return [4, this.estimateGas(tx, relayer, this.provider, {
|
|
@@ -64,10 +68,15 @@ var QueryBase = (function () {
|
|
|
64
68
|
QueryBase.prototype.getNativeGasCost = function (deposit, relayer) {
|
|
65
69
|
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId), deposit.destinationChainId); }
|
|
66
70
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
67
|
-
var unsignedTx, voidSigner;
|
|
71
|
+
var recipient, outputToken, exclusiveRelayer, unsignedTx, voidSigner;
|
|
68
72
|
return tslib_1.__generator(this, function (_a) {
|
|
69
73
|
switch (_a.label) {
|
|
70
|
-
case 0:
|
|
74
|
+
case 0:
|
|
75
|
+
recipient = deposit.recipient, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer;
|
|
76
|
+
(0, assert_1.default)(recipient.isEVM(), "getNativeGasCost: recipient not an EVM address (".concat(recipient, ")"));
|
|
77
|
+
(0, assert_1.default)(outputToken.isEVM(), "getNativeGasCost: outputToken not an EVM address (".concat(outputToken, ")"));
|
|
78
|
+
(0, assert_1.default)(exclusiveRelayer.isEVM(), "getNativeGasCost: exclusiveRelayer not an EVM address (".concat(exclusiveRelayer, ")"));
|
|
79
|
+
return [4, this.getUnsignedTxFromDeposit(tslib_1.__assign(tslib_1.__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
|
|
71
80
|
case 1:
|
|
72
81
|
unsignedTx = _a.sent();
|
|
73
82
|
voidSigner = new ethers_1.VoidSigner(relayer.toEvmAddress(), this.provider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/baseQuery.ts"],"names":[],"mappings":";;;;AACA,kEAA0F;AAE1F,iCAAqE;AACrE,6CAA4C;AAC5C,6CAA4C;AAE5C,6CAAgE;AAChE,sCAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"baseQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/baseQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,11 @@ export declare class SvmQuery implements QueryInterface {
|
|
|
27
27
|
priorityFeeMultiplier: BigNumber;
|
|
28
28
|
}>): Promise<TransactionCostEstimate>;
|
|
29
29
|
getNativeGasCost(deposit: Omit<Deposit, "messageHash">, _relayer?: import("../../utils").Address): Promise<BigNumber>;
|
|
30
|
-
getFillRelayTx(deposit: Omit<Deposit, "
|
|
30
|
+
getFillRelayTx(deposit: Omit<Deposit, "recipent" | "outputToken" | "exclusiveRelayer" | "messageHash"> & {
|
|
31
|
+
recipient: SvmAddress;
|
|
32
|
+
outputToken: SvmAddress;
|
|
33
|
+
exclusiveRelayer: SvmAddress;
|
|
34
|
+
}, relayer?: import("../../utils").Address, repaymentChainId?: number, repaymentAddress?: import("../../utils").Address): Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, import("@solana/kit").TransactionSigner<string>> & Omit<Readonly<{
|
|
31
35
|
instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
|
|
32
36
|
version: 0;
|
|
33
37
|
}>, "feePayer">>;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SvmQuery = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
+
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
5
6
|
var conversionUtils_1 = require("@across-protocol/contracts/dist/src/svm/web3-v1/conversionUtils");
|
|
6
7
|
var system_1 = require("@solana-program/system");
|
|
7
8
|
var token_1 = require("@solana-program/token");
|
|
@@ -31,10 +32,15 @@ var SvmQuery = (function () {
|
|
|
31
32
|
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId), deposit.destinationChainId); }
|
|
32
33
|
if (options === void 0) { options = {}; }
|
|
33
34
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
34
|
-
var fillRelayTx, _a, computeUnitsConsumed, gasPriceEstimate, _b, _c, _d, gasPrice;
|
|
35
|
+
var recipient, outputToken, exclusiveRelayer, fillRelayTx, _a, computeUnitsConsumed, gasPriceEstimate, _b, _c, _d, gasPrice;
|
|
35
36
|
return tslib_1.__generator(this, function (_e) {
|
|
36
37
|
switch (_e.label) {
|
|
37
|
-
case 0:
|
|
38
|
+
case 0:
|
|
39
|
+
recipient = deposit.recipient, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer;
|
|
40
|
+
(0, assert_1.default)(recipient.isSVM(), "getGasCosts: recipient not an SVM address (".concat(recipient, ")"));
|
|
41
|
+
(0, assert_1.default)(outputToken.isSVM(), "getGasCosts: outputToken not an SVM address (".concat(outputToken, ")"));
|
|
42
|
+
(0, assert_1.default)(exclusiveRelayer.isSVM(), "getGasCosts: exclusiveRelayer not an SVM address (".concat(exclusiveRelayer, ")"));
|
|
43
|
+
return [4, this.getFillRelayTx(tslib_1.__assign(tslib_1.__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
|
|
38
44
|
case 1:
|
|
39
45
|
fillRelayTx = _e.sent();
|
|
40
46
|
_c = (_b = Promise).all;
|
|
@@ -63,10 +69,15 @@ var SvmQuery = (function () {
|
|
|
63
69
|
SvmQuery.prototype.getNativeGasCost = function (deposit, _relayer) {
|
|
64
70
|
if (_relayer === void 0) { _relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId), deposit.destinationChainId); }
|
|
65
71
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
66
|
-
var fillRelayTx, _a;
|
|
72
|
+
var recipient, outputToken, exclusiveRelayer, fillRelayTx, _a;
|
|
67
73
|
return tslib_1.__generator(this, function (_b) {
|
|
68
74
|
switch (_b.label) {
|
|
69
|
-
case 0:
|
|
75
|
+
case 0:
|
|
76
|
+
recipient = deposit.recipient, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer;
|
|
77
|
+
(0, assert_1.default)(recipient.isSVM(), "getNativeGasCost: recipient not an SVM address (".concat(recipient, ")"));
|
|
78
|
+
(0, assert_1.default)(outputToken.isSVM(), "getNativeGasCost: outputToken not an SVM address (".concat(outputToken, ")"));
|
|
79
|
+
(0, assert_1.default)(exclusiveRelayer.isSVM(), "getNativeGasCost: exclusiveRelayer not an SVM address (".concat(exclusiveRelayer, ")"));
|
|
80
|
+
return [4, this.getFillRelayTx(tslib_1.__assign(tslib_1.__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), _relayer)];
|
|
70
81
|
case 1:
|
|
71
82
|
fillRelayTx = _b.sent();
|
|
72
83
|
_a = utils_1.toBN;
|
|
@@ -86,6 +97,8 @@ var SvmQuery = (function () {
|
|
|
86
97
|
switch (_c.label) {
|
|
87
98
|
case 0:
|
|
88
99
|
depositor = deposit.depositor, recipient = deposit.recipient, inputToken = deposit.inputToken, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer, destinationChainId = deposit.destinationChainId;
|
|
100
|
+
(0, assert_1.default)(recipient.isSVM(), "getFillRelayTx: recipient not an SVM address (".concat(recipient, ")"));
|
|
101
|
+
(0, assert_1.default)(repaymentAddress.isValidOn(repaymentChainId), "getFillRelayTx: repayment address ".concat(repaymentAddress, " not valid on chain ").concat(repaymentChainId, ")"));
|
|
89
102
|
program = (0, svm_1.toAddress)(this.spokePool);
|
|
90
103
|
_relayDataHash = (0, utils_1.getRelayDataHash)(deposit, destinationChainId);
|
|
91
104
|
relayDataHash = new Uint8Array(Buffer.from(_relayDataHash.slice(2), "hex"));
|
|
@@ -100,7 +113,7 @@ var SvmQuery = (function () {
|
|
|
100
113
|
case 2:
|
|
101
114
|
mintInfo = _c.sent();
|
|
102
115
|
return [4, Promise.all([
|
|
103
|
-
(0, svm_1.getAssociatedTokenAddress)(
|
|
116
|
+
(0, svm_1.getAssociatedTokenAddress)(recipient, outputToken, mintInfo.programAddress),
|
|
104
117
|
(0, svm_1.getAssociatedTokenAddress)(utils_1.SvmAddress.from(relayer.toBase58()), outputToken, mintInfo.programAddress),
|
|
105
118
|
(0, svm_1.getFillStatusPda)(program, deposit, destinationChainId),
|
|
106
119
|
(0, svm_1.getEventAuthority)(program),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svmQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"svmQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,14 +7,13 @@ export declare function toBytes32(address: string): string;
|
|
|
7
7
|
export declare function toEvmAddress(hexString: string): string;
|
|
8
8
|
export declare function isValidEvmAddress(address: string): boolean;
|
|
9
9
|
export declare function toAddressType(address: string, chainId: number): Address;
|
|
10
|
-
export declare class Address {
|
|
10
|
+
export declare abstract class Address {
|
|
11
11
|
readonly rawAddress: Uint8Array;
|
|
12
12
|
evmAddress: string | undefined;
|
|
13
13
|
bytes32Address: string | undefined;
|
|
14
14
|
svmAddress: string | undefined;
|
|
15
15
|
bnAddress: BigNumber | undefined;
|
|
16
16
|
constructor(_rawAddress: Uint8Array);
|
|
17
|
-
static __unsafeConstruct(_rawAddress: Uint8Array): Address;
|
|
18
17
|
toBytes32(): string;
|
|
19
18
|
truncateToBytes20(): string;
|
|
20
19
|
toBase58(): string;
|
|
@@ -23,24 +22,31 @@ export declare class Address {
|
|
|
23
22
|
toNative(): string;
|
|
24
23
|
toHexString(): string;
|
|
25
24
|
isValidOn(chainId: number): boolean;
|
|
26
|
-
static isAddress(obj: unknown): boolean;
|
|
27
25
|
toString(): string;
|
|
28
26
|
isZeroAddress(): boolean;
|
|
29
27
|
forceSvmAddress(): SvmAddress;
|
|
30
28
|
eq(other: Address): boolean;
|
|
31
29
|
compare(otherAddress: Address): 1 | -1 | 0;
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
isEVM(): this is EvmAddress;
|
|
31
|
+
isSVM(): this is SvmAddress;
|
|
34
32
|
}
|
|
35
33
|
export declare class EvmAddress extends Address {
|
|
34
|
+
private readonly _type;
|
|
36
35
|
constructor(rawAddress: Uint8Array);
|
|
37
36
|
static validate(rawAddress: Uint8Array): boolean;
|
|
37
|
+
isEVM(): this is EvmAddress;
|
|
38
38
|
toNative(): string;
|
|
39
|
-
static from(address: string, encoding?: "
|
|
39
|
+
static from(address: string, encoding?: "base58" | "base16"): EvmAddress;
|
|
40
40
|
}
|
|
41
41
|
export declare class SvmAddress extends Address {
|
|
42
|
+
private readonly _type;
|
|
42
43
|
constructor(rawAddress: Uint8Array);
|
|
43
44
|
static validate(rawAddress: Uint8Array): boolean;
|
|
45
|
+
isSVM(): this is SvmAddress;
|
|
44
46
|
toNative(): string;
|
|
45
47
|
static from(address: string, encoding?: "base58" | "base16"): SvmAddress;
|
|
46
48
|
}
|
|
49
|
+
export declare class RawAddress extends Address {
|
|
50
|
+
private readonly _type;
|
|
51
|
+
constructor(rawAddress: Uint8Array);
|
|
52
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SvmAddress = exports.EvmAddress = exports.Address = exports.toAddressType = exports.isValidEvmAddress = exports.toEvmAddress = exports.toBytes32 = exports.compareAddressesSimple = exports.compareAddresses = exports.isContractDeployedToAddress = void 0;
|
|
3
|
+
exports.RawAddress = exports.SvmAddress = exports.EvmAddress = exports.Address = exports.toAddressType = exports.isValidEvmAddress = exports.toEvmAddress = exports.toBytes32 = exports.compareAddressesSimple = exports.compareAddresses = exports.isContractDeployedToAddress = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var ethers_1 = require("ethers");
|
|
6
6
|
var bs58_1 = tslib_1.__importDefault(require("bs58"));
|
|
@@ -68,12 +68,11 @@ function isValidEvmAddress(address) {
|
|
|
68
68
|
exports.isValidEvmAddress = isValidEvmAddress;
|
|
69
69
|
function toAddressType(address, chainId) {
|
|
70
70
|
var rawAddress = address.startsWith("0x") ? ethers_1.utils.arrayify(address) : bs58_1.default.decode(address);
|
|
71
|
-
|
|
72
|
-
if (isEvm && EvmAddress.validate(rawAddress))
|
|
71
|
+
if ((0, _1.chainIsEvm)(chainId) && EvmAddress.validate(rawAddress))
|
|
73
72
|
return new EvmAddress(rawAddress);
|
|
74
|
-
if (
|
|
73
|
+
else if ((0, _1.chainIsSvm)(chainId) && SvmAddress.validate(rawAddress))
|
|
75
74
|
return new SvmAddress(rawAddress);
|
|
76
|
-
return new
|
|
75
|
+
return new RawAddress(rawAddress);
|
|
77
76
|
}
|
|
78
77
|
exports.toAddressType = toAddressType;
|
|
79
78
|
var Address = (function () {
|
|
@@ -87,9 +86,6 @@ var Address = (function () {
|
|
|
87
86
|
}
|
|
88
87
|
this.rawAddress = ethers_1.utils.zeroPad(_rawAddress, 32);
|
|
89
88
|
}
|
|
90
|
-
Address.__unsafeConstruct = function (_rawAddress) {
|
|
91
|
-
return new this(_rawAddress);
|
|
92
|
-
};
|
|
93
89
|
Address.prototype.toBytes32 = function () {
|
|
94
90
|
var _a;
|
|
95
91
|
return ((_a = this.bytes32Address) !== null && _a !== void 0 ? _a : (this.bytes32Address = ethers_1.utils.hexZeroPad(ethers_1.utils.hexlify(this.rawAddress), 32).toLowerCase()));
|
|
@@ -129,9 +125,6 @@ var Address = (function () {
|
|
|
129
125
|
return SvmAddress.validate(this.rawAddress);
|
|
130
126
|
return false;
|
|
131
127
|
};
|
|
132
|
-
Address.isAddress = function (obj) {
|
|
133
|
-
return obj instanceof this;
|
|
134
|
-
};
|
|
135
128
|
Address.prototype.toString = function () {
|
|
136
129
|
return this.toNative();
|
|
137
130
|
};
|
|
@@ -157,11 +150,11 @@ var Address = (function () {
|
|
|
157
150
|
return 0;
|
|
158
151
|
}
|
|
159
152
|
};
|
|
160
|
-
Address.
|
|
161
|
-
return
|
|
153
|
+
Address.prototype.isEVM = function () {
|
|
154
|
+
return false;
|
|
162
155
|
};
|
|
163
|
-
Address.
|
|
164
|
-
return
|
|
156
|
+
Address.prototype.isSVM = function () {
|
|
157
|
+
return false;
|
|
165
158
|
};
|
|
166
159
|
return Address;
|
|
167
160
|
}());
|
|
@@ -169,29 +162,27 @@ exports.Address = Address;
|
|
|
169
162
|
var EvmAddress = (function (_super) {
|
|
170
163
|
tslib_1.__extends(EvmAddress, _super);
|
|
171
164
|
function EvmAddress(rawAddress) {
|
|
165
|
+
var _this = this;
|
|
172
166
|
if (!EvmAddress.validate(rawAddress)) {
|
|
173
167
|
throw new Error("".concat(ethers_1.utils.hexlify(rawAddress), " is not a valid EVM address"));
|
|
174
168
|
}
|
|
175
|
-
|
|
169
|
+
_this = _super.call(this, rawAddress) || this;
|
|
170
|
+
_this._type = "evm";
|
|
171
|
+
_this._type;
|
|
172
|
+
return _this;
|
|
176
173
|
}
|
|
177
174
|
EvmAddress.validate = function (rawAddress) {
|
|
178
175
|
return (rawAddress.length == 20 || (rawAddress.length === 32 && rawAddress.slice(0, 12).every(function (field) { return field === 0; })));
|
|
179
176
|
};
|
|
177
|
+
EvmAddress.prototype.isEVM = function () {
|
|
178
|
+
return true;
|
|
179
|
+
};
|
|
180
180
|
EvmAddress.prototype.toNative = function () {
|
|
181
181
|
return this.toEvmAddress();
|
|
182
182
|
};
|
|
183
183
|
EvmAddress.from = function (address, encoding) {
|
|
184
184
|
if (encoding === void 0) { encoding = "base16"; }
|
|
185
|
-
|
|
186
|
-
return new this(ethers_1.utils.arrayify(address));
|
|
187
|
-
}
|
|
188
|
-
var decodedAddress = bs58_1.default.decode(address);
|
|
189
|
-
var padding = decodedAddress.subarray(0, 12);
|
|
190
|
-
var evmAddress = decodedAddress.subarray(12);
|
|
191
|
-
if (padding.length !== 12 || ethers_1.utils.stripZeros(padding).length !== 0 || evmAddress.length !== 20) {
|
|
192
|
-
throw new Error("Not a valid base58-encoded EVM address: ".concat(address));
|
|
193
|
-
}
|
|
194
|
-
return new this(evmAddress);
|
|
185
|
+
return encoding === "base16" ? new this(ethers_1.utils.arrayify(address)) : new this(bs58_1.default.decode(address));
|
|
195
186
|
};
|
|
196
187
|
return EvmAddress;
|
|
197
188
|
}(Address));
|
|
@@ -199,29 +190,41 @@ exports.EvmAddress = EvmAddress;
|
|
|
199
190
|
var SvmAddress = (function (_super) {
|
|
200
191
|
tslib_1.__extends(SvmAddress, _super);
|
|
201
192
|
function SvmAddress(rawAddress) {
|
|
193
|
+
var _this = this;
|
|
202
194
|
if (!SvmAddress.validate(rawAddress)) {
|
|
203
195
|
throw new Error("".concat(ethers_1.utils.hexlify(rawAddress), " is not a valid SVM address"));
|
|
204
196
|
}
|
|
205
|
-
|
|
197
|
+
_this = _super.call(this, rawAddress) || this;
|
|
198
|
+
_this._type = "svm";
|
|
199
|
+
_this._type;
|
|
200
|
+
return _this;
|
|
206
201
|
}
|
|
207
202
|
SvmAddress.validate = function (rawAddress) {
|
|
208
|
-
return rawAddress.length === 32
|
|
203
|
+
return (rawAddress.length === 32 &&
|
|
204
|
+
(!rawAddress.slice(0, 12).every(function (field) { return field === 0; }) || rawAddress.every(function (field) { return field === 0; })));
|
|
205
|
+
};
|
|
206
|
+
SvmAddress.prototype.isSVM = function () {
|
|
207
|
+
return true;
|
|
209
208
|
};
|
|
210
209
|
SvmAddress.prototype.toNative = function () {
|
|
211
210
|
return this.toBase58();
|
|
212
211
|
};
|
|
213
212
|
SvmAddress.from = function (address, encoding) {
|
|
214
213
|
if (encoding === void 0) { encoding = "base58"; }
|
|
215
|
-
|
|
216
|
-
return new this(bs58_1.default.decode(address));
|
|
217
|
-
}
|
|
218
|
-
var decodedAddress = ethers_1.utils.arrayify(address);
|
|
219
|
-
if (decodedAddress.length !== 32) {
|
|
220
|
-
throw new Error("Not a valid base16-encoded SVM address: ".concat(address));
|
|
221
|
-
}
|
|
222
|
-
return new this(decodedAddress);
|
|
214
|
+
return encoding === "base58" ? new this(bs58_1.default.decode(address)) : new this(ethers_1.utils.arrayify(address));
|
|
223
215
|
};
|
|
224
216
|
return SvmAddress;
|
|
225
217
|
}(Address));
|
|
226
218
|
exports.SvmAddress = SvmAddress;
|
|
219
|
+
var RawAddress = (function (_super) {
|
|
220
|
+
tslib_1.__extends(RawAddress, _super);
|
|
221
|
+
function RawAddress(rawAddress) {
|
|
222
|
+
var _this = _super.call(this, rawAddress) || this;
|
|
223
|
+
_this._type = "raw";
|
|
224
|
+
_this._type;
|
|
225
|
+
return _this;
|
|
226
|
+
}
|
|
227
|
+
return RawAddress;
|
|
228
|
+
}(Address));
|
|
229
|
+
exports.RawAddress = RawAddress;
|
|
227
230
|
//# sourceMappingURL=AddressUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddressUtils.js","sourceRoot":"","sources":["../../../src/utils/AddressUtils.ts"],"names":[],"mappings":";;;;AAAA,iCAA0C;AAC1C,sDAAwB;AACxB,uBAAuD;AAQvD,SAAsB,2BAA2B,CAAC,OAAe,EAAE,QAA4B;;;;;;oBAE7F,IAAI,CAAC,OAAO,IAAI,CAAC,cAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACzC,WAAO,KAAK,EAAC;qBACd;oBAEY,WAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAA;;oBAAtC,IAAI,GAAG,SAA+B;oBAE5C,WAAO,IAAI,KAAK,IAAI,EAAC;;;;CACtB;AATD,kEASC;AAED,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IAGjE,IAAM,UAAU,GAAG,YAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAM,UAAU,GAAG,YAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;QACpC,OAAO,CAAC,CAAC,CAAC;KACX;SAAM;QACL,OAAO,CAAC,CAAC;KACV;AACH,CAAC;AAZD,4CAYC;AAED,SAAgB,sBAAsB,CAAC,QAAiB,EAAE,QAAiB;IACzE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QACpD,OAAO,KAAK,CAAC;KACd;IACD,OAAO,QAAQ,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;AAC3D,CAAC;AALD,wDAKC;AAKD,SAAgB,SAAS,CAAC,OAAe;IACvC,OAAO,cAAK,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;AACrD,CAAC;AAFD,8BAEC;AAID,SAAgB,YAAY,CAAC,SAAiB;IAE5C,IAAM,UAAU,GAAG,cAAK,CAAC,UAAU,CAAC,cAAK,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACxE,OAAO,cAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAJD,oCAIC;AAED,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,IAAI,cAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IAKD,IAAI;QACF,IAAM,UAAU,GAAG,cAAK,CAAC,UAAU,CAAC,cAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,OAAO,cAAK,CAAC,SAAS,CAAC,cAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;KACtD;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAdD,8CAcC;AASD,SAAgB,aAAa,CAAC,OAAe,EAAE,OAAe;IAC5D,IAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE7F,
|
|
1
|
+
{"version":3,"file":"AddressUtils.js","sourceRoot":"","sources":["../../../src/utils/AddressUtils.ts"],"names":[],"mappings":"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"}
|