@aztec/validator-client 2.1.0-rc.1 → 2.1.0-rc.3

package/dest/block_proposal_handler.js

@@ -219,7 +219,7 @@ export class BlockProposalHandler {
             deadline: this.getReexecutionDeadline(proposal, config)
         });
         const numFailedTxs = failedTxs.length;
-        const slot = proposal.slotNumber;
+        const slot = proposal.slotNumber.toBigInt();
         this.log.verbose(`Transaction re-execution complete for slot ${slot}`, {
             numFailedTxs,
             numProposalTxs: txHashes.length,

package/dest/key_store/node_keystore_adapter.js

@@ -272,7 +272,7 @@ export class NodeKeystoreAdapter {
    * @returns Coinbase EthAddress
    */ getCoinbaseAddress(attesterAddress) {
         const validatorIndex = this.findValidatorIndexForAttester(attesterAddress);
-        return this.keystoreManager.getCoinbaseAddress(validatorIndex);
+        return this.keystoreManager.getCoinbaseAddress(validatorIndex, attesterAddress);
     }
     /**
    * Get the publisher addresses for the validator that contains the given attester.

package/dest/validator.js

@@ -165,7 +165,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             ...proposal.toBlockInfo(),
             proposer: proposer.toString()
         };
-        this.log.info(`Received proposal for slot ${slotNumber}`, {
+        this.log.info(`Received proposal for block ${proposal.blockNumber} at slot ${slotNumber}`, {
             ...proposalInfo,
             txHashes: proposal.txHashes.map((t)=>t.toString())
         });
@@ -190,7 +190,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
             return undefined;
         }
         // Provided all of the above checks pass, we can attest to the proposal
-        this.log.info(`Attesting to proposal for slot ${slotNumber}`, proposalInfo);
+        this.log.info(`Attesting to proposal for block ${proposal.blockNumber} at slot ${slotNumber}`, proposalInfo);
         this.metrics.incAttestations(inCommittee.length);
         // If the above function does not throw an error, then we can attest to the proposal
         return this.createBlockAttestationsFromProposal(proposal, inCommittee);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/validator-client",
-  "version": "2.1.0-rc.1",
+  "version": "2.1.0-rc.3",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -64,16 +64,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "2.1.0-rc.1",
-    "@aztec/epoch-cache": "2.1.0-rc.1",
-    "@aztec/ethereum": "2.1.0-rc.1",
-    "@aztec/foundation": "2.1.0-rc.1",
-    "@aztec/node-keystore": "2.1.0-rc.1",
-    "@aztec/p2p": "2.1.0-rc.1",
-    "@aztec/prover-client": "2.1.0-rc.1",
-    "@aztec/slasher": "2.1.0-rc.1",
-    "@aztec/stdlib": "2.1.0-rc.1",
-    "@aztec/telemetry-client": "2.1.0-rc.1",
+    "@aztec/constants": "2.1.0-rc.3",
+    "@aztec/epoch-cache": "2.1.0-rc.3",
+    "@aztec/ethereum": "2.1.0-rc.3",
+    "@aztec/foundation": "2.1.0-rc.3",
+    "@aztec/node-keystore": "2.1.0-rc.3",
+    "@aztec/p2p": "2.1.0-rc.3",
+    "@aztec/prover-client": "2.1.0-rc.3",
+    "@aztec/slasher": "2.1.0-rc.3",
+    "@aztec/stdlib": "2.1.0-rc.3",
+    "@aztec/telemetry-client": "2.1.0-rc.3",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "tslib": "^2.4.0",

package/src/block_proposal_handler.ts

@@ -265,7 +265,7 @@ export class BlockProposalHandler {
     });
 
     const numFailedTxs = failedTxs.length;
-    const slot = proposal.slotNumber;
+    const slot = proposal.slotNumber.toBigInt();
     this.log.verbose(`Transaction re-execution complete for slot ${slot}`, {
       numFailedTxs,
       numProposalTxs: txHashes.length,

package/src/key_store/node_keystore_adapter.ts

@@ -324,7 +324,7 @@ export class NodeKeystoreAdapter implements ExtendedValidatorKeyStore {
    */
   getCoinbaseAddress(attesterAddress: EthAddress): EthAddress {
     const validatorIndex = this.findValidatorIndexForAttester(attesterAddress);
-    return this.keystoreManager.getCoinbaseAddress(validatorIndex);
+    return this.keystoreManager.getCoinbaseAddress(validatorIndex, attesterAddress);
   }
 
   /**

package/src/validator.ts

@@ -262,7 +262,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     const incFailedAttestation = (reason: string) => this.metrics.incFailedAttestations(1, reason, partOfCommittee);
 
     const proposalInfo = { ...proposal.toBlockInfo(), proposer: proposer.toString() };
-    this.log.info(`Received proposal for slot ${slotNumber}`, {
+    this.log.info(`Received proposal for block ${proposal.blockNumber} at slot ${slotNumber}`, {
       ...proposalInfo,
       txHashes: proposal.txHashes.map(t => t.toString()),
     });
@@ -304,7 +304,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     }
 
     // Provided all of the above checks pass, we can attest to the proposal
-    this.log.info(`Attesting to proposal for slot ${slotNumber}`, proposalInfo);
+    this.log.info(`Attesting to proposal for block ${proposal.blockNumber} at slot ${slotNumber}`, proposalInfo);
     this.metrics.incAttestations(inCommittee.length);
 
     // If the above function does not throw an error, then we can attest to the proposal