update subgraph

packages/contracts/contracts/escrow/CollateralUpgradeableBeacon.sol

@@ -0,0 +1,13 @@
+
+
+pragma solidity >=0.8.0 <0.9.0;
+// SPDX-License-Identifier: MIT
+
+import "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
+
+contract CollateralUpgradeableBeacon is UpgradeableBeacon {
+
+
+constructor(address _impl) UpgradeableBeacon(_impl) {}
+
+}

packages/contracts/deploy/00_deploy_meta_forwarder.ts

@@ -1,7 +1,16 @@
+import { getNamedAccounts } from 'hardhat'
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 import { deploy } from 'helpers/deploy-helpers'
 
 const deployFn: DeployFunction = async (hre) => {
+
+
+
+
+  let {deployer} = await getNamedAccounts()
+
+  console.log('deployer',deployer)
+
   const trustedForwarder = await deploy({
     contract: 'MetaForwarder',
     skipIfAlreadyDeployed: true,

packages/contracts/deploy/00_deploy_teller_v2.ts

@@ -58,14 +58,16 @@ const deployFn: DeployFunction = async (hre) => {
     skipIfAlreadyDeployed: true,
     hre,
   })
-
+ 
   const collateralEscrowBeacon = await deploy<UpgradeableBeacon>({
-    contract: 'UpgradeableBeacon',
+    contract: 'CollateralUpgradeableBeacon',
     name: 'CollateralEscrowBeacon',
     args: [collateralEscrowBeaconImpl.address],
     skipIfAlreadyDeployed: true,
     hre,
   })
+
+
   const currentEscrowBeaconImpl = await collateralEscrowBeacon.implementation()
   if (
     collateralEscrowBeaconImpl.deployResult.newlyDeployed &&
@@ -79,6 +81,8 @@ const deployFn: DeployFunction = async (hre) => {
     hre.log(`done`)
   }
 
+
+
   const collateralManager = await deploy<CollateralManager>({
     contract: 'CollateralManager',
     args: [],
@@ -95,6 +99,9 @@ const deployFn: DeployFunction = async (hre) => {
     hre,
   })
 
+
+
+
   const tellerV2IsInitialized = await isInitialized(tellerV2Contract.address)
   if (!tellerV2IsInitialized) {
     const lenderManager = await hre.contracts.get('LenderManager')

packages/contracts/deployments/goerli/.latestDeploymentBlock

@@ -1 +1 @@
-8667201
+8689047

packages/contracts/deployments/goerli/.migrations.json

@@ -1,4 +1,4 @@
 {
-  "1676322266__tellerv2_set_lender_manager.ts": 1677101488,
-  "1677629407__transfer_lendermanager_to_tellerv2.ts": 1677702686
+  "1676322266__tellerv2_set_lender_manager.ts": 1679339048,
+  "1677629407__transfer_lendermanager_to_tellerv2.ts": 1679339057
 }

packages/contracts/deployments/goerli/CollateralManager_Proxy.json

@@ -1,5 +1,5 @@
 {
-  "address": "0xD66de8b25C4165dA2e7696e15E8436380823B118",
+  "address": "0x62824Ff0BDbc42874e23f3cA9966866659F39b09",
   "abi": [
     {
       "inputs": [
@@ -146,78 +146,78 @@
       "type": "receive"
     }
   ],
-  "transactionHash": "0xce9939b4ef707cb105805eb74cdef9c1815696b817811dcfcfdc06164ad07ee8",
+  "transactionHash": "0x9cd2f327bd483fc2bce864a8f9f12b491d22b61d3b8de09e63cc4f170873e780",
   "receipt": {
     "to": null,
-    "from": "0xAFe87013dc96edE1E116a288D80FcaA0eFFE5fe5",
-    "contractAddress": "0xD66de8b25C4165dA2e7696e15E8436380823B118",
-    "transactionIndex": 7,
-    "gasUsed": "815126",
-    "logsBloom": "0x00000000000000000000000000808000400000000000008000800000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000002000101000000000000000000000000000000000000020000000000000000000800000000800000000000000000000000400000000000000000000000000000000000008000000080000000000000800000000000000000000000000000000400000000000002000000000000000000000000000020000100000000000000040000000000000400000000000000000020000000000000000000000000000000000000000000000000800000000000000000",
-    "blockHash": "0x85ecff681ea8bf3802d3d28d182a7148496835fb1e3441d93cdcbd1bae80daeb",
-    "transactionHash": "0xce9939b4ef707cb105805eb74cdef9c1815696b817811dcfcfdc06164ad07ee8",
+    "from": "0x5a5B978142C8F08Dd013901b50892baC49f3b700",
+    "contractAddress": "0x62824Ff0BDbc42874e23f3cA9966866659F39b09",
+    "transactionIndex": 6,
+    "gasUsed": "815436",
+    "logsBloom": "0x00000000000000000000000000000000400000000000000000800000000000000000000000000000000000000000000000000000000002000000000800000000000000000000200000002000001002000001000000000000000000000000000000000000020000000000000000000800000000800000000000000000000000400000000000000004000000000000000000000000000080000000000000800000000000000000000000000000000400048000000000000000001000000000000000000020000000000000000000040000000000000400000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+    "blockHash": "0x9a58b2f12acd461f951ec97a1b6d94fcad3beb85e95be99f495621c20994481c",
+    "transactionHash": "0x9cd2f327bd483fc2bce864a8f9f12b491d22b61d3b8de09e63cc4f170873e780",
     "logs": [
       {
-        "transactionIndex": 7,
-        "blockNumber": 8538491,
-        "transactionHash": "0xce9939b4ef707cb105805eb74cdef9c1815696b817811dcfcfdc06164ad07ee8",
-        "address": "0xD66de8b25C4165dA2e7696e15E8436380823B118",
+        "transactionIndex": 6,
+        "blockNumber": 8689003,
+        "transactionHash": "0x9cd2f327bd483fc2bce864a8f9f12b491d22b61d3b8de09e63cc4f170873e780",
+        "address": "0x62824Ff0BDbc42874e23f3cA9966866659F39b09",
         "topics": [
           "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
-          "0x0000000000000000000000001727add0680412e839c500cce4a2a20e3d96ff5c"
+          "0x000000000000000000000000c1bbf4dea9168e4949fc1d0aebe0fc51975c7b44"
         ],
         "data": "0x",
         "logIndex": 0,
-        "blockHash": "0x85ecff681ea8bf3802d3d28d182a7148496835fb1e3441d93cdcbd1bae80daeb"
+        "blockHash": "0x9a58b2f12acd461f951ec97a1b6d94fcad3beb85e95be99f495621c20994481c"
       },
       {
-        "transactionIndex": 7,
-        "blockNumber": 8538491,
-        "transactionHash": "0xce9939b4ef707cb105805eb74cdef9c1815696b817811dcfcfdc06164ad07ee8",
-        "address": "0xD66de8b25C4165dA2e7696e15E8436380823B118",
+        "transactionIndex": 6,
+        "blockNumber": 8689003,
+        "transactionHash": "0x9cd2f327bd483fc2bce864a8f9f12b491d22b61d3b8de09e63cc4f170873e780",
+        "address": "0x62824Ff0BDbc42874e23f3cA9966866659F39b09",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000000000000000000000000000000000000000000000",
-          "0x000000000000000000000000afe87013dc96ede1e116a288d80fcaa0effe5fe5"
+          "0x0000000000000000000000005a5b978142c8f08dd013901b50892bac49f3b700"
         ],
         "data": "0x",
         "logIndex": 1,
-        "blockHash": "0x85ecff681ea8bf3802d3d28d182a7148496835fb1e3441d93cdcbd1bae80daeb"
+        "blockHash": "0x9a58b2f12acd461f951ec97a1b6d94fcad3beb85e95be99f495621c20994481c"
       },
       {
-        "transactionIndex": 7,
-        "blockNumber": 8538491,
-        "transactionHash": "0xce9939b4ef707cb105805eb74cdef9c1815696b817811dcfcfdc06164ad07ee8",
-        "address": "0xD66de8b25C4165dA2e7696e15E8436380823B118",
+        "transactionIndex": 6,
+        "blockNumber": 8689003,
+        "transactionHash": "0x9cd2f327bd483fc2bce864a8f9f12b491d22b61d3b8de09e63cc4f170873e780",
+        "address": "0x62824Ff0BDbc42874e23f3cA9966866659F39b09",
         "topics": [
           "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
         ],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
         "logIndex": 2,
-        "blockHash": "0x85ecff681ea8bf3802d3d28d182a7148496835fb1e3441d93cdcbd1bae80daeb"
+        "blockHash": "0x9a58b2f12acd461f951ec97a1b6d94fcad3beb85e95be99f495621c20994481c"
       },
       {
-        "transactionIndex": 7,
-        "blockNumber": 8538491,
-        "transactionHash": "0xce9939b4ef707cb105805eb74cdef9c1815696b817811dcfcfdc06164ad07ee8",
-        "address": "0xD66de8b25C4165dA2e7696e15E8436380823B118",
+        "transactionIndex": 6,
+        "blockNumber": 8689003,
+        "transactionHash": "0x9cd2f327bd483fc2bce864a8f9f12b491d22b61d3b8de09e63cc4f170873e780",
+        "address": "0x62824Ff0BDbc42874e23f3cA9966866659F39b09",
         "topics": [
           "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
         ],
-        "data": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000005956c8158bde236d8e3638362ff7555c329a839b",
+        "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c34dbcc2cbca28377e4a2079896a21ef5bfa68cc",
         "logIndex": 3,
-        "blockHash": "0x85ecff681ea8bf3802d3d28d182a7148496835fb1e3441d93cdcbd1bae80daeb"
+        "blockHash": "0x9a58b2f12acd461f951ec97a1b6d94fcad3beb85e95be99f495621c20994481c"
       }
     ],
-    "blockNumber": 8538491,
-    "cumulativeGasUsed": "962126",
+    "blockNumber": 8689003,
+    "cumulativeGasUsed": "968404",
     "status": 1,
     "byzantium": true
   },
   "args": [
-    "0x1727ADd0680412e839c500ccE4a2A20e3d96fF5C",
-    "0x5956c8158bde236d8e3638362ff7555C329A839B",
-    "0x485cc9550000000000000000000000005133d831f2d761e8d64953c489fab1395d91e7e8000000000000000000000000195c6608705546725df0629dd60690cf2b367734"
+    "0xC1bBF4dea9168e4949fc1D0aeBE0Fc51975C7B44",
+    "0xC34dbCc2cBCa28377e4A2079896a21ef5Bfa68Cc",
+    "0x485cc95500000000000000000000000049c97802a5d2598c1a4564eded553330bb85603c0000000000000000000000003a8c417a743a60ecff3988c34783d65362b62915"
   ],
   "numDeployments": 1,
   "solcInputHash": "0e89febeebc7444140de8e67c9067d2c",

packages/contracts/deployments/goerli/DefaultProxyAdmin.json

@@ -1,5 +1,5 @@
 {
-  "address": "0x5956c8158bde236d8e3638362ff7555C329A839B",
+  "address": "0xC34dbCc2cBCa28377e4A2079896a21ef5Bfa68Cc",
   "abi": [
     {
       "inputs": [
@@ -162,39 +162,39 @@
       "type": "function"
     }
   ],
-  "transactionHash": "0x883dd1eedb1d9266643110596e65620dfa50f33fba84601609a385522982e0b0",
+  "transactionHash": "0x7eb81f93a81d9c3238a9ea12520151880f87764ad5f412fbd4b209564670950f",
   "receipt": {
     "to": null,
-    "from": "0xAFe87013dc96edE1E116a288D80FcaA0eFFE5fe5",
-    "contractAddress": "0x5956c8158bde236d8e3638362ff7555C329A839B",
-    "transactionIndex": 1,
-    "gasUsed": "643983",
-    "logsBloom": "0x00000000000000000000000000008000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101040000000000000000000000000000000000020000000000000000000800000000000000000000000000000000400000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000100000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
-    "blockHash": "0xc0168a08f6876dd5c3030c58116131248ea75f8cfe3e5383e3565c5c968ed9d3",
-    "transactionHash": "0x883dd1eedb1d9266643110596e65620dfa50f33fba84601609a385522982e0b0",
+    "from": "0x5a5B978142C8F08Dd013901b50892baC49f3b700",
+    "contractAddress": "0xC34dbCc2cBCa28377e4A2079896a21ef5Bfa68Cc",
+    "transactionIndex": 18,
+    "gasUsed": "644151",
+    "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000002000000000000001000000000000000000000000000000000000020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000008000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000020000000000000000010000000000000000000000000000000000000000000000000",
+    "blockHash": "0x873639197b74a776d07c6daef3f9120f0e44049d26dc53a4dfa4c2dbc5eeab39",
+    "transactionHash": "0x7eb81f93a81d9c3238a9ea12520151880f87764ad5f412fbd4b209564670950f",
     "logs": [
       {
-        "transactionIndex": 1,
-        "blockNumber": 8538439,
-        "transactionHash": "0x883dd1eedb1d9266643110596e65620dfa50f33fba84601609a385522982e0b0",
-        "address": "0x5956c8158bde236d8e3638362ff7555C329A839B",
+        "transactionIndex": 18,
+        "blockNumber": 8688285,
+        "transactionHash": "0x7eb81f93a81d9c3238a9ea12520151880f87764ad5f412fbd4b209564670950f",
+        "address": "0xC34dbCc2cBCa28377e4A2079896a21ef5Bfa68Cc",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000000000000000000000000000000000000000000000",
-          "0x000000000000000000000000afe87013dc96ede1e116a288d80fcaa0effe5fe5"
+          "0x0000000000000000000000005a5b978142c8f08dd013901b50892bac49f3b700"
         ],
         "data": "0x",
-        "logIndex": 0,
-        "blockHash": "0xc0168a08f6876dd5c3030c58116131248ea75f8cfe3e5383e3565c5c968ed9d3"
+        "logIndex": 10,
+        "blockHash": "0x873639197b74a776d07c6daef3f9120f0e44049d26dc53a4dfa4c2dbc5eeab39"
       }
     ],
-    "blockNumber": 8538439,
-    "cumulativeGasUsed": "664983",
+    "blockNumber": 8688285,
+    "cumulativeGasUsed": "1285639",
     "status": 1,
     "byzantium": true
   },
   "args": [
-    "0xAFe87013dc96edE1E116a288D80FcaA0eFFE5fe5"
+    "0x5a5B978142C8F08Dd013901b50892baC49f3b700"
   ],
   "numDeployments": 1,
   "solcInputHash": "0e89febeebc7444140de8e67c9067d2c",