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

Jump to bottom

New geyser for charm spot-usd #254

Merged
merged 2 commits into from
May 6, 2024
Merged

New geyser for charm spot-usd #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31a8f1b
deployed new geyser spot-usd
aalavandhan May 4, 2024
e2c4d15
checked in oz deployment file
aalavandhan May 6, 2024
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ coverage.json
coverage/
coverageEnv/

.openzeppelin
.vscode
cache
artifacts
Expand Down
1 change: 1 addition & 0 deletions .openzeppelin/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
unknown*.json
235 changes: 235 additions & 0 deletions .openzeppelin/mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
{
"manifestVersion": "3.1",
"impls": {
"7f4c9ba4803525f07be06345dab4111fa712fd7b120907da063b8098bfa587a4": {
"address": "0x699A5Fd46F5886E79f430bA4d050d303848375DD",
"txHash": "0x55876328df509d7cd4b06ff2f561ed3e8b08fbc82937861e2f80310e10a105e8",
"layout": {
"storage": [
{
"contract": "Powered",
"label": "_powerSwitch",
"type": "t_address",
"src": "contracts/PowerSwitch/Powered.sol:24"
},
{
"contract": "Initializable",
"label": "_initialized",
"type": "t_bool",
"src": "@openzeppelin/contracts/proxy/Initializable.sol:25"
},
{
"contract": "Initializable",
"label": "_initializing",
"type": "t_bool",
"src": "@openzeppelin/contracts/proxy/Initializable.sol:30"
},
{
"contract": "ContextUpgradeable",
"label": "__gap",
"type": "t_array(t_uint256)50_storage",
"src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:31"
},
{
"contract": "OwnableUpgradeable",
"label": "_owner",
"type": "t_address",
"src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:20"
},
{
"contract": "OwnableUpgradeable",
"label": "__gap",
"type": "t_array(t_uint256)49_storage",
"src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:74"
},
{
"contract": "Geyser",
"label": "_geyser",
"type": "t_struct(GeyserData)5697_storage",
"src": "contracts/Geyser.sol:222"
},
{
"contract": "Geyser",
"label": "_vaults",
"type": "t_mapping(t_address,t_struct(VaultData)5710_storage)",
"src": "contracts/Geyser.sol:223"
},
{
"contract": "Geyser",
"label": "_bonusTokenSet",
"type": "t_struct(AddressSet)4188_storage",
"src": "contracts/Geyser.sol:224"
},
{
"contract": "Geyser",
"label": "_vaultFactorySet",
"type": "t_struct(AddressSet)4188_storage",
"src": "contracts/Geyser.sol:225"
}
],
"types": {
"t_struct(GeyserData)5697_storage": {
"label": "struct IGeyser.GeyserData",
"members": [
{
"label": "stakingToken",
"type": "t_address"
},
{
"label": "rewardToken",
"type": "t_address"
},
{
"label": "rewardPool",
"type": "t_address"
},
{
"label": "rewardScaling",
"type": "t_struct(RewardScaling)5722_storage"
},
{
"label": "rewardSharesOutstanding",
"type": "t_uint256"
},
{
"label": "totalStake",
"type": "t_uint256"
},
{
"label": "totalStakeUnits",
"type": "t_uint256"
},
{
"label": "lastUpdate",
"type": "t_uint256"
},
{
"label": "rewardSchedules",
"type": "t_array(t_struct(RewardSchedule)5704_storage)dyn_storage"
}
]
},
"t_address": {
"label": "address"
},
"t_struct(RewardScaling)5722_storage": {
"label": "struct IGeyser.RewardScaling",
"members": [
{
"label": "floor",
"type": "t_uint256"
},
{
"label": "ceiling",
"type": "t_uint256"
},
{
"label": "time",
"type": "t_uint256"
}
]
},
"t_uint256": {
"label": "uint256"
},
"t_array(t_struct(RewardSchedule)5704_storage)dyn_storage": {
"label": "struct IGeyser.RewardSchedule[]"
},
"t_struct(RewardSchedule)5704_storage": {
"label": "struct IGeyser.RewardSchedule",
"members": [
{
"label": "duration",
"type": "t_uint256"
},
{
"label": "start",
"type": "t_uint256"
},
{
"label": "shares",
"type": "t_uint256"
}
]
},
"t_mapping(t_address,t_struct(VaultData)5710_storage)": {
"label": "mapping(address => struct IGeyser.VaultData)"
},
"t_struct(VaultData)5710_storage": {
"label": "struct IGeyser.VaultData",
"members": [
{
"label": "totalStake",
"type": "t_uint256"
},
{
"label": "stakes",
"type": "t_array(t_struct(StakeData)5715_storage)dyn_storage"
}
]
},
"t_array(t_struct(StakeData)5715_storage)dyn_storage": {
"label": "struct IGeyser.StakeData[]"
},
"t_struct(StakeData)5715_storage": {
"label": "struct IGeyser.StakeData",
"members": [
{
"label": "amount",
"type": "t_uint256"
},
{
"label": "timestamp",
"type": "t_uint256"
}
]
},
"t_struct(AddressSet)4188_storage": {
"label": "struct EnumerableSet.AddressSet",
"members": [
{
"label": "_inner",
"type": "t_struct(Set)3923_storage"
}
]
},
"t_struct(Set)3923_storage": {
"label": "struct EnumerableSet.Set",
"members": [
{
"label": "_values",
"type": "t_array(t_bytes32)dyn_storage"
},
{
"label": "_indexes",
"type": "t_mapping(t_bytes32,t_uint256)"
}
]
},
"t_array(t_bytes32)dyn_storage": {
"label": "bytes32[]"
},
"t_bytes32": {
"label": "bytes32"
},
"t_mapping(t_bytes32,t_uint256)": {
"label": "mapping(bytes32 => uint256)"
},
"t_array(t_uint256)49_storage": {
"label": "uint256[49]"
},
"t_array(t_uint256)50_storage": {
"label": "uint256[50]"
},
"t_bool": {
"label": "bool"
}
}
}
}
},
"admin": {
"address": "0x21a18c81ad418c6C96D4484a97b4632acFBC8914",
"txHash": "0xe2031d760c87b52042ecb149353d678dd75f840d330b880d210f4c3305bbd82a"
}
}
7 changes: 5 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ ethereum:
- poolRef: "UNI-ETH-AMPL-V2 (Beehive V7)"
deployment: 0x5Ec6f02D0b657E4a56d6020Bc21F19f2Ca13EcA9

