wip

Abracadabra-money · Jan 15, 2025 · b3a0018 · b3a0018
1 parent 1a5043a
commit b3a0018
Show file tree

Hide file tree

Showing 7 changed files with 525 additions and 4 deletions.
diff --git a/deploy/BoundSpellOFT.ts b/deploy/BoundSpellOFT.ts
@@ -39,13 +39,14 @@ const deploy: DeployFunction = async (hre) => {
         skipIfAlreadyDeployed: false,
         proxy: {
             proxyContract: 'OpenZeppelinTransparentProxy',
+            viaAdminContract: `${config.contractName}_ProxyAdmin`,
             owner: signer.address,
             execute: {
                 init: {
                     methodName: 'initialize',
                     args: config.initializeArgs(signer.address),
                 },
-            },
+            }
         },
         contract: config.contractName
     })

diff --git a/deploy/MIMOFT.ts b/deploy/MIMOFT.ts
@@ -10,7 +10,7 @@ const configurations = {
         contractName: 'AbraOFTAdapterUpgradeable',
         args: (endpointAddress: string) => ['0x99D8a9C45b2ecA8864373A26D1459e3Dff1e17F3', endpointAddress], // MIM address
         initializeArgs: (signer: string) => [signer],
-        //feeHandler: '0xE66BE95FE4E3889a66925d996AF3E4dC173754a2'
+        feeHandler: '0xE66BE95FE4E3889a66925d996AF3E4dC173754a2'
     },
     //'berachain': {
     //    contractName: 'AbraOFTUpgradeable',
@@ -39,6 +39,7 @@ const deploy: DeployFunction = async (hre) => {
         skipIfAlreadyDeployed: false,
         proxy: {
             proxyContract: 'OpenZeppelinTransparentProxy',
+            viaAdminContract: `${config.contractName}_ProxyAdmin`,
             owner: signer.address,
             execute: {
                 init: {
@@ -50,8 +51,8 @@ const deploy: DeployFunction = async (hre) => {
         contract: config.contractName
     })
 
-    //const oft = await hre.ethers.getContractAt('SenderWithFees', deployment.address)
-    //await (await oft.setFeeHandler(config.feeHandler)).wait()
+    const oft = await hre.ethers.getContractAt('SenderWithFees', deployment.address)
+    await (await oft.setFeeHandler(config.feeHandler)).wait()
 }
 
 deploy.tags = [deploymentName]

diff --git a/deploy/SpellOFT.ts b/deploy/SpellOFT.ts
@@ -39,6 +39,7 @@ const deploy: DeployFunction = async (hre) => {
         skipIfAlreadyDeployed: false,
         proxy: {
             proxyContract: 'OpenZeppelinTransparentProxy',
+            viaAdminContract: `${config.contractName}_ProxyAdmin`,
             owner: signer.address,
             execute: {
                 init: {

diff --git a/...s/arbitrum-mainnet/DefaultProxyAdmin.json → ...rum-mainnet/BoundSpellOFT_ProxyAdmin.json b/...s/arbitrum-mainnet/DefaultProxyAdmin.json → ...rum-mainnet/BoundSpellOFT_ProxyAdmin.json
diff --git a/deployments/arbitrum-mainnet/SpellOFT_ProxyAdmin.json b/deployments/arbitrum-mainnet/SpellOFT_ProxyAdmin.json
diff --git a/...s/ethereum-mainnet/DefaultProxyAdmin.json → ...eum-mainnet/BoundSpellOFT_ProxyAdmin.json b/...s/ethereum-mainnet/DefaultProxyAdmin.json → ...eum-mainnet/BoundSpellOFT_ProxyAdmin.json
diff --git a/deployments/ethereum-mainnet/SpellOFT_ProxyAdmin.json b/deployments/ethereum-mainnet/SpellOFT_ProxyAdmin.json