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.

Sign up for GitHub

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

Update Interfaces #19

Open
wants to merge 1 commit into
base: fix/gamma-audit-update
Choose a base branch
from
Open

Update Interfaces #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions contracts/interfaces/IHypervisor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import "@uniswap/v3-core/contracts/interfaces/IUniswapV3Pool.sol";

interface IHypervisor {

function deposit(
uint256,
uint256,
address,
address,
uint256[4] memory minIn
uint256,
uint256,
address,
address,
uint256[4] memory minIn
) external returns (uint256);

function withdraw(
Expand Down Expand Up @@ -55,7 +54,6 @@ interface IHypervisor {
);

function compound() external returns (

uint128 baseToken0Owed,
uint128 baseToken1Owed,
uint128 limitToken0Owed,
Expand Down
6 changes: 2 additions & 4 deletions contracts/interfaces/IUniProxy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity =0.7.6;
pragma abicoder v2;

interface IUniProxy {

function deposit(
uint256 deposit0,
uint256 deposit1,
address to,
address from,
address pos
address pos,
uint256[4] memory minIn
) external returns (uint256 shares);

function getDepositAmount(
Expand Down
83 changes: 0 additions & 83 deletions contracts/interfaces/IUniversalVault.sol
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions contracts/interfaces/IVault.sol
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion contracts/proxy/admin.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// SPDX-License-Identifier: BUSL-1.1

pragma solidity 0.7.6;

import "../interfaces/IHypervisor.sol";
Expand Down
20 changes: 13 additions & 7 deletions typechain/IUniProxy.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,19 @@ import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";

interface IUniProxyInterface extends ethers.utils.Interface {
functions: {
"deposit(uint256,uint256,address,address,address)": FunctionFragment;
"deposit(uint256,uint256,address,address,uint256[4])": FunctionFragment;
"getDepositAmount(address,address,uint256)": FunctionFragment;
};

encodeFunctionData(
functionFragment: "deposit",
values: [BigNumberish, BigNumberish, string, string, string]
values: [
BigNumberish,
BigNumberish,
string,
string,
[BigNumberish, BigNumberish, BigNumberish, BigNumberish]
]
): string;
encodeFunctionData(
functionFragment: "getDepositAmount",
Expand Down Expand Up @@ -91,8 +97,8 @@ export class IUniProxy extends BaseContract {
deposit0: BigNumberish,
deposit1: BigNumberish,
to: string,
from: string,
pos: string,
minIn: [BigNumberish, BigNumberish, BigNumberish, BigNumberish],
overrides?: Overrides & { from?: string | Promise<string> }
): Promise<ContractTransaction>;

Expand All @@ -110,8 +116,8 @@ export class IUniProxy extends BaseContract {
deposit0: BigNumberish,
deposit1: BigNumberish,
to: string,
from: string,
pos: string,
minIn: [BigNumberish, BigNumberish, BigNumberish, BigNumberish],
overrides?: Overrides & { from?: string | Promise<string> }
): Promise<ContractTransaction>;

Expand All @@ -129,8 +135,8 @@ export class IUniProxy extends BaseContract {
deposit0: BigNumberish,
deposit1: BigNumberish,
to: string,
from: string,
pos: string,
minIn: [BigNumberish, BigNumberish, BigNumberish, BigNumberish],
overrides?: CallOverrides
): Promise<BigNumber>;

Expand All @@ -151,8 +157,8 @@ export class IUniProxy extends BaseContract {
deposit0: BigNumberish,
deposit1: BigNumberish,
to: string,
from: string,
pos: string,
minIn: [BigNumberish, BigNumberish, BigNumberish, BigNumberish],
overrides?: Overrides & { from?: string | Promise<string> }
): Promise<BigNumber>;

Expand All @@ -169,8 +175,8 @@ export class IUniProxy extends BaseContract {
deposit0: BigNumberish,
deposit1: BigNumberish,
to: string,
from: string,
pos: string,
minIn: [BigNumberish, BigNumberish, BigNumberish, BigNumberish],
overrides?: Overrides & { from?: string | Promise<string> }
): Promise<PopulatedTransaction>;

Expand Down
8 changes: 4 additions & 4 deletions typechain/factories/IUniProxy__factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ const _abi = [
},
{
internalType: "address",
name: "from",
name: "pos",
type: "address",
},
{
internalType: "address",
name: "pos",
type: "address",
internalType: "uint256[4]",
name: "minIn",
type: "uint256[4]",
},
],
name: "deposit",
Expand Down
Loading