@ercworldio/blockchain-shared 1.0.3-dev.3-PROJ-1296.6 → 1.0.3-dev.3-PROJ-1296.8
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/build/contracts/contract-events/EscrowEvents.d.ts +30 -1
- package/build/contracts/contract-events/EscrowEvents.d.ts.map +1 -1
- package/build/contracts/contract-events/EscrowEvents.js +6 -0
- package/build/services/AzureEventHubHandler.d.ts.map +1 -1
- package/build/services/AzureEventHubHandler.js +7 -3
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Result } from "ethers";
|
|
2
2
|
import { ChainId, EventObject } from "../../interfaces";
|
|
3
3
|
import { IConfig } from "../../interfaces/config";
|
|
4
|
-
import { AdminWithdrawEventData, ConfigureTokenMultisigEventData, LowReservesEventData, SetTokenTimelockEventData, WithdrawalExecutedEventData, WithdrawalScheduledEventData } from "./types/events";
|
|
4
|
+
import { AdminWithdrawEventData, ConfigureAdminMultisigEventData, ConfigureTokenMultisigEventData, LowReservesEventData, SetTimelockGranularEventData, SetTokenTimelockEventData, WithdrawalExecutedEventData, WithdrawalScheduledEventData } from "./types/events";
|
|
5
5
|
/**
|
|
6
6
|
* Handles the mutation of deposit and withdrawal events before they are used to produce events to the event hub
|
|
7
7
|
*/
|
|
@@ -49,6 +49,20 @@ declare class EscrowEvents {
|
|
|
49
49
|
durationBelow: bigint;
|
|
50
50
|
durationAbove: bigint;
|
|
51
51
|
};
|
|
52
|
+
mutateTimelockGranularEvent(baseEvent: SetTimelockGranularEventData): {
|
|
53
|
+
gasUsed: number;
|
|
54
|
+
eventName: string;
|
|
55
|
+
confirmed: boolean;
|
|
56
|
+
blockchain: import("../../interfaces").BlockchainType;
|
|
57
|
+
parentContract: string;
|
|
58
|
+
caller?: string;
|
|
59
|
+
timestamp: number | bigint;
|
|
60
|
+
blockNumber?: number;
|
|
61
|
+
txHash: string;
|
|
62
|
+
chainId: number;
|
|
63
|
+
receiverAddress: string;
|
|
64
|
+
duration: bigint;
|
|
65
|
+
};
|
|
52
66
|
mutateConfigureTokenMultiSig(chainId: string, baseEvent: ConfigureTokenMultisigEventData, eventArgs: Result): {
|
|
53
67
|
thresholdAmount: number;
|
|
54
68
|
thresholdAmountWei: string;
|
|
@@ -69,6 +83,21 @@ declare class EscrowEvents {
|
|
|
69
83
|
sigsManagerBelow: bigint;
|
|
70
84
|
sigsManagerAbove: bigint;
|
|
71
85
|
};
|
|
86
|
+
mutateConfigureAdminMultisig(baseEvent: ConfigureAdminMultisigEventData): {
|
|
87
|
+
gasUsed: number;
|
|
88
|
+
eventName: string;
|
|
89
|
+
confirmed: boolean;
|
|
90
|
+
blockchain: import("../../interfaces").BlockchainType;
|
|
91
|
+
parentContract: string;
|
|
92
|
+
caller?: string;
|
|
93
|
+
timestamp: number | bigint;
|
|
94
|
+
blockNumber?: number;
|
|
95
|
+
txHash: string;
|
|
96
|
+
chainId: number;
|
|
97
|
+
opType: bigint;
|
|
98
|
+
sigsManagerRequired: bigint;
|
|
99
|
+
sigsExecutiveRequired: bigint;
|
|
100
|
+
};
|
|
72
101
|
mutateAdminWithdraw(chainId: string, baseEvent: AdminWithdrawEventData, eventArgs: Result): {
|
|
73
102
|
amount: number;
|
|
74
103
|
amountWei: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EscrowEvents.d.ts","sourceRoot":"","sources":["../../../src/contracts/contract-events/EscrowEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAe,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAA0B,sBAAsB,
|
|
1
|
+
{"version":3,"file":"EscrowEvents.d.ts","sourceRoot":"","sources":["../../../src/contracts/contract-events/EscrowEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAe,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAA0B,sBAAsB,EAAmC,+BAA+B,EAAmC,+BAA+B,EAA4D,oBAAoB,EAAE,4BAA4B,EAA6B,yBAAyB,EAAuG,2BAA2B,EAAgC,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAItjB;;GAEG;AACH,cAAM,YAAY;IACd,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAQ;IAC5C,OAAO,CAAC,MAAM,CAAU;IAExB,OAAO;IAIP,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO;IAOlC;;;;OAIG;IACH,OAAO,CAAC,iCAAiC;IA6BzC,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;IA6B1F,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;IAYpG,2BAA2B,CAAC,SAAS,EAAE,4BAA4B;;;;;;;;;;;;;;IAOnE,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,+BAA+B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;IAY3G,4BAA4B,CAAC,SAAS,EAAE,+BAA+B;;;;;;;;;;;;;;;IAOvE,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;IAYzF,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,4BAA4B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;;;IAYrG,wBAAwB,CAAC,SAAS,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;IAWlF,yBAAyB,CAAC,SAAS,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;IAWnF,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAUtG;;;;;;OAMG;IACH,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE;IAc7F;;;;;;OAMG;IACH,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE;IAiBhG;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAsB1B,oCAAoC;IACpC,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAcpE;AAGD,eAAe,YAAY,CAAC"}
|
|
@@ -68,11 +68,17 @@ class EscrowEvents {
|
|
|
68
68
|
let thresholdAmountDecimals = this.formatTokenAmount(chainId, _eventArgs.tokenAddress, _eventArgs.thresholdAmount);
|
|
69
69
|
return Object.assign(Object.assign({}, baseEvent), { thresholdAmount: thresholdAmountDecimals, thresholdAmountWei: _eventArgs.thresholdAmount.toString(), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
|
|
70
70
|
}
|
|
71
|
+
mutateTimelockGranularEvent(baseEvent) {
|
|
72
|
+
return Object.assign(Object.assign({}, baseEvent), { gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
|
|
73
|
+
}
|
|
71
74
|
mutateConfigureTokenMultiSig(chainId, baseEvent, eventArgs) {
|
|
72
75
|
const _eventArgs = eventArgs;
|
|
73
76
|
let thresholdAmountDecimals = this.formatTokenAmount(chainId, _eventArgs.tokenAddress, _eventArgs.thresholdAmount);
|
|
74
77
|
return Object.assign(Object.assign({}, baseEvent), { thresholdAmount: thresholdAmountDecimals, thresholdAmountWei: _eventArgs.thresholdAmount.toString(), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
|
|
75
78
|
}
|
|
79
|
+
mutateConfigureAdminMultisig(baseEvent) {
|
|
80
|
+
return Object.assign(Object.assign({}, baseEvent), { gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
|
|
81
|
+
}
|
|
76
82
|
mutateAdminWithdraw(chainId, baseEvent, eventArgs) {
|
|
77
83
|
const _eventArgs = eventArgs;
|
|
78
84
|
let amount = this.formatTokenAmount(chainId, _eventArgs.tokenAddress, _eventArgs.amount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureEventHubHandler.d.ts","sourceRoot":"","sources":["../../src/services/AzureEventHubHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAsB,MAAM,SAAS,CAAC;AAI/D,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAC9B,eAAe,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACrC,OAAO,CAAC,MAAM,CAAU;IACjB,4BAA4B,EAAE,aAAa,EAAE,CAAC;IAC9C,4BAA4B,EAAE,MAAM,CAAC,MAAM,gBAAgB,EAAE,aAAa,CAAC,CAAC;IACnF,OAAO,CAAC,MAAM,CAAS;gBAGX,OAAO,EAAE,OAAO;IAiC5B,OAAO,CAAC,yBAAyB;IAajC,gBAAgB;;;;IAchB;;;;OAIG;IACG,SAAS,CAAC,SAAS,EAAE,UAAU;IAwC/B,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,sBAAsB;IAwB7E;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,EAAE,MAAM,gBAAgB;
|
|
1
|
+
{"version":3,"file":"AzureEventHubHandler.d.ts","sourceRoot":"","sources":["../../src/services/AzureEventHubHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAsB,MAAM,SAAS,CAAC;AAI/D,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAC9B,eAAe,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACrC,OAAO,CAAC,MAAM,CAAU;IACjB,4BAA4B,EAAE,aAAa,EAAE,CAAC;IAC9C,4BAA4B,EAAE,MAAM,CAAC,MAAM,gBAAgB,EAAE,aAAa,CAAC,CAAC;IACnF,OAAO,CAAC,MAAM,CAAS;gBAGX,OAAO,EAAE,OAAO;IAiC5B,OAAO,CAAC,yBAAyB;IAajC,gBAAgB;;;;IAchB;;;;OAIG;IACG,SAAS,CAAC,SAAS,EAAE,UAAU;IAwC/B,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,sBAAsB;IAwB7E;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,EAAE,MAAM,gBAAgB;CAe5D"}
|
|
@@ -69,10 +69,10 @@ class AzureEventHubHandler {
|
|
|
69
69
|
*/
|
|
70
70
|
sendEvent(eventData) {
|
|
71
71
|
return __awaiter(this, void 0, void 0, function* () {
|
|
72
|
-
|
|
72
|
+
let eventHubName = this.event_name_to_event_hub_name[eventData.eventName];
|
|
73
73
|
if (!eventHubName) {
|
|
74
|
-
this.logger.info(`[AzureEventHubHandler]: Event hub name not found for ${eventData.eventName} event.
|
|
75
|
-
|
|
74
|
+
this.logger.info(`[AzureEventHubHandler]: Event hub name not found for ${eventData.eventName} event. Using 'rawtransferlogs'`);
|
|
75
|
+
eventHubName = this.config.config.transferLogsRawEventHubName ? this.config.config.transferLogsRawEventHubName : 'rawtransferlogs';
|
|
76
76
|
}
|
|
77
77
|
const clientDefault = new event_hubs_1.EventHubProducerClient(this.config.config.azureConnectionStringNotifications, eventHubName, { retryOptions: { retryDelayInMs: 10000 } });
|
|
78
78
|
const eventDataBatch = yield clientDefault.createBatch();
|
|
@@ -127,6 +127,10 @@ class AzureEventHubHandler {
|
|
|
127
127
|
getEventHubClient(eventName) {
|
|
128
128
|
return __awaiter(this, void 0, void 0, function* () {
|
|
129
129
|
try {
|
|
130
|
+
// Fallback to rawtransferlogs if event name is not mapped to a event hub client
|
|
131
|
+
if (!this.event_name_to_event_hub_name[eventName]) {
|
|
132
|
+
return this.eventHubClients.get(this.config.config.transferLogsRawEventHubName || 'rawtransferlogs');
|
|
133
|
+
}
|
|
130
134
|
return this.eventHubClients.get(this.event_name_to_event_hub_name[eventName]);
|
|
131
135
|
}
|
|
132
136
|
catch (error) {
|
package/package.json
CHANGED