@mainsail/evm-consensus 0.0.1-evm.17 → 0.0.1-evm.18
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/distribution/deployer.d.ts +1 -1
- package/distribution/deployer.d.ts.map +1 -1
- package/distribution/deployer.js +37 -41
- package/distribution/deployer.js.map +1 -1
- package/distribution/index.js +3 -3
- package/distribution/index.js.map +1 -1
- package/distribution/services/consensus-contract-service.js +6 -6
- package/distribution/services/consensus-contract-service.js.map +1 -1
- package/distribution/services/rounds-iterator.js +2 -2
- package/distribution/services/rounds-iterator.js.map +1 -1
- package/distribution/services/votes-iterator.js +2 -2
- package/distribution/services/votes-iterator.js.map +1 -1
- package/distribution/validator-set.js +1 -1
- package/distribution/validator-set.js.map +1 -1
- package/package.json +6 -6
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../source/deployer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAuB,MAAM,qBAAqB,CAAC;AAOrE,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,
|
1
|
+
{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../source/deployer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAuB,MAAM,qBAAqB,CAAC;AAOrE,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACpC;AAED,qBACa,QAAQ;;IAEpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAGpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAG3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2B;IAIlD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAG9C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAS7B,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8R/D,mBAAmB,IAAI,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE;CAsB9D"}
|
package/distribution/deployer.js
CHANGED
@@ -47,7 +47,7 @@ let Deployer = class Deployer {
|
|
47
47
|
if (__classPrivateFieldGet(this, _Deployer_needsCommit, "f")) {
|
48
48
|
await this.evm.onCommit({
|
49
49
|
commitKey,
|
50
|
-
getBlock: () => ({ header: { ...commitKey } }),
|
50
|
+
getBlock: () => ({ header: { ...commitKey, number: commitKey.blockNumber } }),
|
51
51
|
setAccountUpdates: () => ({}),
|
52
52
|
});
|
53
53
|
}
|
@@ -67,7 +67,7 @@ _Deployer_initialize = async function _Deployer_initialize(commitKey) {
|
|
67
67
|
const genesisInfo = {
|
68
68
|
account: __classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").generatorAddress,
|
69
69
|
deployerAccount: this.deployerAddress,
|
70
|
-
|
70
|
+
initialBlockNumber: BigNumber.make(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").initialBlockNumber).toBigInt(),
|
71
71
|
initialSupply: BigNumber.make(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").totalAmount).toBigInt(),
|
72
72
|
usernameContract: ethers.getCreateAddress({ from: this.deployerAddress, nonce: 3 }), // PROXY Uses nonce 3
|
73
73
|
validatorContract: ethers.getCreateAddress({ from: this.deployerAddress, nonce: 1 }), // PROXY Uses nonce 1
|
@@ -80,7 +80,7 @@ _Deployer_getBlockContext = function _Deployer_getBlockContext() {
|
|
80
80
|
const milestone = this.configuration.getMilestone();
|
81
81
|
// Commit Key chosen in a way such that it does not conflict with blocks.
|
82
82
|
return {
|
83
|
-
commitKey: {
|
83
|
+
commitKey: { blockNumber: BigInt(2 ** 32 + 1), round: BigInt(0) },
|
84
84
|
gasLimit: BigInt(milestone.block.maxGasLimit),
|
85
85
|
timestamp: BigInt(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").timestamp),
|
86
86
|
validatorAddress: this.deployerAddress,
|
@@ -94,8 +94,8 @@ _Deployer_deployConsensusContract = async function _Deployer_deployConsensusCont
|
|
94
94
|
// CONSENSUS
|
95
95
|
const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
|
96
96
|
blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
|
97
|
-
caller: this.deployerAddress,
|
98
97
|
data: Buffer.concat([Buffer.from(ethers.getBytes(ConsensusAbi.bytecode.object))]),
|
98
|
+
from: this.deployerAddress,
|
99
99
|
gasLimit: BigInt(10_000_000),
|
100
100
|
gasPrice: BigInt(0),
|
101
101
|
nonce: BigInt(0),
|
@@ -103,14 +103,14 @@ _Deployer_deployConsensusContract = async function _Deployer_deployConsensusCont
|
|
103
103
|
txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
|
104
104
|
value: 0n,
|
105
105
|
});
|
106
|
-
if (!receipt.
|
106
|
+
if (!receipt.status) {
|
107
107
|
throw new Error("failed to deploy Consensus contract");
|
108
108
|
}
|
109
|
-
if (receipt.
|
109
|
+
if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 0 })) {
|
110
110
|
throw new Error("Contract address mismatch");
|
111
111
|
}
|
112
|
-
this.logger.info(`Deployed Consensus contract from ${this.deployerAddress} to ${receipt.
|
113
|
-
return receipt.
|
112
|
+
this.logger.info(`Deployed Consensus contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
|
113
|
+
return receipt.contractAddress;
|
114
114
|
};
|
115
115
|
_Deployer_deployConsensusProxy = async function _Deployer_deployConsensusProxy(consensusContractAddress) {
|
116
116
|
// Logic contract initializer function ABI
|
@@ -123,11 +123,11 @@ _Deployer_deployConsensusProxy = async function _Deployer_deployConsensusProxy(c
|
|
123
123
|
.slice(2);
|
124
124
|
const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
|
125
125
|
blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
|
126
|
-
caller: this.deployerAddress,
|
127
126
|
data: Buffer.concat([
|
128
127
|
Buffer.from(ethers.getBytes(ERC1967ProxyAbi.bytecode.object)),
|
129
128
|
Buffer.from(proxyConstructorArguments, "hex"),
|
130
129
|
]),
|
130
|
+
from: this.deployerAddress,
|
131
131
|
gasLimit: BigInt(10_000_000),
|
132
132
|
gasPrice: BigInt(0),
|
133
133
|
nonce: BigInt(1),
|
@@ -135,29 +135,27 @@ _Deployer_deployConsensusProxy = async function _Deployer_deployConsensusProxy(c
|
|
135
135
|
txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
|
136
136
|
value: 0n,
|
137
137
|
});
|
138
|
-
if (!receipt.
|
138
|
+
if (!receipt.status) {
|
139
139
|
throw new Error("failed to deploy Consensus PROXY contract");
|
140
140
|
}
|
141
|
-
if (receipt.
|
141
|
+
if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 1 })) {
|
142
142
|
throw new Error("Contract address mismatch");
|
143
143
|
}
|
144
|
-
this.logger.info(`Deployed Consensus PROXY contract from ${this.deployerAddress} to ${receipt.
|
144
|
+
this.logger.info(`Deployed Consensus PROXY contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
|
145
145
|
__classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_emitContractDeployed).call(this, {
|
146
146
|
activeImplementation: consensusContractAddress,
|
147
|
-
address: receipt.
|
147
|
+
address: receipt.contractAddress,
|
148
148
|
implementations: [{ abi: ConsensusAbi.abi, address: consensusContractAddress }],
|
149
149
|
name: "consensus",
|
150
150
|
proxy: "UUPS",
|
151
151
|
});
|
152
|
-
this.app
|
153
|
-
.bind(EvmConsensusIdentifiers.Contracts.Addresses.Consensus)
|
154
|
-
.toConstantValue(receipt.deployedContractAddress);
|
152
|
+
this.app.bind(EvmConsensusIdentifiers.Contracts.Addresses.Consensus).toConstantValue(receipt.contractAddress);
|
155
153
|
};
|
156
154
|
_Deployer_deployUsernamesContract = async function _Deployer_deployUsernamesContract() {
|
157
155
|
const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
|
158
156
|
blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
|
159
|
-
caller: this.deployerAddress,
|
160
157
|
data: Buffer.concat([Buffer.from(ethers.getBytes(UsernamesAbi.bytecode.object))]),
|
158
|
+
from: this.deployerAddress,
|
161
159
|
gasLimit: BigInt(10_000_000),
|
162
160
|
gasPrice: BigInt(0),
|
163
161
|
nonce: BigInt(2),
|
@@ -165,14 +163,14 @@ _Deployer_deployUsernamesContract = async function _Deployer_deployUsernamesCont
|
|
165
163
|
txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
|
166
164
|
value: 0n,
|
167
165
|
});
|
168
|
-
if (!receipt.
|
166
|
+
if (!receipt.status) {
|
169
167
|
throw new Error("failed to deploy Usernames contract");
|
170
168
|
}
|
171
|
-
if (receipt.
|
169
|
+
if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 2 })) {
|
172
170
|
throw new Error("Contract address mismatch");
|
173
171
|
}
|
174
|
-
this.logger.info(`Deployed Usernames contract from ${this.deployerAddress} to ${receipt.
|
175
|
-
return receipt.
|
172
|
+
this.logger.info(`Deployed Usernames contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
|
173
|
+
return receipt.contractAddress;
|
176
174
|
};
|
177
175
|
_Deployer_deployUsernamesProxy = async function _Deployer_deployUsernamesProxy(usernamesContractAddress) {
|
178
176
|
// Logic contract initializer function ABI
|
@@ -185,11 +183,11 @@ _Deployer_deployUsernamesProxy = async function _Deployer_deployUsernamesProxy(u
|
|
185
183
|
.slice(2);
|
186
184
|
const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
|
187
185
|
blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
|
188
|
-
caller: this.deployerAddress,
|
189
186
|
data: Buffer.concat([
|
190
187
|
Buffer.from(ethers.getBytes(ERC1967ProxyAbi.bytecode.object)),
|
191
188
|
Buffer.from(proxyConstructorArguments, "hex"),
|
192
189
|
]),
|
190
|
+
from: this.deployerAddress,
|
193
191
|
gasLimit: BigInt(10_000_000),
|
194
192
|
gasPrice: BigInt(0),
|
195
193
|
nonce: BigInt(3),
|
@@ -197,29 +195,27 @@ _Deployer_deployUsernamesProxy = async function _Deployer_deployUsernamesProxy(u
|
|
197
195
|
txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
|
198
196
|
value: 0n,
|
199
197
|
});
|
200
|
-
if (!receipt.
|
198
|
+
if (!receipt.status) {
|
201
199
|
throw new Error("failed to deploy Usernames PROXY contract");
|
202
200
|
}
|
203
|
-
if (receipt.
|
201
|
+
if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 3 })) {
|
204
202
|
throw new Error("Contract address mismatch");
|
205
203
|
}
|
206
|
-
this.logger.info(`Deployed Usernames PROXY contract from ${this.deployerAddress} to ${receipt.
|
204
|
+
this.logger.info(`Deployed Usernames PROXY contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
|
207
205
|
__classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_emitContractDeployed).call(this, {
|
208
206
|
activeImplementation: usernamesContractAddress,
|
209
|
-
address: receipt.
|
207
|
+
address: receipt.contractAddress,
|
210
208
|
implementations: [{ abi: UsernamesAbi.abi, address: usernamesContractAddress }],
|
211
209
|
name: "usernames",
|
212
210
|
proxy: "UUPS",
|
213
211
|
});
|
214
|
-
this.app
|
215
|
-
.bind(EvmConsensusIdentifiers.Contracts.Addresses.Usernames)
|
216
|
-
.toConstantValue(receipt.deployedContractAddress);
|
212
|
+
this.app.bind(EvmConsensusIdentifiers.Contracts.Addresses.Usernames).toConstantValue(receipt.contractAddress);
|
217
213
|
};
|
218
214
|
_Deployer_deployMultiPaymentContract = async function _Deployer_deployMultiPaymentContract() {
|
219
215
|
const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
|
220
216
|
blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
|
221
|
-
caller: this.deployerAddress,
|
222
217
|
data: Buffer.concat([Buffer.from(ethers.getBytes(MultiPaymentAbi.bytecode.object))]),
|
218
|
+
from: this.deployerAddress,
|
223
219
|
gasLimit: BigInt(10_000_000),
|
224
220
|
gasPrice: BigInt(0),
|
225
221
|
nonce: BigInt(4),
|
@@ -227,14 +223,14 @@ _Deployer_deployMultiPaymentContract = async function _Deployer_deployMultiPayme
|
|
227
223
|
txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
|
228
224
|
value: 0n,
|
229
225
|
});
|
230
|
-
if (!receipt.
|
226
|
+
if (!receipt.status) {
|
231
227
|
throw new Error("failed to deploy MultiPayment contract");
|
232
228
|
}
|
233
|
-
if (receipt.
|
229
|
+
if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 4 })) {
|
234
230
|
throw new Error("Contract address mismatch");
|
235
231
|
}
|
236
|
-
this.logger.info(`Deployed MultiPayment contract from ${this.deployerAddress} to ${receipt.
|
237
|
-
return receipt.
|
232
|
+
this.logger.info(`Deployed MultiPayment contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
|
233
|
+
return receipt.contractAddress;
|
238
234
|
};
|
239
235
|
_Deployer_deployMultiPaymentProxy = async function _Deployer_deployMultiPaymentProxy(multiPaymentAddress) {
|
240
236
|
// Logic contract initializer function ABI
|
@@ -247,11 +243,11 @@ _Deployer_deployMultiPaymentProxy = async function _Deployer_deployMultiPaymentP
|
|
247
243
|
.slice(2);
|
248
244
|
const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
|
249
245
|
blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
|
250
|
-
caller: this.deployerAddress,
|
251
246
|
data: Buffer.concat([
|
252
247
|
Buffer.from(ethers.getBytes(ERC1967ProxyAbi.bytecode.object)),
|
253
248
|
Buffer.from(proxyConstructorArguments, "hex"),
|
254
249
|
]),
|
250
|
+
from: this.deployerAddress,
|
255
251
|
gasLimit: BigInt(10_000_000),
|
256
252
|
gasPrice: BigInt(0),
|
257
253
|
nonce: BigInt(5),
|
@@ -259,30 +255,30 @@ _Deployer_deployMultiPaymentProxy = async function _Deployer_deployMultiPaymentP
|
|
259
255
|
txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
|
260
256
|
value: 0n,
|
261
257
|
});
|
262
|
-
if (!receipt.
|
258
|
+
if (!receipt.status) {
|
263
259
|
throw new Error("failed to deploy MultiPayment PROXY contract");
|
264
260
|
}
|
265
|
-
if (receipt.
|
261
|
+
if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 5 })) {
|
266
262
|
throw new Error("Contract address mismatch");
|
267
263
|
}
|
268
|
-
this.logger.info(`Deployed MultiPayment PROXY contract from ${this.deployerAddress} to ${receipt.
|
264
|
+
this.logger.info(`Deployed MultiPayment PROXY contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
|
269
265
|
__classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_emitContractDeployed).call(this, {
|
270
266
|
activeImplementation: multiPaymentAddress,
|
271
|
-
address: receipt.
|
267
|
+
address: receipt.contractAddress,
|
272
268
|
implementations: [{ abi: MultiPaymentAbi.abi, address: multiPaymentAddress }],
|
273
269
|
name: "multi-payments",
|
274
270
|
proxy: "UUPS",
|
275
271
|
});
|
276
272
|
this.app
|
277
273
|
.bind(EvmConsensusIdentifiers.Contracts.Addresses.MultiPayment)
|
278
|
-
.toConstantValue(receipt.
|
274
|
+
.toConstantValue(receipt.contractAddress);
|
279
275
|
};
|
280
276
|
_Deployer_emitContractDeployed = function _Deployer_emitContractDeployed(event) {
|
281
277
|
__classPrivateFieldGet(this, _Deployer_deploymentEvents, "f").push(event);
|
282
278
|
void this.events.dispatch(Events.DeployerEvent.ContractCreated, event);
|
283
279
|
};
|
284
280
|
_Deployer_processTransaction = async function _Deployer_processTransaction(context) {
|
285
|
-
const { receipt } = await this.evm.getReceipt(context.blockContext.commitKey.
|
281
|
+
const { receipt } = await this.evm.getReceipt(context.blockContext.commitKey.blockNumber, context.txHash);
|
286
282
|
if (receipt) {
|
287
283
|
return receipt;
|
288
284
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../source/deployer.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../source/deployer.ts"],"names":[],"mappings":"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"}
|
package/distribution/index.js
CHANGED
@@ -27,10 +27,10 @@ let ServiceProvider = class ServiceProvider extends Providers.ServiceProvider {
|
|
27
27
|
assert.defined(genesisBlock);
|
28
28
|
this.app.bind(EvmConsensusIdentifiers.Internal.Deployer).to(Deployer).inSingletonScope();
|
29
29
|
await this.app.get(EvmConsensusIdentifiers.Internal.Deployer).deploy({
|
30
|
-
generatorAddress: genesisBlock.block.
|
31
|
-
|
30
|
+
generatorAddress: genesisBlock.block.proposer,
|
31
|
+
initialBlockNumber: genesisBlock.block.number,
|
32
32
|
timestamp: genesisBlock.block.timestamp,
|
33
|
-
totalAmount: genesisBlock.block.
|
33
|
+
totalAmount: genesisBlock.block.amount,
|
34
34
|
});
|
35
35
|
}
|
36
36
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAa,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,SAAS,CAAC,eAAe;IACtD,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEpF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC;QAEtF,IAAI,CAAC,GAAG;aACN,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC;aACzD,eAAe,CAAC,4CAA4C,CAAC,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,GAAG,CAAC,GAAG,CAA0B,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEzG,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAA8B,qBAAqB,CAAC,CAAC;QACzF,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEzF,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAW,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;YAC9E,gBAAgB,EAAE,YAAY,CAAC,KAAK,CAAC,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAa,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,SAAS,CAAC,eAAe;IACtD,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEpF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC;QAEtF,IAAI,CAAC,GAAG;aACN,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC;aACzD,eAAe,CAAC,4CAA4C,CAAC,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,GAAG,CAAC,GAAG,CAA0B,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEzG,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAA8B,qBAAqB,CAAC,CAAC;QACzF,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEzF,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAW,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;YAC9E,gBAAgB,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ;YAC7C,kBAAkB,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM;YAC7C,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,SAAS;YACvC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM;SACtC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA1BY,eAAe;IAD3B,UAAU,EAAE;GACA,eAAe,CA0B3B;;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}
|
@@ -23,10 +23,10 @@ let ConsensusContractService = class ConsensusContractService {
|
|
23
23
|
const iface = new ethers.Interface(ConsensusAbi.abi);
|
24
24
|
const data = iface.encodeFunctionData("getActiveValidators").slice(2);
|
25
25
|
const result = await this.evm.view({
|
26
|
-
caller: deployerAddress,
|
27
26
|
data: Buffer.from(data, "hex"),
|
28
|
-
|
27
|
+
from: deployerAddress,
|
29
28
|
specId: evmSpec,
|
29
|
+
to: consensusContractAddress,
|
30
30
|
});
|
31
31
|
if (!result.success) {
|
32
32
|
await this.app.terminate("getActiveValidators failed");
|
@@ -53,10 +53,10 @@ let ConsensusContractService = class ConsensusContractService {
|
|
53
53
|
const iface = new ethers.Interface(ConsensusAbi.abi);
|
54
54
|
const data = iface.encodeFunctionData("getAllValidators").slice(2);
|
55
55
|
const result = await this.evm.view({
|
56
|
-
caller: deployerAddress,
|
57
56
|
data: Buffer.from(data, "hex"),
|
58
|
-
|
57
|
+
from: deployerAddress,
|
59
58
|
specId: evmSpec,
|
59
|
+
to: consensusContractAddress,
|
60
60
|
});
|
61
61
|
if (!result.success) {
|
62
62
|
await this.app.terminate("getAllValidators failed");
|
@@ -86,10 +86,10 @@ let ConsensusContractService = class ConsensusContractService {
|
|
86
86
|
const iface = new ethers.Interface(ConsensusAbi.abi);
|
87
87
|
const data = iface.encodeFunctionData("getVotesCount").slice(2);
|
88
88
|
const result = await this.evm.view({
|
89
|
-
caller: deployerAddress,
|
90
89
|
data: Buffer.from(data, "hex"),
|
91
|
-
|
90
|
+
from: deployerAddress,
|
92
91
|
specId: evmSpec,
|
92
|
+
to: consensusContractAddress,
|
93
93
|
});
|
94
94
|
if (!result.success) {
|
95
95
|
await this.app.terminate("getVotesCount failed");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"consensus-contract-service.js","sourceRoot":"","sources":["../../source/services/consensus-contract-service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAGlD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAWpC,KAAK,CAAC,mBAAmB;QACxB,MAAM,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC7G,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAEtD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEtE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAClC,
|
1
|
+
{"version":3,"file":"consensus-contract-service.js","sourceRoot":"","sources":["../../source/services/consensus-contract-service.ts"],"names":[],"mappings":"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"}
|
@@ -54,11 +54,11 @@ let AsyncValidatorRoundsIterator = class AsyncValidatorRoundsIterator {
|
|
54
54
|
const iface = new ethers.Interface(ConsensusAbi.abi);
|
55
55
|
const data = iface.encodeFunctionData("getRounds", [__classPrivateFieldGet(this, _AsyncValidatorRoundsIterator_offset, "f"), ROUNDS_PER_REQUEST]).slice(2);
|
56
56
|
const result = await this.evm.view({
|
57
|
-
caller: deployerAddress,
|
58
57
|
data: Buffer.from(data, "hex"),
|
58
|
+
from: deployerAddress,
|
59
59
|
gasLimit: 100000000n,
|
60
|
-
recipient: consensusContractAddress,
|
61
60
|
specId: evmSpec,
|
61
|
+
to: consensusContractAddress,
|
62
62
|
});
|
63
63
|
if (!result.success) {
|
64
64
|
await this.app.terminate("getRounds failed");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"rounds-iterator.js","sourceRoot":"","sources":["../../source/services/rounds-iterator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAGzB,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAAlC;QAcN,+CAA0C,EAAE,EAAC;QAC7C,8CAAS,CAAC,EAAC,CAAC,mCAAmC;QAC/C,+CAAU,CAAC,EAAC,CAAC,6BAA6B;IAiE3C,CAAC;IA/DA,mKAAC,MAAM,CAAC,aAAa,EAAC;QACrB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,IAAI;;QACT,IAAI,uBAAA,IAAI,4CAAQ,CAAC,MAAM,KAAK,uBAAA,IAAI,2CAAO,EAAE,CAAC;YACzC,uBAAA,IAAI,wCAAW,MAAM,IAAI,CAAC,SAAS,EAAE,MAAA,CAAC;YAEtC,IAAI,uBAAA,IAAI,4CAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YACzC,CAAC;YAED,uBAAA,IAAI,uCAAU,CAAC,MAAA,CAAC;YAChB,6IAAgB,uBAAA,IAAI,4CAAQ,CAAC,MAAM,MAAA,CAAC;QACrC,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,uBAAA,IAAI,4CAAQ,CAAC,kEAAA,CAAA,2EAAW,EAAX,KAAA,IAAa,IAAA,CAAA,MAAA,IAAA,CAAC,EAAE,CAAC;IAC5D,CAAC;IAEO,KAAK,CAAC,SAAS;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC7G,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAEtD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,uBAAA,IAAI,4CAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEhG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAClC,
|
1
|
+
{"version":3,"file":"rounds-iterator.js","sourceRoot":"","sources":["../../source/services/rounds-iterator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAGzB,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAAlC;QAcN,+CAA0C,EAAE,EAAC;QAC7C,8CAAS,CAAC,EAAC,CAAC,mCAAmC;QAC/C,+CAAU,CAAC,EAAC,CAAC,6BAA6B;IAiE3C,CAAC;IA/DA,mKAAC,MAAM,CAAC,aAAa,EAAC;QACrB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,IAAI;;QACT,IAAI,uBAAA,IAAI,4CAAQ,CAAC,MAAM,KAAK,uBAAA,IAAI,2CAAO,EAAE,CAAC;YACzC,uBAAA,IAAI,wCAAW,MAAM,IAAI,CAAC,SAAS,EAAE,MAAA,CAAC;YAEtC,IAAI,uBAAA,IAAI,4CAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YACzC,CAAC;YAED,uBAAA,IAAI,uCAAU,CAAC,MAAA,CAAC;YAChB,6IAAgB,uBAAA,IAAI,4CAAQ,CAAC,MAAM,MAAA,CAAC;QACrC,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,uBAAA,IAAI,4CAAQ,CAAC,kEAAA,CAAA,2EAAW,EAAX,KAAA,IAAa,IAAA,CAAA,MAAA,IAAA,CAAC,EAAE,CAAC;IAC5D,CAAC;IAEO,KAAK,CAAC,SAAS;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC7G,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAEtD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,uBAAA,IAAI,4CAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEhG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAClC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;YAC9B,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,UAAY;YACtB,MAAM,EAAE,OAAO;YACf,EAAE,EAAE,wBAAwB;SAC5B,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,oBAAoB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAO,CAAC,CAAC;QAE1E,MAAM,eAAe,GAAmC,EAAE,CAAC;QAC3D,KAAK,MAAM,cAAc,IAAI,OAAO,EAAE,CAAC;YACtC,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,cAAc,CAAC;YAE3C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAElC,eAAe,CAAC,IAAI,CAAC;gBACpB,KAAK,EAAE,WAAW;gBAClB,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAC,WAAW;gBACpF,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;oBACxC,MAAM,CAAC,gBAAgB,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;oBAElD,OAAO;wBACN,OAAO,EAAE,gBAAgB;wBACzB,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC;qBACxC,CAAC;gBACH,CAAC,CAAC;aACF,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,eAAe,CAAC;IACxB,CAAC;CACD,CAAA;AA/EiB;IADhB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC;;yDACW;AAGnC;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;;mEACiB;AAG/C;IADhB,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC;;qEACyB;AAI5D;IAFhB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC;IAChC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC;;yDACoB;AAZlC,4BAA4B;IADxC,UAAU,EAAE;GACA,4BAA4B,CAiFxC"}
|
@@ -53,11 +53,11 @@ let AsyncVotesIterator = class AsyncVotesIterator {
|
|
53
53
|
const iface = new ethers.Interface(ConsensusAbi.abi);
|
54
54
|
const data = iface.encodeFunctionData("getVotes", [__classPrivateFieldGet(this, _AsyncVotesIterator_address, "f"), VOTES_PER_REQUEST]).slice(2);
|
55
55
|
const result = await this.evm.view({
|
56
|
-
caller: deployerAddress,
|
57
56
|
data: Buffer.from(data, "hex"),
|
57
|
+
from: deployerAddress,
|
58
58
|
gasLimit: 100000000n,
|
59
|
-
recipient: consensusContractAddress,
|
60
59
|
specId: evmSpec,
|
60
|
+
to: consensusContractAddress,
|
61
61
|
});
|
62
62
|
if (!result.success) {
|
63
63
|
await this.app.terminate("getVotes failed");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"votes-iterator.js","sourceRoot":"","sources":["../../source/services/votes-iterator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAG1B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAWN,sCAAW,4CAA4C,EAAC;QACxD,oCAA+B,EAAE,EAAC;QAClC,oCAAS,CAAC,EAAC;IA6CZ,CAAC;IA3CA,qIAAC,MAAM,CAAC,aAAa,EAAC;QACrB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,IAAI;;QACT,IAAI,uBAAA,IAAI,iCAAO,CAAC,MAAM,KAAK,uBAAA,IAAI,iCAAO,EAAE,CAAC;YACxC,uBAAA,IAAI,6BAAU,MAAM,IAAI,CAAC,QAAQ,EAAE,MAAA,CAAC;YAEpC,IAAI,uBAAA,IAAI,iCAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YACzC,CAAC;YAED,uBAAA,IAAI,6BAAU,CAAC,MAAA,CAAC;YAChB,uBAAA,IAAI,+BAAY,uBAAA,IAAI,iCAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,YAAY,MAAA,CAAC;QAClD,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,uBAAA,IAAI,iCAAO,CAAC,wDAAA,CAAA,iEAAW,EAAX,KAAA,IAAa,IAAA,CAAA,MAAA,IAAA,CAAC,EAAE,CAAC;IAC3D,CAAC;IAEO,KAAK,CAAC,QAAQ;QACrB,MAAM,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC7G,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAEtD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC,uBAAA,IAAI,mCAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAE/F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAClC,
|
1
|
+
{"version":3,"file":"votes-iterator.js","sourceRoot":"","sources":["../../source/services/votes-iterator.ts"],"names":[],"mappings":"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"}
|
@@ -35,7 +35,7 @@ let ValidatorSet = class ValidatorSet {
|
|
35
35
|
__classPrivateFieldSet(this, _ValidatorSet_allValidators, new Map(validators.map((validator) => [validator.address, validator])), "f");
|
36
36
|
}
|
37
37
|
async onCommit(unit) {
|
38
|
-
if (this.roundCalculator.isNewRound(unit.
|
38
|
+
if (this.roundCalculator.isNewRound(unit.blockNumber + 1)) {
|
39
39
|
await __classPrivateFieldGet(this, _ValidatorSet_instances, "m", _ValidatorSet_buildActiveValidators).call(this);
|
40
40
|
}
|
41
41
|
await __classPrivateFieldGet(this, _ValidatorSet_instances, "m", _ValidatorSet_calculateChangedValidators).call(this);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"validator-set.js","sourceRoot":"","sources":["../source/validator-set.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGlE,IAAM,YAAY,GAAlB,MAAM,YAAY;IAAlB;;QAUN,sCAAoD,EAAE,EAAC;QACvD,uCAAuC,IAAI,GAAG,EAAE,EAAC;QAEjD,sCAA+D,IAAI,GAAG,EAAE,EAAC;QACzE,wCAAsD,EAAE,EAAC;IA+E1D,CAAC;IA7EO,KAAK,CAAC,OAAO;QACnB,MAAM,uBAAA,IAAI,oEAAuB,MAA3B,IAAI,CAAyB,CAAC;QAEpC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,CAAC;QAC1E,uBAAA,IAAI,+BAAkB,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,MAAA,CAAC;IAC9F,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,IAAyC;QAC9D,IAAI,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,
|
1
|
+
{"version":3,"file":"validator-set.js","sourceRoot":"","sources":["../source/validator-set.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@mainsail/evm-consensus",
|
3
|
-
"version": "0.0.1-evm.
|
3
|
+
"version": "0.0.1-evm.18",
|
4
4
|
"description": "EVM development support for the Mainsail blockchain",
|
5
5
|
"license": "GPL-3.0-only",
|
6
6
|
"contributors": [],
|
@@ -12,11 +12,11 @@
|
|
12
12
|
],
|
13
13
|
"dependencies": {
|
14
14
|
"ethers": "6.13.5",
|
15
|
-
"@mainsail/container": "0.0.1-evm.
|
16
|
-
"@mainsail/contracts": "0.0.1-evm.
|
17
|
-
"@mainsail/
|
18
|
-
"@mainsail/
|
19
|
-
"@mainsail/
|
15
|
+
"@mainsail/container": "0.0.1-evm.18",
|
16
|
+
"@mainsail/contracts": "0.0.1-evm.18",
|
17
|
+
"@mainsail/evm-contracts": "0.0.1-evm.18",
|
18
|
+
"@mainsail/utils": "0.0.1-evm.18",
|
19
|
+
"@mainsail/kernel": "0.0.1-evm.18"
|
20
20
|
},
|
21
21
|
"devDependencies": {
|
22
22
|
"@types/seedrandom": "3.0.8",
|