npm - @across-protocol/sdk - Versions diffs - 4.2.16 → 4.3.0 - Mend

@across-protocol/sdk 4.2.16 → 4.3.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.

Files changed (220) hide show

package/dist/esm/clients/BundleDataClient/utils/FillUtils.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { __assign, __awaiter, __generator } from "tslib";
 import _ from "lodash";
 import assert from "assert";
 import { providers } from "ethers";
-import { isSlowFill, isValidEvmAddress, isDefined, chainIsEvm } from "../../../utils";
+import { isSlowFill, isValidEvmAddress, isDefined, chainIsEvm, toAddressType } from "../../../utils";
 /**
  * @notice Return repayment chain and repayment token for a fill, but does not verify if the returned
  * repayment information is valid for the desired repayment address.
@@ -76,7 +76,8 @@ export function verifyFillRepayment(_fill, destinationChainProvider, matchedDepo
                             return [2 /*return*/, undefined];
                         }
                     }
-                    fill.relayer = destinationRelayer;
+                    fill.relayer = toAddressType(destinationRelayer, fill.destinationChainId);
+                    assert(fill.relayer.isValidOn(fill.destinationChainId), "Cannot re-assign fill to msg.sender: ".concat(destinationRelayer));
                     return [3 /*break*/, 3];
                 case 2: return [2 /*return*/, undefined];
                 case 3:
@@ -121,10 +122,9 @@ function _repaymentAddressNeedsToBeOverwritten(fill) {
     if (isSlowFill(fill)) {
         return false;
     }
-    // @todo add Solana logic here:
-    // - i.e. If chainIsSvm && !isValidSvmAddress(fill.relayer) then return false
-    //        If chainIsEvm && !isValidEvmAddress(fill.relayer) then return false
-    //        If chainIsEvm && isValidEvmAddress(fill.relayer) then return true
-    return !isValidEvmAddress(fill.relayer);
+    // @dev If the repayment chain is EVM, the repayment address is valid if the address is 20 bytes.
+    // If the repayment chain is SVM, the repayment address is valid if the address is strictly greater than
+    // 20 bytes.
+    return !fill.relayer.isValidOn(fill.repaymentChainId);
 }
 //# sourceMappingURL=FillUtils.js.map

