@across-protocol/sdk 4.2.16 → 4.3.1
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 +8 -3
- package/dist/cjs/arch/evm/SpokeUtils.js +26 -11
- package/dist/cjs/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/SpokeUtils.d.ts +8 -2
- package/dist/cjs/arch/svm/SpokeUtils.js +41 -50
- 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 +3 -3
- package/dist/cjs/arch/svm/utils.js +16 -14
- package/dist/cjs/arch/svm/utils.js.map +1 -1
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +4 -2
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.d.ts +4 -4
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +59 -59
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js +16 -13
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js +3 -2
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js +5 -1
- package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js +3 -3
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +71 -71
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +13 -8
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/cjs/clients/HubPoolClient.d.ts +21 -21
- package/dist/cjs/clients/HubPoolClient.js +85 -58
- package/dist/cjs/clients/HubPoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js +2 -2
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SVMSpokePoolClient.js +1 -3
- package/dist/cjs/clients/SpokePoolClient/SVMSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +66 -46
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/index.d.ts +1 -0
- package/dist/cjs/clients/SpokePoolClient/index.js +3 -1
- package/dist/cjs/clients/SpokePoolClient/index.js.map +1 -1
- package/dist/cjs/clients/index.d.ts +1 -1
- package/dist/cjs/clients/index.js +2 -1
- package/dist/cjs/clients/index.js.map +1 -1
- package/dist/cjs/clients/mocks/MockHubPoolClient.d.ts +9 -9
- package/dist/cjs/clients/mocks/MockHubPoolClient.js +15 -9
- package/dist/cjs/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +5 -3
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js +40 -36
- package/dist/cjs/clients/mocks/MockSpokePoolClient.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/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js +2 -2
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
- package/dist/cjs/interfaces/HubPool.d.ts +19 -14
- package/dist/cjs/interfaces/SpokePool.d.ts +18 -19
- package/dist/cjs/interfaces/SpokePool.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.d.ts +17 -9
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js +24 -15
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/factory.d.ts +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/factory.js +8 -5
- package/dist/cjs/relayFeeCalculator/chain-queries/factory.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.d.ts +13 -5
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js +61 -58
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.d.ts +15 -7
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js +13 -13
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/cjs/utils/AddressUtils.d.ts +12 -8
- package/dist/cjs/utils/AddressUtils.js +33 -36
- package/dist/cjs/utils/AddressUtils.js.map +1 -1
- package/dist/cjs/utils/DepositUtils.d.ts +2 -2
- package/dist/cjs/utils/DepositUtils.js +1 -1
- package/dist/cjs/utils/DepositUtils.js.map +1 -1
- package/dist/cjs/utils/SpokeUtils.d.ts +1 -3
- package/dist/cjs/utils/SpokeUtils.js +3 -25
- package/dist/cjs/utils/SpokeUtils.js.map +1 -1
- package/dist/cjs/utils/TokenUtils.d.ts +4 -4
- 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 +9 -4
- package/dist/esm/arch/evm/SpokeUtils.js +29 -14
- package/dist/esm/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/SpokeUtils.d.ts +9 -3
- package/dist/esm/arch/svm/SpokeUtils.js +42 -55
- 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 +3 -3
- package/dist/esm/arch/svm/utils.js +17 -15
- package/dist/esm/arch/svm/utils.js.map +1 -1
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +4 -2
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.d.ts +4 -4
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js +60 -60
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +18 -15
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +7 -7
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js +5 -1
- package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js +4 -4
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +71 -71
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +20 -10
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/esm/clients/HubPoolClient.d.ts +22 -22
- package/dist/esm/clients/HubPoolClient.js +93 -66
- package/dist/esm/clients/HubPoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js +3 -3
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SVMSpokePoolClient.js +2 -4
- package/dist/esm/clients/SpokePoolClient/SVMSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +69 -48
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/index.d.ts +1 -0
- package/dist/esm/clients/SpokePoolClient/index.js +1 -0
- package/dist/esm/clients/SpokePoolClient/index.js.map +1 -1
- package/dist/esm/clients/index.d.ts +1 -1
- package/dist/esm/clients/index.js +1 -1
- package/dist/esm/clients/index.js.map +1 -1
- package/dist/esm/clients/mocks/MockHubPoolClient.d.ts +9 -9
- package/dist/esm/clients/mocks/MockHubPoolClient.js +16 -10
- package/dist/esm/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +5 -3
- package/dist/esm/clients/mocks/MockSpokePoolClient.js +42 -38
- package/dist/esm/clients/mocks/MockSpokePoolClient.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/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js +3 -3
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
- package/dist/esm/interfaces/HubPool.d.ts +19 -14
- package/dist/esm/interfaces/SpokePool.d.ts +18 -19
- package/dist/esm/interfaces/SpokePool.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.d.ts +20 -12
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js +28 -19
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/factory.d.ts +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/factory.js +9 -6
- package/dist/esm/relayFeeCalculator/chain-queries/factory.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.d.ts +15 -7
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js +67 -63
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.d.ts +25 -8
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js +12 -12
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/esm/utils/AddressUtils.d.ts +12 -8
- package/dist/esm/utils/AddressUtils.js +36 -38
- package/dist/esm/utils/AddressUtils.js.map +1 -1
- package/dist/esm/utils/DepositUtils.d.ts +2 -2
- package/dist/esm/utils/DepositUtils.js +2 -2
- package/dist/esm/utils/DepositUtils.js.map +1 -1
- package/dist/esm/utils/SpokeUtils.d.ts +1 -8
- package/dist/esm/utils/SpokeUtils.js +3 -29
- package/dist/esm/utils/SpokeUtils.js.map +1 -1
- package/dist/esm/utils/TokenUtils.d.ts +6 -18
- 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 +9 -4
- package/dist/types/arch/evm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/SpokeUtils.d.ts +9 -3
- 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 +3 -3
- package/dist/types/arch/svm/utils.d.ts.map +1 -1
- package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
- package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts +4 -4
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts +2 -1
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/MerkleTreeUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +71 -71
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
- package/dist/types/clients/HubPoolClient.d.ts +22 -22
- package/dist/types/clients/HubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/EVMSpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/SVMSpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/index.d.ts +1 -0
- package/dist/types/clients/SpokePoolClient/index.d.ts.map +1 -1
- package/dist/types/clients/index.d.ts +1 -1
- package/dist/types/clients/index.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockHubPoolClient.d.ts +9 -9
- package/dist/types/clients/mocks/MockHubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +5 -3
- package/dist/types/clients/mocks/MockSpokePoolClient.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/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
- package/dist/types/clients/mocks/MockSvmSpokePoolClient.d.ts.map +1 -1
- package/dist/types/interfaces/HubPool.d.ts +19 -14
- package/dist/types/interfaces/HubPool.d.ts.map +1 -1
- package/dist/types/interfaces/SpokePool.d.ts +18 -19
- package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts +20 -12
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/factory.d.ts +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/factory.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts +15 -7
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts +25 -8
- package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts.map +1 -1
- package/dist/types/utils/AddressUtils.d.ts +12 -8
- package/dist/types/utils/AddressUtils.d.ts.map +1 -1
- package/dist/types/utils/DepositUtils.d.ts +2 -2
- package/dist/types/utils/DepositUtils.d.ts.map +1 -1
- package/dist/types/utils/SpokeUtils.d.ts +1 -8
- package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
- package/dist/types/utils/TokenUtils.d.ts +6 -18
- package/dist/types/utils/TokenUtils.d.ts.map +1 -1
- package/package.json +1 -2
- package/src/arch/evm/SpokeUtils.ts +72 -22
- package/src/arch/svm/SpokeUtils.ts +67 -53
- package/src/arch/svm/eventsClient.ts +40 -8
- package/src/arch/svm/utils.ts +6 -6
- package/src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts +7 -4
- package/src/clients/BundleDataClient/BundleDataClient.ts +56 -56
- package/src/clients/BundleDataClient/utils/DataworkerUtils.ts +32 -15
- package/src/clients/BundleDataClient/utils/FillUtils.ts +12 -8
- package/src/clients/BundleDataClient/utils/MerkleTreeUtils.ts +7 -1
- package/src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts +4 -4
- package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +22 -10
- package/src/clients/HubPoolClient.ts +125 -86
- package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts +7 -2
- package/src/clients/SpokePoolClient/SVMSpokePoolClient.ts +1 -4
- package/src/clients/SpokePoolClient/SpokePoolClient.ts +122 -37
- package/src/clients/SpokePoolClient/index.ts +1 -0
- package/src/clients/index.ts +1 -0
- package/src/clients/mocks/MockHubPoolClient.ts +24 -19
- package/src/clients/mocks/MockSpokePoolClient.ts +39 -27
- package/src/clients/mocks/MockSvmCpiEventsClient.ts +8 -5
- package/src/clients/mocks/MockSvmSpokePoolClient.ts +12 -3
- package/src/interfaces/HubPool.ts +20 -14
- package/src/interfaces/SpokePool.ts +19 -19
- package/src/relayFeeCalculator/chain-queries/baseQuery.ts +39 -21
- package/src/relayFeeCalculator/chain-queries/factory.ts +8 -5
- package/src/relayFeeCalculator/chain-queries/svmQuery.ts +73 -58
- package/src/relayFeeCalculator/relayFeeCalculator.ts +23 -21
- package/src/utils/AddressUtils.ts +39 -51
- package/src/utils/DepositUtils.ts +4 -4
- package/src/utils/SpokeUtils.ts +8 -36
- package/src/utils/TokenUtils.ts +10 -8
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { __awaiter, __extends, __generator } from "tslib";
|
|
2
|
-
import { randomAddress, assign, bnZero } from "../../utils";
|
|
2
|
+
import { randomAddress, assign, bnZero, toAddressType, EvmAddress, isDefined } from "../../utils";
|
|
3
3
|
import { HubPoolClient } from "../HubPoolClient";
|
|
4
4
|
import { getEventManager } from "./MockEvents";
|
|
5
|
+
import { ZERO_ADDRESS } from "../../constants";
|
|
5
6
|
var emptyRootBundle = {
|
|
6
7
|
poolRebalanceRoot: "",
|
|
7
8
|
relayerRefundRoot: "",
|
|
8
9
|
slowRelayRoot: "",
|
|
9
|
-
proposer:
|
|
10
|
+
proposer: EvmAddress.from(ZERO_ADDRESS),
|
|
10
11
|
unclaimedPoolRebalanceLeafCount: 0,
|
|
11
12
|
challengePeriodEndTimestamp: 0,
|
|
12
13
|
bundleEvaluationBlockNumbers: [],
|
|
@@ -83,7 +84,7 @@ var MockHubPoolClient = /** @class */ (function (_super) {
|
|
|
83
84
|
if (blockNumber === void 0) { blockNumber = 0; }
|
|
84
85
|
assign(this.crossChainContracts, [chainId], [
|
|
85
86
|
{
|
|
86
|
-
spokePool: contract,
|
|
87
|
+
spokePool: toAddressType(contract, this.chainId),
|
|
87
88
|
blockNumber: blockNumber,
|
|
88
89
|
transactionIndex: 0,
|
|
89
90
|
logIndex: 0,
|
|
@@ -103,11 +104,11 @@ var MockHubPoolClient = /** @class */ (function (_super) {
|
|
|
103
104
|
var _a;
|
|
104
105
|
var _b;
|
|
105
106
|
(_a = (_b = this.spokePoolTokens)[l1Token]) !== null && _a !== void 0 ? _a : (_b[l1Token] = {});
|
|
106
|
-
this.spokePoolTokens[l1Token][chainId] = l2Token;
|
|
107
|
+
this.spokePoolTokens[l1Token][chainId] = toAddressType(l2Token, chainId);
|
|
107
108
|
};
|
|
108
109
|
MockHubPoolClient.prototype.l2TokenEnabledForL1TokenAtBlock = function (l1Token, destinationChainId, hubBlockNumber) {
|
|
109
110
|
var _a;
|
|
110
|
-
if ((_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
|
|
111
|
+
if ((_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[destinationChainId]) {
|
|
111
112
|
return true;
|
|
112
113
|
}
|
|
113
114
|
else {
|
|
@@ -116,7 +117,7 @@ var MockHubPoolClient = /** @class */ (function (_super) {
|
|
|
116
117
|
};
|
|
117
118
|
MockHubPoolClient.prototype.l2TokenHasPoolRebalanceRoute = function (l2Token, chainId, hubPoolBlock) {
|
|
118
119
|
var _this = this;
|
|
119
|
-
var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return ((_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === l2Token; });
|
|
120
|
+
var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a, _b; return (_b = (_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId]) === null || _b === void 0 ? void 0 : _b.eq(l2Token); });
|
|
120
121
|
if (!l1Token) {
|
|
121
122
|
return _super.prototype.l2TokenHasPoolRebalanceRoute.call(this, l2Token, chainId, hubPoolBlock);
|
|
122
123
|
}
|
|
@@ -129,16 +130,21 @@ var MockHubPoolClient = /** @class */ (function (_super) {
|
|
|
129
130
|
};
|
|
130
131
|
MockHubPoolClient.prototype.getL1TokenForL2TokenAtBlock = function (l2Token, chainId, blockNumber) {
|
|
131
132
|
var _this = this;
|
|
132
|
-
var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return (
|
|
133
|
-
|
|
133
|
+
var l1Token = Object.keys(this.spokePoolTokens).find(function (l1Token) { var _a; return (_a = _this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId].eq(l2Token); });
|
|
134
|
+
if (isDefined(l1Token)) {
|
|
135
|
+
return EvmAddress.from(l1Token);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
return _super.prototype.getL1TokenForL2TokenAtBlock.call(this, l2Token, chainId, blockNumber);
|
|
139
|
+
}
|
|
134
140
|
};
|
|
135
141
|
MockHubPoolClient.prototype.getL2TokenForL1TokenAtBlock = function (l1Token, chainId, blockNumber) {
|
|
136
142
|
var _a;
|
|
137
|
-
var l2Token = (_a = this.spokePoolTokens[l1Token]) === null || _a === void 0 ? void 0 : _a[chainId];
|
|
143
|
+
var l2Token = (_a = this.spokePoolTokens[l1Token.toEvmAddress()]) === null || _a === void 0 ? void 0 : _a[chainId];
|
|
138
144
|
return l2Token !== null && l2Token !== void 0 ? l2Token : _super.prototype.getL2TokenForL1TokenAtBlock.call(this, l1Token, chainId, blockNumber);
|
|
139
145
|
};
|
|
140
146
|
MockHubPoolClient.prototype.getTokenInfoForL1Token = function (l1Token) {
|
|
141
|
-
return this.l1TokensMock.find(function (token) { return token.address
|
|
147
|
+
return this.l1TokensMock.find(function (token) { return token.address.eq(l1Token); });
|
|
142
148
|
};
|
|
143
149
|
MockHubPoolClient.prototype._update = function (eventNames) {
|
|
144
150
|
// Generate new "on chain" responses.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockHubPoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockHubPoolClient.ts"],"names":[],"mappings":";AAEA,OAAO,EAAa,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"MockHubPoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockHubPoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Contract } from "ethers";
|
|
2
2
|
import winston from "winston";
|
|
3
3
|
import { Log, Deposit, DepositWithBlock, RelayerRefundExecution, SlowFillRequest, SortableEvent, Fill, SlowFillLeaf, SpeedUp, TokensBridged } from "../../interfaces";
|
|
4
|
-
import { BigNumber } from "../../utils";
|
|
4
|
+
import { BigNumber, Address } from "../../utils";
|
|
5
5
|
import { EVMSpokePoolClient, SpokePoolUpdate } from "../SpokePoolClient";
|
|
6
6
|
import { HubPoolClient } from "../HubPoolClient";
|
|
7
7
|
import { EventManager, EventOverrides } from "./MockEvents";
|
|
@@ -16,14 +16,16 @@ export declare class MockSpokePoolClient extends EVMSpokePoolClient {
|
|
|
16
16
|
});
|
|
17
17
|
setConfigStoreClient(configStore?: AcrossConfigStoreClient): void;
|
|
18
18
|
setDestinationTokenForChain(chainId: number, token: string): void;
|
|
19
|
-
getDestinationTokenForDeposit(deposit: DepositWithBlock):
|
|
19
|
+
getDestinationTokenForDeposit(deposit: DepositWithBlock): Address;
|
|
20
20
|
setLatestBlockNumber(blockNumber: number): void;
|
|
21
21
|
setDepositIds(_depositIds: BigNumber[]): void;
|
|
22
22
|
_getDepositIdAtBlock(blockTag: number): Promise<BigNumber>;
|
|
23
23
|
_update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
|
|
24
24
|
readonly eventSignatures: Record<string, string>;
|
|
25
25
|
deposit(deposit: Omit<Deposit, "messageHash"> & Partial<SortableEvent>): Log;
|
|
26
|
-
protected _deposit(event: string, deposit: Omit<Deposit, "messageHash"> &
|
|
26
|
+
protected _deposit(event: string, deposit: Omit<Deposit, "messageHash"> & {
|
|
27
|
+
message?: string;
|
|
28
|
+
} & Partial<SortableEvent>): Log;
|
|
27
29
|
fillRelay(fill: Omit<Fill, "messageHash"> & {
|
|
28
30
|
message?: string;
|
|
29
31
|
} & Partial<SortableEvent>): Log;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { __assign, __extends } from "tslib";
|
|
2
2
|
import assert from "assert";
|
|
3
3
|
import { random } from "lodash";
|
|
4
|
-
import { EMPTY_MESSAGE, ZERO_ADDRESS } from "../../constants";
|
|
4
|
+
import { EMPTY_MESSAGE, ZERO_ADDRESS, ZERO_BYTES } from "../../constants";
|
|
5
5
|
import { FillType, } from "../../interfaces";
|
|
6
|
-
import { toBN, toBNWei, getCurrentTime, getMessageHash, randomAddress, BigNumber, bnZero, bnOne, toBytes32, spreadEventWithBlockNumber, } from "../../utils";
|
|
6
|
+
import { toBN, toBNWei, getCurrentTime, getMessageHash, randomAddress, BigNumber, bnZero, bnOne, toBytes32, spreadEventWithBlockNumber, toAddressType, isDefined, } from "../../utils";
|
|
7
7
|
import { EVMSpokePoolClient } from "../SpokePoolClient";
|
|
8
8
|
import { getEventManager } from "./MockEvents";
|
|
9
9
|
// This class replaces internal SpokePoolClient functionality, enabling
|
|
@@ -32,8 +32,10 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
32
32
|
this.destinationTokenForChainOverride[chainId] = token;
|
|
33
33
|
};
|
|
34
34
|
MockSpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
|
|
35
|
-
var
|
|
36
|
-
return (
|
|
35
|
+
var override = this.destinationTokenForChainOverride[deposit.originChainId];
|
|
36
|
+
return isDefined(override)
|
|
37
|
+
? toAddressType(override, deposit.destinationChainId)
|
|
38
|
+
: _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
|
|
37
39
|
};
|
|
38
40
|
MockSpokePoolClient.prototype.setLatestBlockNumber = function (blockNumber) {
|
|
39
41
|
this.latestHeightSearched = blockNumber;
|
|
@@ -86,25 +88,25 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
86
88
|
return this._deposit("FundsDeposited", deposit);
|
|
87
89
|
};
|
|
88
90
|
MockSpokePoolClient.prototype._deposit = function (event, deposit) {
|
|
89
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
91
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
90
92
|
var blockNumber = deposit.blockNumber, txnIndex = deposit.txnIndex;
|
|
91
93
|
var depositId = deposit.depositId, destinationChainId = deposit.destinationChainId, inputAmount = deposit.inputAmount, outputAmount = deposit.outputAmount;
|
|
92
94
|
depositId !== null && depositId !== void 0 ? depositId : (depositId = this.numberOfDeposits);
|
|
93
95
|
this.numberOfDeposits = depositId.add(bnOne);
|
|
94
96
|
destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = random(1, 42161, false));
|
|
95
|
-
var depositor =
|
|
96
|
-
var recipient =
|
|
97
|
-
var inputToken =
|
|
98
|
-
var outputToken =
|
|
99
|
-
var exclusiveRelayer =
|
|
97
|
+
var depositor = (_b = (_a = deposit.depositor) === null || _a === void 0 ? void 0 : _a.toBytes32()) !== null && _b !== void 0 ? _b : toBytes32(randomAddress());
|
|
98
|
+
var recipient = (_d = (_c = deposit.recipient) === null || _c === void 0 ? void 0 : _c.toBytes32()) !== null && _d !== void 0 ? _d : toBytes32(depositor);
|
|
99
|
+
var inputToken = (_f = (_e = deposit.inputToken) === null || _e === void 0 ? void 0 : _e.toBytes32()) !== null && _f !== void 0 ? _f : toBytes32(randomAddress());
|
|
100
|
+
var outputToken = (_h = (_g = deposit.outputToken) === null || _g === void 0 ? void 0 : _g.toBytes32()) !== null && _h !== void 0 ? _h : inputToken;
|
|
101
|
+
var exclusiveRelayer = (_k = (_j = deposit.exclusiveRelayer) === null || _j === void 0 ? void 0 : _j.toBytes32()) !== null && _k !== void 0 ? _k : toBytes32(ZERO_ADDRESS);
|
|
100
102
|
inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = toBNWei(random(1, 1000, false)));
|
|
101
103
|
outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount.mul(toBN("0.95")));
|
|
102
|
-
var message = (
|
|
104
|
+
var message = (_l = deposit.message) !== null && _l !== void 0 ? _l : "0x";
|
|
103
105
|
var topics = [destinationChainId, depositId, depositor];
|
|
104
|
-
var quoteTimestamp = (
|
|
106
|
+
var quoteTimestamp = (_m = deposit.quoteTimestamp) !== null && _m !== void 0 ? _m : getCurrentTime();
|
|
105
107
|
var args = {
|
|
106
108
|
depositId: depositId,
|
|
107
|
-
originChainId: (
|
|
109
|
+
originChainId: (_o = deposit.originChainId) !== null && _o !== void 0 ? _o : this.chainId,
|
|
108
110
|
destinationChainId: destinationChainId,
|
|
109
111
|
depositor: depositor,
|
|
110
112
|
recipient: recipient,
|
|
@@ -113,9 +115,9 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
113
115
|
outputToken: outputToken,
|
|
114
116
|
outputAmount: outputAmount,
|
|
115
117
|
quoteTimestamp: quoteTimestamp,
|
|
116
|
-
fillDeadline: (
|
|
118
|
+
fillDeadline: (_p = deposit.fillDeadline) !== null && _p !== void 0 ? _p : quoteTimestamp + 3600,
|
|
117
119
|
exclusiveRelayer: exclusiveRelayer,
|
|
118
|
-
exclusivityDeadline: (
|
|
120
|
+
exclusivityDeadline: (_q = deposit.exclusivityDeadline) !== null && _q !== void 0 ? _q : quoteTimestamp + 600,
|
|
119
121
|
message: message,
|
|
120
122
|
};
|
|
121
123
|
return this.eventManager.generateEvent({
|
|
@@ -131,7 +133,7 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
131
133
|
return this._fillRelay("FilledRelay", fill);
|
|
132
134
|
};
|
|
133
135
|
MockSpokePoolClient.prototype._fillRelay = function (event, fill) {
|
|
134
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
|
|
136
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
|
|
135
137
|
var blockNumber = fill.blockNumber, txnIndex = fill.txnIndex;
|
|
136
138
|
var originChainId = fill.originChainId, depositId = fill.depositId, inputAmount = fill.inputAmount, outputAmount = fill.outputAmount, fillDeadline = fill.fillDeadline;
|
|
137
139
|
originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = random(1, 42161, false));
|
|
@@ -139,38 +141,39 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
139
141
|
inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = toBNWei(random(1, 1000, false)));
|
|
140
142
|
outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = inputAmount);
|
|
141
143
|
fillDeadline !== null && fillDeadline !== void 0 ? fillDeadline : (fillDeadline = getCurrentTime() + 60);
|
|
142
|
-
var depositor =
|
|
143
|
-
var recipient =
|
|
144
|
-
var inputToken =
|
|
145
|
-
var outputToken =
|
|
146
|
-
var exclusiveRelayer =
|
|
147
|
-
var relayer =
|
|
144
|
+
var depositor = (_b = (_a = fill.depositor) === null || _a === void 0 ? void 0 : _a.toBytes32()) !== null && _b !== void 0 ? _b : toBytes32(randomAddress());
|
|
145
|
+
var recipient = (_d = (_c = fill.recipient) === null || _c === void 0 ? void 0 : _c.toBytes32()) !== null && _d !== void 0 ? _d : toBytes32(depositor);
|
|
146
|
+
var inputToken = (_f = (_e = fill.inputToken) === null || _e === void 0 ? void 0 : _e.toBytes32()) !== null && _f !== void 0 ? _f : toBytes32(randomAddress());
|
|
147
|
+
var outputToken = (_h = (_g = fill.outputToken) === null || _g === void 0 ? void 0 : _g.toBytes32()) !== null && _h !== void 0 ? _h : toBytes32(ZERO_ADDRESS);
|
|
148
|
+
var exclusiveRelayer = (_k = (_j = fill.exclusiveRelayer) === null || _j === void 0 ? void 0 : _j.toBytes32()) !== null && _k !== void 0 ? _k : toBytes32(ZERO_ADDRESS);
|
|
149
|
+
var relayer = (_m = (_l = fill.relayer) === null || _l === void 0 ? void 0 : _l.toBytes32()) !== null && _m !== void 0 ? _m : toBytes32(randomAddress());
|
|
148
150
|
var topics = [originChainId, depositId, relayer];
|
|
149
|
-
var message = (
|
|
150
|
-
var updatedMessage = (
|
|
151
|
+
var message = (_o = fill.message) !== null && _o !== void 0 ? _o : EMPTY_MESSAGE;
|
|
152
|
+
var updatedMessage = (_q = (_p = fill.relayExecutionInfo) === null || _p === void 0 ? void 0 : _p.updatedMessage) !== null && _q !== void 0 ? _q : message;
|
|
153
|
+
var updatedRecipient = (_s = (_r = fill.relayExecutionInfo) === null || _r === void 0 ? void 0 : _r.updatedRecipient.toBytes32()) !== null && _s !== void 0 ? _s : recipient;
|
|
151
154
|
var relayExecutionInfo = {
|
|
152
|
-
updatedRecipient:
|
|
153
|
-
updatedOutputAmount: (
|
|
154
|
-
fillType: (
|
|
155
|
+
updatedRecipient: updatedRecipient,
|
|
156
|
+
updatedOutputAmount: (_u = (_t = fill.relayExecutionInfo) === null || _t === void 0 ? void 0 : _t.updatedOutputAmount) !== null && _u !== void 0 ? _u : outputAmount,
|
|
157
|
+
fillType: (_w = (_v = fill.relayExecutionInfo) === null || _v === void 0 ? void 0 : _v.fillType) !== null && _w !== void 0 ? _w : FillType.FastFill,
|
|
155
158
|
};
|
|
156
159
|
var _args = {
|
|
157
160
|
inputToken: inputToken,
|
|
158
161
|
outputToken: outputToken,
|
|
159
162
|
inputAmount: fill.inputAmount,
|
|
160
163
|
outputAmount: fill.outputAmount,
|
|
161
|
-
repaymentChainId: (
|
|
164
|
+
repaymentChainId: (_x = fill.repaymentChainId) !== null && _x !== void 0 ? _x : this.chainId,
|
|
162
165
|
originChainId: originChainId,
|
|
163
166
|
depositId: depositId,
|
|
164
167
|
fillDeadline: fillDeadline,
|
|
165
|
-
exclusivityDeadline: (
|
|
168
|
+
exclusivityDeadline: (_y = fill.exclusivityDeadline) !== null && _y !== void 0 ? _y : fillDeadline,
|
|
166
169
|
exclusiveRelayer: exclusiveRelayer,
|
|
167
170
|
relayer: relayer,
|
|
168
171
|
depositor: depositor,
|
|
169
172
|
recipient: recipient,
|
|
170
173
|
relayExecutionInfo: {
|
|
171
|
-
updatedRecipient:
|
|
172
|
-
updatedOutputAmount: (
|
|
173
|
-
fillType: (
|
|
174
|
+
updatedRecipient: updatedRecipient,
|
|
175
|
+
updatedOutputAmount: (_0 = (_z = fill.relayExecutionInfo) === null || _z === void 0 ? void 0 : _z.updatedOutputAmount) !== null && _0 !== void 0 ? _0 : outputAmount,
|
|
176
|
+
fillType: (_2 = (_1 = fill.relayExecutionInfo) === null || _1 === void 0 ? void 0 : _1.fillType) !== null && _2 !== void 0 ? _2 : FillType.FastFill,
|
|
174
177
|
},
|
|
175
178
|
};
|
|
176
179
|
var args = __assign(__assign({}, _args), { messageHash: getMessageHash(message), relayExecutionInfo: __assign(__assign({}, relayExecutionInfo), { updatedMessageHash: getMessageHash(updatedMessage) }) });
|
|
@@ -187,14 +190,14 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
187
190
|
return this._speedUpDeposit("RequestedSpeedUpDeposit", speedUp);
|
|
188
191
|
};
|
|
189
192
|
MockSpokePoolClient.prototype._speedUpDeposit = function (event, speedUp) {
|
|
190
|
-
var depositor =
|
|
193
|
+
var depositor = speedUp.depositor.toBytes32();
|
|
191
194
|
var topics = [speedUp.depositId, depositor];
|
|
192
195
|
var args = __assign({}, speedUp);
|
|
193
196
|
return this.eventManager.generateEvent({
|
|
194
197
|
event: event,
|
|
195
198
|
address: this.spokePool.address,
|
|
196
199
|
topics: topics.map(function (topic) { return topic.toString(); }),
|
|
197
|
-
args: __assign(__assign({}, args), { depositor: depositor, updatedRecipient:
|
|
200
|
+
args: __assign(__assign({}, args), { depositor: depositor, updatedRecipient: speedUp.updatedRecipient.toBytes32() }),
|
|
198
201
|
});
|
|
199
202
|
};
|
|
200
203
|
MockSpokePoolClient.prototype.setTokensBridged = function (tokensBridged) {
|
|
@@ -212,16 +215,16 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
212
215
|
return this._requestSlowFill("RequestedSlowFill", request);
|
|
213
216
|
};
|
|
214
217
|
MockSpokePoolClient.prototype._requestSlowFill = function (event, request) {
|
|
215
|
-
var _a, _b, _c, _d, _e;
|
|
218
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
216
219
|
var originChainId = request.originChainId, depositId = request.depositId;
|
|
217
220
|
var topics = [originChainId, depositId];
|
|
218
221
|
var args = __assign({}, request);
|
|
219
|
-
var depositor =
|
|
222
|
+
var depositor = (_a = args.depositor.toBytes32()) !== null && _a !== void 0 ? _a : toBytes32(randomAddress());
|
|
220
223
|
return this.eventManager.generateEvent({
|
|
221
224
|
event: event,
|
|
222
225
|
address: this.spokePool.address,
|
|
223
226
|
topics: topics.map(function (topic) { return topic.toString(); }),
|
|
224
|
-
args: __assign(__assign({}, args), { destinationChainId: this.chainId, depositor: depositor, recipient:
|
|
227
|
+
args: __assign(__assign({}, args), { destinationChainId: this.chainId, depositor: depositor, recipient: (_c = (_b = args.recipient) === null || _b === void 0 ? void 0 : _b.toBytes32()) !== null && _c !== void 0 ? _c : depositor, inputToken: (_e = (_d = args.inputToken) === null || _d === void 0 ? void 0 : _d.toBytes32()) !== null && _e !== void 0 ? _e : toBytes32(randomAddress()), outputToken: (_g = (_f = args.outputToken) === null || _f === void 0 ? void 0 : _f.toBytes32()) !== null && _g !== void 0 ? _g : toBytes32(ZERO_ADDRESS), exclusiveRelayer: (_j = (_h = args.exclusiveRelayer) === null || _h === void 0 ? void 0 : _h.toBytes32()) !== null && _j !== void 0 ? _j : toBytes32(ZERO_ADDRESS), messageHash: (_k = args.messageHash) !== null && _k !== void 0 ? _k : ZERO_BYTES }),
|
|
225
228
|
blockNumber: request.blockNumber,
|
|
226
229
|
transactionIndex: request.txnIndex,
|
|
227
230
|
});
|
|
@@ -229,7 +232,8 @@ var MockSpokePoolClient = /** @class */ (function (_super) {
|
|
|
229
232
|
// This is a simple wrapper around fillRelay().
|
|
230
233
|
// rootBundleId and proof are discarded here - we have no interest in verifying that.
|
|
231
234
|
MockSpokePoolClient.prototype.executeSlowRelayLeaf = function (leaf) {
|
|
232
|
-
var
|
|
235
|
+
var destinationChainId = this.chainId;
|
|
236
|
+
var fill = __assign(__assign({}, leaf.relayData), { destinationChainId: destinationChainId, relayer: toAddressType(ZERO_ADDRESS, destinationChainId), repaymentChainId: 0, relayExecutionInfo: {
|
|
233
237
|
updatedRecipient: leaf.relayData.recipient,
|
|
234
238
|
updatedOutputAmount: leaf.updatedOutputAmount,
|
|
235
239
|
updatedMessage: leaf.relayData.message,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MockSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSpokePoolClient.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;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { __assign, __extends } from "tslib";
|
|
2
2
|
import assert from "assert";
|
|
3
|
+
import { utils as ethersUtils } from "ethers";
|
|
3
4
|
import { createHash } from "crypto";
|
|
4
5
|
import { hexlify, arrayify, hexZeroPad } from "ethers/lib/utils";
|
|
5
6
|
import { random } from "lodash";
|
|
@@ -8,8 +9,9 @@ import { SvmSpokeClient } from "@across-protocol/contracts";
|
|
|
8
9
|
import { CHAIN_IDs } from "@across-protocol/constants";
|
|
9
10
|
import { MockSolanaRpcFactory } from "../../providers/mocks";
|
|
10
11
|
import { SVM_DEFAULT_ADDRESS, SvmCpiEventsClient, SVMEventNames, getRandomSvmAddress, } from "../../arch/svm";
|
|
11
|
-
import { bnZero, bnOne, bs58, getCurrentTime, randomAddress, EvmAddress } from "../../utils";
|
|
12
|
+
import { bnZero, bnOne, bs58, getCurrentTime, randomAddress, EvmAddress, SvmAddress } from "../../utils";
|
|
12
13
|
import { FillType } from "../../interfaces";
|
|
14
|
+
var randomBytes = function (n) { return ethersUtils.hexlify(ethersUtils.randomBytes(n)); };
|
|
13
15
|
var MockSvmCpiEventsClient = /** @class */ (function (_super) {
|
|
14
16
|
__extends(MockSvmCpiEventsClient, _super);
|
|
15
17
|
function MockSvmCpiEventsClient(programId, chainId) {
|
|
@@ -62,9 +64,9 @@ var MockSvmCpiEventsClient = /** @class */ (function (_super) {
|
|
|
62
64
|
this.numberOfDeposits = this.numberOfDeposits.add(bnOne);
|
|
63
65
|
destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = BigInt(random(1, 42161, false)));
|
|
64
66
|
var depositor = (_a = deposit.depositor) !== null && _a !== void 0 ? _a : getRandomSvmAddress();
|
|
65
|
-
var recipient = (_b = deposit.recipient) !== null && _b !== void 0 ? _b :
|
|
67
|
+
var recipient = (_b = deposit.recipient) !== null && _b !== void 0 ? _b : SvmAddress.from(randomBytes(32), "base16").toBase58();
|
|
66
68
|
var inputToken = (_c = deposit.inputToken) !== null && _c !== void 0 ? _c : getRandomSvmAddress();
|
|
67
|
-
var outputToken = (_d = deposit.outputToken) !== null && _d !== void 0 ? _d :
|
|
69
|
+
var outputToken = (_d = deposit.outputToken) !== null && _d !== void 0 ? _d : SvmAddress.from(randomBytes(32), "base16").toBase58();
|
|
68
70
|
inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = BigInt(random(1, 1000, false)));
|
|
69
71
|
outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = (inputAmount * BigInt(95)) / BigInt(100));
|
|
70
72
|
var message = (_e = deposit.message) !== null && _e !== void 0 ? _e : new Uint8Array(32);
|
|
@@ -139,9 +141,9 @@ var MockSvmCpiEventsClient = /** @class */ (function (_super) {
|
|
|
139
141
|
var depositId = slowFillRequest.depositId, originChainId = slowFillRequest.originChainId;
|
|
140
142
|
depositId !== null && depositId !== void 0 ? depositId : (depositId = Uint8Array.from([random(1, 100000, false)]));
|
|
141
143
|
originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = BigInt(random(1, 42161, false)));
|
|
142
|
-
var depositor = (_a = slowFillRequest.depositor) !== null && _a !== void 0 ? _a :
|
|
144
|
+
var depositor = (_a = slowFillRequest.depositor) !== null && _a !== void 0 ? _a : SvmAddress.from(randomBytes(32)).toBase58();
|
|
143
145
|
var recipient = (_b = slowFillRequest.recipient) !== null && _b !== void 0 ? _b : getRandomSvmAddress();
|
|
144
|
-
var inputToken = (_c = slowFillRequest.inputToken) !== null && _c !== void 0 ? _c :
|
|
146
|
+
var inputToken = (_c = slowFillRequest.inputToken) !== null && _c !== void 0 ? _c : SvmAddress.from(randomBytes(32)).toBase58();
|
|
145
147
|
var outputToken = (_d = slowFillRequest.outputToken) !== null && _d !== void 0 ? _d : getRandomSvmAddress();
|
|
146
148
|
var args = __assign(__assign({}, slowFillRequest), { depositId: depositId, originChainId: originChainId, depositor: depositor, recipient: recipient, inputToken: inputToken, outputToken: outputToken, inputAmount: (_e = slowFillRequest.inputAmount) !== null && _e !== void 0 ? _e : BigInt(random(1, 1000, false)), outputAmount: (_g = (_f = slowFillRequest.outputAmount) !== null && _f !== void 0 ? _f : slowFillRequest.inputAmount) !== null && _g !== void 0 ? _g : BigInt(random(1, 1000, false)), exclusiveRelayer: (_h = slowFillRequest.exclusiveRelayer) !== null && _h !== void 0 ? _h : SVM_DEFAULT_ADDRESS });
|
|
147
149
|
return this.generateEvent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockSvmCpiEventsClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmCpiEventsClient.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAA0B,SAAS,EAAE,MAAM,aAAa,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EACL,mBAAmB,EAGnB,kBAAkB,EAClB,aAAa,EAEb,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"MockSvmCpiEventsClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmCpiEventsClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import winston from "winston";
|
|
|
2
2
|
import { SvmSpokeClient } from "@across-protocol/contracts";
|
|
3
3
|
import { Address } from "@solana/kit";
|
|
4
4
|
import { DepositWithBlock, RelayerRefundExecution, SortableEvent, SlowFillLeaf, Log } from "../../interfaces";
|
|
5
|
-
import { MakeOptional, EventSearchConfig } from "../../utils";
|
|
5
|
+
import { MakeOptional, EventSearchConfig, Address as SDKAddress } from "../../utils";
|
|
6
6
|
import { SpokePoolUpdate, SVMSpokePoolClient } from "../SpokePoolClient";
|
|
7
7
|
import { HubPoolClient } from "../HubPoolClient";
|
|
8
8
|
import { EventOverrides } from "./MockEvents";
|
|
@@ -17,7 +17,7 @@ export declare class MockSvmSpokePoolClient extends SVMSpokePoolClient {
|
|
|
17
17
|
});
|
|
18
18
|
setConfigStoreClient(configStore?: AcrossConfigStoreClient): void;
|
|
19
19
|
setDestinationTokenForChain(chainId: number, token: string): void;
|
|
20
|
-
getDestinationTokenForDeposit(deposit: DepositWithBlock):
|
|
20
|
+
getDestinationTokenForDeposit(deposit: DepositWithBlock): SDKAddress;
|
|
21
21
|
setLatestBlockNumber(blockNumber: number): void;
|
|
22
22
|
_update(eventsToQuery: string[]): Promise<SpokePoolUpdate>;
|
|
23
23
|
deposit(deposit: SvmSpokeClient.FundsDeposited & Partial<EventWithData>): EventWithData;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __assign, __awaiter, __extends, __generator } from "tslib";
|
|
2
2
|
import { SvmSpokeClient } from "@across-protocol/contracts";
|
|
3
|
-
import { getCurrentTime, bnZero } from "../../utils";
|
|
3
|
+
import { getCurrentTime, bnZero, toAddressType, isDefined, } from "../../utils";
|
|
4
4
|
import { SVMSpokePoolClient } from "../SpokePoolClient";
|
|
5
5
|
import { MockSvmCpiEventsClient } from "./MockSvmCpiEventsClient";
|
|
6
6
|
import { unwrapEventData } from "../../arch/svm";
|
|
@@ -26,8 +26,8 @@ var MockSvmSpokePoolClient = /** @class */ (function (_super) {
|
|
|
26
26
|
this.destinationTokenForChainOverride[chainId] = token;
|
|
27
27
|
};
|
|
28
28
|
MockSvmSpokePoolClient.prototype.getDestinationTokenForDeposit = function (deposit) {
|
|
29
|
-
var
|
|
30
|
-
return (
|
|
29
|
+
var override = this.destinationTokenForChainOverride[deposit.originChainId];
|
|
30
|
+
return isDefined(override) ? toAddressType(override, this.chainId) : _super.prototype.getDestinationTokenForDeposit.call(this, deposit);
|
|
31
31
|
};
|
|
32
32
|
MockSvmSpokePoolClient.prototype.setLatestBlockNumber = function (blockNumber) {
|
|
33
33
|
this.latestHeightSearched = blockNumber;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockSvmSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmSpokePoolClient.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,
|
|
1
|
+
{"version":3,"file":"MockSvmSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmSpokePoolClient.ts"],"names":[],"mappings":"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"}
|