Skip to content

Commit 634e00a

Browse files
authored
redeployed bill broker (#261)
1 parent b91b91d commit 634e00a

File tree

2 files changed

+320
-1
lines changed

2 files changed

+320
-1
lines changed

spot-vaults/.openzeppelin/mainnet.json

Lines changed: 319 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -964,6 +964,325 @@
964964
},
965965
"namespaces": {}
966966
}
967+
},
968+
"2887dfa3327bf2c6c3fedd96ab7570643d403c5255ef98a0e2387111a6844c57": {
969+
"address": "0x9Ce5056eEEd22e4569a39DAa670bacD277df3ef1",
970+
"txHash": "0xfa230a8845a5ed6906e9f680fd90e15945491a1b86db33677a00a8496370ac0c",
971+
"layout": {
972+
"solcVersion": "0.8.24",
973+
"storage": [
974+
{
975+
"label": "_initialized",
976+
"offset": 0,
977+
"slot": "0",
978+
"type": "t_uint8",
979+
"contract": "Initializable",
980+
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
981+
"retypedFrom": "bool"
982+
},
983+
{
984+
"label": "_initializing",
985+
"offset": 1,
986+
"slot": "0",
987+
"type": "t_bool",
988+
"contract": "Initializable",
989+
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
990+
},
991+
{
992+
"label": "__gap",
993+
"offset": 0,
994+
"slot": "1",
995+
"type": "t_array(t_uint256)50_storage",
996+
"contract": "ContextUpgradeable",
997+
"src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40"
998+
},
999+
{
1000+
"label": "_balances",
1001+
"offset": 0,
1002+
"slot": "51",
1003+
"type": "t_mapping(t_address,t_uint256)",
1004+
"contract": "ERC20Upgradeable",
1005+
"src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:40"
1006+
},
1007+
{
1008+
"label": "_allowances",
1009+
"offset": 0,
1010+
"slot": "52",
1011+
"type": "t_mapping(t_address,t_mapping(t_address,t_uint256))",
1012+
"contract": "ERC20Upgradeable",
1013+
"src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:42"
1014+
},
1015+
{
1016+
"label": "_totalSupply",
1017+
"offset": 0,
1018+
"slot": "53",
1019+
"type": "t_uint256",
1020+
"contract": "ERC20Upgradeable",
1021+
"src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:44"
1022+
},
1023+
{
1024+
"label": "_name",
1025+
"offset": 0,
1026+
"slot": "54",
1027+
"type": "t_string_storage",
1028+
"contract": "ERC20Upgradeable",
1029+
"src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:46"
1030+
},
1031+
{
1032+
"label": "_symbol",
1033+
"offset": 0,
1034+
"slot": "55",
1035+
"type": "t_string_storage",
1036+
"contract": "ERC20Upgradeable",
1037+
"src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:47"
1038+
},
1039+
{
1040+
"label": "__gap",
1041+
"offset": 0,
1042+
"slot": "56",
1043+
"type": "t_array(t_uint256)45_storage",
1044+
"contract": "ERC20Upgradeable",
1045+
"src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:376"
1046+
},
1047+
{
1048+
"label": "__gap",
1049+
"offset": 0,
1050+
"slot": "101",
1051+
"type": "t_array(t_uint256)50_storage",
1052+
"contract": "ERC20BurnableUpgradeable",
1053+
"src": "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol:51"
1054+
},
1055+
{
1056+
"label": "_owner",
1057+
"offset": 0,
1058+
"slot": "151",
1059+
"type": "t_address",
1060+
"contract": "OwnableUpgradeable",
1061+
"src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
1062+
},
1063+
{
1064+
"label": "__gap",
1065+
"offset": 0,
1066+
"slot": "152",
1067+
"type": "t_array(t_uint256)49_storage",
1068+
"contract": "OwnableUpgradeable",
1069+
"src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
1070+
},
1071+
{
1072+
"label": "_paused",
1073+
"offset": 0,
1074+
"slot": "201",
1075+
"type": "t_bool",
1076+
"contract": "PausableUpgradeable",
1077+
"src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:29"
1078+
},
1079+
{
1080+
"label": "__gap",
1081+
"offset": 0,
1082+
"slot": "202",
1083+
"type": "t_array(t_uint256)49_storage",
1084+
"contract": "PausableUpgradeable",
1085+
"src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:116"
1086+
},
1087+
{
1088+
"label": "_status",
1089+
"offset": 0,
1090+
"slot": "251",
1091+
"type": "t_uint256",
1092+
"contract": "ReentrancyGuardUpgradeable",
1093+
"src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38"
1094+
},
1095+
{
1096+
"label": "__gap",
1097+
"offset": 0,
1098+
"slot": "252",
1099+
"type": "t_array(t_uint256)49_storage",
1100+
"contract": "ReentrancyGuardUpgradeable",
1101+
"src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:88"
1102+
},
1103+
{
1104+
"label": "perp",
1105+
"offset": 0,
1106+
"slot": "301",
1107+
"type": "t_contract(IPerpetualTranche)2878",
1108+
"contract": "BillBroker",
1109+
"src": "contracts/BillBroker.sol:94"
1110+
},
1111+
{
1112+
"label": "usd",
1113+
"offset": 0,
1114+
"slot": "302",
1115+
"type": "t_contract(IERC20Upgradeable)5020",
1116+
"contract": "BillBroker",
1117+
"src": "contracts/BillBroker.sol:97"
1118+
},
1119+
{
1120+
"label": "usdUnitAmt",
1121+
"offset": 0,
1122+
"slot": "303",
1123+
"type": "t_uint256",
1124+
"contract": "BillBroker",
1125+
"src": "contracts/BillBroker.sol:100"
1126+
},
1127+
{
1128+
"label": "perpUnitAmt",
1129+
"offset": 0,
1130+
"slot": "304",
1131+
"type": "t_uint256",
1132+
"contract": "BillBroker",
1133+
"src": "contracts/BillBroker.sol:103"
1134+
},
1135+
{
1136+
"label": "keeper",
1137+
"offset": 0,
1138+
"slot": "305",
1139+
"type": "t_address",
1140+
"contract": "BillBroker",
1141+
"src": "contracts/BillBroker.sol:108"
1142+
},
1143+
{
1144+
"label": "oracle",
1145+
"offset": 0,
1146+
"slot": "306",
1147+
"type": "t_contract(IPerpPricer)13597",
1148+
"contract": "BillBroker",
1149+
"src": "contracts/BillBroker.sol:111"
1150+
},
1151+
{
1152+
"label": "fees",
1153+
"offset": 0,
1154+
"slot": "307",
1155+
"type": "t_struct(BillBrokerFees)13707_storage",
1156+
"contract": "BillBroker",
1157+
"src": "contracts/BillBroker.sol:114"
1158+
},
1159+
{
1160+
"label": "arHardBound",
1161+
"offset": 0,
1162+
"slot": "314",
1163+
"type": "t_struct(Range)13739_storage",
1164+
"contract": "BillBroker",
1165+
"src": "contracts/BillBroker.sol:117"
1166+
},
1167+
{
1168+
"label": "arSoftBound",
1169+
"offset": 0,
1170+
"slot": "316",
1171+
"type": "t_struct(Range)13739_storage",
1172+
"contract": "BillBroker",
1173+
"src": "contracts/BillBroker.sol:121"
1174+
}
1175+
],
1176+
"types": {
1177+
"t_address": {
1178+
"label": "address",
1179+
"numberOfBytes": "20"
1180+
},
1181+
"t_array(t_uint256)45_storage": {
1182+
"label": "uint256[45]",
1183+
"numberOfBytes": "1440"
1184+
},
1185+
"t_array(t_uint256)49_storage": {
1186+
"label": "uint256[49]",
1187+
"numberOfBytes": "1568"
1188+
},
1189+
"t_array(t_uint256)50_storage": {
1190+
"label": "uint256[50]",
1191+
"numberOfBytes": "1600"
1192+
},
1193+
"t_bool": {
1194+
"label": "bool",
1195+
"numberOfBytes": "1"
1196+
},
1197+
"t_contract(IERC20Upgradeable)5020": {
1198+
"label": "contract IERC20Upgradeable",
1199+
"numberOfBytes": "20"
1200+
},
1201+
"t_contract(IPerpPricer)13597": {
1202+
"label": "contract IPerpPricer",
1203+
"numberOfBytes": "20"
1204+
},
1205+
"t_contract(IPerpetualTranche)2878": {
1206+
"label": "contract IPerpetualTranche",
1207+
"numberOfBytes": "20"
1208+
},
1209+
"t_mapping(t_address,t_mapping(t_address,t_uint256))": {
1210+
"label": "mapping(address => mapping(address => uint256))",
1211+
"numberOfBytes": "32"
1212+
},
1213+
"t_mapping(t_address,t_uint256)": {
1214+
"label": "mapping(address => uint256)",
1215+
"numberOfBytes": "32"
1216+
},
1217+
"t_string_storage": {
1218+
"label": "string",
1219+
"numberOfBytes": "32"
1220+
},
1221+
"t_struct(BillBrokerFees)13707_storage": {
1222+
"label": "struct BillBrokerFees",
1223+
"members": [
1224+
{
1225+
"label": "mintFeePerc",
1226+
"type": "t_uint256",
1227+
"offset": 0,
1228+
"slot": "0"
1229+
},
1230+
{
1231+
"label": "burnFeePerc",
1232+
"type": "t_uint256",
1233+
"offset": 0,
1234+
"slot": "1"
1235+
},
1236+
{
1237+
"label": "perpToUSDSwapFeeFactors",
1238+
"type": "t_struct(Range)13739_storage",
1239+
"offset": 0,
1240+
"slot": "2"
1241+
},
1242+
{
1243+
"label": "usdToPerpSwapFeeFactors",
1244+
"type": "t_struct(Range)13739_storage",
1245+
"offset": 0,
1246+
"slot": "4"
1247+
},
1248+
{
1249+
"label": "protocolSwapSharePerc",
1250+
"type": "t_uint256",
1251+
"offset": 0,
1252+
"slot": "6"
1253+
}
1254+
],
1255+
"numberOfBytes": "224"
1256+
},
1257+
"t_struct(Range)13739_storage": {
1258+
"label": "struct Range",
1259+
"members": [
1260+
{
1261+
"label": "lower",
1262+
"type": "t_uint256",
1263+
"offset": 0,
1264+
"slot": "0"
1265+
},
1266+
{
1267+
"label": "upper",
1268+
"type": "t_uint256",
1269+
"offset": 0,
1270+
"slot": "1"
1271+
}
1272+
],
1273+
"numberOfBytes": "64"
1274+
},
1275+
"t_uint256": {
1276+
"label": "uint256",
1277+
"numberOfBytes": "32"
1278+
},
1279+
"t_uint8": {
1280+
"label": "uint8",
1281+
"numberOfBytes": "1"
1282+
}
1283+
},
1284+
"namespaces": {}
1285+
}
9671286
}
9681287
}
9691288
}

spot-vaults/contracts/BillBroker.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ contract BillBroker is
8484
uint256 public constant TWO = ONE * 2;
8585
uint256 private constant INITIAL_RATE = 1000000;
8686
uint256 public constant MINIMUM_LIQUIDITY = 10 ** 22;
87-
uint256 public constant MAX_FEE_FACTOR = ((ONE * 6) / 5); // 1.2 or 20%
87+
uint256 public constant MAX_FEE_FACTOR = (ONE * 2); // 2 or 100%
8888
uint256 public constant MAX_ASSET_RATIO = uint256(type(int256).max);
8989

9090
//-------------------------------------------------------------------------

0 commit comments

Comments
 (0)