package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"FillUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/FillUtils.ts"],"names":[],"mappings":";AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;~~AAUtF~~;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B,CAC1C,SAAmC,EACnC,aAA4B,EAC5B,wBAAgC;IAKhC,IAAM,mBAAmB,GAAG,oBAAoB,CAAC,SAAS,EAAE,aAAa,EAAE,wBAAwB,CAAC,CAAC;IACrG,IAAI,mBAAmB,KAAK,SAAS,CAAC,aAAa,EAAE;QACnD,OAAO;YACL,mBAAmB,qBAAA;YACnB,cAAc,EAAE,SAAS,CAAC,UAAU;SACrC,CAAC;KACH;IAED,mGAAmG;IACnG,iHAAiH;IACjH,wFAAwF;IACxF,IAAM,kBAAkB,GAAG,aAAa,CAAC,2BAA2B,CAClE,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,aAAa,EACvB,wBAAwB,CACzB,CAAC;IAEF,IAAM,cAAc,GAAG,aAAa,CAAC,2BAA2B,CAC9D,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,CACzB,CAAC;~~IACF~~,OAAO;QACL,mBAAmB,qBAAA;QACnB,cAAc,gBAAA;KACf,CAAC;AACJ,CAAC;AACD;;;;;;;;;GASG;AACH,MAAM,UAAgB,mBAAmB,CACvC,KAAoB,EACpB,wBAA0D,EAC1D,cAAgC,EAChC,aAA4B,EAC5B,wBAAgC;;;;;;oBAE1B,IAAI,GAAG,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBAEhC,iEAAiE;oBACjE,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;wBACpB,sBAAO,IAAI,EAAC;qBACb;oBAEG,gBAAgB,GAAG,oBAAoB,uBAEpC,IAAI,KACP,aAAa,EAAE,cAAc,CAAC,aAAa,KAE7C,aAAa,EACb,wBAAwB,CACzB,CAAC;yBAIE,qCAAqC,CAAC,IAAI,CAAC,EAA3C,wBAA2C;yBAGzC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAnC,wBAAmC;oBACrC,MAAM,CACJ,wBAAwB,YAAY,SAAS,CAAC,QAAQ,EACtD,mGAA4F,IAAI,CAAC,kBAAkB,CAAE,CACtH,CAAC;oBACsB,qBAAM,wBAAwB,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,EAAA;;oBAA5E,eAAe,GAAG,SAA0D;oBAC5E,kBAAkB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC;oBACjD,0GAA0G;oBAC1G,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE;wBAC5E,sBAAO,SAAS,EAAC;qBAClB;oBACD,0GAA0G;oBAC1G,4GAA4G;oBAC5G,0EAA0E;oBAC1E,IACE,CAAC,cAAc,CAAC,aAAa;wBAC7B,aAAa,CAAC,mBAAmB,CAC/B,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,kBAAkB,CACxB,EACD;wBACA,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC;qBAC5C;oBACD,sHAAsH;oBACtH,gHAAgH;oBAChH,4CAA4C;yBACvC;wBACH,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;4BACjC,sBAAO,SAAS,EAAC;yBAClB;qBACF;oBACD,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAC;;~~wBAElC~~,sBAAO,SAAS,EAAC;;oBAIrB,8GAA8G;oBAC9G,qFAAqF;oBACrF,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;oBACzC,sBAAO,IAAI,EAAC;;;;CACb;AAED,SAAS,oBAAoB,CAC3B,SAAmC,EACnC,aAA4B,EAC5B,wBAAgC;IAEhC,IAAI,SAAS,CAAC,aAAa,EAAE;QAC3B,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,yEAAyE,CAAC,CAAC;QAC1G,OAAO,SAAS,CAAC,aAAa,CAAC;KAChC;IAED,oGAAoG;IACpG,yDAAyD;IACzD,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC,kBAAkB,CAAC;KACrC;IAED,6GAA6G;IAC7G,IAAM,qBAAqB,GAAG,2BAA2B,CAAC,SAAS,EAAE,aAAa,EAAE,wBAAwB,CAAC,CAAC;IAC9G,IAAI,qBAAqB,EAAE;QACzB,OAAO,SAAS,CAAC,gBAAgB,CAAC;KACnC;IAED,iHAAiH;IACjH,OAAO,SAAS,CAAC,aAAa,CAAC;AACjC,CAAC;AAED,SAAS,2BAA2B,CAClC,SAAmC,EACnC,aAA4B,EAC5B,wBAAgC;IAEhC,IACE,CAAC,aAAa,CAAC,4BAA4B,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC,aAAa,EAAE,wBAAwB,CAAC,EACpH;QACA,OAAO,KAAK,CAAC;KACd;IACD,IAAM,kBAAkB,GAAG,aAAa,CAAC,2BAA2B,CAClE,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,aAAa,EACvB,wBAAwB,CACzB,CAAC;IACF,IACE,CAAC,aAAa,CAAC,+BAA+B,CAC5C,kBAAkB,EAClB,SAAS,CAAC,gBAAgB,EAC1B,wBAAwB,CACzB,EACD;QACA,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,qCAAqC,CAAC,IAAU;IACvD,iEAAiE;IACjE,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IAED~~,+BAA+B;IAC/B~~,~~6EAA6E~~;~~IAC7E~~,~~6EAA6E~~;~~IAC7E~~,~~2EAA2E~~;~~IAC3E~~,OAAO,CAAC,~~iBAAiB~~,CAAC,IAAI,CAAC,~~OAAO~~,CAAC,CAAC;~~AAC1C~~,CAAC"}
1	+ {"version":3,"file":"FillUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/FillUtils.ts"],"names":[],"mappings":"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"}

package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { __assign } from "tslib";
 import { MerkleTree } from "@across-protocol/contracts";
 import { getParamType } from "../../../utils/ContractUtils";
 import { utils } from "ethers";
@@ -14,7 +15,10 @@ export function buildPoolRebalanceLeafTree(poolRebalanceLeaves) {
         }
     }
     var paramType = getParamType("MerkleLibTest", "verifyPoolRebalance", "rebalance");
-    var hashFn = function (input) { return utils.keccak256(utils.defaultAbiCoder.encode([paramType], [input])); };
+    var hashFn = function (input) {
+        var ethersLeaf = __assign(__assign({}, input), { l1Tokens: input.l1Tokens.map(function (l1Token) { return l1Token.toEvmAddress(); }) });
+        return utils.keccak256(utils.defaultAbiCoder.encode([paramType], [ethersLeaf]));
+    };
     return new MerkleTree(poolRebalanceLeaves, hashFn);
 }
 //# sourceMappingURL=MerkleTreeUtils.js.map

