Fixed veto duration fields.

NoahSaso · NoahSaso · commit dd8831a0dadd · 2023-12-04T14:57:03.000-08:00
diff --git a/src/data/formulas/contract/proposal/daoProposalMultiple/formulas.ts b/src/data/formulas/contract/proposal/daoProposalMultiple/formulas.ts
@@ -382,7 +382,7 @@ const intoResponse = async (
       if (proposal.veto) {
         const expiration = expirationPlusDuration(
           proposal.expiration,
-          proposal.veto.delay
+          proposal.veto.timelock_duration
         )
 
         if (isExpirationExpired(env, expiration)) {
diff --git a/src/data/formulas/contract/proposal/daoProposalMultiple/types.ts b/src/data/formulas/contract/proposal/daoProposalMultiple/types.ts
@@ -66,8 +66,8 @@ export type VoteResult =
     }
 
 export type VetoConfig = {
-  delay: Duration
   vetoer: string
+  timelock_duration: Duration
   early_execute: boolean
   veto_before_passed: boolean
 }
diff --git a/src/data/formulas/contract/proposal/daoProposalSingle/formulas.ts b/src/data/formulas/contract/proposal/daoProposalSingle/formulas.ts
@@ -440,7 +440,7 @@ const intoResponse = async (
       if (proposal.veto) {
         const expiration = expirationPlusDuration(
           proposal.expiration,
-          proposal.veto.delay
+          proposal.veto.timelock_duration
         )
 
         if (isExpirationExpired(env, expiration)) {
diff --git a/src/data/formulas/contract/proposal/daoProposalSingle/types.ts b/src/data/formulas/contract/proposal/daoProposalSingle/types.ts
@@ -50,8 +50,8 @@ export interface Ballot {
 }
 
 export type VetoConfig = {
-  delay: Duration
   vetoer: string
+  timelock_duration: Duration
   early_execute: boolean
   veto_before_passed: boolean
 }

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ const intoResponse = async (`
`382`	`382`	`if (proposal.veto) {`
`383`	`383`	`const expiration = expirationPlusDuration(`
`384`	`384`	`proposal.expiration,`
`385`		`- proposal.veto.delay`
	`385`	`+ proposal.veto.timelock_duration`
`386`	`386`	`)`
`387`	`387`
`388`	`388`	`if (isExpirationExpired(env, expiration)) {`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ export type VoteResult =`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`export type VetoConfig = {`
`69`		`- delay: Duration`
`70`	`69`	`vetoer: string`
	`70`	`+ timelock_duration: Duration`
`71`	`71`	`early_execute: boolean`
`72`	`72`	`veto_before_passed: boolean`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ const intoResponse = async (`
`440`	`440`	`if (proposal.veto) {`
`441`	`441`	`const expiration = expirationPlusDuration(`
`442`	`442`	`proposal.expiration,`
`443`		`- proposal.veto.delay`
	`443`	`+ proposal.veto.timelock_duration`
`444`	`444`	`)`
`445`	`445`
`446`	`446`	`if (isExpirationExpired(env, expiration)) {`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ export interface Ballot {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`export type VetoConfig = {`
`53`		`- delay: Duration`
`54`	`53`	`vetoer: string`
	`54`	`+ timelock_duration: Duration`
`55`	`55`	`early_execute: boolean`
`56`	`56`	`veto_before_passed: boolean`
`57`	`57`	`}`