Skip to content

Commit

Permalink
fixed naming bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrDeadCe11
MrDeadCe11 committed Jun 28, 2024
1 parent 5d06d85 commit 9b43eff
Show file tree
Hide file tree
Showing 7 changed files with 126 additions and 125 deletions.
28 changes: 14 additions & 14 deletions gov-input/sepolia/new-AddNitroRewards.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"chainid": 421614,
"network": "sepolia",
"proposalType": "AddNitroRewards",
"description": "add arb to nitro pool as reward",
"ProtocolToken_Address": "",
"ODGovernor_Address": "0xA5DC5C86212cF22167c52b756363B0FeA7B6e591",
"nitroPool": "0x5ff631684f3dcF6430764C002b7184b9757C814c",
"objectArray": [
{
"rewardToken": "0xA5DC5C86212cF22167c52b756363B0FeA7B6e591",
"rewardAmount": "100000"
}
],
"arrayLength": 2
"chainid": 421614,
"network": "sepolia",
"proposalType": "AddNitroRewards",
"description": "add arb to nitro pool as reward",
"ProtocolToken_Address": "",
"ODGovernor_Address": "",
"nitroPool": "0x5ff631684f3dcF6430764C002b7184b9757C814c",
"objectArray": [
{
"rewardToken": "0xA5DC5C86212cF22167c52b756363B0FeA7B6e591",
"rewardAmount": "100000"
}
],
"arrayLength": "1"
}
49 changes: 25 additions & 24 deletions gov-input/sepolia/new-DeployChainlinkRelayer.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
{
"chainid": 421614,
"description": "Deploy new chainlink relayers",
"network": "sepolia",
"proposalType": "DeployChainlinkRelayers",
"ODGovernor_Address": "",
"ChainlinkRelayerFactory_Address": "",
"objectArray": [
{
"symbol": "LINK/USD",
"chainlinkFeed": "0x86E53CF1B870786351Da77A57575e79CB55812CB",
"oracleInterval": "86400"
},
{
"symbol": "GRT/USD",
"chainlinkFeed": "0x0F38D86FceF4955B705F35c9e41d1A16e0637c73",
"oracleInterval": "86400"
},
{
"symbol": "ETH/USD",
"chainlinkFeed": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612",
"oracleInterval": "86400"
}
],
"arrayLength": "3"
"chainid": 421614,
"description": "Deploy new chainlink relayers",
"network": "sepolia",
"proposalType": "DeployChainlinkRelayers",
"ODGovernor_Address": "",
"ChainlinkRelayerFactory_Address": "",
"objectArray": [
{
"symbol": "LINK/USD",
"chainlinkPriceFeed": "0x86E53CF1B870786351Da77A57575e79CB55812CB",
"oracleInterval": "86400"
},
{
"symbol": "GRT/USD",
"chainlinkPriceFeed": "0x0F38D86FceF4955B705F35c9e41d1A16e0637c73",
"oracleInterval": "86400"
},
{
"symbol": "ETH/USD",
"chainlinkPriceFeed": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612",
"oracleInterval": "86400"
}
],
"arrayLength": "3",
"PredictedRelayerAddresses": []
}
48 changes: 24 additions & 24 deletions gov-input/sepolia/new-DeployDelayedOracle.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"chainid": 421614,
"description": "deploy a new delayed oracle",
"network": "sepolia",
"proposalType": "DeployDelayedOracles",
"ODGovernor_Address": "",
"DelayedOracleFactory_Address": "",
"objectArray": [
{
"symbol": "LINK/USD",
"chainlinkPriceFeed": "0x86E53CF1B870786351Da77A57575e79CB55812CB",
"interval": "86400"
},
{
"symbol": "GRT/USD",
"chainlinkPriceFeed": "0x0F38D86FceF4955B705F35c9e41d1A16e0637c73",
"interval": "86400"
},
{
"symbol": "ETH/USD",
"chainlinkPriceFeed": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612",
"interval": "86400"
}
],
"arrayLength": "3"
"chainid": 421614,
"description": "deploy a new delayed oracle",
"network": "sepolia",
"proposalType": "DeployDelayedOracles",
"ODGovernor_Address": "",
"DelayedOracleFactory_Address": "",
"objectArray": [
{
"symbol": "LINK/USD",
"priceFeed": "0x86E53CF1B870786351Da77A57575e79CB55812CB",
"interval": "86400"
},
{
"symbol": "GRT/USD",
"priceFeed": "0x0F38D86FceF4955B705F35c9e41d1A16e0637c73",
"interval": "86400"
},
{
"symbol": "ETH/USD",
"priceFeed": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612",
"interval": "86400"
}
],
"arrayLength": "3"
}
6 changes: 3 additions & 3 deletions gov-input/sepolia/new-ERC20Transfer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"chainid": 421614,
"description": "Transfer ODG back",
"network": "sepolia",
"ODGovernor_Address": "0x69ae232E574352232aB8678869eAA3BEBd885211",
"ODGovernor_Address": "",
"ProtocolToken_Address": "",
"proposalType": "ERC20Transfer",
"objectArray": [
Expand All @@ -12,5 +12,5 @@
"amount": "1000000000000000000"
}
],
"arrayLength": 1
}
"arrayLength": "1"
}
4 changes: 2 additions & 2 deletions gov-input/sepolia/new-ModifyParameters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"data": "27750000000000000000000000000000000000000000000000000"
}
],
"arrayLength": 1
}
"arrayLength": "1"
}
114 changes: 57 additions & 57 deletions gov-input/sepolia/new-UpdatePIDController.json
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
{
"chainid": 421614,
"description": "UpdatePidController",
"network": "sepolia",
"proposalType": "ModifyParameters",
"ODGovernor_Address": "",
"ProtocolToken_Address": "",
"objectArray": [
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "seedProposer",
"type": "address",
"data": "0xA5DC5C86212cF22167c52b756363B0FeA7B6e591"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "noiseBarrier",
"type": "uint256",
"data": "11111"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "integralPeriodSize",
"type": "uint256",
"data": "222222"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "feedbackOutputLowerBound",
"type": "int",
"data": "1000"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "feedbackOutputUpperBound",
"type": "uint256",
"data": "33333"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "perSecondCumulativeLeak",
"type": "uint256",
"data": "44444"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "kp",
"type": "int256",
"data": "200"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "ki",
"type": "int256",
"data": "300"
}
],
"arrayLength": 8
"chainid": 421614,
"description": "UpdatePidController",
"network": "sepolia",
"proposalType": "ModifyParameters",
"ODGovernor_Address": "",
"ProtocolToken_Address": "",
"objectArray": [
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "seedProposer",
"type": "address",
"data": "0xA5DC5C86212cF22167c52b756363B0FeA7B6e591"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "noiseBarrier",
"type": "uint256",
"data": "11111"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "integralPeriodSize",
"type": "uint256",
"data": "222222"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "feedbackOutputLowerBound",
"type": "int",
"data": "1000"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "feedbackOutputUpperBound",
"type": "uint256",
"data": "33333"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "perSecondCumulativeLeak",
"type": "uint256",
"data": "44444"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "kp",
"type": "int256",
"data": "200"
},
{
"target": "0xA1550dCfdb0195e0e1DECe7b6aad711da5eD303a",
"param": "ki",
"type": "int256",
"data": "300"
}
],
"arrayLength": "8"
}
2 changes: 1 addition & 1 deletion src/contracts/Generate/GenerateDeployChainlinkRelayersProposal.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ contract GenerateDeployChainlinkRelayersProposal is Generator, JSONScript {

for (uint256 i; i < len; i++) {
string memory index = Strings.toString(i);
address feed = json.readAddress(string(abi.encodePacked('.objectArray[', index, '].chainlinkFeed')));
address feed = json.readAddress(string(abi.encodePacked('.objectArray[', index, '].chainlinkPriceFeed')));
uint256 interval = json.readUint(string(abi.encodePacked('.objectArray[', index, '].oracleInterval')));
chainlinkFeed.push(feed);
oracleInterval.push(interval);
Expand Down

0 comments on commit 9b43eff

Please sign in to comment.