package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MerkleTreeUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/MerkleTreeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE/B,MAAM,UAAU,0BAA0B,CAAC,mBAAwC;IACjF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnD,2GAA2G;QAC3G,IACE,mBAAmB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM;YACrF,mBAAmB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAC3F;YACA,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;QACD,IACE,mBAAmB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAChG,mBAAmB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAC5F;YACA,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;KACF;IAED,IAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,qBAAqB,EAAE,WAAW,CAAC,CAAC;IACpF,IAAM,MAAM,GAAG,UAAC,KAAwB,IAAK,OAAA,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,~~KAAK~~,CAAC,CAAC,CAAC,~~EAAnE~~,~~CAAmE~~,CAAC;~~IACjH~~,OAAO,IAAI,UAAU,CAAoB,mBAAmB,EAAE,MAAM,CAAC,CAAC;AACxE,CAAC"}
1	+ {"version":3,"file":"MerkleTreeUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/MerkleTreeUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE/B,MAAM,UAAU,0BAA0B,CAAC,mBAAwC;IACjF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnD,2GAA2G;QAC3G,IACE,mBAAmB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM;YACrF,mBAAmB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAC3F;YACA,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;QACD,IACE,mBAAmB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAChG,mBAAmB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAC5F;YACA,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;KACF;IAED,IAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,qBAAqB,EAAE,WAAW,CAAC,CAAC;IACpF,IAAM,MAAM,GAAG,UAAC,KAAwB;QACtC,IAAM,UAAU,yBACX,KAAK,KACR,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAC,OAAO,IAAK,OAAA,OAAO,CAAC,YAAY,EAAE,EAAtB,CAAsB,CAAC,GAClE,CAAC;QACF,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC,CAAC;IACF,OAAO,IAAI,UAAU,CAAoB,mBAAmB,EAAE,MAAM,CAAC,CAAC;AACxE,CAAC"}

package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { bnZero, compareAddresses } from "../../../utils";
+import { bnZero, compareAddresses, EvmAddress } from "../../../utils";
 import assert from "assert";
 // This returns a possible next block range that could be submitted as a new root bundle, or used as a reference
 // when evaluating  pending root bundle. The block end numbers must be less than the latest blocks for each chain ID
