fix: upgrade to latest governor contract and close #9

bots/execute-approved.js

@@ -1,7 +1,10 @@
+const ethers = require('ethers')
+
+const { bigNumberify } = ethers.utils
 const { LAST_EXECUTED_SESSION } = require('../utils/db-keys')
 
 // Executes transactions approved in the last session, if any.
-module.exports = async ({ governor, currentSessionNumber, db }) => {
+module.exports = async ({ governor, currentSessionNumber, db, timestamp }) => {
   const sessionToExecute = currentSessionNumber.toNumber() - 1
   if (sessionToExecute <= 0) return // We are in the very first session. Nothing to execute yet.
 
@@ -14,9 +17,12 @@ module.exports = async ({ governor, currentSessionNumber, db }) => {
 
   if (lastExecutedSession === sessionToExecute) return // Already executed transactions from this session.
 
-  const submissionIndexes = await governor.getSubmittedLists(sessionToExecute)
+  const [submissionIndexes, executionTimeout] = await Promise.all([
+    governor.getSubmittedLists(sessionToExecute),
+    governor.executionTimeout()
+  ])
 
-  const approvedSubmission = (
+  const approvedSubmissions = (
     await Promise.all(
       submissionIndexes.map(async listID => ({
         listID,
@@ -25,9 +31,16 @@ module.exports = async ({ governor, currentSessionNumber, db }) => {
     )
   ).filter(a => a.approved)
 
-  if (approvedSubmission.length === 0) return
+  if (approvedSubmissions.length === 0) return // No approved transactions.
+
+  const { listID, approvalTime } = approvedSubmissions[0]
 
-  const listID = approvedSubmission[0].listID
+  if (
+    bigNumberify(timestamp)
+      .sub(approvalTime)
+      .lte(executionTimeout)
+  )
+    return // Time to execute transactions has passed.
 
   console.info('Executing approved transactions for session', sessionToExecute)
   console.info('Approved List ID', listID.toNumber())

bots/pass-period.js

@@ -20,16 +20,17 @@ module.exports = async ({
   chainId,
   signerAddress
 }) => {
+  const session = await governor.sessions(currentSessionNumber)
+
   // Are we still in the submission period?
   if (
     bigNumberify(timestamp)
       .sub(lastApprovalTime)
-      .lte(submissionTimeout)
+      .lte(submissionTimeout.add(session.durationOffset))
   )
     return
 
   // Submission period is over. Was there a dispute in the last session?
-  const session = await governor.sessions(currentSessionNumber)
   if (session.status !== NO_DISPUTE) return
 
   console.info('In approval period, calling executeSubmissions...')