- poolRef: "Arrakis Vault V1 USDC/SPOT (RAKIS-35) (Fly V2)"
deployment: 0x392b58F407Efe1681a2EBB470600Bc2146D231a2
- poolRef: "CHARM-SPOT-USDC (Great geyser V1)"
deployment: 0x7B2e9353D3Bf71d9f9246B1291eE29DFB11B32C7

# - poolRef: "Arrakis Vault V1 USDC/SPOT (RAKIS-35) (Fly V2)"
# deployment: 0x392b58F407Efe1681a2EBB470600Bc2146D231a2

# - poolRef: "UNI-ETH-AMPL-V2 (Beehive V6)"
# deployment: 0xfa3A1B55f77D0cEd6706283c16296F8317c70e52
Expand Down
10 changes: 10 additions & 0 deletions frontend/src/config/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@ const geyserList: AppGeysersList = {
// staked pool address: 0xc5be99A02C6857f9Eac67BbCE58DF5572498F40c
},

{
name: 'ETH Great Geyser V1 (Charm USDC/SPOT)',
address: '0x7B2e9353D3Bf71d9f9246B1291eE29DFB11B32C7',
stakingToken: StakingToken.CHARM_V1,
rewardToken: RewardToken.FORTH,
isWrapped: false,
poolAddress: 'https://alpha.charm.fi/vault/0x2dcaff0f75765d7867887fc402b71c841b3a4bfb-1',
// staked pool address: 0x898adc9aa0c23dce3fed6456c34dbe2b57784325
},

{
name: 'ETH Fly V2 (ArrakisV1 USDC/SPOT)',
address: '0x392b58F407Efe1681a2EBB470600Bc2146D231a2',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export enum StakingToken {
PANGOLIN,
BALANCER_WEIGHTED_POOL_V2,
ARRAKIS_V1,
CHARM_V1
}

// Reward tokens
Expand Down
Loading
Loading