Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/subgraph add clarity #162

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,327 changes: 2,326 additions & 1 deletion packages/contracts/.openzeppelin/unknown-66814.json

Large diffs are not rendered by default.

47 changes: 47 additions & 0 deletions packages/contracts/deploy/accessories/deploy_erc20_token.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { DeployFunction } from 'hardhat-deploy/dist/types'
import { deploy } from 'helpers/deploy-helpers'


const deployFn: DeployFunction = async (hre) => {


const tokenContractOne = await deploy({
contract: 'WethMock',
args: [],
skipIfAlreadyDeployed: true,
hre,
})

hre.log(`deploying tokenContractOne ${tokenContractOne}`)

const tokenContractTwo = await deploy({
contract: 'WethMock',
args: [],
skipIfAlreadyDeployed: true,
hre,
})
hre.log(`deploying tokenContractTwo ${tokenContractOne}`)

return true
}

// tags and deployment
deployFn.id = 'deploy-mock-tokens'
deployFn.tags = [
'mock-tokens',
'deploy-mock-tokens'

]
deployFn.dependencies = []
deployFn.skip = async (hre) => {

return (
!hre.network.live ||
![
'clarity',


].includes(hre.network.name)
)
}
export default deployFn
7 changes: 1 addition & 6 deletions packages/contracts/deploy/collateral/escrow_beacon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ const deployFn: DeployFunction = async (hre) => {
{
customName: 'CollateralEscrowBeacon',
}
)

const { protocolTimelock } = await hre.getNamedAccounts()
hre.log('Transferring ownership of CollateralEscrowBeacon to Gnosis Safe...')
await collateralEscrowBeacon.transferOwnership(protocolTimelock)
hre.log('done.')
)

return true
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { DeployFunction } from 'hardhat-deploy/dist/types'
import { UpgradeableBeacon } from 'types/typechain'

const deployFn: DeployFunction = async (hre) => {
const collateralEscrowBeacon = await hre.contracts.get(
'CollateralEscrowBeacon'
)



const { protocolTimelock } = await hre.getNamedAccounts()
hre.log('Transferring ownership of CollateralEscrowBeacon to Gnosis Safe...')
await collateralEscrowBeacon.transferOwnership(protocolTimelock)
hre.log('done.')

return true
}

// tags and deployment
deployFn.id = 'collateral:escrow-beacon:transfer-ownership-to-gnosis-safe'
deployFn.tags = [
'collateral',
'collateral:escrow-beacon:transfer-ownership-to-gnosis-safe',
]
deployFn.dependencies = ['collateral:escrow-beacon:deploy']
deployFn.skip = async (hre) => {
return (
!hre.network.live ||
!['mainnet', 'polygon', 'arbitrum', 'base'].includes(hre.network.name)
)
}
export default deployFn
12 changes: 12 additions & 0 deletions packages/contracts/deploy/default_proxy_admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,16 @@ deployFn.id = 'default-proxy-admin:transfer'
deployFn.tags = ['default-proxy-admin', 'default-proxy-admin:transfer']
deployFn.dependencies = ['teller-v2:deploy']
deployFn.runAtTheEnd = true

deployFn.skip = async (hre) => {

return (
!hre.network.live ||
!['mainnet', 'polygon', 'arbitrum', 'goerli','base', 'sepolia'].includes(
hre.network.name
)
)
}


export default deployFn
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,17 @@ deployFn.tags = [
'lender-commitment-forwarder:alpha:deploy'
]
deployFn.dependencies = ['teller-v2:deploy', 'market-registry:deploy']


deployFn.skip = async (hre) => {

return (
!hre.network.live ||
!['mainnet', 'polygon', 'arbitrum', 'goerli','base', 'sepolia'].includes(
hre.network.name
)
)
}


export default deployFn
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,10 @@ const deployFn: DeployFunction = async (hre) => {
deployFn.id = 'teller-v2:transfer-ownership-to-safe'
deployFn.tags = ['teller-v2', 'teller-v2:transfer-ownership-to-safe']
deployFn.dependencies = ['teller-v2:init']
deployFn.skip = async (hre) => {
return (
!hre.network.live ||
!['mainnet', 'polygon', 'arbitrum', 'base'].includes(hre.network.name)
)
}
export default deployFn
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
47
16 changes: 16 additions & 0 deletions packages/contracts/deployments/clarity/.migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"collateral:escrow-beacon:deploy": 1711031940,
"meta-forwarder:deploy": 1711031942,
"teller-v2:deploy": 1711031945,
"collateral:manager:deploy": 1711031946,
"escrow-vault:deploy": 1711031948,
"market-registry:deploy": 1711031952,
"lender-commitment-forwarder:deploy": 1711031954,
"lender-commitment-forwarder:staging:deploy": 1711032014,
"lender-manager:deploy": 1711032015,
"reputation-manager:deploy": 1711032017,
"teller-v2:init": 1711032017,
"lender-manager:transfer-ownership": 1711032017,
"liquidity-rewards:deploy": 1711032019,
"deploy-mock-tokens": 1711125342
}
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,6 @@
}
],
"receipt": {},
"numDeployments": 1,
"numDeployments": 3,
"implementation": "0x6b1eC259a35005b7562c92f42C490f39131fF1d8"
}
Loading
Loading