@hyperlane-xyz/relayer 1.1.26 → 1.1.28
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/metadata/aggregation.d.ts +1 -1
- package/dist/metadata/aggregation.d.ts.map +1 -1
- package/dist/metadata/aggregation.js +2 -3
- package/dist/metadata/aggregation.js.map +1 -1
- package/dist/metadata/aggregation.test.js +2 -0
- package/dist/metadata/aggregation.test.js.map +1 -1
- package/dist/metadata/decode.d.ts.map +1 -1
- package/dist/metadata/decode.js +2 -2
- package/dist/metadata/decode.js.map +1 -1
- package/dist/metadata/routing.d.ts +1 -1
- package/dist/metadata/routing.d.ts.map +1 -1
- package/dist/metadata/routing.js +2 -3
- package/dist/metadata/routing.js.map +1 -1
- package/package.json +5 -5
- package/src/metadata/aggregation.test.ts +15 -9
- package/src/metadata/aggregation.ts +5 -2
- package/src/metadata/decode.ts +13 -5
- package/src/metadata/routing.ts +5 -2
|
@@ -18,6 +18,6 @@ export declare class AggregationMetadataBuilder implements MetadataBuilder {
|
|
|
18
18
|
end: number;
|
|
19
19
|
encoded: string;
|
|
20
20
|
};
|
|
21
|
-
static decode(metadata: string, context: MetadataContext<AggregationIsmConfig
|
|
21
|
+
static decode(metadata: string, context: MetadataContext<AggregationIsmConfig>, decodeSubmodule: (metadata: string, context: MetadataContext) => StructuredMetadata): AggregationMetadata<StructuredMetadata | string>;
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=aggregation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregation.d.ts","sourceRoot":"","sources":["../../src/metadata/aggregation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAGrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,WAAW,EAMZ,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"aggregation.d.ts","sourceRoot":"","sources":["../../src/metadata/aggregation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAGrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,WAAW,EAMZ,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EACL,8BAA8B,EAE9B,eAAe,EACf,eAAe,EACf,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAIpB,MAAM,WAAW,mBAAmB,CAAC,CAAC,GAAG,MAAM;IAC7C,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACnC,iBAAiB,EAAE,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;CACpC;AAKD,qBAAa,0BAA2B,YAAW,eAAe;IAKpD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,mBAAmB;IAJxD,SAAS,CAAC,MAAM,uCAEb;gBAE4B,IAAI,EAAE,mBAAmB;IAElD,KAAK,CACT,OAAO,EAAE,eAAe,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,EAC3D,QAAQ,SAAK,EACb,SAAS,SAAkB,GAC1B,OAAO,CAAC,8BAA8B,CAAC;IAgG1C,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIxC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,mBAAmB,CAAC,MAAM,CAAC,GAAG,MAAM;IAmB5D,MAAM,CAAC,aAAa,CAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE;IAYlD,MAAM,CAAC,MAAM,CACX,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,CAAC,oBAAoB,CAAC,EAC9C,eAAe,EAAE,CACf,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,KACrB,kBAAkB,GACtB,mBAAmB,CAAC,kBAAkB,GAAG,MAAM,CAAC;CAYpD"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { IsmType, } from '@hyperlane-xyz/sdk';
|
|
2
2
|
import { fromHexString, mapAllSettled, rootLogger, timeout, toHexString, } from '@hyperlane-xyz/utils';
|
|
3
|
-
import { decodeIsmMetadata } from './decode.js';
|
|
4
3
|
const RANGE_SIZE = 4;
|
|
5
4
|
// adapted from rust/main/agents/relayer/src/msg/metadata/aggregation.rs
|
|
6
5
|
export class AggregationMetadataBuilder {
|
|
@@ -104,14 +103,14 @@ export class AggregationMetadataBuilder {
|
|
|
104
103
|
encoded: toHexString(encoded.subarray(start, end)),
|
|
105
104
|
};
|
|
106
105
|
}
|
|
107
|
-
static decode(metadata, context) {
|
|
106
|
+
static decode(metadata, context, decodeSubmodule) {
|
|
108
107
|
const submoduleMetadata = context.ism.modules.map((ism, index) => {
|
|
109
108
|
const range = this.metadataRange(metadata, index);
|
|
110
109
|
if (range.start == 0)
|
|
111
110
|
return null;
|
|
112
111
|
if (typeof ism === 'string')
|
|
113
112
|
return range.encoded;
|
|
114
|
-
return
|
|
113
|
+
return decodeSubmodule(range.encoded, {
|
|
115
114
|
...context,
|
|
116
115
|
ism: ism,
|
|
117
116
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregation.js","sourceRoot":"","sources":["../../src/metadata/aggregation.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,GACR,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,aAAa,EACb,aAAa,EACb,UAAU,EACV,OAAO,EACP,WAAW,GACZ,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"aggregation.js","sourceRoot":"","sources":["../../src/metadata/aggregation.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,8 @@ describe('AggregationMetadataBuilder', () => {
|
|
|
30
30
|
modules: Array.from({ length: count }, () => ethers.constants.AddressZero),
|
|
31
31
|
threshold: count,
|
|
32
32
|
},
|
|
33
|
+
}, () => {
|
|
34
|
+
throw new Error('Should not be called for string modules');
|
|
33
35
|
})).to.deep.equal(fixture.decoded);
|
|
34
36
|
});
|
|
35
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregation.test.js","sourceRoot":"","sources":["../../src/metadata/aggregation.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAEL,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC;AAG1B,MAAM,IAAI,GAAG,qCAAqC,CAAC;AACnD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxD,MAAM,QAAQ,GAAmC,KAAK;KACnD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;KAC5D,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;IAChB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,QAAQ,CAAC;IACxC,OAAO;QACL,OAAO;QACP,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACrD,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAC1D;SACF;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEL,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QAC9B,EAAE,CAAC,yBAAyB,CAAC,EAAE,EAAE,GAAG,EAAE;YACpC,MAAM,CAAC,0BAA0B,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACjE,OAAO,CAAC,OAAO,CAChB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yBAAyB,CAAC,EAAE,EAAE,GAAG,EAAE;YACpC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACvD,MAAM,CACJ,0BAA0B,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"aggregation.test.js","sourceRoot":"","sources":["../../src/metadata/aggregation.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAEL,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC;AAG1B,MAAM,IAAI,GAAG,qCAAqC,CAAC;AACnD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxD,MAAM,QAAQ,GAAmC,KAAK;KACnD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;KAC5D,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;IAChB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,QAAQ,CAAC;IACxC,OAAO;QACL,OAAO;QACP,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACrD,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAC1D;SACF;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEL,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QAC9B,EAAE,CAAC,yBAAyB,CAAC,EAAE,EAAE,GAAG,EAAE;YACpC,MAAM,CAAC,0BAA0B,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CACjE,OAAO,CAAC,OAAO,CAChB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yBAAyB,CAAC,EAAE,EAAE,GAAG,EAAE;YACpC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACvD,MAAM,CACJ,0BAA0B,CAAC,MAAM,CAC/B,OAAO,CAAC,OAAO,EACf;gBACE,GAAG,EAAE;oBACH,IAAI,EAAE,OAAO,CAAC,WAAW;oBACzB,OAAO,EAAE,KAAK,CAAC,IAAI,CACjB,EAAE,MAAM,EAAE,KAAK,EAAE,EACjB,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CACnC;oBACD,SAAS,EAAE,KAAK;iBACjB;aACK,EACR,GAAG,EAAE;gBACH,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAC7D,CAAC,CACF,CACF,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../src/metadata/decode.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEjE,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,GACvB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../src/metadata/decode.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEjE,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,GACvB,kBAAkB,CAuCpB"}
|
package/dist/metadata/decode.js
CHANGED
|
@@ -16,12 +16,12 @@ export function decodeIsmMetadata(metadata, context) {
|
|
|
16
16
|
return MultisigMetadataBuilder.decode(metadata, ism.type);
|
|
17
17
|
case IsmType.AGGREGATION:
|
|
18
18
|
case IsmType.STORAGE_AGGREGATION:
|
|
19
|
-
return AggregationMetadataBuilder.decode(metadata, { ...context, ism });
|
|
19
|
+
return AggregationMetadataBuilder.decode(metadata, { ...context, ism }, decodeIsmMetadata);
|
|
20
20
|
case IsmType.ROUTING:
|
|
21
21
|
return DynamicRoutingMetadataBuilder.decode(metadata, {
|
|
22
22
|
...context,
|
|
23
23
|
ism,
|
|
24
|
-
});
|
|
24
|
+
}, decodeIsmMetadata);
|
|
25
25
|
case IsmType.ARB_L2_TO_L1:
|
|
26
26
|
return ArbL2ToL1MetadataBuilder.decode(metadata, {
|
|
27
27
|
...context,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decode.js","sourceRoot":"","sources":["../../src/metadata/decode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAG7D,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,OAAwB;IAExB,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACxB,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,OAAO,CAAC,eAAe;YAC1B,OAAO,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEzC,KAAK,OAAO,CAAC,oBAAoB,CAAC;QAClC,KAAK,OAAO,CAAC,mBAAmB,CAAC;QACjC,KAAK,OAAO,CAAC,4BAA4B,CAAC;QAC1C,KAAK,OAAO,CAAC,2BAA2B;YACtC,OAAO,uBAAuB,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAE5D,KAAK,OAAO,CAAC,WAAW,CAAC;QACzB,KAAK,OAAO,CAAC,mBAAmB;YAC9B,OAAO,0BAA0B,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"decode.js","sourceRoot":"","sources":["../../src/metadata/decode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAG7D,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,OAAwB;IAExB,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACxB,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,OAAO,CAAC,eAAe;YAC1B,OAAO,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEzC,KAAK,OAAO,CAAC,oBAAoB,CAAC;QAClC,KAAK,OAAO,CAAC,mBAAmB,CAAC;QACjC,KAAK,OAAO,CAAC,4BAA4B,CAAC;QAC1C,KAAK,OAAO,CAAC,2BAA2B;YACtC,OAAO,uBAAuB,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAE5D,KAAK,OAAO,CAAC,WAAW,CAAC;QACzB,KAAK,OAAO,CAAC,mBAAmB;YAC9B,OAAO,0BAA0B,CAAC,MAAM,CACtC,QAAQ,EACR,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,EACnB,iBAAiB,CAClB,CAAC;QAEJ,KAAK,OAAO,CAAC,OAAO;YAClB,OAAO,6BAA6B,CAAC,MAAM,CACzC,QAAQ,EACR;gBACE,GAAG,OAAO;gBACV,GAAG;aACJ,EACD,iBAAiB,CAClB,CAAC;QAEJ,KAAK,OAAO,CAAC,YAAY;YACvB,OAAO,wBAAwB,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAC/C,GAAG,OAAO;gBACV,GAAG;aACJ,CAAC,CAAC;QAEL;YACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC;AACH,CAAC"}
|
|
@@ -11,7 +11,7 @@ export declare class StaticRoutingMetadataBuilder implements MetadataBuilder {
|
|
|
11
11
|
protected baseMetadataBuilder: BaseMetadataBuilder;
|
|
12
12
|
constructor(baseMetadataBuilder: BaseMetadataBuilder);
|
|
13
13
|
build(context: MetadataContext<WithAddress<DomainRoutingIsmConfig>>, maxDepth?: number): Promise<RoutingMetadataBuildResult>;
|
|
14
|
-
static decode(metadata: string, context: MetadataContext<WithAddress<DomainRoutingIsmConfig
|
|
14
|
+
static decode(metadata: string, context: MetadataContext<WithAddress<DomainRoutingIsmConfig>>, decodeFn: (metadata: string, context: MetadataContext) => StructuredMetadata): RoutingMetadata<StructuredMetadata | string>;
|
|
15
15
|
}
|
|
16
16
|
export declare class DynamicRoutingMetadataBuilder extends StaticRoutingMetadataBuilder {
|
|
17
17
|
protected baseMetadataBuilder: BaseMetadataBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/metadata/routing.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EAET,sBAAsB,EAEtB,OAAO,EACP,gBAAgB,EAEjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAU,MAAM,sBAAsB,CAAC;AAE3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/metadata/routing.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EAET,sBAAsB,EAEtB,OAAO,EACP,gBAAgB,EAEjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAU,MAAM,sBAAsB,CAAC;AAE3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,0BAA0B,EAC1B,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC/B,IAAI,EAAE,OAAO,OAAO,CAAC,OAAO,CAAC;IAC7B,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,CAAC,CAAC;CACb,CAAC;AAEF,qBAAa,4BAA6B,YAAW,eAAe;IACtD,SAAS,CAAC,mBAAmB,EAAE,mBAAmB;gBAAxC,mBAAmB,EAAE,mBAAmB;IAEjD,KAAK,CAChB,OAAO,EAAE,eAAe,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,EAC7D,QAAQ,SAAK,GACZ,OAAO,CAAC,0BAA0B,CAAC;IAwBtC,MAAM,CAAC,MAAM,CACX,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,EAC7D,QAAQ,EAAE,CACR,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,KACrB,kBAAkB,GACtB,eAAe,CAAC,kBAAkB,GAAG,MAAM,CAAC;CAmBhD;AAED,qBAAa,6BAA8B,SAAQ,4BAA4B;IACjE,SAAS,CAAC,mBAAmB,EAAE,mBAAmB;gBAAxC,mBAAmB,EAAE,mBAAmB;IAIjD,KAAK,CAChB,OAAO,EAAE,eAAe,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,EACvD,QAAQ,SAAK,GACZ,OAAO,CAAC,0BAA0B,CAAC;CA6DvC"}
|
package/dist/metadata/routing.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { DefaultFallbackRoutingIsm__factory, IRoutingIsm__factory, } from '@hyperlane-xyz/core';
|
|
2
2
|
import { EvmIsmReader, IsmType, isDynamicallyRoutedIsmType, } from '@hyperlane-xyz/sdk';
|
|
3
3
|
import { assert } from '@hyperlane-xyz/utils';
|
|
4
|
-
import { decodeIsmMetadata } from './decode.js';
|
|
5
4
|
export class StaticRoutingMetadataBuilder {
|
|
6
5
|
baseMetadataBuilder;
|
|
7
6
|
constructor(baseMetadataBuilder) {
|
|
@@ -23,13 +22,13 @@ export class StaticRoutingMetadataBuilder {
|
|
|
23
22
|
metadata: selectedIsmResult.metadata,
|
|
24
23
|
};
|
|
25
24
|
}
|
|
26
|
-
static decode(metadata, context) {
|
|
25
|
+
static decode(metadata, context, decodeFn) {
|
|
27
26
|
// TODO: this is a naive implementation, we should support domain ID keys
|
|
28
27
|
assert(context.message.parsed.originChain, 'originChain is required');
|
|
29
28
|
const ism = context.ism.domains[context.message.parsed.originChain];
|
|
30
29
|
const originMetadata = typeof ism === 'string'
|
|
31
30
|
? metadata
|
|
32
|
-
:
|
|
31
|
+
: decodeFn(metadata, {
|
|
33
32
|
...context,
|
|
34
33
|
ism: ism,
|
|
35
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/metadata/routing.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,EAClC,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAIL,YAAY,EACZ,OAAO,EAEP,0BAA0B,GAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAe,MAAM,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/metadata/routing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hyperlane-xyz/relayer",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.28",
|
|
4
4
|
"description": "Hyperlane Message Relayer Service",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"blockchain",
|
|
@@ -55,9 +55,9 @@
|
|
|
55
55
|
"zod": "^3.21.2",
|
|
56
56
|
"zod-validation-error": "^3.3.0",
|
|
57
57
|
"@hyperlane-xyz/core": "11.3.1",
|
|
58
|
-
"@hyperlane-xyz/metrics": "0.2.
|
|
59
|
-
"@hyperlane-xyz/sdk": "33.0
|
|
60
|
-
"@hyperlane-xyz/utils": "33.0
|
|
58
|
+
"@hyperlane-xyz/metrics": "0.2.21",
|
|
59
|
+
"@hyperlane-xyz/sdk": "33.1.0",
|
|
60
|
+
"@hyperlane-xyz/utils": "33.1.0"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
63
|
"@ethersproject/providers": "*",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"sinon": "^13.0.2",
|
|
79
79
|
"tsx": "^4.19.1",
|
|
80
80
|
"typescript": "6.0.2",
|
|
81
|
-
"@hyperlane-xyz/tsconfig": "^33.0
|
|
81
|
+
"@hyperlane-xyz/tsconfig": "^33.1.0"
|
|
82
82
|
},
|
|
83
83
|
"engines": {
|
|
84
84
|
"node": ">=18"
|
|
@@ -38,16 +38,22 @@ describe('AggregationMetadataBuilder', () => {
|
|
|
38
38
|
it(`should decode fixture ${i}`, () => {
|
|
39
39
|
const count = fixture.decoded.submoduleMetadata.length;
|
|
40
40
|
expect(
|
|
41
|
-
AggregationMetadataBuilder.decode(
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
41
|
+
AggregationMetadataBuilder.decode(
|
|
42
|
+
fixture.encoded,
|
|
43
|
+
{
|
|
44
|
+
ism: {
|
|
45
|
+
type: IsmType.AGGREGATION,
|
|
46
|
+
modules: Array.from(
|
|
47
|
+
{ length: count },
|
|
48
|
+
() => ethers.constants.AddressZero,
|
|
49
|
+
),
|
|
50
|
+
threshold: count,
|
|
51
|
+
},
|
|
52
|
+
} as any,
|
|
53
|
+
() => {
|
|
54
|
+
throw new Error('Should not be called for string modules');
|
|
49
55
|
},
|
|
50
|
-
|
|
56
|
+
),
|
|
51
57
|
).to.deep.equal(fixture.decoded);
|
|
52
58
|
});
|
|
53
59
|
});
|
|
@@ -13,7 +13,6 @@ import {
|
|
|
13
13
|
} from '@hyperlane-xyz/utils';
|
|
14
14
|
|
|
15
15
|
import type { BaseMetadataBuilder } from './builder.js';
|
|
16
|
-
import { decodeIsmMetadata } from './decode.js';
|
|
17
16
|
import {
|
|
18
17
|
AggregationMetadataBuildResult,
|
|
19
18
|
MetadataBuildResult,
|
|
@@ -180,12 +179,16 @@ export class AggregationMetadataBuilder implements MetadataBuilder {
|
|
|
180
179
|
static decode(
|
|
181
180
|
metadata: string,
|
|
182
181
|
context: MetadataContext<AggregationIsmConfig>,
|
|
182
|
+
decodeSubmodule: (
|
|
183
|
+
metadata: string,
|
|
184
|
+
context: MetadataContext,
|
|
185
|
+
) => StructuredMetadata,
|
|
183
186
|
): AggregationMetadata<StructuredMetadata | string> {
|
|
184
187
|
const submoduleMetadata = context.ism.modules.map((ism, index) => {
|
|
185
188
|
const range = this.metadataRange(metadata, index);
|
|
186
189
|
if (range.start == 0) return null;
|
|
187
190
|
if (typeof ism === 'string') return range.encoded;
|
|
188
|
-
return
|
|
191
|
+
return decodeSubmodule(range.encoded, {
|
|
189
192
|
...context,
|
|
190
193
|
ism: ism as DerivedIsmConfig,
|
|
191
194
|
});
|
package/src/metadata/decode.ts
CHANGED
|
@@ -24,13 +24,21 @@ export function decodeIsmMetadata(
|
|
|
24
24
|
|
|
25
25
|
case IsmType.AGGREGATION:
|
|
26
26
|
case IsmType.STORAGE_AGGREGATION:
|
|
27
|
-
return AggregationMetadataBuilder.decode(
|
|
27
|
+
return AggregationMetadataBuilder.decode(
|
|
28
|
+
metadata,
|
|
29
|
+
{ ...context, ism },
|
|
30
|
+
decodeIsmMetadata,
|
|
31
|
+
);
|
|
28
32
|
|
|
29
33
|
case IsmType.ROUTING:
|
|
30
|
-
return DynamicRoutingMetadataBuilder.decode(
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
+
return DynamicRoutingMetadataBuilder.decode(
|
|
35
|
+
metadata,
|
|
36
|
+
{
|
|
37
|
+
...context,
|
|
38
|
+
ism,
|
|
39
|
+
},
|
|
40
|
+
decodeIsmMetadata,
|
|
41
|
+
);
|
|
34
42
|
|
|
35
43
|
case IsmType.ARB_L2_TO_L1:
|
|
36
44
|
return ArbL2ToL1MetadataBuilder.decode(metadata, {
|
package/src/metadata/routing.ts
CHANGED
|
@@ -14,7 +14,6 @@ import {
|
|
|
14
14
|
import { WithAddress, assert } from '@hyperlane-xyz/utils';
|
|
15
15
|
|
|
16
16
|
import type { BaseMetadataBuilder } from './builder.js';
|
|
17
|
-
import { decodeIsmMetadata } from './decode.js';
|
|
18
17
|
import type {
|
|
19
18
|
MetadataBuilder,
|
|
20
19
|
MetadataContext,
|
|
@@ -61,6 +60,10 @@ export class StaticRoutingMetadataBuilder implements MetadataBuilder {
|
|
|
61
60
|
static decode(
|
|
62
61
|
metadata: string,
|
|
63
62
|
context: MetadataContext<WithAddress<DomainRoutingIsmConfig>>,
|
|
63
|
+
decodeFn: (
|
|
64
|
+
metadata: string,
|
|
65
|
+
context: MetadataContext,
|
|
66
|
+
) => StructuredMetadata,
|
|
64
67
|
): RoutingMetadata<StructuredMetadata | string> {
|
|
65
68
|
// TODO: this is a naive implementation, we should support domain ID keys
|
|
66
69
|
assert(context.message.parsed.originChain, 'originChain is required');
|
|
@@ -69,7 +72,7 @@ export class StaticRoutingMetadataBuilder implements MetadataBuilder {
|
|
|
69
72
|
const originMetadata =
|
|
70
73
|
typeof ism === 'string'
|
|
71
74
|
? metadata
|
|
72
|
-
:
|
|
75
|
+
: decodeFn(metadata, {
|
|
73
76
|
...context,
|
|
74
77
|
ism: ism as DerivedIsmConfig,
|
|
75
78
|
});
|