From afb8b63c098375adbefdb0a9826bf0193b6e7d02 Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Fri, 2 Apr 2021 14:12:49 +0200
Subject: [PATCH 01/15] feat: set up maker bar

---
 .../components/Overview/OverviewHeader.tsx    | 167 ++++++++++++------
 tinlake-ui/static/maker-logo.svg              |   1 +
 tinlake.js/src/actions/proxy.ts               |   2 +-
 tinlake.js/src/services/solver/solver.ts      |   5 +-
 4 files changed, 120 insertions(+), 55 deletions(-)
 create mode 100644 tinlake-ui/static/maker-logo.svg

diff --git a/tinlake-ui/components/Overview/OverviewHeader.tsx b/tinlake-ui/components/Overview/OverviewHeader.tsx
index a40aeead89..68a8e0c33a 100644
--- a/tinlake-ui/components/Overview/OverviewHeader.tsx
+++ b/tinlake-ui/components/Overview/OverviewHeader.tsx
@@ -28,6 +28,8 @@ const OverviewHeader: React.FC<Props> = (props: Props) => {
 
   const [awaitingConnect, setAwaitingConnect] = React.useState(false)
 
+  const isMakerIntegrated = true
+
   React.useEffect(() => {
     if (address && awaitingConnect) {
       ;(async () => {
@@ -68,61 +70,85 @@ const OverviewHeader: React.FC<Props> = (props: Props) => {
   }
 
   return (
-    <Box
-      direction="row"
-      justify="between"
-      gap="medium"
-      elevation="small"
-      round="xsmall"
-      pad="medium"
-      background="white"
-      margin={{ bottom: 'large' }}
-    >
-      <HeaderBox width="400px">
-        <Heading level="5">{props.selectedPool.metadata.asset}</Heading>
-        <Type>Asset type</Type>
-      </HeaderBox>
-      <Tooltip id="assetMaturity">
-        <HeaderBox>
-          <Heading level="4">{props.selectedPool.metadata.assetMaturity}</Heading>
-          <Type>Asset maturity</Type>
-        </HeaderBox>
-      </Tooltip>
-      <Tooltip id="dropAPR">
-        <HeaderBox>
-          <Heading level="4">
-            <TokenLogo src={`/static/DROP_final.svg`} />
-            {toPrecision(feeToInterestRate(dropRate || '0'), 2)}
-            <Unit>%</Unit>
-          </Heading>
-          <Type>DROP APR</Type>
+    <Box margin={{ bottom: 'large' }}>
+      <Box
+        elevation="small"
+        round="xsmall"
+        background="white"
+        direction="row"
+        justify="between"
+        gap="medium"
+        pad="medium"
+        style={{ zIndex: 3 }}
+      >
+        <HeaderBox width="400px">
+          <Heading level="5">{props.selectedPool.metadata.asset}</Heading>
+          <Type>Asset type</Type>
         </HeaderBox>
-      </Tooltip>
-      <Tooltip id="poolValue">
+        <Tooltip id="assetMaturity">
+          <HeaderBox>
+            <Heading level="4">{props.selectedPool.metadata.assetMaturity}</Heading>
+            <Type>Asset maturity</Type>
+          </HeaderBox>
+        </Tooltip>
+        <Tooltip id="dropAPR">
+          <HeaderBox>
+            <Heading level="4">
+              <TokenLogo src={`/static/DROP_final.svg`} />
+              {toPrecision(feeToInterestRate(dropRate || '0'), 2)}
+              <Unit>%</Unit>
+            </Heading>
+            <Type>DROP APR</Type>
+          </HeaderBox>
+        </Tooltip>
+        <Tooltip id="poolValue">
+          <HeaderBox style={{ borderRight: 'none' }}>
+            <Heading level="4">
+              <TokenLogo src={`/static/currencies/${props.selectedPool.metadata.currencySymbol}.svg`} />
+              {addThousandsSeparators(
+                toPrecision(
+                  baseToDisplay((poolData?.netAssetValue || new BN(0)).add(poolData?.reserve || new BN(0)), 18),
+                  0
+                )
+              )}
+              <Unit>{props.selectedPool.metadata.currencySymbol}</Unit>
+            </Heading>
+            <Type>Pool Value</Type>
+          </HeaderBox>
+        </Tooltip>
         <HeaderBox style={{ borderRight: 'none' }}>
-          <Heading level="4">
-            <TokenLogo src={`/static/currencies/${props.selectedPool.metadata.currencySymbol}.svg`} />
-            {addThousandsSeparators(
-              toPrecision(
-                baseToDisplay((poolData?.netAssetValue || new BN(0)).add(poolData?.reserve || new BN(0)), 18),
-                0
-              )
-            )}
-            <Unit>{props.selectedPool.metadata.currencySymbol}</Unit>
-          </Heading>
-          <Type>Pool Value</Type>
+          {'addresses' in props.selectedPool &&
+          config.featureFlagNewOnboardingPools.includes(props.selectedPool.addresses.ROOT_CONTRACT) ? (
+            <Anchor>
+              <Button label="Invest" primary onClick={invest} />
+            </Anchor>
+          ) : (
+            <InvestAction pool={props.selectedPool} />
+          )}
         </HeaderBox>
-      </Tooltip>
-      <HeaderBox style={{ borderRight: 'none' }}>
-        {'addresses' in props.selectedPool &&
-        config.featureFlagNewOnboardingPools.includes(props.selectedPool.addresses.ROOT_CONTRACT) ? (
-          <Anchor>
-            <Button label="Invest" primary onClick={invest} />
-          </Anchor>
-        ) : (
-          <InvestAction pool={props.selectedPool} />
-        )}
-      </HeaderBox>
+      </Box>
+      {isMakerIntegrated && (
+        <MakerBox direction="row" round="xsmall" gap="small" elevation="small" background="#1AAB9B">
+          <MakerLogo>
+            <img src="/static/maker-logo.svg" />
+          </MakerLogo>
+          <Box pad={{ top: '8px;' }} direction="row">
+            This pool is directly integrated with Maker for liquidity. &nbsp;<a href="#">Learn more</a>
+          </Box>
+          <MakerMetric margin={{ left: 'auto' }} style={{ borderRight: '1px solid #fff' }}>
+            <h3>Provided by Maker</h3>
+            <h2>
+              1.3M <MakerUnit>DAI</MakerUnit>
+            </h2>
+          </MakerMetric>
+          <MakerMetric>
+            <h3>Maker Debt Ceiling</h3>
+            <h2>
+              5.0M <MakerUnit>DAI</MakerUnit>
+            </h2>
+          </MakerMetric>
+        </MakerBox>
+      )}
     </Box>
   )
 }
@@ -169,3 +195,40 @@ const Unit = styled.span`
   margin-left: 4px;
   color: #333;
 `
+const MakerBox = styled(Box)`
+  color: #fff;
+  position: relative;
+  top: -10px;
+  padding: 22px 24px 10px 24px;
+
+  a {
+    color: #fff;
+  }
+`
+
+const MakerLogo = styled.div`
+  margin-top: 4px;
+
+  img {
+    width: 28px;
+    height: 28px;
+  }
+`
+
+const MakerMetric = styled(Box)`
+  padding: 0 12px 0 0;
+  h3 {
+    margin: 0;
+    font-size: 12px;
+  }
+  h2 {
+    margin: 0;
+    font-size: 16px;
+  }
+`
+
+const MakerUnit = styled.div`
+  display: inline-block;
+  font-size: 13px;
+  font-weight: normal;
+`
diff --git a/tinlake-ui/static/maker-logo.svg b/tinlake-ui/static/maker-logo.svg
new file mode 100644
index 0000000000..6f3cc56167
--- /dev/null
+++ b/tinlake-ui/static/maker-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 600 600"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style><linearGradient id="linear-gradient" x1="300" y1="602" x2="300" y2="2" gradientTransform="matrix(1, 0, 0, -1, 0, 602)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4fa89b"/><stop offset="1" stop-color="#6acebb"/></linearGradient></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><circle class="cls-1" cx="300" cy="300" r="300"/><path class="cls-2" d="M152.34,390V248.8l107.08,80.59V390h27.33V323.7A15.94,15.94,0,0,0,280.4,311L150.54,213.23A16,16,0,0,0,125,226V390Zm296.14,0V248.8L341.4,329.39V390H314.07V323.7A15.94,15.94,0,0,1,320.42,311l129.86-97.73A16,16,0,0,1,475.82,226V390Z"/></g></g></svg>
\ No newline at end of file
diff --git a/tinlake.js/src/actions/proxy.ts b/tinlake.js/src/actions/proxy.ts
index 9f623a7f5f..62c33eebca 100644
--- a/tinlake.js/src/actions/proxy.ts
+++ b/tinlake.js/src/actions/proxy.ts
@@ -138,7 +138,7 @@ export function ProxyActions<ActionsBase extends Constructor<TinlakeParams>>(Bas
       ])
 
       return this.pending(
-        proxy.execute(this.contract('ACTIONS').address, encoded, { ...this.overrides, gasLimit: 550000 })
+        proxy.execute(this.contract('ACTIONS').address, encoded, { ...this.overrides, gasLimit: 700000 })
       )
     }
 
diff --git a/tinlake.js/src/services/solver/solver.ts b/tinlake.js/src/services/solver/solver.ts
index e076197e6d..4bb433be8d 100644
--- a/tinlake.js/src/services/solver/solver.ts
+++ b/tinlake.js/src/services/solver/solver.ts
@@ -4,7 +4,8 @@ import { CLP } from 'clp-wasm'
 export const calculateOptimalSolution = async (
   state: State,
   orders: Orders,
-  weights: SolverWeights
+  weights: SolverWeights,
+  calcInvestmentCapacity?: boolean
 ): Promise<SolverResult> => {
   return require('clp-wasm/clp-wasm.all').then((clp: CLP) => {
     const e27 = new BN(1).mul(new BN(10).pow(new BN(27)))
@@ -41,7 +42,7 @@ export const calculateOptimalSolution = async (
         maxTINRatioLb: ${linearExpression(maxTINRatioLbCoeffs)} >= ${maxTINRatioLb}
       Bounds
         0 <= tinInvest  <= ${orders.tinInvest}
-        0 <= dropInvest <= ${orders.dropInvest}
+        ${!calcInvestmentCapacity && `0 <= dropInvest <= ${orders.dropInvest}`}
         0 <= tinRedeem  <= ${orders.tinRedeem}
         0 <= dropRedeem <= ${orders.dropRedeem}
       End

From d596310217b40164b381965eee739cde399762af Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Thu, 8 Apr 2021 20:08:38 +0200
Subject: [PATCH 02/15] feat: set up maker integration

---
 .../components/Overview/OverviewHeader.tsx    |  31 +-
 tinlake-ui/components/PoolsMetrics/index.tsx  |  15 -
 tinlake-ui/config.ts                          |  73 ++---
 .../Investment/View/EpochOverview.tsx         |   8 +-
 .../Loan/Overview/MaxReserveForm.tsx          |  57 +++-
 tinlake-ui/containers/Loan/Overview/index.tsx |   2 +-
 .../containers/Onboarding/AgreementStep.tsx   |   2 +-
 tinlake-ui/ducks/pool.ts                      |  38 ++-
 tinlake-ui/services/tinlake/actions.ts        |  21 +-
 tinlake.js/bin/decode.js                      |   6 +-
 tinlake.js/src/Tinlake.ts                     |   3 +-
 tinlake.js/src/abi/PoolAdmin.abi.json         | 289 ++++++++++++++++++
 tinlake.js/src/abi/index.ts                   |   2 +
 tinlake.js/src/actions/admin.ts               |  11 +-
 tinlake.js/src/actions/proxy.ts               |   2 +-
 15 files changed, 473 insertions(+), 87 deletions(-)
 create mode 100644 tinlake.js/src/abi/PoolAdmin.abi.json

diff --git a/tinlake-ui/components/Overview/OverviewHeader.tsx b/tinlake-ui/components/Overview/OverviewHeader.tsx
index 68a8e0c33a..32bccd5737 100644
--- a/tinlake-ui/components/Overview/OverviewHeader.tsx
+++ b/tinlake-ui/components/Overview/OverviewHeader.tsx
@@ -28,7 +28,7 @@ const OverviewHeader: React.FC<Props> = (props: Props) => {
 
   const [awaitingConnect, setAwaitingConnect] = React.useState(false)
 
-  const isMakerIntegrated = true
+  const isMakerIntegrated = props.selectedPool.addresses.CLERK !== undefined
 
   React.useEffect(() => {
     if (address && awaitingConnect) {
@@ -136,15 +136,30 @@ const OverviewHeader: React.FC<Props> = (props: Props) => {
             This pool is directly integrated with Maker for liquidity. &nbsp;<a href="#">Learn more</a>
           </Box>
           <MakerMetric margin={{ left: 'auto' }} style={{ borderRight: '1px solid #fff' }}>
-            <h3>Provided by Maker</h3>
+            <h3>Remaining credit</h3>
             <h2>
-              1.3M <MakerUnit>DAI</MakerUnit>
+              {addThousandsSeparators(toPrecision(baseToDisplay(poolData?.maker?.remainingCredit || new BN(0), 18), 0))}{' '}
+              <MakerUnit>DAI</MakerUnit>{' '}
+            </h2>
+          </MakerMetric>
+          <MakerMetric style={{ borderRight: '1px solid #fff' }}>
+            <h3>Current Debt</h3>
+            <h2>
+              {addThousandsSeparators(toPrecision(baseToDisplay(poolData?.maker?.art || new BN(0), 18), 0))}{' '}
+              <MakerUnit>DAI</MakerUnit>{' '}
+            </h2>
+          </MakerMetric>
+          <MakerMetric style={{ borderRight: '1px solid #fff' }}>
+            <h3>Debt Ceiling</h3>
+            <h2>
+              {addThousandsSeparators(toPrecision(baseToDisplay(poolData?.maker?.line || new BN(0), 45 + 6), 0))}M{' '}
+              <MakerUnit>DAI</MakerUnit>
             </h2>
           </MakerMetric>
           <MakerMetric>
-            <h3>Maker Debt Ceiling</h3>
+            <h3>Stability Fee</h3>
             <h2>
-              5.0M <MakerUnit>DAI</MakerUnit>
+              {toPrecision(feeToInterestRate(poolData?.maker?.duty || '0'), 2)} <MakerUnit>%</MakerUnit>
             </h2>
           </MakerMetric>
         </MakerBox>
@@ -216,7 +231,7 @@ const MakerLogo = styled.div`
 `
 
 const MakerMetric = styled(Box)`
-  padding: 0 12px 0 0;
+  padding: 0 24px 0 10px;
   h3 {
     margin: 0;
     font-size: 12px;
@@ -225,6 +240,10 @@ const MakerMetric = styled(Box)`
     margin: 0;
     font-size: 16px;
   }
+
+  &:last-child {
+    padding-right: 0;
+  }
 `
 
 const MakerUnit = styled.div`
diff --git a/tinlake-ui/components/PoolsMetrics/index.tsx b/tinlake-ui/components/PoolsMetrics/index.tsx
index 45b96d9af5..cd272c642b 100644
--- a/tinlake-ui/components/PoolsMetrics/index.tsx
+++ b/tinlake-ui/components/PoolsMetrics/index.tsx
@@ -41,21 +41,6 @@ const PoolsMetrics: React.FC<Props> = (props: Props) => {
 
   return (
     <>
-      {router.query.showAll && (
-        <Box
-          width="256px"
-          pad="medium"
-          elevation="small"
-          round="xsmall"
-          background="white"
-          margin={{ horizontal: '16px' }}
-        >
-          <Cont>
-            <Value>{props.pools.ongoingLoans}</Value>
-          </Cont>
-          <Label>Assets Locked</Label>
-        </Box>
-      )}
       <Box
         width="460px"
         elevation="small"
diff --git a/tinlake-ui/config.ts b/tinlake-ui/config.ts
index 6e3675b995..5b2a546787 100644
--- a/tinlake-ui/config.ts
+++ b/tinlake-ui/config.ts
@@ -65,6 +65,7 @@ export interface Pool extends BasePool {
     COLLATERAL_NFT: string
     SENIOR_TOKEN: string
     JUNIOR_TOKEN: string
+    CLERK?: string
   }
   contractConfig?: {
     JUNIOR_OPERATOR: 'ALLOWANCE_OPERATOR'
@@ -128,6 +129,21 @@ const contractAddressesSchema = yup.object().shape({
     .string()
     .length(42)
     .matches(/0x[0-9a-fA-F]{40}/),
+  SENIOR_TOKEN: yup
+    .string()
+    .length(42)
+    .matches(/0x[0-9a-fA-F]{40}/)
+    .required('contractAddressesSchema.SENIOR_TOKEN is required'),
+  JUNIOR_TOKEN: yup
+    .string()
+    .length(42)
+    .matches(/0x[0-9a-fA-F]{40}/)
+    .required('contractAddressesSchema.JUNIOR_TOKEN is required'),
+  CLERK: yup
+    .string()
+    .length(42)
+    .matches(/0x[0-9a-fA-F]{40}/)
+    .optional(),
 })
 
 const contractConfigSchema = yup.object().shape({
@@ -147,6 +163,10 @@ const mediaSchema = yup.object().shape({
   icon: yup.string(),
 })
 
+const makerSchema = yup.object().shape({
+  ilk: yup.string().default(''),
+})
+
 const metadataSchema = yup.object().shape({
   name: yup.string().required('poolSchema.name is required'),
   shortName: yup.string(),
@@ -159,31 +179,20 @@ const metadataSchema = yup.object().shape({
   assetMaturity: yup.string(),
   securitize: securitizeDataSchema,
   currencySymbol: yup.string().default('DAI'),
+  maker: makerSchema.optional(),
 })
 
 const poolSchema = yup.object().shape({
-  network: yup
-    .string()
-    .oneOf(['mainnet', 'kovan'])
-    .required('poolSchema.network is required'),
-  version: yup
-    .number()
-    .oneOf([2, 3])
-    .required('poolSchema.version is required'),
+  network: yup.string().oneOf(['mainnet', 'kovan']).required('poolSchema.network is required'),
+  version: yup.number().oneOf([2, 3]).required('poolSchema.version is required'),
   addresses: contractAddressesSchema.required('poolSchema.addresses is required'),
   contractConfig: contractConfigSchema.default(undefined),
   metadata: metadataSchema.required('poolSchema.metadata is required'),
 })
 
 const upcomingPoolSchema = yup.object().shape({
-  network: yup
-    .string()
-    .oneOf(['mainnet', 'kovan'])
-    .required('poolSchema.network is required'),
-  version: yup
-    .number()
-    .oneOf([2, 3])
-    .required('poolSchema.version is required'),
+  network: yup.string().oneOf(['mainnet', 'kovan']).required('poolSchema.network is required'),
+  version: yup.number().oneOf([2, 3]).required('poolSchema.version is required'),
   metadata: metadataSchema.required('poolSchema.metadata is required'),
   presetValues: yup.object().shape({
     seniorInterestRate: yup
@@ -198,14 +207,8 @@ const upcomingPoolSchema = yup.object().shape({
 })
 
 const archivedPoolSchema = yup.object().shape({
-  network: yup
-    .string()
-    .oneOf(['mainnet', 'kovan'])
-    .required('poolSchema.network is required'),
-  version: yup
-    .number()
-    .oneOf([2, 3])
-    .required('poolSchema.version is required'),
+  network: yup.string().oneOf(['mainnet', 'kovan']).required('poolSchema.network is required'),
+  version: yup.number().oneOf([2, 3]).required('poolSchema.version is required'),
   metadata: metadataSchema.required('poolSchema.metadata is required'),
   archivedValues: yup.object().shape({
     status: yup.string().oneOf(['Deployed', 'Closed']),
@@ -266,11 +269,7 @@ const config: Config = {
     .string()
     .required('NEXT_PUBLIC_POOL_REGISTRY is required')
     .validateSync(process.env.NEXT_PUBLIC_POOL_REGISTRY),
-  rpcUrl: yup
-    .string()
-    .required('NEXT_PUBLIC_RPC_URL is required')
-    .url()
-    .validateSync(process.env.NEXT_PUBLIC_RPC_URL),
+  rpcUrl: yup.string().required('NEXT_PUBLIC_RPC_URL is required').url().validateSync(process.env.NEXT_PUBLIC_RPC_URL),
   ipfsGateway: yup
     .string()
     .required('NEXT_PUBLIC_IPFS_GATEWAY is required')
@@ -291,11 +290,7 @@ const config: Config = {
     .required('NEXT_PUBLIC_TINLAKE_DATA_BACKEND_URL is required')
     .url()
     .validateSync(process.env.NEXT_PUBLIC_TINLAKE_DATA_BACKEND_URL),
-  isDemo:
-    yup
-      .string()
-      .required('NEXT_PUBLIC_ENV is required')
-      .validateSync(process.env.NEXT_PUBLIC_ENV) === 'demo',
+  isDemo: yup.string().required('NEXT_PUBLIC_ENV is required').validateSync(process.env.NEXT_PUBLIC_ENV) === 'demo',
   network: yup
     .mixed<'Mainnet' | 'Kovan'>()
     .required('NEXT_PUBLIC_RPC_URL is required')
@@ -309,10 +304,7 @@ const config: Config = {
     .string()
     .required('NEXT_PUBLIC_INFURA_KEY is required')
     .validateSync(process.env.NEXT_PUBLIC_INFURA_KEY),
-  gasLimit: yup
-    .number()
-    .required('gasLimit is required')
-    .validateSync('7000000'),
+  gasLimit: yup.number().required('gasLimit is required').validateSync('7000000'),
   onboardAPIHost: yup
     .string()
     .required('NEXT_PUBLIC_ONBOARD_API_HOST is required')
@@ -338,10 +330,7 @@ const config: Config = {
     .string()
     .required('NEXT_PUBLIC_MULTICALL_CONTRACT_ADDRESS is required')
     .validateSync(process.env.NEXT_PUBLIC_MULTICALL_CONTRACT_ADDRESS),
-  matomoSiteId: yup
-    .number()
-    .optional()
-    .validateSync(process.env.NEXT_PUBLIC_MATOMO_SITE_ID),
+  matomoSiteId: yup.number().optional().validateSync(process.env.NEXT_PUBLIC_MATOMO_SITE_ID),
 }
 
 function between1e23and1e27(s: string): boolean {
diff --git a/tinlake-ui/containers/Investment/View/EpochOverview.tsx b/tinlake-ui/containers/Investment/View/EpochOverview.tsx
index 35276dcfbc..57d84d7a77 100644
--- a/tinlake-ui/containers/Investment/View/EpochOverview.tsx
+++ b/tinlake-ui/containers/Investment/View/EpochOverview.tsx
@@ -42,8 +42,6 @@ const EpochOverview: React.FC<Props> = (props: Props) => {
 
   const investmentCapacity = poolData ? poolData.maxReserve.sub(poolData.reserve) : undefined
 
-  const isAdmin = props.auth?.permissions?.canSetMinimumJuniorRatio
-
   const [open, setOpen] = React.useState(false)
 
   return (
@@ -258,7 +256,7 @@ const EpochOverview: React.FC<Props> = (props: Props) => {
               </TableBody>
             </Table>
 
-            {isAdmin && epochData && (
+            {epochData && (
               <Box gap="small" justify="end" direction="row" margin={{ top: 'small' }}>
                 {epochData?.state === 'can-be-closed' && (
                   <Button
@@ -271,7 +269,9 @@ const EpochOverview: React.FC<Props> = (props: Props) => {
                     }
                   />
                 )}
-                {epochData?.state === 'in-submission-period' && <Button label={`Run solver`} primary onClick={solve} />}
+                {epochData?.state === 'in-submission-period' && (
+                  <Button label={`Submit a solution`} primary onClick={solve} />
+                )}
                 {epochData?.state === 'in-challenge-period' && (
                   <Button label={`Execute epoch ${epochData?.id}`} primary disabled={true} />
                 )}
diff --git a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
index d1140225d1..7805cf29cf 100644
--- a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
+++ b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
@@ -1,5 +1,7 @@
 import { TokenInput } from '@centrifuge/axis-token-input'
-import { ITinlake } from '@centrifuge/tinlake-js'
+import { addThousandsSeparators, baseToDisplay, ITinlake } from '@centrifuge/tinlake-js'
+import BN from 'bn.js'
+import Decimal from 'decimal.js-light'
 import { Box, Button, Heading } from 'grommet'
 import * as React from 'react'
 import { connect, useSelector } from 'react-redux'
@@ -25,13 +27,47 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
     setValue(newValue)
   }
 
+  const [creditlineValue, setCreditlineValue] = React.useState<string | undefined>(undefined)
+
+  const onChangeCreditline = (newValue: string) => {
+    setCreditlineValue(newValue)
+  }
+
   const [status, , setTxId] = useTransactionState()
+  const [creditlineStatus, , setCreditlineTxId] = useTransactionState()
 
   const save = async () => {
-    if (value) {
+    if (value && value !== (poolData?.reserve || new BN(0)).toString()) {
       const txId = await props.createTransaction(`Set max reserve`, 'setMaxReserve', [props.tinlake, value.toString()])
       setTxId(txId)
     }
+
+    if (
+      creditlineValue &&
+      poolData?.maker?.creditline &&
+      creditlineValue !== (poolData?.maker?.creditline || new BN(0)).toString()
+    ) {
+      const currentCreditline = poolData?.maker?.creditline.toString()
+      const amount = new BN(creditlineValue).gt(new BN(currentCreditline))
+        ? new BN(creditlineValue).sub(new BN(currentCreditline))
+        : new BN(currentCreditline).sub(new BN(creditlineValue))
+      const valueToDecimal = new Decimal(baseToDisplay(creditlineValue, 18)).toDecimalPlaces(4)
+      const formatted = addThousandsSeparators(valueToDecimal.toString())
+
+      if (new BN(creditlineValue).gt(new BN(currentCreditline))) {
+        const txId = await props.createTransaction(`Increase creditline to ${formatted}`, 'raiseCreditline', [
+          props.tinlake,
+          amount.toString(),
+        ])
+        setCreditlineTxId(txId)
+      } else {
+        const txId = await props.createTransaction(`Lower creditline to ${formatted}`, 'sinkCreditline', [
+          props.tinlake,
+          amount.toString(),
+        ])
+        setCreditlineTxId(txId)
+      }
+    }
   }
 
   React.useEffect(() => {
@@ -46,7 +82,9 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
       <Heading level="5" margin={{ top: '0', bottom: '0' }}>
         Set maximum reserve amount
       </Heading>
-      <Description margin={{ top: 'medium' }}>Please update the maximum reserve amount.</Description>
+      <Description margin={{ top: 'small' }}>
+        This will determine how much can be invested into the reserve right now.
+      </Description>
 
       <TokenInput
         token={props.selectedPool?.metadata.currencySymbol || 'DAI'}
@@ -54,6 +92,19 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
         onChange={onChange}
         disabled={status === 'pending' || status === 'unconfirmed'}
       />
+
+      <Heading level="5" margin={{ top: 'large', bottom: '0' }}>
+        Set Maker creditline
+      </Heading>
+      <Description margin={{ top: 'small' }}>This will lock in the required TIN for overcollateralization.</Description>
+
+      <TokenInput
+        token={props.selectedPool?.metadata.currencySymbol || 'DAI'}
+        value={creditlineValue === undefined ? poolData?.maker?.creditline?.toString() || '0' : creditlineValue}
+        onChange={onChangeCreditline}
+        disabled={status === 'pending' || status === 'unconfirmed'}
+      />
+
       <Box gap="small" justify="end" direction="row" margin={{ top: 'medium' }}>
         <Button
           label="Cancel"
diff --git a/tinlake-ui/containers/Loan/Overview/index.tsx b/tinlake-ui/containers/Loan/Overview/index.tsx
index 42a9b946d4..b088e10cf0 100644
--- a/tinlake-ui/containers/Loan/Overview/index.tsx
+++ b/tinlake-ui/containers/Loan/Overview/index.tsx
@@ -183,7 +183,7 @@ const LoanOverview: React.FC<Props> = (props: Props) => {
 
                 {isAdmin && (
                   <Box gap="small" justify="end" direction="row" margin={{ top: 'small' }}>
-                    <Button label="Set max reserve" onClick={() => setShowMaxReserveForm(true)} disabled={!poolData} />
+                    <Button label="Manage" onClick={() => setShowMaxReserveForm(true)} disabled={!poolData} />
                   </Box>
                 )}
               </>
diff --git a/tinlake-ui/containers/Onboarding/AgreementStep.tsx b/tinlake-ui/containers/Onboarding/AgreementStep.tsx
index c7bb90d843..c785103c3d 100644
--- a/tinlake-ui/containers/Onboarding/AgreementStep.tsx
+++ b/tinlake-ui/containers/Onboarding/AgreementStep.tsx
@@ -106,7 +106,7 @@ const AgreementStep: React.FC<Props> = (props: Props) => {
         <StepBody>
           <Paragraph margin={{ bottom: 'medium' }} style={{ width: '100%' }}>
             Finalize onboarding by signing the {props.agreement.name} for {poolName}. Note that the minimum investment
-            amount for this pool is 5.000 {props.activePool?.metadata.currencySymbol || 'DAI'}.
+            amount for this pool is 5000 {props.activePool?.metadata.currencySymbol || 'DAI'}.
           </Paragraph>
           {props.onboarding.data?.showNonSolicitationNotice && (
             <Box margin={{ right: 'auto', bottom: 'medium' }}>
diff --git a/tinlake-ui/ducks/pool.ts b/tinlake-ui/ducks/pool.ts
index 40ea6f7189..663b1bdc3c 100644
--- a/tinlake-ui/ducks/pool.ts
+++ b/tinlake-ui/ducks/pool.ts
@@ -1,7 +1,7 @@
 import { Tranche } from '@centrifuge/tinlake-js'
 import { createWatcher } from '@makerdao/multicall'
 import BN from 'bn.js'
-import { BigNumber } from 'ethers'
+import { BigNumber, ethers } from 'ethers'
 import { HYDRATE } from 'next-redux-wrapper'
 import { Action, AnyAction } from 'redux'
 import { ThunkAction } from 'redux-thunk'
@@ -31,6 +31,7 @@ export interface PoolTranche extends Tranche {
 export interface PoolData {
   junior: PoolTranche
   senior?: PoolTranche
+  maker?: any
   availableFunds: BN
   minJuniorRatio: BN
   currentJuniorRatio: BN
@@ -269,12 +270,43 @@ export function loadPool(
       },
     ]
 
-    watcher.recreate([...addressWatchers, ...globalWatchers], multicallConfig)
+    const isMakerIntegrated = tinlake.contractAddresses.CLERK !== undefined
+
+    const makerWatchers = isMakerIntegrated
+      ? [
+          {
+            target: tinlake.contractAddresses.MCD_VAT,
+            call: [
+              'ilks(bytes32)(uint256,uint256,uint256,uint256,uint256)',
+              ethers.utils.formatBytes32String('NS2DRP-A'),
+            ],
+            returns: [[`maker.art`], [`maker.rate`], [`maker.spot`], [`maker.line`], [`maker.dust`]],
+          },
+          {
+            target: tinlake.contractAddresses.MCD_JUG,
+            call: ['ilks(bytes32)(uint256,uint256)', ethers.utils.formatBytes32String('NS2DRP-A')],
+            returns: [[`maker.duty`], [`maker.rho`]],
+          },
+          {
+            target: tinlake.contractAddresses.CLERK,
+            call: ['remainingCredit()(uint)'],
+            returns: [[`maker.remainingCredit`]],
+          },
+          {
+            target: tinlake.contractAddresses.CLERK,
+            call: ['creditline()(uint)'],
+            returns: [[`maker.creditline`]],
+          },
+        ]
+      : []
+
+    watcher.recreate([...addressWatchers, ...globalWatchers, ...makerWatchers], multicallConfig)
 
     try {
       const initial = {
         junior: { type: 'junior' },
         senior: { type: 'senior' },
+        maker: {},
       }
 
       const prev =
@@ -285,7 +317,7 @@ export function loadPool(
       watcher.batch().subscribe((updates: any[]) => {
         const data: Partial<PoolData> = updates.reduce((prev: any, update: any) => {
           const prefix = update.type.split('.')[0]
-          if (prefix === 'junior' || prefix === 'senior') {
+          if (prefix === 'junior' || prefix === 'senior' || prefix === 'maker') {
             const item = update.type.split('.')[1]
             prev[prefix][item] = update.value
           } else {
diff --git a/tinlake-ui/services/tinlake/actions.ts b/tinlake-ui/services/tinlake/actions.ts
index ec0235a4e9..4a5b07cafe 100644
--- a/tinlake-ui/services/tinlake/actions.ts
+++ b/tinlake-ui/services/tinlake/actions.ts
@@ -487,12 +487,13 @@ export async function borrow(tinlake: ITinlake, loan: Loan, amount: string): Pro
   const proxy = loan.ownerOf
 
   // make sure tranche has enough funds
-  const juniorReserve = await tinlake.getJuniorReserve()
-  const seniorReserve = await tinlake.getSeniorReserve()
-  const trancheReserve = juniorReserve.add(seniorReserve)
-  if (new BN(amount).cmp(trancheReserve) > 0) {
-    return loggedError({}, 'There is not enough available funds.', loanId)
-  }
+  // TODO: update for maker integration
+  // const juniorReserve = await tinlake.getJuniorReserve()
+  // const seniorReserve = await tinlake.getSeniorReserve()
+  // const trancheReserve = juniorReserve.add(seniorReserve)
+  // if (new BN(amount).cmp(trancheReserve) > 0) {
+  //   return loggedError({}, 'There is not enough available funds.', loanId)
+  // }
 
   // borrow with proxy
   return tinlake.proxyLockBorrowWithdraw(proxy.toString(), loanId, amount, address!)
@@ -575,6 +576,14 @@ export async function setMaxReserve(tinlake: ITinlake, ratio: string): Promise<P
   return tinlake.setMaximumReserve(ratio)
 }
 
+export async function raiseCreditline(tinlake: ITinlake, amount: string): Promise<PendingTransaction> {
+  return tinlake.raiseCreditline(amount)
+}
+
+export async function sinkCreditline(tinlake: ITinlake, amount: string): Promise<PendingTransaction> {
+  return tinlake.sinkCreditline(amount)
+}
+
 export async function updateClaimRADAccountID(tinlake: ITinlake, centAddress: string): Promise<PendingTransaction> {
   return tinlake.updateClaimRADAccountID(centAddress)
 }
diff --git a/tinlake.js/bin/decode.js b/tinlake.js/bin/decode.js
index 4b3aca97a4..79862922e1 100644
--- a/tinlake.js/bin/decode.js
+++ b/tinlake.js/bin/decode.js
@@ -1,6 +1,6 @@
 const dotenv = require('dotenv')
 const ethers = require('ethers')
-const navFeedAbi = require('../src/abi/NAVFeed.abi.json')
+const actionsAbi = require('../src/abi/Actions.abi.json')
 
 dotenv.config()
 
@@ -8,10 +8,10 @@ dotenv.config()
  * This is a simple script to help with decoding function calls found on Etherscan.
  */
 
-const contract = new ethers.Contract('0x00cD3AE59fdbd375A187BF8074DB59eDAF766C19', navFeedAbi)
+const contract = new ethers.Contract('0xA0B0d8394ADC79f5d1563a892abFc6186E519644', actionsAbi)
 
 const run = async () => {
-  const decoded = contract.interface.decodeFunctionData('borrow', '0x0ecbcdab0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000675e56da063e8940000')
+  const decoded = contract.interface.decodeFunctionData('close', '0xe49280cb000000000000000000000000a0b0d8394adc79f5d1563a892abfc6186e5196440000000000000000000000000000000000000000000000000000000000000044')
   decoded.forEach((value) => {
     console.log(value.toString())
   })
diff --git a/tinlake.js/src/Tinlake.ts b/tinlake.js/src/Tinlake.ts
index db824ea0ee..9f4421ba24 100644
--- a/tinlake.js/src/Tinlake.ts
+++ b/tinlake.js/src/Tinlake.ts
@@ -29,6 +29,7 @@ const contractNames = [
   'COORDINATOR',
   'POOL_REGISTRY',
   'CLAIM_RAD',
+  'POOL_ADMIN',
 ] as const
 
 export type PendingTransaction = {
@@ -68,7 +69,7 @@ export type TinlakeParams = {
 export type Constructor<T = {}> = new (...args: any[]) => Tinlake
 
 // This adds a .toBN() function to all BigNumber instances returned by ethers.js
-;(ethers.BigNumber as any).prototype.toBN = function() {
+;(ethers.BigNumber as any).prototype.toBN = function () {
   return new BN((this as any).toString())
 }
 
diff --git a/tinlake.js/src/abi/PoolAdmin.abi.json b/tinlake.js/src/abi/PoolAdmin.abi.json
new file mode 100644
index 0000000000..0bd57442b7
--- /dev/null
+++ b/tinlake.js/src/abi/PoolAdmin.abi.json
@@ -0,0 +1,289 @@
+[
+  { "inputs": [], "payable": false, "stateMutability": "nonpayable", "type": "constructor" },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": true, "internalType": "address", "name": "usr", "type": "address" }],
+    "name": "DenyAdmin",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "bytes32", "name": "what", "type": "bytes32" },
+      { "indexed": true, "internalType": "bool", "name": "data", "type": "bool" }
+    ],
+    "name": "File",
+    "type": "event"
+  },
+  {
+    "anonymous": true,
+    "inputs": [
+      { "indexed": true, "internalType": "bytes4", "name": "sig", "type": "bytes4" },
+      { "indexed": true, "internalType": "address", "name": "guy", "type": "address" },
+      { "indexed": true, "internalType": "bytes32", "name": "foo", "type": "bytes32" },
+      { "indexed": true, "internalType": "bytes32", "name": "bar", "type": "bytes32" },
+      { "indexed": false, "internalType": "uint256", "name": "wad", "type": "uint256" },
+      { "indexed": false, "internalType": "bytes", "name": "fax", "type": "bytes" }
+    ],
+    "name": "LogNote",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }],
+    "name": "RaiseCreditline",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": true, "internalType": "address", "name": "usr", "type": "address" }],
+    "name": "RelyAdmin",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "value", "type": "uint256" }],
+    "name": "SetMaxReserve",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }],
+    "name": "SinkCreditline",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "usr", "type": "address" },
+      { "indexed": false, "internalType": "uint256", "name": "validUntil", "type": "uint256" }
+    ],
+    "name": "UpdateJuniorMember",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address[]", "name": "users", "type": "address[]" },
+      { "indexed": false, "internalType": "uint256", "name": "validUntil", "type": "uint256" }
+    ],
+    "name": "UpdateJuniorMembers",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "usr", "type": "address" },
+      { "indexed": false, "internalType": "uint256", "name": "validUntil", "type": "uint256" }
+    ],
+    "name": "UpdateSeniorMember",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address[]", "name": "users", "type": "address[]" },
+      { "indexed": false, "internalType": "uint256", "name": "validUntil", "type": "uint256" }
+    ],
+    "name": "UpdateSeniorMembers",
+    "type": "event"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "name": "admins",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "assessor",
+    "outputs": [{ "internalType": "contract AssessorLike", "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+    "name": "deny",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+    "name": "denyAdmin",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "internalType": "bytes32", "name": "contractName", "type": "bytes32" },
+      { "internalType": "address", "name": "addr", "type": "address" }
+    ],
+    "name": "depend",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "internalType": "bytes32", "name": "what", "type": "bytes32" },
+      { "internalType": "bool", "name": "data", "type": "bool" }
+    ],
+    "name": "file",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "juniorMemberlist",
+    "outputs": [{ "internalType": "contract MemberlistLike", "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "lending",
+    "outputs": [{ "internalType": "contract LendingAdapter", "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "live",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "internalType": "uint256", "name": "amount", "type": "uint256" }],
+    "name": "raiseCreditline",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+    "name": "rely",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "internalType": "address", "name": "usr", "type": "address" }],
+    "name": "relyAdmin",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "seniorMemberlist",
+    "outputs": [{ "internalType": "contract MemberlistLike", "name": "", "type": "address" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "internalType": "uint256", "name": "value", "type": "uint256" }],
+    "name": "setMaxReserve",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [{ "internalType": "uint256", "name": "amount", "type": "uint256" }],
+    "name": "sinkCreditline",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "internalType": "address", "name": "usr", "type": "address" },
+      { "internalType": "uint256", "name": "validUntil", "type": "uint256" }
+    ],
+    "name": "updateJuniorMember",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "internalType": "address[]", "name": "users", "type": "address[]" },
+      { "internalType": "uint256", "name": "validUntil", "type": "uint256" }
+    ],
+    "name": "updateJuniorMembers",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "internalType": "address", "name": "usr", "type": "address" },
+      { "internalType": "uint256", "name": "validUntil", "type": "uint256" }
+    ],
+    "name": "updateSeniorMember",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "internalType": "address[]", "name": "users", "type": "address[]" },
+      { "internalType": "uint256", "name": "validUntil", "type": "uint256" }
+    ],
+    "name": "updateSeniorMembers",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "name": "wards",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  }
+]
diff --git a/tinlake.js/src/abi/index.ts b/tinlake.js/src/abi/index.ts
index b8fcfa5e4c..30baab4323 100644
--- a/tinlake.js/src/abi/index.ts
+++ b/tinlake.js/src/abi/index.ts
@@ -10,6 +10,7 @@ import contractAbiMemberlist from './Memberlist.abi.json'
 import contractAbiNavFeed from './NAVFeed.abi.json'
 import contractAbiOperator from './Operator.abi.json'
 import contractAbiPile from './Pile.abi.json'
+import contractAbiPoolAdmin from './PoolAdmin.abi.json'
 import contractAbiPoolRegistry from './PoolRegistry.abi.json'
 import contractAbiProxy from './Proxy.abi.json'
 import contractAbiProxyRegistry from './ProxyRegistry.abi.json'
@@ -48,4 +49,5 @@ export default {
   SENIOR_TRANCHE: contractAbiTranche,
   POOL_REGISTRY: contractAbiPoolRegistry,
   CLAIM_RAD: contractAbiClaimRAD,
+  POOL_ADMIN: contractAbiPoolAdmin,
 } as ContractAbis
diff --git a/tinlake.js/src/actions/admin.ts b/tinlake.js/src/actions/admin.ts
index 0cba6e0e18..075f534ce1 100644
--- a/tinlake.js/src/actions/admin.ts
+++ b/tinlake.js/src/actions/admin.ts
@@ -93,10 +93,17 @@ export function AdminActions<ActionsBase extends Constructor<TinlakeParams>>(Bas
     }
 
     setMaximumReserve = async (value: string) => {
-      // Source: https://github.com/ethereum/web3.js/issues/2256#issuecomment-462730550
       return this.pending(this.contract('ASSESSOR_ADMIN').setMaxReserve(value, this.overrides))
     }
 
+    raiseCreditline = async (amount: string) => {
+      return this.pending(this.contract('POOL_ADMIN').raiseCreditline(amount, { ...this.overrides, gasLimit: 600000 }))
+    }
+
+    sinkCreditline = async (amount: string) => {
+      return this.pending(this.contract('POOL_ADMIN').sinkCreditline(amount, { ...this.overrides, gasLimit: 600000 }))
+    }
+
     setSeniorTrancheInterest = async (value: string) => {
       // Source: https://github.com/ethereum/web3.js/issues/2256#issuecomment-462730550
       return this.pending(
@@ -169,6 +176,8 @@ export type IAdminActions = {
   setMinimumJuniorRatio(amount: string): Promise<PendingTransaction>
   setMaximumJuniorRatio(amount: string): Promise<PendingTransaction>
   setMaximumReserve(amount: string): Promise<PendingTransaction>
+  raiseCreditline(amount: string): Promise<PendingTransaction>
+  sinkCreditline(amount: string): Promise<PendingTransaction>
   setSeniorTrancheInterest(amount: string): Promise<PendingTransaction>
   setDiscountRate(amount: string): Promise<PendingTransaction>
   setMaturityDate(nftId: string, timestampSecs: number): Promise<PendingTransaction>
diff --git a/tinlake.js/src/actions/proxy.ts b/tinlake.js/src/actions/proxy.ts
index 62c33eebca..fdb01c9c90 100644
--- a/tinlake.js/src/actions/proxy.ts
+++ b/tinlake.js/src/actions/proxy.ts
@@ -102,7 +102,7 @@ export function ProxyActions<ActionsBase extends Constructor<TinlakeParams>>(Bas
       ])
 
       return this.pending(
-        proxy.execute(this.contract('ACTIONS').address, encoded, { ...this.overrides, gasLimit: 1000000 })
+        proxy.execute(this.contract('ACTIONS').address, encoded, { ...this.overrides, gasLimit: 1500000 })
       )
     }
 

From 4cb66ec40c13e9fa9dae5c2e5f3670052ba17cdf Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Fri, 9 Apr 2021 20:50:27 +0200
Subject: [PATCH 03/15] feat: show overcoll required in form

---
 .../Loan/Overview/MaxReserveForm.tsx          | 23 ++++++++++++++-----
 tinlake-ui/ducks/pool.ts                      | 22 ++++++++++++++----
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
index 7805cf29cf..aa5870a23d 100644
--- a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
+++ b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
@@ -1,5 +1,5 @@
 import { TokenInput } from '@centrifuge/axis-token-input'
-import { addThousandsSeparators, baseToDisplay, ITinlake } from '@centrifuge/tinlake-js'
+import { addThousandsSeparators, baseToDisplay, ITinlake, toPrecision } from '@centrifuge/tinlake-js'
 import BN from 'bn.js'
 import Decimal from 'decimal.js-light'
 import { Box, Button, Heading } from 'grommet'
@@ -34,7 +34,7 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
   }
 
   const [status, , setTxId] = useTransactionState()
-  const [creditlineStatus, , setCreditlineTxId] = useTransactionState()
+  const [, , setCreditlineTxId] = useTransactionState()
 
   const save = async () => {
     if (value && value !== (poolData?.reserve || new BN(0)).toString()) {
@@ -77,6 +77,17 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
     }
   }, [status])
 
+  const mat = poolData?.maker ? poolData.maker.mat : new BN(0)
+  const tinSupply = poolData?.junior?.totalSupply || new BN(0)
+
+  const tinStakeRequired = creditlineValue
+    ? new BN(creditlineValue)
+        .mul(mat)
+        .div(new BN(10).pow(new BN(27))) // overcollateralization required (e.g 106%)
+        .sub(new BN(creditlineValue)) // TIN stake required (e.g. 6%)
+        .sub(tinSupply) // diff from whats already supplied
+    : new BN(0)
+
   return (
     <Box>
       <Heading level="5" margin={{ top: '0', bottom: '0' }}>
@@ -85,26 +96,26 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
       <Description margin={{ top: 'small' }}>
         This will determine how much can be invested into the reserve right now.
       </Description>
-
       <TokenInput
         token={props.selectedPool?.metadata.currencySymbol || 'DAI'}
         value={value === undefined ? poolData?.maxReserve.toString() || '0' : value}
         onChange={onChange}
         disabled={status === 'pending' || status === 'unconfirmed'}
       />
-
       <Heading level="5" margin={{ top: 'large', bottom: '0' }}>
         Set Maker creditline
       </Heading>
       <Description margin={{ top: 'small' }}>This will lock in the required TIN for overcollateralization.</Description>
-
       <TokenInput
         token={props.selectedPool?.metadata.currencySymbol || 'DAI'}
         value={creditlineValue === undefined ? poolData?.maker?.creditline?.toString() || '0' : creditlineValue}
         onChange={onChangeCreditline}
+        maxValue={poolData?.maker?.line.div(new BN(10).pow(new BN(45 - 18)))}
+        limitLabel="Debt Ceiling"
         disabled={status === 'pending' || status === 'unconfirmed'}
       />
-
+      This will require an additional{' '}
+      {addThousandsSeparators(toPrecision(baseToDisplay(tinStakeRequired || '0', 18), 4))} TIN.
       <Box gap="small" justify="end" direction="row" margin={{ top: 'medium' }}>
         <Button
           label="Cancel"
diff --git a/tinlake-ui/ducks/pool.ts b/tinlake-ui/ducks/pool.ts
index 663b1bdc3c..d62dadfeed 100644
--- a/tinlake-ui/ducks/pool.ts
+++ b/tinlake-ui/ducks/pool.ts
@@ -280,22 +280,36 @@ export function loadPool(
               'ilks(bytes32)(uint256,uint256,uint256,uint256,uint256)',
               ethers.utils.formatBytes32String('NS2DRP-A'),
             ],
-            returns: [[`maker.art`], [`maker.rate`], [`maker.spot`], [`maker.line`], [`maker.dust`]],
+            returns: [
+              [`maker.art`, toBN],
+              [`maker.rate`, toBN],
+              [`maker.spot`, toBN],
+              [`maker.line`, toBN],
+              [`maker.dust`, toBN],
+            ],
           },
           {
             target: tinlake.contractAddresses.MCD_JUG,
             call: ['ilks(bytes32)(uint256,uint256)', ethers.utils.formatBytes32String('NS2DRP-A')],
-            returns: [[`maker.duty`], [`maker.rho`]],
+            returns: [
+              [`maker.duty`, toBN],
+              [`maker.rho`, toBN],
+            ],
           },
           {
             target: tinlake.contractAddresses.CLERK,
             call: ['remainingCredit()(uint)'],
-            returns: [[`maker.remainingCredit`]],
+            returns: [[`maker.remainingCredit`, toBN]],
+          },
+          {
+            target: tinlake.contractAddresses.CLERK,
+            call: ['mat()(uint)'],
+            returns: [[`maker.mat`, toBN]],
           },
           {
             target: tinlake.contractAddresses.CLERK,
             call: ['creditline()(uint)'],
-            returns: [[`maker.creditline`]],
+            returns: [[`maker.creditline`, toBN]],
           },
         ]
       : []

From 825a08191c62a7daa2b81b7ecbb82583f23cb04d Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Mon, 12 Apr 2021 14:22:07 +0200
Subject: [PATCH 04/15] feat: improve maker integration

---
 .../components/Overview/OverviewHeader.tsx    |  6 +-
 tinlake-ui/config.ts                          |  5 ++
 .../Investment/View/TrancheOverview.tsx       |  7 +-
 .../Loan/Overview/MaxReserveForm.tsx          | 79 ++++++++++++-------
 tinlake-ui/containers/Loan/Overview/index.tsx |  4 +-
 tinlake-ui/ducks/pool.ts                      |  6 ++
 tinlake-ui/services/tinlake/actions.ts        | 13 ++-
 tinlake.js/src/actions/coordinator.ts         |  2 +-
 tinlake.js/src/actions/proxy.ts               |  2 +-
 9 files changed, 79 insertions(+), 45 deletions(-)

diff --git a/tinlake-ui/components/Overview/OverviewHeader.tsx b/tinlake-ui/components/Overview/OverviewHeader.tsx
index 32bccd5737..8eabee9f4c 100644
--- a/tinlake-ui/components/Overview/OverviewHeader.tsx
+++ b/tinlake-ui/components/Overview/OverviewHeader.tsx
@@ -135,14 +135,14 @@ const OverviewHeader: React.FC<Props> = (props: Props) => {
           <Box pad={{ top: '8px;' }} direction="row">
             This pool is directly integrated with Maker for liquidity. &nbsp;<a href="#">Learn more</a>
           </Box>
-          <MakerMetric margin={{ left: 'auto' }} style={{ borderRight: '1px solid #fff' }}>
+          {/* <MakerMetric style={{ borderRight: '1px solid #fff' }}>
             <h3>Remaining credit</h3>
             <h2>
               {addThousandsSeparators(toPrecision(baseToDisplay(poolData?.maker?.remainingCredit || new BN(0), 18), 0))}{' '}
               <MakerUnit>DAI</MakerUnit>{' '}
             </h2>
-          </MakerMetric>
-          <MakerMetric style={{ borderRight: '1px solid #fff' }}>
+          </MakerMetric> */}
+          <MakerMetric margin={{ left: 'auto' }} style={{ borderRight: '1px solid #fff' }}>
             <h3>Current Debt</h3>
             <h2>
               {addThousandsSeparators(toPrecision(baseToDisplay(poolData?.maker?.art || new BN(0), 18), 0))}{' '}
diff --git a/tinlake-ui/config.ts b/tinlake-ui/config.ts
index 32ccbdb559..a0ffef6c3d 100644
--- a/tinlake-ui/config.ts
+++ b/tinlake-ui/config.ts
@@ -145,6 +145,11 @@ const contractAddressesSchema = yup.object().shape({
     .length(42)
     .matches(/0x[0-9a-fA-F]{40}/)
     .optional(),
+  ASSESSOR: yup
+    .string()
+    .length(42)
+    .matches(/0x[0-9a-fA-F]{40}/)
+    .required('contractAddressesSchema.JUNIOR_TOKEN is required'),
 })
 
 const contractConfigSchema = yup.object().shape({
diff --git a/tinlake-ui/containers/Investment/View/TrancheOverview.tsx b/tinlake-ui/containers/Investment/View/TrancheOverview.tsx
index 608ce74559..ff9fe00d8d 100644
--- a/tinlake-ui/containers/Investment/View/TrancheOverview.tsx
+++ b/tinlake-ui/containers/Investment/View/TrancheOverview.tsx
@@ -98,6 +98,8 @@ const TrancheOverview: React.FC<Props> = (props: Props) => {
     if (!trancheData || !trancheData.address || !trancheData.token || !trancheData.decimals) return
 
     try {
+      const fallback = `https://tinlake.centrifuge.io/static/${token}_final.svg`
+
       await (window as any).ethereum.request({
         method: 'wallet_watchAsset',
         params: {
@@ -106,7 +108,10 @@ const TrancheOverview: React.FC<Props> = (props: Props) => {
             address: trancheData.address,
             symbol: trancheData.token,
             decimals: trancheData.decimals,
-            image: `https://tinlake.centrifuge.io/static/${token}_final.svg`,
+            image:
+              token === 'DROP'
+                ? props.pool?.metadata.media?.drop || fallback
+                : props.pool?.metadata.media?.tin || fallback,
           },
         },
       })
diff --git a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
index aa5870a23d..9b8f4eee77 100644
--- a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
+++ b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
@@ -1,5 +1,5 @@
 import { TokenInput } from '@centrifuge/axis-token-input'
-import { addThousandsSeparators, baseToDisplay, ITinlake, toPrecision } from '@centrifuge/tinlake-js'
+import { addThousandsSeparators, baseToDisplay, ITinlake } from '@centrifuge/tinlake-js'
 import BN from 'bn.js'
 import Decimal from 'decimal.js-light'
 import { Box, Button, Heading } from 'grommet'
@@ -36,24 +36,24 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
   const [status, , setTxId] = useTransactionState()
   const [, , setCreditlineTxId] = useTransactionState()
 
+  const mat = poolData?.maker?.mat
+
   const save = async () => {
     if (value && value !== (poolData?.reserve || new BN(0)).toString()) {
       const txId = await props.createTransaction(`Set max reserve`, 'setMaxReserve', [props.tinlake, value.toString()])
       setTxId(txId)
     }
 
-    if (
-      creditlineValue &&
-      poolData?.maker?.creditline &&
-      creditlineValue !== (poolData?.maker?.creditline || new BN(0)).toString()
-    ) {
-      const currentCreditline = poolData?.maker?.creditline.toString()
+    if (creditlineValue && mat && creditlineValue !== (mat || new BN(0)).toString()) {
+      const currentCreditline = poolData?.maker?.creditline?.toString()
       const amount = new BN(creditlineValue).gt(new BN(currentCreditline))
         ? new BN(creditlineValue).sub(new BN(currentCreditline))
         : new BN(currentCreditline).sub(new BN(creditlineValue))
       const valueToDecimal = new Decimal(baseToDisplay(creditlineValue, 18)).toDecimalPlaces(4)
       const formatted = addThousandsSeparators(valueToDecimal.toString())
 
+      console.log(`${currentCreditline} => ${creditlineValue}`)
+
       if (new BN(creditlineValue).gt(new BN(currentCreditline))) {
         const txId = await props.createTransaction(`Increase creditline to ${formatted}`, 'raiseCreditline', [
           props.tinlake,
@@ -77,16 +77,23 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
     }
   }, [status])
 
-  const mat = poolData?.maker ? poolData.maker.mat : new BN(0)
-  const tinSupply = poolData?.junior?.totalSupply || new BN(0)
+  const debtCeiling = poolData?.maker?.line.div(new BN(10).pow(new BN(45 - 18)))
+  const tinSupplyDAI = (poolData?.junior?.totalSupply || new BN(0))
+    .mul(poolData?.junior?.tokenPrice || new BN(0))
+    .div(new BN(10).pow(new BN(27)))
+  const effectiveDropBalanceDAI = (poolData?.senior?.effectiveBalance || new BN(0))
+    .mul(poolData?.senior?.tokenPrice || new BN(0))
+    .div(new BN(10).pow(new BN(27)))
 
-  const tinStakeRequired = creditlineValue
-    ? new BN(creditlineValue)
-        .mul(mat)
-        .div(new BN(10).pow(new BN(27))) // overcollateralization required (e.g 106%)
-        .sub(new BN(creditlineValue)) // TIN stake required (e.g. 6%)
-        .sub(tinSupply) // diff from whats already supplied
-    : new BN(0)
+  const maxDropDAI = tinSupplyDAI
+    .mul(new BN(10).pow(new BN(27)))
+    .div(poolData?.minJuniorRatio || new BN(0))
+    .mul(new BN(10).pow(new BN(27)).sub(poolData?.minJuniorRatio || new BN(0)))
+    .div(new BN(10).pow(new BN(27)))
+  const maxCreditline = maxDropDAI
+    .sub(effectiveDropBalanceDAI)
+    .mul(new BN(10).pow(new BN(27)))
+    .div(mat)
 
   return (
     <Box>
@@ -102,26 +109,38 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
         onChange={onChange}
         disabled={status === 'pending' || status === 'unconfirmed'}
       />
-      <Heading level="5" margin={{ top: 'large', bottom: '0' }}>
-        Set Maker creditline
-      </Heading>
-      <Description margin={{ top: 'small' }}>This will lock in the required TIN for overcollateralization.</Description>
-      <TokenInput
-        token={props.selectedPool?.metadata.currencySymbol || 'DAI'}
-        value={creditlineValue === undefined ? poolData?.maker?.creditline?.toString() || '0' : creditlineValue}
-        onChange={onChangeCreditline}
-        maxValue={poolData?.maker?.line.div(new BN(10).pow(new BN(45 - 18)))}
-        limitLabel="Debt Ceiling"
-        disabled={status === 'pending' || status === 'unconfirmed'}
-      />
-      This will require an additional{' '}
-      {addThousandsSeparators(toPrecision(baseToDisplay(tinStakeRequired || '0', 18), 4))} TIN.
+      {mat && (
+        <>
+          <Heading level="5" margin={{ top: 'large', bottom: '0' }}>
+            Set Maker creditline
+          </Heading>
+          <Description margin={{ top: 'small' }}>
+            This will lock in the required TIN for overcollateralization.
+          </Description>
+          <TokenInput
+            token={props.selectedPool?.metadata.currencySymbol || 'DAI'}
+            value={creditlineValue === undefined ? poolData?.maker?.creditline?.toString() || '0' : creditlineValue}
+            onChange={onChangeCreditline}
+            maxValue={(maxCreditline.lt(debtCeiling) ? maxCreditline : debtCeiling).toString()}
+            limitLabel={maxCreditline.lt(debtCeiling) ? 'Max' : 'Debt Ceiling'}
+            disabled={status === 'pending' || status === 'unconfirmed'}
+          />
+          {effectiveDropBalanceDAI.toString()}
+          {/* {tinStakeRequired.gtn(0) && (
+            <Paragraph>
+              This will require an additional{' '}
+              {addThousandsSeparators(toPrecision(baseToDisplay(tinStakeRequired || '0', 18), 0))} TIN.
+            </Paragraph>
+          )} */}
+        </>
+      )}
       <Box gap="small" justify="end" direction="row" margin={{ top: 'medium' }}>
         <Button
           label="Cancel"
           onClick={() => props.setShowMaxReserveForm(false)}
           disabled={status === 'pending' || status === 'unconfirmed'}
         />
+        {/* (mat && tinStakeRequired.gtn(0)) ||  */}
         <Button primary label="Set" onClick={save} disabled={status === 'pending' || status === 'unconfirmed'} />
       </Box>
     </Box>
diff --git a/tinlake-ui/containers/Loan/Overview/index.tsx b/tinlake-ui/containers/Loan/Overview/index.tsx
index b088e10cf0..c7f9e106d3 100644
--- a/tinlake-ui/containers/Loan/Overview/index.tsx
+++ b/tinlake-ui/containers/Loan/Overview/index.tsx
@@ -168,7 +168,9 @@ const LoanOverview: React.FC<Props> = (props: Props) => {
                           {addThousandsSeparators(
                             toPrecision(
                               baseToDisplay(
-                                (poolData?.reserve || new BN(0)).sub(poolData?.availableFunds || new BN(0)),
+                                (poolData?.reserve || new BN(0))
+                                  .add(poolData?.maker?.remainingCredit || new BN(0))
+                                  .sub(poolData?.availableFunds || new BN(0)),
                                 18
                               ),
                               0
diff --git a/tinlake-ui/ducks/pool.ts b/tinlake-ui/ducks/pool.ts
index d62dadfeed..98f762806e 100644
--- a/tinlake-ui/ducks/pool.ts
+++ b/tinlake-ui/ducks/pool.ts
@@ -26,6 +26,7 @@ export interface PoolTranche extends Tranche {
   decimals?: number
   address?: string
   inMemberlist?: boolean
+  effectiveBalance?: BN
 }
 
 export interface PoolData {
@@ -311,6 +312,11 @@ export function loadPool(
             call: ['creditline()(uint)'],
             returns: [[`maker.creditline`, toBN]],
           },
+          {
+            target: tinlake.contractAddresses.ASSESSOR,
+            call: ['effectiveSeniorBalance()(uint)'],
+            returns: [[`senior.effectiveBalance`, toBN]],
+          },
         ]
       : []
 
diff --git a/tinlake-ui/services/tinlake/actions.ts b/tinlake-ui/services/tinlake/actions.ts
index ce4cc79161..72d2f46095 100644
--- a/tinlake-ui/services/tinlake/actions.ts
+++ b/tinlake-ui/services/tinlake/actions.ts
@@ -498,14 +498,11 @@ export async function borrow(tinlake: ITinlake, loan: Loan, amount: string): Pro
   const address = await tinlake.signer.getAddress()
   const proxy = loan.ownerOf
 
-  // make sure tranche has enough funds
-  // TODO: update for maker integration
-  // const juniorReserve = await tinlake.getJuniorReserve()
-  // const seniorReserve = await tinlake.getSeniorReserve()
-  // const trancheReserve = juniorReserve.add(seniorReserve)
-  // if (new BN(amount).cmp(trancheReserve) > 0) {
-  //   return loggedError({}, 'There is not enough available funds.', loanId)
-  // }
+  // make sure there are enough funds available
+  const availableFunds = await tinlake.getAvailableFunds()
+  if (new BN(amount).cmp(availableFunds) > 0) {
+    return loggedError({}, 'There is not enough available funds.', loanId)
+  }
 
   // borrow with proxy
   return tinlake.proxyLockBorrowWithdraw(proxy.toString(), loanId, amount, address!)
diff --git a/tinlake.js/src/actions/coordinator.ts b/tinlake.js/src/actions/coordinator.ts
index 99c1c89dc4..6a5b4b3dbf 100644
--- a/tinlake.js/src/actions/coordinator.ts
+++ b/tinlake.js/src/actions/coordinator.ts
@@ -83,7 +83,7 @@ export function CoordinatorActions<ActionsBase extends Constructor<TinlakeParams
 
       if ((await coordinator.submissionPeriod()) === false) {
         // The epoch is can be closed, but is not closed yet
-        const closeTx = await coordinator.closeEpoch({ ...this.overrides, gasLimit: 2000000 })
+        const closeTx = await coordinator.closeEpoch({ ...this.overrides, gasLimit: 3000000 })
         const closeResult = await this.getTransactionReceipt(closeTx)
 
         if (closeResult.status === 0) {
diff --git a/tinlake.js/src/actions/proxy.ts b/tinlake.js/src/actions/proxy.ts
index fdb01c9c90..d82f0fb191 100644
--- a/tinlake.js/src/actions/proxy.ts
+++ b/tinlake.js/src/actions/proxy.ts
@@ -138,7 +138,7 @@ export function ProxyActions<ActionsBase extends Constructor<TinlakeParams>>(Bas
       ])
 
       return this.pending(
-        proxy.execute(this.contract('ACTIONS').address, encoded, { ...this.overrides, gasLimit: 700000 })
+        proxy.execute(this.contract('ACTIONS').address, encoded, { ...this.overrides, gasLimit: 1000000 })
       )
     }
 

From 9beb4dca2a1ac8f76a0a101b7ffa99b13131c3bf Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Mon, 12 Apr 2021 14:56:42 +0200
Subject: [PATCH 05/15] fix: repay gas limit

---
 tinlake-ui/containers/Loan/Repay/index.tsx | 2 ++
 tinlake.js/src/actions/proxy.ts            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tinlake-ui/containers/Loan/Repay/index.tsx b/tinlake-ui/containers/Loan/Repay/index.tsx
index 7049653dca..28c1ce969c 100644
--- a/tinlake-ui/containers/Loan/Repay/index.tsx
+++ b/tinlake-ui/containers/Loan/Repay/index.tsx
@@ -35,6 +35,7 @@ const LoanRepay: React.FC<Props> = (props: Props) => {
     let txId: string
     if (repayAmount === debt) {
       // full repay
+      console.log('full repay')
       txId = await props.createTransaction(
         `Repay Asset ${props.loan.loanId} (${formatted} ${props.poolConfig.metadata.currencySymbol || 'DAI'})`,
         'repayFull',
@@ -42,6 +43,7 @@ const LoanRepay: React.FC<Props> = (props: Props) => {
       )
     } else {
       // partial repay
+      console.log('partial repay')
       txId = await props.createTransaction(
         `Repay Asset ${props.loan.loanId} (${formatted} ${props.poolConfig.metadata.currencySymbol || 'DAI'})`,
         'repay',
diff --git a/tinlake.js/src/actions/proxy.ts b/tinlake.js/src/actions/proxy.ts
index d82f0fb191..6b88292fe6 100644
--- a/tinlake.js/src/actions/proxy.ts
+++ b/tinlake.js/src/actions/proxy.ts
@@ -166,7 +166,7 @@ export function ProxyActions<ActionsBase extends Constructor<TinlakeParams>>(Bas
       ])
 
       return this.pending(
-        proxy.execute(this.contract('ACTIONS').address, encoded, { ...this.overrides, gasLimit: 550000 })
+        proxy.execute(this.contract('ACTIONS').address, encoded, { ...this.overrides, gasLimit: 1500000 })
       )
     }
   }

From 328f9eabc3f70365bbc1437862fedd53ef2eac2f Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Wed, 14 Apr 2021 16:22:04 +0200
Subject: [PATCH 06/15] feat: minor maker ui changes

---
 .../components/Overview/OverviewHeader.tsx    |  5 +++-
 .../Loan/Overview/MaxReserveForm.tsx          | 13 +++++----
 tinlake-ui/containers/Loan/Overview/index.tsx | 28 +++++++++++++++++++
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/tinlake-ui/components/Overview/OverviewHeader.tsx b/tinlake-ui/components/Overview/OverviewHeader.tsx
index 8eabee9f4c..d996f913d3 100644
--- a/tinlake-ui/components/Overview/OverviewHeader.tsx
+++ b/tinlake-ui/components/Overview/OverviewHeader.tsx
@@ -133,7 +133,10 @@ const OverviewHeader: React.FC<Props> = (props: Props) => {
             <img src="/static/maker-logo.svg" />
           </MakerLogo>
           <Box pad={{ top: '8px;' }} direction="row">
-            This pool is directly integrated with Maker for liquidity. &nbsp;<a href="#">Learn more</a>
+            This pool is directly integrated with a Maker vault for liquidity. &nbsp;
+            <a href="https://medium.com/centrifuge/as-composable-as-it-gets-43b4dcc5db5a" target="_blank">
+              Learn more
+            </a>
           </Box>
           {/* <MakerMetric style={{ borderRight: '1px solid #fff' }}>
             <h3>Remaining credit</h3>
diff --git a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
index 9b8f4eee77..3ba2b4a28c 100644
--- a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
+++ b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
@@ -77,7 +77,7 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
     }
   }, [status])
 
-  const debtCeiling = poolData?.maker?.line.div(new BN(10).pow(new BN(45 - 18)))
+  const debtCeiling = (poolData?.maker?.line || new BN('0')).div(new BN(10).pow(new BN(45 - 18)))
   const tinSupplyDAI = (poolData?.junior?.totalSupply || new BN(0))
     .mul(poolData?.junior?.tokenPrice || new BN(0))
     .div(new BN(10).pow(new BN(27)))
@@ -90,10 +90,13 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
     .div(poolData?.minJuniorRatio || new BN(0))
     .mul(new BN(10).pow(new BN(27)).sub(poolData?.minJuniorRatio || new BN(0)))
     .div(new BN(10).pow(new BN(27)))
-  const maxCreditline = maxDropDAI
-    .sub(effectiveDropBalanceDAI)
-    .mul(new BN(10).pow(new BN(27)))
-    .div(mat)
+  const maxCreditline =
+    mat && !mat.isZero()
+      ? maxDropDAI
+          .sub(effectiveDropBalanceDAI)
+          .mul(new BN(10).pow(new BN(27)))
+          .div(mat)
+      : new BN('0')
 
   return (
     <Box>
diff --git a/tinlake-ui/containers/Loan/Overview/index.tsx b/tinlake-ui/containers/Loan/Overview/index.tsx
index c7f9e106d3..cd6482ecdb 100644
--- a/tinlake-ui/containers/Loan/Overview/index.tsx
+++ b/tinlake-ui/containers/Loan/Overview/index.tsx
@@ -143,6 +143,34 @@ const LoanOverview: React.FC<Props> = (props: Props) => {
                         </LoadingValue>
                       </TableCell>
                     </TableRow>
+                    {poolData?.maker?.line && (
+                      <TableRow>
+                        <TableCell
+                          scope="row"
+                          style={{ alignItems: 'start', justifyContent: 'center' }}
+                          pad={{ vertical: '6px' }}
+                        >
+                          <span>Maker creditline</span>
+                        </TableCell>
+                        <TableCell style={{ textAlign: 'end' }} pad={{ vertical: '6px' }}>
+                          <LoadingValue done={poolData?.reserve !== undefined} height={39}>
+                            <>
+                              {addThousandsSeparators(
+                                toPrecision(baseToDisplay(poolData?.maker?.creditline || '0', 18), 0)
+                              )}{' '}
+                              {props.selectedPool?.metadata.currencySymbol || 'DAI'}
+                              <Sidenote>
+                                Remaining:{' '}
+                                {addThousandsSeparators(
+                                  toPrecision(baseToDisplay(poolData?.maker?.remainingCredit || '0', 18), 0)
+                                )}{' '}
+                                {props.selectedPool?.metadata.currencySymbol || 'DAI'}
+                              </Sidenote>
+                            </>
+                          </LoadingValue>
+                        </TableCell>
+                      </TableRow>
+                    )}
                     <TableRow>
                       <TableCell scope="row" style={{ alignItems: 'start', justifyContent: 'center' }}>
                         <span>Available funds for financing</span>

From 856d3421f2aee34dc19538e467ec5c38efad03be Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Fri, 16 Apr 2021 09:23:26 +0200
Subject: [PATCH 07/15] fix: run bot tasks less often

---
 tinlake-bot/src/index.ts | 10 +++++-----
 tinlake-ui/ducks/pool.ts |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tinlake-bot/src/index.ts b/tinlake-bot/src/index.ts
index 7c6319d561..27d48bb1ea 100644
--- a/tinlake-bot/src/index.ts
+++ b/tinlake-bot/src/index.ts
@@ -29,7 +29,7 @@ const run = async () => {
 
   let cronJobs: Map<string, CronJob> = new Map<string, CronJob>()
 
-  let retrievePoolsTask = new CronJob(CronExpression.EVERY_30_MINUTES, async () => {
+  let retrievePoolsTask = new CronJob(CronExpression.EVERY_HOUR, async () => {
     // Update the list of pools every 30 minutes
     pools = await loadFromIPFS(provider)
   })
@@ -41,14 +41,14 @@ const run = async () => {
   })
   cronJobs.set('closePools', closePoolsTask)
 
-  let submitSolutionsTask = new CronJob(CronExpression.EVERY_10_MINUTES, async () => {
-    // Submit solutions every 10 minutes
+  let submitSolutionsTask = new CronJob(CronExpression.EVERY_30_MINUTES, async () => {
+    // Submit solutions every 15 minutes
     await submitSolutions(pools, provider, signerWithProvider)
   })
   cronJobs.set('submitSolutions', submitSolutionsTask)
 
-  let executePoolsTask = new CronJob(CronExpression.EVERY_5_MINUTES, async () => {
-    // Execute pool epochs every 5 minutes
+  let executePoolsTask = new CronJob(CronExpression.EVERY_30_MINUTES, async () => {
+    // Execute pool epochs every 15 minutes
     await executePools(pools, provider, signerWithProvider)
   })
   cronJobs.set('executePools', executePoolsTask)
diff --git a/tinlake-ui/ducks/pool.ts b/tinlake-ui/ducks/pool.ts
index 98f762806e..7e6e3f1267 100644
--- a/tinlake-ui/ducks/pool.ts
+++ b/tinlake-ui/ducks/pool.ts
@@ -279,7 +279,7 @@ export function loadPool(
             target: tinlake.contractAddresses.MCD_VAT,
             call: [
               'ilks(bytes32)(uint256,uint256,uint256,uint256,uint256)',
-              ethers.utils.formatBytes32String('NS2DRP-A'),
+              ethers.utils.formatBytes32String('RWA002-A'),
             ],
             returns: [
               [`maker.art`, toBN],
@@ -291,7 +291,7 @@ export function loadPool(
           },
           {
             target: tinlake.contractAddresses.MCD_JUG,
-            call: ['ilks(bytes32)(uint256,uint256)', ethers.utils.formatBytes32String('NS2DRP-A')],
+            call: ['ilks(bytes32)(uint256,uint256)', ethers.utils.formatBytes32String('RWA002-A')],
             returns: [
               [`maker.duty`, toBN],
               [`maker.rho`, toBN],

From 3a10b1bb3710daba78e93c9fde47349d180370a4 Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Sun, 18 Apr 2021 14:03:06 +0200
Subject: [PATCH 08/15] feat: improve maker ui

---
 tinlake-ui/components/PageTitle/index.tsx     |   6 +-
 .../containers/Investment/View/InvestCard.tsx |  11 +-
 .../Loan/Overview/MaxReserveForm.tsx          |  13 +-
 tinlake-ui/containers/Loan/Overview/index.tsx | 161 ++++++++++--------
 tinlake-ui/ducks/pool.ts                      |   6 +
 tinlake.js/src/actions/admin.ts               |   6 +
 tinlake.js/src/actions/coordinator.ts         |   2 +-
 7 files changed, 127 insertions(+), 78 deletions(-)

diff --git a/tinlake-ui/components/PageTitle/index.tsx b/tinlake-ui/components/PageTitle/index.tsx
index 0a3fb295a1..b9385e4964 100644
--- a/tinlake-ui/components/PageTitle/index.tsx
+++ b/tinlake-ui/components/PageTitle/index.tsx
@@ -26,7 +26,11 @@ const PageTitle: React.FC<Props> = (props: Props) => {
 
   const pool = useSelector<any, PoolState>((state) => state.pool)
   const isOversubscribed =
-    (pool?.data && new BN(pool?.data.maxReserve).lte(new BN(pool?.data.reserve).add(OversubscribedBuffer))) || false
+    (pool?.data &&
+      new BN(pool?.data.maxReserve).lte(
+        new BN(pool?.data.reserve).add(pool?.data.maker?.remainingCredit || new BN(0)).add(OversubscribedBuffer)
+      )) ||
+    false
 
   // TODO: fix this somehow, otherwise the oversubscribed label isn't shown on pages which don't load the pool data
   // (but this requires injecting the tinlake prop everywhere we include the PoolTitle component)
diff --git a/tinlake-ui/containers/Investment/View/InvestCard.tsx b/tinlake-ui/containers/Investment/View/InvestCard.tsx
index 668c3d3759..aaefdd5823 100644
--- a/tinlake-ui/containers/Investment/View/InvestCard.tsx
+++ b/tinlake-ui/containers/Investment/View/InvestCard.tsx
@@ -39,7 +39,11 @@ const InvestCard: React.FC<Props> = (props: Props) => {
 
   const pool = useSelector<any, PoolState>((state) => state.pool)
   const isOversubscribed =
-    (pool?.data && new BN(pool?.data.maxReserve).lte(new BN(pool?.data.reserve).add(OversubscribedBuffer))) || false
+    (pool?.data &&
+      new BN(pool?.data.maxReserve).lte(
+        new BN(pool?.data.reserve).add(pool?.data.maker?.remainingCredit || new BN(0)).add(OversubscribedBuffer)
+      )) ||
+    false
 
   const loadHasInvested = async () => {
     if (address) {
@@ -93,8 +97,9 @@ const InvestCard: React.FC<Props> = (props: Props) => {
     setDaiValue(newValue)
     if (disableLimit === false && hasInvested === false && new BN(newValue).lt(MinInvestment)) {
       setError(
-        `Minimum investment: ${config.network === 'Mainnet' ? '5.000' : '10'} ${props.selectedPool?.metadata
-          .currencySymbol || 'DAI'}`
+        `Minimum investment: ${config.network === 'Mainnet' ? '5.000' : '10'} ${
+          props.selectedPool?.metadata.currencySymbol || 'DAI'
+        }`
       )
     } else if (limit && new BN(newValue).gt(new BN(limit))) {
       setError('Amount larger than balance')
diff --git a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
index 3ba2b4a28c..1f1d4a3572 100644
--- a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
+++ b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
@@ -128,7 +128,6 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
             limitLabel={maxCreditline.lt(debtCeiling) ? 'Max' : 'Debt Ceiling'}
             disabled={status === 'pending' || status === 'unconfirmed'}
           />
-          {effectiveDropBalanceDAI.toString()}
           {/* {tinStakeRequired.gtn(0) && (
             <Paragraph>
               This will require an additional{' '}
@@ -143,8 +142,16 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
           onClick={() => props.setShowMaxReserveForm(false)}
           disabled={status === 'pending' || status === 'unconfirmed'}
         />
-        {/* (mat && tinStakeRequired.gtn(0)) ||  */}
-        <Button primary label="Set" onClick={save} disabled={status === 'pending' || status === 'unconfirmed'} />
+        <Button
+          primary
+          label="Set"
+          onClick={save}
+          disabled={
+            status === 'pending' ||
+            status === 'unconfirmed' ||
+            (creditlineValue ? new BN(creditlineValue).gt(debtCeiling) : true)
+          }
+        />
       </Box>
     </Box>
   )
diff --git a/tinlake-ui/containers/Loan/Overview/index.tsx b/tinlake-ui/containers/Loan/Overview/index.tsx
index cd6482ecdb..d88b4a9255 100644
--- a/tinlake-ui/containers/Loan/Overview/index.tsx
+++ b/tinlake-ui/containers/Loan/Overview/index.tsx
@@ -76,7 +76,8 @@ const LoanOverview: React.FC<Props> = (props: Props) => {
     dispatch(loadAssetData(props.tinlake))
   }, [address])
 
-  const isAdmin = props.auth?.permissions && (props.auth?.permissions as PermissionsV3).canSetMaxReserve
+  const isAdmin =
+    poolData?.isPoolAdmin || (props.auth?.permissions && (props.auth?.permissions as PermissionsV3).canSetMaxReserve)
 
   const [showMaxReserveForm, setShowMaxReserveForm] = React.useState(false)
 
@@ -126,10 +127,15 @@ const LoanOverview: React.FC<Props> = (props: Props) => {
                         scope="row"
                         style={{ alignItems: 'start', justifyContent: 'center' }}
                         pad={{ vertical: '6px' }}
+                        border={isAdmin ? undefined : { color: 'transparent' }}
                       >
                         <span>Pool reserve</span>
                       </TableCell>
-                      <TableCell style={{ textAlign: 'end' }} pad={{ vertical: '6px' }}>
+                      <TableCell
+                        style={{ textAlign: 'end' }}
+                        pad={{ vertical: '6px' }}
+                        border={isAdmin ? undefined : { color: 'transparent' }}
+                      >
                         <LoadingValue done={poolData?.reserve !== undefined} height={39}>
                           <>
                             {addThousandsSeparators(toPrecision(baseToDisplay(poolData?.reserve || '0', 18), 0))}{' '}
@@ -143,78 +149,93 @@ const LoanOverview: React.FC<Props> = (props: Props) => {
                         </LoadingValue>
                       </TableCell>
                     </TableRow>
-                    {poolData?.maker?.line && (
-                      <TableRow>
-                        <TableCell
-                          scope="row"
-                          style={{ alignItems: 'start', justifyContent: 'center' }}
-                          pad={{ vertical: '6px' }}
-                        >
-                          <span>Maker creditline</span>
-                        </TableCell>
-                        <TableCell style={{ textAlign: 'end' }} pad={{ vertical: '6px' }}>
-                          <LoadingValue done={poolData?.reserve !== undefined} height={39}>
-                            <>
-                              {addThousandsSeparators(
-                                toPrecision(baseToDisplay(poolData?.maker?.creditline || '0', 18), 0)
-                              )}{' '}
-                              {props.selectedPool?.metadata.currencySymbol || 'DAI'}
-                              <Sidenote>
-                                Remaining:{' '}
-                                {addThousandsSeparators(
-                                  toPrecision(baseToDisplay(poolData?.maker?.remainingCredit || '0', 18), 0)
-                                )}{' '}
-                                {props.selectedPool?.metadata.currencySymbol || 'DAI'}
-                              </Sidenote>
-                            </>
-                          </LoadingValue>
-                        </TableCell>
-                      </TableRow>
-                    )}
-                    <TableRow>
-                      <TableCell scope="row" style={{ alignItems: 'start', justifyContent: 'center' }}>
-                        <span>Available funds for financing</span>
-                      </TableCell>
-                      <TableCell style={{ textAlign: 'end' }}>
-                        <LoadingValue done={poolData?.reserve !== undefined}>
-                          {addThousandsSeparators(toPrecision(baseToDisplay(poolData?.availableFunds || '0', 18), 0))}{' '}
-                          {props.selectedPool?.metadata.currencySymbol || 'DAI'}
-                        </LoadingValue>
-                      </TableCell>
-                    </TableRow>
-                    <TableRow>
-                      <TableCell
-                        scope="row"
-                        style={{ alignItems: 'start', justifyContent: 'center' }}
-                        border={{ color: 'transparent' }}
-                        pad={{ top: '15px' }}
-                      >
-                        <span>Repaid this epoch</span>
-                      </TableCell>
-                      <TableCell style={{ textAlign: 'end' }} border={{ color: 'transparent' }} pad={{ top: '15px' }}>
-                        <LoadingValue done={poolData?.reserve !== undefined}>
-                          {addThousandsSeparators(
-                            toPrecision(
-                              baseToDisplay(
-                                (poolData?.reserve || new BN(0))
-                                  .add(poolData?.maker?.remainingCredit || new BN(0))
-                                  .sub(poolData?.availableFunds || new BN(0)),
-                                18
-                              ),
-                              0
-                            )
-                          )}{' '}
-                          {props.selectedPool?.metadata.currencySymbol || 'DAI'}
-                        </LoadingValue>
-                      </TableCell>
-                    </TableRow>
                   </TableBody>
                 </Table>
 
                 {isAdmin && (
-                  <Box gap="small" justify="end" direction="row" margin={{ top: 'small' }}>
-                    <Button label="Manage" onClick={() => setShowMaxReserveForm(true)} disabled={!poolData} />
-                  </Box>
+                  <>
+                    <Table>
+                      <TableBody>
+                        <TableRow>
+                          <TableCell scope="row" style={{ alignItems: 'start', justifyContent: 'center' }}>
+                            <span>Available funds for Financing</span>
+                          </TableCell>
+                          <TableCell style={{ textAlign: 'end' }}>
+                            <LoadingValue done={poolData?.reserve !== undefined}>
+                              {addThousandsSeparators(
+                                toPrecision(baseToDisplay(poolData?.availableFunds || '0', 18), 0)
+                              )}{' '}
+                              {props.selectedPool?.metadata.currencySymbol || 'DAI'}
+                            </LoadingValue>
+                          </TableCell>
+                        </TableRow>
+                        {poolData?.maker?.line && (
+                          <TableRow>
+                            <TableCell
+                              scope="row"
+                              style={{ alignItems: 'start', justifyContent: 'center' }}
+                              pad={{ vertical: '6px' }}
+                            >
+                              <span>Maker creditline</span>
+                            </TableCell>
+                            <TableCell style={{ textAlign: 'end' }} pad={{ vertical: '6px' }}>
+                              <LoadingValue done={poolData?.reserve !== undefined} height={39}>
+                                <>
+                                  {addThousandsSeparators(
+                                    toPrecision(baseToDisplay(poolData?.maker?.creditline || '0', 18), 0)
+                                  )}{' '}
+                                  {props.selectedPool?.metadata.currencySymbol || 'DAI'}
+                                  <Sidenote>
+                                    Remaining:{' '}
+                                    {addThousandsSeparators(
+                                      toPrecision(baseToDisplay(poolData?.maker?.remainingCredit || '0', 18), 0)
+                                    )}{' '}
+                                    {props.selectedPool?.metadata.currencySymbol || 'DAI'}
+                                  </Sidenote>
+                                </>
+                              </LoadingValue>
+                            </TableCell>
+                          </TableRow>
+                        )}
+                        <TableRow>
+                          <TableCell
+                            scope="row"
+                            style={{ alignItems: 'start', justifyContent: 'center' }}
+                            border={{ color: 'transparent' }}
+                            pad={{ top: '15px' }}
+                          >
+                            <span>Repaid this epoch</span>
+                          </TableCell>
+                          <TableCell
+                            style={{ textAlign: 'end' }}
+                            border={{ color: 'transparent' }}
+                            pad={{ top: '15px' }}
+                          >
+                            <LoadingValue done={poolData?.reserve !== undefined}>
+                              {addThousandsSeparators(
+                                toPrecision(
+                                  baseToDisplay(
+                                    (poolData?.reserve || new BN(0))
+                                      .add(poolData?.maker?.remainingCredit || new BN(0))
+                                      .sub(poolData?.availableFunds || new BN(0)),
+                                    18
+                                  ),
+                                  0
+                                )
+                              )}{' '}
+                              {props.selectedPool?.metadata.currencySymbol || 'DAI'}
+                            </LoadingValue>
+                          </TableCell>
+                        </TableRow>
+                      </TableBody>
+                    </Table>
+
+                    {isAdmin && (
+                      <Box gap="small" justify="end" direction="row" margin={{ top: 'small' }}>
+                        <Button label="Manage" onClick={() => setShowMaxReserveForm(true)} disabled={!poolData} />
+                      </Box>
+                    )}
+                  </>
                 )}
               </>
             )}
diff --git a/tinlake-ui/ducks/pool.ts b/tinlake-ui/ducks/pool.ts
index 7e6e3f1267..14c8940af8 100644
--- a/tinlake-ui/ducks/pool.ts
+++ b/tinlake-ui/ducks/pool.ts
@@ -43,6 +43,7 @@ export interface PoolData {
   outstandingVolume: BN
   totalPendingInvestments: BN
   totalRedemptionsCurrency: BN
+  isPoolAdmin?: boolean
 }
 
 export type PoolStatus = 'Upcoming' | 'Active' | 'Deployed' | 'Closed'
@@ -135,6 +136,11 @@ export function loadPool(
             call: ['hasMember(address)(bool)', address || '0'],
             returns: [[`junior.inMemberlist`]],
           },
+          tinlake.contractAddresses.POOL_ADMIN && {
+            target: tinlake.contractAddresses.POOL_ADMIN,
+            call: ['admins(address)(uint256)', address || '0'],
+            returns: [[`isPoolAdmin`, (num: BigNumber) => toBN(num).toNumber() === 1]],
+          },
         ]
       : []
 
diff --git a/tinlake.js/src/actions/admin.ts b/tinlake.js/src/actions/admin.ts
index 075f534ce1..74203cca6e 100644
--- a/tinlake.js/src/actions/admin.ts
+++ b/tinlake.js/src/actions/admin.ts
@@ -25,6 +25,11 @@ export function AdminActions<ActionsBase extends Constructor<TinlakeParams>>(Bas
       return await this.toBN(this.contract(contractName).wards(user))
     }
 
+    isPoolAdmin = async (user: string) => {
+      if (!this.contract('POOL_ADMIN')) return false
+      return (await this.toBN(this.contract('POOL_ADMIN').admins(user))).toNumber() === 1
+    }
+
     canUpdateNftFeed = async (user: string) => {
       if (!this.contract('FEED')?.wards) return false
       return (await this.toBN(this.contract('FEED').wards(user))).toNumber() === 1
@@ -162,6 +167,7 @@ export function AdminActions<ActionsBase extends Constructor<TinlakeParams>>(Bas
 
 export type IAdminActions = {
   isWard(user: string, contractName: ContractName): Promise<BN>
+  isPoolAdmin(user: string): Promise<boolean>
   canQueryPermissions(): boolean
   canUpdateNftFeed(user: string): Promise<boolean>
   canSetRiskScore(user: string): Promise<boolean>
diff --git a/tinlake.js/src/actions/coordinator.ts b/tinlake.js/src/actions/coordinator.ts
index 6a5b4b3dbf..1eb7c6f5c0 100644
--- a/tinlake.js/src/actions/coordinator.ts
+++ b/tinlake.js/src/actions/coordinator.ts
@@ -170,7 +170,7 @@ export function CoordinatorActions<ActionsBase extends Constructor<TinlakeParams
         throw new Error('Current epoch is still in the challenge period')
       }
 
-      return this.pending(coordinator.executeEpoch({ ...this.overrides, gasLimit: 500000 }))
+      return this.pending(coordinator.executeEpoch({ ...this.overrides, gasLimit: 2000000 }))
     }
 
     getCurrentEpochId = async () => {

From fac9d067ef1724eaff3a11a17cbb03c721a88851 Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Sun, 18 Apr 2021 19:40:22 +0200
Subject: [PATCH 09/15] feat: maintenance mode

---
 .../components/Overview/OverviewHeader.tsx    |  12 +-
 tinlake-ui/config.ts                          |   2 +
 .../Investment/View/TrancheOverview.tsx       | 176 ++++++++++--------
 tinlake.js/src/utils/feeToInterestRate.ts     |  22 ++-
 4 files changed, 126 insertions(+), 86 deletions(-)

diff --git a/tinlake-ui/components/Overview/OverviewHeader.tsx b/tinlake-ui/components/Overview/OverviewHeader.tsx
index d996f913d3..3af4e3c4d9 100644
--- a/tinlake-ui/components/Overview/OverviewHeader.tsx
+++ b/tinlake-ui/components/Overview/OverviewHeader.tsx
@@ -1,4 +1,11 @@
-import { addThousandsSeparators, baseToDisplay, feeToInterestRate, ITinlake, toPrecision } from '@centrifuge/tinlake-js'
+import {
+  addThousandsSeparators,
+  baseToDisplay,
+  feeToInterestRate,
+  feeToInterestRateCompounding,
+  ITinlake,
+  toPrecision,
+} from '@centrifuge/tinlake-js'
 import BN from 'bn.js'
 import { Anchor, Box, Button, Heading } from 'grommet'
 import { useRouter } from 'next/router'
@@ -162,7 +169,8 @@ const OverviewHeader: React.FC<Props> = (props: Props) => {
           <MakerMetric>
             <h3>Stability Fee</h3>
             <h2>
-              {toPrecision(feeToInterestRate(poolData?.maker?.duty || '0'), 2)} <MakerUnit>%</MakerUnit>
+              {toPrecision(feeToInterestRateCompounding(poolData?.maker?.duty || '0'), 2)}{' '}
+              <MakerUnit>% (APY)</MakerUnit>
             </h2>
           </MakerMetric>
         </MakerBox>
diff --git a/tinlake-ui/config.ts b/tinlake-ui/config.ts
index a0ffef6c3d..809877637b 100644
--- a/tinlake-ui/config.ts
+++ b/tinlake-ui/config.ts
@@ -96,6 +96,7 @@ interface Config {
   gasLimit: number
   onboardAPIHost: string
   featureFlagNewOnboardingPools: string[]
+  featureFlagMaintenanceMode: string[]
   enableErrorLogging: boolean
   centrifugeChainUrl: string
   claimCFGContractAddress: string
@@ -332,6 +333,7 @@ const config: Config = {
   enableErrorLogging: yup.boolean().validateSync(false),
   // Loading a comma-separated string as a string array using yup proved hard/impossible
   featureFlagNewOnboardingPools: process.env.NEXT_PUBLIC_FEATURE_FLAG_NEW_ONBOARDING?.split(',') || [],
+  featureFlagMaintenanceMode: process.env.NEXT_PUBLIC_FEATURE_FLAG_MAINTENANCE_MODE?.split(',') || [],
   multicallContractAddress: yup
     .string()
     .required('NEXT_PUBLIC_MULTICALL_CONTRACT_ADDRESS is required')
diff --git a/tinlake-ui/containers/Investment/View/TrancheOverview.tsx b/tinlake-ui/containers/Investment/View/TrancheOverview.tsx
index ff9fe00d8d..5eee8141ef 100644
--- a/tinlake-ui/containers/Investment/View/TrancheOverview.tsx
+++ b/tinlake-ui/containers/Investment/View/TrancheOverview.tsx
@@ -203,89 +203,104 @@ const TrancheOverview: React.FC<Props> = (props: Props) => {
             </TableRow>
           </TableBody>
         </Table>
-        {address && trancheData?.inMemberlist === true && (
-          <>
-            {card === 'home' && (
-              <>
-                {epochData?.isBlockedState && (
-                  <Warning>
-                    <Heading level="6" margin={{ bottom: 'xsmall' }}>
-                      Computing orders
-                    </Heading>
-                    The Epoch has just been closed and the order executions are currently being computed. Until the next
-                    Epoch opens, you cannot submit new orders.
-                    {epochData?.minChallengePeriodEnd !== 0 && (
-                      <MinTimeRemaining>
-                        Minimum time remaining:{' '}
-                        {secondsToHms(epochData.minChallengePeriodEnd + 60 - new Date().getTime() / 1000)}
-                      </MinTimeRemaining>
-                    )}
-                  </Warning>
-                )}
+        {props.pool && config.featureFlagMaintenanceMode.includes(props.pool.addresses.ROOT_CONTRACT) && (
+          <Warning>
+            <Heading level="6" margin={{ bottom: 'xsmall' }}>
+              Pool maintenance ongoing
+            </Heading>
+            Until this upgrade is finished, investments and redemptions are not possible for a short while. Please come
+            back soon.
+          </Warning>
+        )}
+        {!(props.pool && config.featureFlagMaintenanceMode.includes(props.pool.addresses.ROOT_CONTRACT)) &&
+          address &&
+          trancheData?.inMemberlist === true && (
+            <>
+              {card === 'home' && (
+                <>
+                  {epochData?.isBlockedState && (
+                    <Warning>
+                      <Heading level="6" margin={{ bottom: 'xsmall' }}>
+                        Computing orders
+                      </Heading>
+                      The Epoch has just been closed and the order executions are currently being computed. Until the
+                      next Epoch opens, you cannot submit new orders.
+                      {epochData?.minChallengePeriodEnd !== 0 && (
+                        <MinTimeRemaining>
+                          Minimum time remaining:{' '}
+                          {secondsToHms(epochData.minChallengePeriodEnd + 60 - new Date().getTime() / 1000)}
+                        </MinTimeRemaining>
+                      )}
+                    </Warning>
+                  )}
 
-                {!epochData?.isBlockedState && (
-                  <Box gap="small" justify="end" direction="row" margin={{ top: 'small' }}>
-                    <Button
-                      primary
-                      label="Invest"
-                      onClick={() => setCard('invest')}
-                      disabled={epochData?.isBlockedState === true}
-                    />
-                    <Button
-                      primary
-                      label="Redeem"
-                      onClick={() => setCard('redeem')}
-                      disabled={balance === '0' || epochData?.isBlockedState === true}
-                    />
-                  </Box>
-                )}
-              </>
-            )}
-            {card === 'order' && (
-              <OrderCard
-                {...props}
-                selectedPool={props.pool}
-                tinlake={props.tinlake}
-                setCard={setCard}
-                disbursements={disbursements}
-                tokenPrice={tokenPrice || '0'}
-                updateTrancheData={updateTrancheData}
-              />
-            )}
-            {card === 'collect' && (
-              <CollectCard
-                {...props}
-                selectedPool={props.pool}
-                setCard={setCard}
-                disbursements={disbursements}
-                tokenPrice={tokenPrice || '0'}
-                updateTrancheData={updateTrancheData}
-              />
-            )}
-            {card === 'invest' && (
-              <InvestCard
-                selectedPool={props.pool}
-                tranche={props.tranche}
-                tinlake={props.tinlake}
-                setCard={setCard}
-                updateTrancheData={updateTrancheData}
-              />
-            )}
-            {card === 'redeem' && (
-              <RedeemCard
-                {...props}
-                selectedPool={props.pool}
-                setCard={setCard}
-                updateTrancheData={updateTrancheData}
-              />
-            )}
+                  {!epochData?.isBlockedState && (
+                    <Box gap="small" justify="end" direction="row" margin={{ top: 'small' }}>
+                      <Button
+                        primary
+                        label="Invest"
+                        onClick={() => setCard('invest')}
+                        disabled={epochData?.isBlockedState === true}
+                      />
+                      <Button
+                        primary
+                        label="Redeem"
+                        onClick={() => setCard('redeem')}
+                        disabled={balance === '0' || epochData?.isBlockedState === true}
+                      />
+                    </Box>
+                  )}
+                </>
+              )}
+              {card === 'order' && (
+                <OrderCard
+                  {...props}
+                  selectedPool={props.pool}
+                  tinlake={props.tinlake}
+                  setCard={setCard}
+                  disbursements={disbursements}
+                  tokenPrice={tokenPrice || '0'}
+                  updateTrancheData={updateTrancheData}
+                />
+              )}
+              {card === 'collect' && (
+                <CollectCard
+                  {...props}
+                  selectedPool={props.pool}
+                  setCard={setCard}
+                  disbursements={disbursements}
+                  tokenPrice={tokenPrice || '0'}
+                  updateTrancheData={updateTrancheData}
+                />
+              )}
+              {card === 'invest' && (
+                <InvestCard
+                  selectedPool={props.pool}
+                  tranche={props.tranche}
+                  tinlake={props.tinlake}
+                  setCard={setCard}
+                  updateTrancheData={updateTrancheData}
+                />
+              )}
+              {card === 'redeem' && (
+                <RedeemCard
+                  {...props}
+                  selectedPool={props.pool}
+                  setCard={setCard}
+                  updateTrancheData={updateTrancheData}
+                />
+              )}
 
-            {card === 'home' && trancheData?.token && trancheData.token.length > 0 && trancheData.token.length < 7 && (
-              <AddWalletLink onClick={addToWallet}>Display {trancheData?.token} in your wallet</AddWalletLink>
-            )}
-          </>
-        )}
+              {card === 'home' &&
+                trancheData?.token &&
+                trancheData.token.length > 0 &&
+                trancheData.token.length < 7 && (
+                  <AddWalletLink onClick={addToWallet}>Display {trancheData?.token} in your wallet</AddWalletLink>
+                )}
+            </>
+          )}
         {props.pool &&
+          !config.featureFlagMaintenanceMode.includes(props.pool.addresses.ROOT_CONTRACT) &&
           props.tranche === 'senior' &&
           !trancheData?.inMemberlist &&
           ('onboard' in router.query ||
@@ -308,6 +323,7 @@ const TrancheOverview: React.FC<Props> = (props: Props) => {
           )}
 
         {props.pool &&
+          !config.featureFlagMaintenanceMode.includes(props.pool.addresses.ROOT_CONTRACT) &&
           !(
             'onboard' in router.query ||
             ('addresses' in props.pool &&
diff --git a/tinlake.js/src/utils/feeToInterestRate.ts b/tinlake.js/src/utils/feeToInterestRate.ts
index 5f37b21ff7..ad0355c72e 100644
--- a/tinlake.js/src/utils/feeToInterestRate.ts
+++ b/tinlake.js/src/utils/feeToInterestRate.ts
@@ -35,10 +35,7 @@ export const feeToInterestRate = (fee: string | BN): string => {
     return lookup[feeToConvert]
   }
 
-  const i = new Decimal(feeToConvert)
-    .div('1e27')
-    .minus(1)
-    .times(n)
+  const i = new Decimal(feeToConvert).div('1e27').minus(1).times(n)
 
   const interestRate = i.mul(100).toDecimalPlaces(1)
 
@@ -48,3 +45,20 @@ export const feeToInterestRate = (fee: string | BN): string => {
 
   return interestRateString
 }
+
+export const feeToInterestRateCompounding = (fee: string | BN): string => {
+  let feeToConvert = fee
+  if (typeof feeToConvert !== 'string' && typeof feeToConvert !== 'number') {
+    feeToConvert = feeToConvert.toString()
+  }
+
+  if (feeToConvert.toString() === '0') {
+    return feeToConvert.toString()
+  }
+
+  const i = new Decimal(feeToConvert).div('1e27').pow(n).minus(1)
+
+  const interestRate = i.mul(100).toDecimalPlaces(1)
+
+  return interestRate.toString()
+}

From aae8e330e5eb193157e5ccd5d1127db6d5e33373 Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Mon, 19 Apr 2021 13:39:24 +0200
Subject: [PATCH 10/15] chore: format, cleanup

---
 tinlake-ui/config.ts                          | 52 +++++++++++++++----
 .../containers/Investment/View/InvestCard.tsx |  5 +-
 .../Loan/Overview/MaxReserveForm.tsx          |  6 ---
 tinlake-ui/containers/Loan/Repay/index.tsx    |  2 -
 tinlake.js/src/Tinlake.ts                     |  2 +-
 tinlake.js/src/utils/feeToInterestRate.ts     | 10 +++-
 6 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/tinlake-ui/config.ts b/tinlake-ui/config.ts
index 809877637b..06bd478e3a 100644
--- a/tinlake-ui/config.ts
+++ b/tinlake-ui/config.ts
@@ -190,16 +190,28 @@ const metadataSchema = yup.object().shape({
 })
 
 const poolSchema = yup.object().shape({
-  network: yup.string().oneOf(['mainnet', 'kovan']).required('poolSchema.network is required'),
-  version: yup.number().oneOf([2, 3]).required('poolSchema.version is required'),
+  network: yup
+    .string()
+    .oneOf(['mainnet', 'kovan'])
+    .required('poolSchema.network is required'),
+  version: yup
+    .number()
+    .oneOf([2, 3])
+    .required('poolSchema.version is required'),
   addresses: contractAddressesSchema.required('poolSchema.addresses is required'),
   contractConfig: contractConfigSchema.default(undefined),
   metadata: metadataSchema.required('poolSchema.metadata is required'),
 })
 
 const upcomingPoolSchema = yup.object().shape({
-  network: yup.string().oneOf(['mainnet', 'kovan']).required('poolSchema.network is required'),
-  version: yup.number().oneOf([2, 3]).required('poolSchema.version is required'),
+  network: yup
+    .string()
+    .oneOf(['mainnet', 'kovan'])
+    .required('poolSchema.network is required'),
+  version: yup
+    .number()
+    .oneOf([2, 3])
+    .required('poolSchema.version is required'),
   metadata: metadataSchema.required('poolSchema.metadata is required'),
   presetValues: yup.object().shape({
     seniorInterestRate: yup
@@ -214,8 +226,14 @@ const upcomingPoolSchema = yup.object().shape({
 })
 
 const archivedPoolSchema = yup.object().shape({
-  network: yup.string().oneOf(['mainnet', 'kovan']).required('poolSchema.network is required'),
-  version: yup.number().oneOf([2, 3]).required('poolSchema.version is required'),
+  network: yup
+    .string()
+    .oneOf(['mainnet', 'kovan'])
+    .required('poolSchema.network is required'),
+  version: yup
+    .number()
+    .oneOf([2, 3])
+    .required('poolSchema.version is required'),
   metadata: metadataSchema.required('poolSchema.metadata is required'),
   archivedValues: yup.object().shape({
     status: yup.string().oneOf(['Deployed', 'Closed']),
@@ -276,7 +294,11 @@ const config: Config = {
     .string()
     .required('NEXT_PUBLIC_POOL_REGISTRY is required')
     .validateSync(process.env.NEXT_PUBLIC_POOL_REGISTRY),
-  rpcUrl: yup.string().required('NEXT_PUBLIC_RPC_URL is required').url().validateSync(process.env.NEXT_PUBLIC_RPC_URL),
+  rpcUrl: yup
+    .string()
+    .required('NEXT_PUBLIC_RPC_URL is required')
+    .url()
+    .validateSync(process.env.NEXT_PUBLIC_RPC_URL),
   ipfsGateway: yup
     .string()
     .required('NEXT_PUBLIC_IPFS_GATEWAY is required')
@@ -297,7 +319,11 @@ const config: Config = {
     .required('NEXT_PUBLIC_TINLAKE_DATA_BACKEND_URL is required')
     .url()
     .validateSync(process.env.NEXT_PUBLIC_TINLAKE_DATA_BACKEND_URL),
-  isDemo: yup.string().required('NEXT_PUBLIC_ENV is required').validateSync(process.env.NEXT_PUBLIC_ENV) === 'demo',
+  isDemo:
+    yup
+      .string()
+      .required('NEXT_PUBLIC_ENV is required')
+      .validateSync(process.env.NEXT_PUBLIC_ENV) === 'demo',
   network: yup
     .mixed<'Mainnet' | 'Kovan'>()
     .required('NEXT_PUBLIC_RPC_URL is required')
@@ -311,7 +337,10 @@ const config: Config = {
     .string()
     .required('NEXT_PUBLIC_INFURA_KEY is required')
     .validateSync(process.env.NEXT_PUBLIC_INFURA_KEY),
-  gasLimit: yup.number().required('gasLimit is required').validateSync('7000000'),
+  gasLimit: yup
+    .number()
+    .required('gasLimit is required')
+    .validateSync('7000000'),
   onboardAPIHost: yup
     .string()
     .required('NEXT_PUBLIC_ONBOARD_API_HOST is required')
@@ -338,7 +367,10 @@ const config: Config = {
     .string()
     .required('NEXT_PUBLIC_MULTICALL_CONTRACT_ADDRESS is required')
     .validateSync(process.env.NEXT_PUBLIC_MULTICALL_CONTRACT_ADDRESS),
-  matomoSiteId: yup.number().optional().validateSync(process.env.NEXT_PUBLIC_MATOMO_SITE_ID),
+  matomoSiteId: yup
+    .number()
+    .optional()
+    .validateSync(process.env.NEXT_PUBLIC_MATOMO_SITE_ID),
 }
 
 function between1e23and1e27(s: string): boolean {
diff --git a/tinlake-ui/containers/Investment/View/InvestCard.tsx b/tinlake-ui/containers/Investment/View/InvestCard.tsx
index aaefdd5823..7bd59feed4 100644
--- a/tinlake-ui/containers/Investment/View/InvestCard.tsx
+++ b/tinlake-ui/containers/Investment/View/InvestCard.tsx
@@ -97,9 +97,8 @@ const InvestCard: React.FC<Props> = (props: Props) => {
     setDaiValue(newValue)
     if (disableLimit === false && hasInvested === false && new BN(newValue).lt(MinInvestment)) {
       setError(
-        `Minimum investment: ${config.network === 'Mainnet' ? '5.000' : '10'} ${
-          props.selectedPool?.metadata.currencySymbol || 'DAI'
-        }`
+        `Minimum investment: ${config.network === 'Mainnet' ? '5.000' : '10'} ${props.selectedPool?.metadata
+          .currencySymbol || 'DAI'}`
       )
     } else if (limit && new BN(newValue).gt(new BN(limit))) {
       setError('Amount larger than balance')
diff --git a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
index 1f1d4a3572..53af9255f2 100644
--- a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
+++ b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
@@ -128,12 +128,6 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
             limitLabel={maxCreditline.lt(debtCeiling) ? 'Max' : 'Debt Ceiling'}
             disabled={status === 'pending' || status === 'unconfirmed'}
           />
-          {/* {tinStakeRequired.gtn(0) && (
-            <Paragraph>
-              This will require an additional{' '}
-              {addThousandsSeparators(toPrecision(baseToDisplay(tinStakeRequired || '0', 18), 0))} TIN.
-            </Paragraph>
-          )} */}
         </>
       )}
       <Box gap="small" justify="end" direction="row" margin={{ top: 'medium' }}>
diff --git a/tinlake-ui/containers/Loan/Repay/index.tsx b/tinlake-ui/containers/Loan/Repay/index.tsx
index 28c1ce969c..7049653dca 100644
--- a/tinlake-ui/containers/Loan/Repay/index.tsx
+++ b/tinlake-ui/containers/Loan/Repay/index.tsx
@@ -35,7 +35,6 @@ const LoanRepay: React.FC<Props> = (props: Props) => {
     let txId: string
     if (repayAmount === debt) {
       // full repay
-      console.log('full repay')
       txId = await props.createTransaction(
         `Repay Asset ${props.loan.loanId} (${formatted} ${props.poolConfig.metadata.currencySymbol || 'DAI'})`,
         'repayFull',
@@ -43,7 +42,6 @@ const LoanRepay: React.FC<Props> = (props: Props) => {
       )
     } else {
       // partial repay
-      console.log('partial repay')
       txId = await props.createTransaction(
         `Repay Asset ${props.loan.loanId} (${formatted} ${props.poolConfig.metadata.currencySymbol || 'DAI'})`,
         'repay',
diff --git a/tinlake.js/src/Tinlake.ts b/tinlake.js/src/Tinlake.ts
index 42ce02bc6a..055962a370 100644
--- a/tinlake.js/src/Tinlake.ts
+++ b/tinlake.js/src/Tinlake.ts
@@ -69,7 +69,7 @@ export type TinlakeParams = {
 export type Constructor<T = {}> = new (...args: any[]) => Tinlake
 
 // This adds a .toBN() function to all BigNumber instances returned by ethers.js
-;(ethers.BigNumber as any).prototype.toBN = function () {
+;(ethers.BigNumber as any).prototype.toBN = function() {
   return new BN((this as any).toString())
 }
 
diff --git a/tinlake.js/src/utils/feeToInterestRate.ts b/tinlake.js/src/utils/feeToInterestRate.ts
index ad0355c72e..3b21205445 100644
--- a/tinlake.js/src/utils/feeToInterestRate.ts
+++ b/tinlake.js/src/utils/feeToInterestRate.ts
@@ -35,7 +35,10 @@ export const feeToInterestRate = (fee: string | BN): string => {
     return lookup[feeToConvert]
   }
 
-  const i = new Decimal(feeToConvert).div('1e27').minus(1).times(n)
+  const i = new Decimal(feeToConvert)
+    .div('1e27')
+    .minus(1)
+    .times(n)
 
   const interestRate = i.mul(100).toDecimalPlaces(1)
 
@@ -56,7 +59,10 @@ export const feeToInterestRateCompounding = (fee: string | BN): string => {
     return feeToConvert.toString()
   }
 
-  const i = new Decimal(feeToConvert).div('1e27').pow(n).minus(1)
+  const i = new Decimal(feeToConvert)
+    .div('1e27')
+    .pow(n)
+    .minus(1)
 
   const interestRate = i.mul(100).toDecimalPlaces(1)
 

From be22539960237147b68a476bc0a6e1fefb97331f Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <Offerijns@users.noreply.github.com>
Date: Mon, 19 Apr 2021 13:59:18 +0200
Subject: [PATCH 11/15] Update tinlake-bot/src/index.ts

Co-authored-by: philipstanislaus <6912756+philipstanislaus@users.noreply.github.com>
---
 tinlake-bot/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tinlake-bot/src/index.ts b/tinlake-bot/src/index.ts
index 27d48bb1ea..33d31bbd19 100644
--- a/tinlake-bot/src/index.ts
+++ b/tinlake-bot/src/index.ts
@@ -42,7 +42,7 @@ const run = async () => {
   cronJobs.set('closePools', closePoolsTask)
 
   let submitSolutionsTask = new CronJob(CronExpression.EVERY_30_MINUTES, async () => {
-    // Submit solutions every 15 minutes
+    // Submit solutions every x minutes
     await submitSolutions(pools, provider, signerWithProvider)
   })
   cronJobs.set('submitSolutions', submitSolutionsTask)

From 31dab1c5d05f020194e60d416776c2e113237adb Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <Offerijns@users.noreply.github.com>
Date: Mon, 19 Apr 2021 14:00:27 +0200
Subject: [PATCH 12/15] Update tinlake-bot/src/index.ts

Co-authored-by: philipstanislaus <6912756+philipstanislaus@users.noreply.github.com>
---
 tinlake-bot/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tinlake-bot/src/index.ts b/tinlake-bot/src/index.ts
index 33d31bbd19..6a55e2a381 100644
--- a/tinlake-bot/src/index.ts
+++ b/tinlake-bot/src/index.ts
@@ -48,7 +48,7 @@ const run = async () => {
   cronJobs.set('submitSolutions', submitSolutionsTask)
 
   let executePoolsTask = new CronJob(CronExpression.EVERY_30_MINUTES, async () => {
-    // Execute pool epochs every 15 minutes
+    // Execute pool epochs every x minutes
     await executePools(pools, provider, signerWithProvider)
   })
   cronJobs.set('executePools', executePoolsTask)

From 77d9b85d500174c41c1fd8eeebd30adb4086679d Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Mon, 19 Apr 2021 21:55:56 +0200
Subject: [PATCH 13/15] fix: update readme, fix changing max reserve ux

---
 README.md                                     |  2 ++
 .../Loan/Overview/MaxReserveForm.tsx          | 28 ++++++++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 82016a9a68..1edaf63339 100644
--- a/README.md
+++ b/README.md
@@ -13,3 +13,5 @@ It's also recommended to run Prettier automatically in your editor, e.g. using [
 ## Notes
 
 To add other repositories to this monorepo while preserving the Git history, we can use the following steps: https://medium.com/@filipenevola/how-to-migrate-to-mono-repository-without-losing-any-git-history-7a4d80aa7de2
+
+To set a pool into maintenance mode, add the pool id to the environment variable `NEXT_PUBLIC_FEATURE_FLAG_MAINTENANCE_MODE`.
\ No newline at end of file
diff --git a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
index 53af9255f2..25e5bb08f5 100644
--- a/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
+++ b/tinlake-ui/containers/Loan/Overview/MaxReserveForm.tsx
@@ -34,17 +34,20 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
   }
 
   const [status, , setTxId] = useTransactionState()
-  const [, , setCreditlineTxId] = useTransactionState()
+  const [creditlineStatus, , setCreditlineTxId] = useTransactionState()
 
   const mat = poolData?.maker?.mat
 
+  const changedMaxReserve = value && value !== (poolData?.reserve || new BN(0)).toString()
+  const changedCreditline = creditlineValue && mat && creditlineValue !== poolData?.maker?.creditline?.toString()
+
   const save = async () => {
-    if (value && value !== (poolData?.reserve || new BN(0)).toString()) {
+    if (changedMaxReserve && value) {
       const txId = await props.createTransaction(`Set max reserve`, 'setMaxReserve', [props.tinlake, value.toString()])
       setTxId(txId)
     }
 
-    if (creditlineValue && mat && creditlineValue !== (mat || new BN(0)).toString()) {
+    if (changedCreditline && creditlineValue) {
       const currentCreditline = poolData?.maker?.creditline?.toString()
       const amount = new BN(creditlineValue).gt(new BN(currentCreditline))
         ? new BN(creditlineValue).sub(new BN(currentCreditline))
@@ -52,8 +55,6 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
       const valueToDecimal = new Decimal(baseToDisplay(creditlineValue, 18)).toDecimalPlaces(4)
       const formatted = addThousandsSeparators(valueToDecimal.toString())
 
-      console.log(`${currentCreditline} => ${creditlineValue}`)
-
       if (new BN(creditlineValue).gt(new BN(currentCreditline))) {
         const txId = await props.createTransaction(`Increase creditline to ${formatted}`, 'raiseCreditline', [
           props.tinlake,
@@ -77,6 +78,7 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
     }
   }, [status])
 
+  // TODO: fix and then refactor these
   const debtCeiling = (poolData?.maker?.line || new BN('0')).div(new BN(10).pow(new BN(45 - 18)))
   const tinSupplyDAI = (poolData?.junior?.totalSupply || new BN(0))
     .mul(poolData?.junior?.tokenPrice || new BN(0))
@@ -126,7 +128,7 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
             onChange={onChangeCreditline}
             maxValue={(maxCreditline.lt(debtCeiling) ? maxCreditline : debtCeiling).toString()}
             limitLabel={maxCreditline.lt(debtCeiling) ? 'Max' : 'Debt Ceiling'}
-            disabled={status === 'pending' || status === 'unconfirmed'}
+            disabled={creditlineStatus === 'pending' || creditlineStatus === 'unconfirmed'}
           />
         </>
       )}
@@ -134,16 +136,22 @@ const MaxReserveForm: React.FC<Props> = (props: Props) => {
         <Button
           label="Cancel"
           onClick={() => props.setShowMaxReserveForm(false)}
-          disabled={status === 'pending' || status === 'unconfirmed'}
+          disabled={
+            (changedMaxReserve && (status === 'pending' || status === 'unconfirmed')) ||
+            (changedCreditline && (creditlineStatus === 'pending' || creditlineStatus === 'unconfirmed'))
+          }
         />
         <Button
           primary
           label="Set"
           onClick={save}
           disabled={
-            status === 'pending' ||
-            status === 'unconfirmed' ||
-            (creditlineValue ? new BN(creditlineValue).gt(debtCeiling) : true)
+            (!changedMaxReserve && !changedCreditline) ||
+            (changedMaxReserve && (status === 'pending' || status === 'unconfirmed')) ||
+            (changedCreditline &&
+              (creditlineStatus === 'pending' ||
+                creditlineStatus === 'unconfirmed' ||
+                (creditlineValue ? new BN(creditlineValue).gt(debtCeiling) : true)))
           }
         />
       </Box>

From 83d3a93c9372ac8c5659b78e817076a49e096c22 Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Tue, 20 Apr 2021 13:22:46 +0200
Subject: [PATCH 14/15] fix: apy ui

---
 tinlake-ui/components/Overview/OverviewHeader.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tinlake-ui/components/Overview/OverviewHeader.tsx b/tinlake-ui/components/Overview/OverviewHeader.tsx
index 3af4e3c4d9..14c19e3db3 100644
--- a/tinlake-ui/components/Overview/OverviewHeader.tsx
+++ b/tinlake-ui/components/Overview/OverviewHeader.tsx
@@ -167,10 +167,9 @@ const OverviewHeader: React.FC<Props> = (props: Props) => {
             </h2>
           </MakerMetric>
           <MakerMetric>
-            <h3>Stability Fee</h3>
+            <h3>Stability Fee (APY)</h3>
             <h2>
-              {toPrecision(feeToInterestRateCompounding(poolData?.maker?.duty || '0'), 2)}{' '}
-              <MakerUnit>% (APY)</MakerUnit>
+              {toPrecision(feeToInterestRateCompounding(poolData?.maker?.duty || '0'), 2)} <MakerUnit>%</MakerUnit>
             </h2>
           </MakerMetric>
         </MakerBox>

From 8a3baf84b70b2b5c0cfc996eaef120e0b4e94df5 Mon Sep 17 00:00:00 2001
From: Jeroen Offerijns <jeroen@offerijns.com>
Date: Wed, 21 Apr 2021 10:24:27 +0200
Subject: [PATCH 15/15] fix: loading of memberlist status

---
 tinlake-ui/ducks/pool.ts | 47 +++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/tinlake-ui/ducks/pool.ts b/tinlake-ui/ducks/pool.ts
index 14c8940af8..626883fdb3 100644
--- a/tinlake-ui/ducks/pool.ts
+++ b/tinlake-ui/ducks/pool.ts
@@ -125,23 +125,36 @@ export function loadPool(
     const toBN = (val: BigNumber) => new BN(val.toString())
 
     const addressWatchers = address
-      ? [
-          {
-            target: tinlake.contractAddresses.SENIOR_MEMBERLIST,
-            call: ['hasMember(address)(bool)', address || '0'],
-            returns: [[`senior.inMemberlist`]],
-          },
-          {
-            target: tinlake.contractAddresses.JUNIOR_MEMBERLIST,
-            call: ['hasMember(address)(bool)', address || '0'],
-            returns: [[`junior.inMemberlist`]],
-          },
-          tinlake.contractAddresses.POOL_ADMIN && {
-            target: tinlake.contractAddresses.POOL_ADMIN,
-            call: ['admins(address)(uint256)', address || '0'],
-            returns: [[`isPoolAdmin`, (num: BigNumber) => toBN(num).toNumber() === 1]],
-          },
-        ]
+      ? tinlake.contractAddresses.POOL_ADMIN
+        ? [
+            {
+              target: tinlake.contractAddresses.SENIOR_MEMBERLIST,
+              call: ['hasMember(address)(bool)', address || '0'],
+              returns: [[`senior.inMemberlist`]],
+            },
+            {
+              target: tinlake.contractAddresses.JUNIOR_MEMBERLIST,
+              call: ['hasMember(address)(bool)', address || '0'],
+              returns: [[`junior.inMemberlist`]],
+            },
+            {
+              target: tinlake.contractAddresses.POOL_ADMIN,
+              call: ['admins(address)(uint256)', address || '0'],
+              returns: [[`isPoolAdmin`, (num: BigNumber) => toBN(num).toNumber() === 1]],
+            },
+          ]
+        : [
+            {
+              target: tinlake.contractAddresses.SENIOR_MEMBERLIST,
+              call: ['hasMember(address)(bool)', address || '0'],
+              returns: [[`senior.inMemberlist`]],
+            },
+            {
+              target: tinlake.contractAddresses.JUNIOR_MEMBERLIST,
+              call: ['hasMember(address)(bool)', address || '0'],
+              returns: [[`junior.inMemberlist`]],
+            },
+          ]
       : []
 
     const globalWatchers = [