Merge branch 'master' into david/staging2

nightfall-optimist/src/services/block-assembler.mjs

@@ -73,18 +73,30 @@ export async function conditionalMakeBlock(proposer) {
 // transaction. If not, we must wait until either we have enough (hooray)
 // or we're no-longer the proposer (boo).
 if (proposer.isMe) {
-if ((await numberOfUnprocessedTransactions()) >= TRANSACTIONS_PER_BLOCK) {
-const { block, transactions } = await makeBlock(proposer.address);
-logger.info(`Block Assembler - New Block created, ${JSON.stringify(block, null, 2)}`);
-// propose this block to the Shield contract here
-const unsignedProposeBlockTransaction = await (
-await waitForContract(STATE_CONTRACT_NAME)
-).methods
-.proposeBlock(
-Block.buildSolidityStruct(block),
-transactions.map(t => Transaction.buildSolidityStruct(t)),
-)
-.encodeABI();
+const unprocessedTransactions = await numberOfUnprocessedTransactions();
+if (unprocessedTransactions >= TRANSACTIONS_PER_BLOCK) {
+const { blockList, transactionsList } = await makeBlock(
+proposer.address,
+unprocessedTransactions,
+);
+
+const unsignedProposeBlockTransactionList = [];
+
+for (let i = 0; i < blockList.length; i++) {
+const block = blockList[i];
+const transactions = transactionsList[i];
+logger.info(`Block Assembler - New Block created, ${JSON.stringify(block, null, 2)}`);
+// propose this block to the Shield contract here
+const unsignedProposeBlockTransaction = await (
+await waitForContract(STATE_CONTRACT_NAME)
+).methods
+.proposeBlock(
+Block.buildSolidityStruct(block),
+transactions.map(t => Transaction.buildSolidityStruct(t)),
+)
+.encodeABI();
+unsignedProposeBlockTransactionList.push(unsignedProposeBlockTransaction);
+}
 // TODO - check ws readyState is OPEN => CLOSED .WebSocket.OPEN(1), CONNECTING(0), CLOSING(2), CLOSED(3)
 // before sending Poposed block. If not Open, try to open it
 if (ws) {
@@ -96,9 +108,9 @@ export async function conditionalMakeBlock(proposer) {
 transactionsList,
 }),
 );
-logger.debug('Send unsigned block-assembler transaction to ws client');
+logger.debug('Send unsigned block-assembler transactions to ws client');
 }
-// remove the transactiosn from the mempool so we don't keep making new
+// remove the transactions from the mempool so we don't keep making new
 // blocks with them
 const transactionHashes = blockList.reduce(
 (transactionHashList, block) => transactionHashList.concat(block.transactionHashes),