@@ -92,7 +92,7 @@ export function updateRunningBalance(runningBalances, l2ChainId, l1Token, update
 export function addLastRunningBalance(latestMainnetBlock, runningBalances, hubPoolClient) {
     Object.keys(runningBalances).forEach(function (repaymentChainId) {
         Object.keys(runningBalances[Number(repaymentChainId)]).forEach(function (l1TokenAddress) {
-            var runningBalance = hubPoolClient.getRunningBalanceBeforeBlockForChain(latestMainnetBlock, Number(repaymentChainId), l1TokenAddress).runningBalance;
+            var runningBalance = hubPoolClient.getRunningBalanceBeforeBlockForChain(latestMainnetBlock, Number(repaymentChainId), EvmAddress.from(l1TokenAddress)).runningBalance;
             if (!runningBalance.eq(bnZero)) {
                 updateRunningBalance(runningBalances, Number(repaymentChainId), l1TokenAddress, runningBalance);
             }
@@ -101,7 +101,7 @@ export function addLastRunningBalance(latestMainnetBlock, runningBalances, hubPo
 }
 export function updateRunningBalanceForDeposit(runningBalances, hubPoolClient, deposit, updateAmount, mainnetBundleEndBlock) {
     var l1TokenCounterpart = hubPoolClient.getL1TokenForL2TokenAtBlock(deposit.inputToken, deposit.originChainId, mainnetBundleEndBlock);
-    updateRunningBalance(runningBalances, deposit.originChainId, l1TokenCounterpart, updateAmount);
+    updateRunningBalance(runningBalances, deposit.originChainId, l1TokenCounterpart.toEvmAddress(), updateAmount);
 }
 export function constructPoolRebalanceLeaves(latestMainnetBlock, runningBalances, realizedLpFees, chainsWithRefundsOnly, configStoreClient, maxL1TokenCount) {
     // Add a leaf for each chain ID with no L1 tokens or running balances
@@ -162,7 +162,7 @@ export function constructPoolRebalanceLeaves(latestMainnetBlock, runningBalances
                 runningBalances: leafRunningBalances,
                 groupIndex: groupIndexForChainId++,
                 leafId: leaves.length,
-                l1Tokens: l1TokensToIncludeInThisLeaf,
+                l1Tokens: l1TokensToIncludeInThisLeaf.map(function (l1TokenAddr) { return EvmAddress.from(l1TokenAddr); }),
             });
         };
         for (var i = 0; i < sortedL1Tokens.length; i += maxL1TokensPerLeaf) {

package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PoolRebalanceUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,MAAM,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;~~AAIrE~~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~~CACf~~,eAJqB,CAIpB;YACF,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;gBAC9B,oBAAoB,CAAC,eAAe,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;aACjG;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,eAAgC,EAChC,aAA4B,EAC5B,OAA2B,EAC3B,YAAuB,EACvB,qBAA6B;IAE7B,IAAM,kBAAkB,GAAG,aAAa,CAAC,2BAA2B,CAClE,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,EACrB,qBAAqB,CACtB,CAAC;IACF,oBAAoB,CAAC,eAAe,EAAE,OAAO,CAAC,aAAa,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;~~AACjG~~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~~aACtC~~,CAAC,CAAC;;QA/BL,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,IAAI,kBAAkB;oBAAzD,CAAC;SAgCT;IACH,CAAC,CAAC,CAAC;IAEL,OAAO,MAAM,CAAC;AAChB,CAAC"}
1	+ {"version":3,"file":"PoolRebalanceUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts"],"names":[],"mappings":"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"}

package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Infer } from "superstruct";
-import { BigNumber } from "../../../utils";
+import { BigNumber, EvmAddress, RawAddress, SvmAddress } from "../../../utils";
 export declare const SortableEventSS: {
     blockNumber: import("superstruct").Struct<number, null>;
     logIndex: import("superstruct").Struct<number, null>;
@@ -17,23 +17,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: SvmAddress | EvmAddress | RawAddress;
+        recipient: SvmAddress | EvmAddress | RawAddress;
+        inputToken: SvmAddress | EvmAddress | RawAddress;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: SvmAddress | EvmAddress | RawAddress;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
-        speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
+        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
         transactionHash?: string | undefined;
@@ -48,22 +48,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
             repaymentChainId: number;
             messageHash: string;
             quoteTimestamp: number;
-            depositor: string;
-            recipient: string;
-            inputToken: string;
+            depositor: SvmAddress | EvmAddress | RawAddress;
+            recipient: SvmAddress | EvmAddress | RawAddress;
+            inputToken: SvmAddress | EvmAddress | RawAddress;
             inputAmount: BigNumber;
-            outputToken: string;
+            outputToken: SvmAddress | EvmAddress | RawAddress;
             outputAmount: BigNumber;
             fillDeadline: number;
-            exclusiveRelayer: string;
+            exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
             exclusivityDeadline: number;
             blockNumber: number;
             logIndex: number;
-            relayer: string;
+            relayer: SvmAddress | EvmAddress | RawAddress;
             lpFeePct: BigNumber;
             relayExecutionInfo: {
                 fillType: number;
-                updatedRecipient: string;
+                updatedRecipient: SvmAddress | EvmAddress | RawAddress;
                 updatedOutputAmount: BigNumber;
                 updatedMessageHash: string;
                 updatedMessage?: string | undefined;
@@ -86,24 +86,24 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: SvmAddress | EvmAddress | RawAddress;
+        recipient: SvmAddress | EvmAddress | RawAddress;
+        inputToken: SvmAddress | EvmAddress | RawAddress;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: SvmAddress | EvmAddress | RawAddress;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
-        speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
+        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
         transactionHash?: string | undefined;
@@ -118,23 +118,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: SvmAddress | EvmAddress | RawAddress;
+        recipient: SvmAddress | EvmAddress | RawAddress;
+        inputToken: SvmAddress | EvmAddress | RawAddress;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: SvmAddress | EvmAddress | RawAddress;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
-        speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
+        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
         transactionHash?: string | undefined;
@@ -149,24 +149,24 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: SvmAddress | EvmAddress | RawAddress;
+        recipient: SvmAddress | EvmAddress | RawAddress;
+        inputToken: SvmAddress | EvmAddress | RawAddress;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: SvmAddress | EvmAddress | RawAddress;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
-        speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
+        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
         transactionHash?: string | undefined;
@@ -182,23 +182,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: SvmAddress | EvmAddress | RawAddress;
+        recipient: SvmAddress | EvmAddress | RawAddress;
+        inputToken: SvmAddress | EvmAddress | RawAddress;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: SvmAddress | EvmAddress | RawAddress;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
-        speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
+        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
         transactionHash?: string | undefined;
@@ -213,23 +213,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: SvmAddress | EvmAddress | RawAddress;
+        recipient: SvmAddress | EvmAddress | RawAddress;
+        inputToken: SvmAddress | EvmAddress | RawAddress;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: SvmAddress | EvmAddress | RawAddress;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
-        speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
+        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
         transactionHash?: string | undefined;
@@ -244,24 +244,24 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: SvmAddress | EvmAddress | RawAddress;
+        recipient: SvmAddress | EvmAddress | RawAddress;
+        inputToken: SvmAddress | EvmAddress | RawAddress;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: SvmAddress | EvmAddress | RawAddress;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
-        speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
+        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
         transactionHash?: string | undefined;
@@ -276,24 +276,24 @@ export declare const BundleDataSS: import("superstruct").Struct<{
         toLiteChain: boolean;
         messageHash: string;
         quoteTimestamp: number;
-        depositor: string;
-        recipient: string;
-        inputToken: string;
+        depositor: SvmAddress | EvmAddress | RawAddress;
+        recipient: SvmAddress | EvmAddress | RawAddress;
+        inputToken: SvmAddress | EvmAddress | RawAddress;
         inputAmount: BigNumber;
-        outputToken: string;
+        outputToken: SvmAddress | EvmAddress | RawAddress;
         outputAmount: BigNumber;
         message: string;
         fillDeadline: number;
-        exclusiveRelayer: string;
+        exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
         exclusivityDeadline: number;
         blockNumber: number;
         logIndex: number;
         quoteBlockNumber: number;
         lpFeePct: BigNumber;
-        speedUpSignature?: string | undefined;
-        updatedRecipient?: string | undefined;
+        updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
         updatedOutputAmount?: BigNumber | undefined;
         updatedMessage?: string | undefined;
+        speedUpSignature?: string | undefined;
         txnIndex?: number | undefined;
         txnRef?: string | undefined;
         transactionHash?: string | undefined;
@@ -308,22 +308,22 @@ export declare const BundleDataSS: import("superstruct").Struct<{
             repaymentChainId: number;
             messageHash: string;
             quoteTimestamp: number;
-            depositor: string;
-            recipient: string;
-            inputToken: string;
+            depositor: SvmAddress | EvmAddress | RawAddress;
+            recipient: SvmAddress | EvmAddress | RawAddress;
+            inputToken: SvmAddress | EvmAddress | RawAddress;
             inputAmount: BigNumber;
-            outputToken: string;
+            outputToken: SvmAddress | EvmAddress | RawAddress;
             outputAmount: BigNumber;
             fillDeadline: number;
-            exclusiveRelayer: string;
+            exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
             exclusivityDeadline: number;
             blockNumber: number;
             logIndex: number;
-            relayer: string;
+            relayer: SvmAddress | EvmAddress | RawAddress;
             lpFeePct: BigNumber;
             relayExecutionInfo: {
                 fillType: number;
-                updatedRecipient: string;
+                updatedRecipient: SvmAddress | EvmAddress | RawAddress;
                 updatedOutputAmount: BigNumber;
                 updatedMessageHash: string;
                 updatedMessage?: string | undefined;

package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { __assign } from "tslib";
 import { object, number, optional, string, array, record, coerce, instance, pattern, boolean, defaulted, union, type, } from "superstruct";
-import { UNDEFINED_MESSAGE_HASH } from "../../../constants";
-import { BigNumber } from "../../../utils";
+import { CHAIN_IDs, UNDEFINED_MESSAGE_HASH } from "../../../constants";
+import { BigNumber, EvmAddress, RawAddress, SvmAddress, toAddressType } from "../../../utils";
 var PositiveIntegerStringSS = pattern(string(), /\d+/);
 var Web3AddressSS = pattern(string(), /^0x[a-fA-F0-9]{40}$/);
 var BigNumberType = coerce(instance(BigNumber), union([string(), number()]), function (value) {
@@ -15,18 +15,28 @@ var BigNumberType = coerce(instance(BigNumber), union([string(), number()]), fun
         return value;
     }
 });
+// Accept any concrete implementation of `Address` (Evm, Svm, or Raw) but avoid using the
+// abstract `Address` class directly to keep TypeScript happy.
+var AddressInstanceSS = union([instance(EvmAddress), instance(SvmAddress), instance(RawAddress)]);
+var AddressType = coerce(AddressInstanceSS, string(), function (value) {
+    // Addresses are posted to arweave in their native format (base16 for EVM, base58 for SVM). The chainId for
+    // for the event data is not directly available, so infer it based on the shape of the address. RawAddress
+    // will be instantiated if the address format does not match the expected family.
+    var chainId = value.startsWith("0x") ? CHAIN_IDs.MAINNET : CHAIN_IDs.SOLANA;
+    return toAddressType(value, chainId);
+});
 var FillTypeSS = number();
 var V3RelayDataSS = {
-    inputToken: string(),
+    inputToken: AddressType,
     inputAmount: BigNumberType,
-    outputToken: string(),
+    outputToken: AddressType,
     outputAmount: BigNumberType,
     fillDeadline: number(),
-    exclusiveRelayer: string(),
+    exclusiveRelayer: AddressType,
     exclusivityDeadline: number(),
     originChainId: number(),
-    depositor: string(),
-    recipient: string(),
+    depositor: AddressType,
+    recipient: AddressType,
     depositId: BigNumberType,
     message: string(),
 };
@@ -46,7 +56,7 @@ var V3DepositSS = {
     quoteTimestamp: number(),
     relayerFeePct: optional(BigNumberType),
     speedUpSignature: optional(string()),
-    updatedRecipient: optional(string()),
+    updatedRecipient: optional(AddressType),
     updatedOutputAmount: optional(BigNumberType),
     updatedMessage: optional(string()),
 };
@@ -56,11 +66,11 @@ var V3DepositWithBlockLpFeeSS = object(__assign(__assign({}, _V3DepositWithBlock
 var V3RelayExecutionEventInfoSS = object({
     updatedOutputAmount: BigNumberType,
     fillType: FillTypeSS,
-    updatedRecipient: string(),
+    updatedRecipient: AddressType,
     updatedMessage: optional(string()),
     updatedMessageHash: defaulted(string(), UNDEFINED_MESSAGE_HASH),
 });
-var V3FillSS = __assign(__assign({}, V3RelayDataSS), { message: optional(string()), messageHash: defaulted(string(), UNDEFINED_MESSAGE_HASH), destinationChainId: number(), relayer: string(), repaymentChainId: number(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: number() });
+var V3FillSS = __assign(__assign({}, V3RelayDataSS), { message: optional(string()), messageHash: defaulted(string(), UNDEFINED_MESSAGE_HASH), destinationChainId: number(), relayer: AddressType, repaymentChainId: number(), relayExecutionInfo: V3RelayExecutionEventInfoSS, quoteTimestamp: number() });
 var V3FillWithBlockSS = __assign(__assign({}, SortableEventSS), V3FillSS);
 var BundleFillV3SS = object(__assign(__assign({}, V3FillWithBlockSS), { lpFeePct: BigNumberType }));
 var nestedV3DepositRecordSS = record(PositiveIntegerStringSS, record(Web3AddressSS, array(V3DepositWithBlockSS)));

package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SuperstructUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,MAAM,EACN,MAAM,EACN,QAAQ,EACR,MAAM,EACN,KAAK,EACL,MAAM,EACN,MAAM,EACN,QAAQ,EACR,OAAO,EACP,OAAO,EACP,SAAS,EACT,KAAK,EACL,IAAI,GACL,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;~~AAC5D~~,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;~~AAE3C~~,IAAM,uBAAuB,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;AACzD,IAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC;AAE/D,IAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,UAAC,KAAK;IACnF,IAAI;QACF,+CAA+C;QAC/C,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC9B;IAAC,OAAO,KAAK,EAAE;QACd,oEAAoE;QACpE,uGAAuG;QACvG,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC,CAAC;AAEH,IAAM,UAAU,GAAG,MAAM,EAAE,CAAC;AAE5B,IAAM,aAAa,GAAG;IACpB,UAAU,EAAE,~~MAAM,EAAE~~;~~IACpB~~,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,~~MAAM,EAAE~~;~~IACrB~~,YAAY,EAAE,aAAa;IAC3B,YAAY,EAAE,MAAM,EAAE;IACtB,gBAAgB,EAAE,~~MAAM,EAAE~~;~~IAC1B~~,mBAAmB,EAAE,MAAM,EAAE;IAC7B,aAAa,EAAE,MAAM,EAAE;IACvB,SAAS,EAAE,~~MAAM,EAAE~~;~~IACnB~~,SAAS,EAAE,~~MAAM,EAAE~~;~~IACnB~~,SAAS,EAAE,aAAa;IACxB,OAAO,EAAE,MAAM,EAAE;CAClB,CAAC;AAEF,MAAM,CAAC,IAAM,eAAe,GAAG;IAC7B,WAAW,EAAE,MAAM,EAAE;IACrB,QAAQ,EAAE,MAAM,EAAE;IAElB,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IAE5B,eAAe,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IACnC,gBAAgB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;CACrC,CAAC;AAEF,IAAM,WAAW,GAAG;IAClB,WAAW,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC;IACxD,aAAa,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC;IAC1C,WAAW,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC;IACxC,kBAAkB,EAAE,MAAM,EAAE;IAC5B,cAAc,EAAE,MAAM,EAAE;IACxB,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC;IACtC,gBAAgB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IACpC,gBAAgB,EAAE,QAAQ,CAAC,~~MAAM~~,~~EAAE,~~CAAC;~~IACpC~~,mBAAmB,EAAE,QAAQ,CAAC,aAAa,CAAC;IAC5C,cAAc,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;CACnC,CAAC;AAEF,IAAM,qBAAqB,gCACzB,gBAAgB,EAAE,MAAM,EAAE,IACvB,WAAW,GACX,eAAe,GACf,aAAa,CACjB,CAAC;AAEF,IAAM,oBAAoB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAC3D,IAAM,yBAAyB,GAAG,MAAM,uBACnC,qBAAqB,KACxB,QAAQ,EAAE,aAAa,IACvB,CAAC;AAEH,IAAM,2BAA2B,GAAG,MAAM,CAAC;IACzC,mBAAmB,EAAE,aAAa;IAClC,QAAQ,EAAE,UAAU;IACpB,gBAAgB,EAAE,~~MAAM,EAAE~~;~~IAC1B~~,cAAc,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IAClC,kBAAkB,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC;CAChE,CAAC,CAAC;AAEH,IAAM,QAAQ,yBACT,aAAa,KAChB,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,EAC3B,WAAW,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC,EACxD,kBAAkB,EAAE,MAAM,EAAE,EAC5B,OAAO,EAAE,~~MAAM~~,~~EAAE~~,~~EACjB,~~gBAAgB,EAAE,MAAM,EAAE,EAC1B,kBAAkB,EAAE,2BAA2B,EAC/C,cAAc,EAAE,MAAM,EAAE,GACzB,CAAC;AAEF,IAAM,iBAAiB,yBAClB,eAAe,GACf,QAAQ,CACZ,CAAC;AAEF,IAAM,cAAc,GAAG,MAAM,uBACxB,iBAAiB,KACpB,QAAQ,EAAE,aAAa,IACvB,CAAC;AAEH,IAAM,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,EAAE,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;AACpH,IAAM,mCAAmC,GAAG,MAAM,CAChD,uBAAuB,EACvB,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC,CACxD,CAAC;AAEF,IAAM,qBAAqB,GAAG,MAAM;AAClC,oBAAoB;AACpB,uBAAuB,EACvB,MAAM,CACJ,aAAa,EACb,MAAM,CAAC;IACL,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC;IACxC,iBAAiB,EAAE,aAAa;IAChC,cAAc,EAAE,aAAa;CAC9B,CAAC,CACH,CACF,CAAC;AAEF,MAAM,CAAC,IAAM,YAAY,GAAG,IAAI,CAAC;IAC/B,gBAAgB,EAAE,uBAAuB;IACzC,yBAAyB,EAAE,uBAAuB;IAClD,qBAAqB,EAAE,mCAAmC;IAC1D,iBAAiB,EAAE,mCAAmC;IACtD,aAAa,EAAE,qBAAqB;CACrC,CAAC,CAAC"}
1	+ {"version":3,"file":"SuperstructUtils.js","sourceRoot":"","sources":["../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":"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"}