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

Feature/update staking bank #151

Merged
merged 9 commits into from
Oct 29, 2024
+200 −143
Merged

Feature/update staking bank #151

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
404e942
remove validators
DZariusz Oct 16, 2024
73fb45e
update numbers
DZariusz Oct 16, 2024
c3abcd6
update URL
DZariusz Oct 16, 2024
d7faec0
test
DZariusz Oct 16, 2024
b4b52a2
validatorsCount
DZariusz Oct 16, 2024
669a474
only
DZariusz Oct 16, 2024
ca39224
t
DZariusz Oct 16, 2024
a514b2b
.
DZariusz Oct 16, 2024
269f67d
update staking bank on linea
DZariusz Oct 16, 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
Prev Previous commit
Next Next commit
Loading
Loading status checks…
t
@DZariusz
DZariusz committed Oct 16, 2024
commit ca39224121c5bcef23577b6911b4ab7bf9b604df
1 change: 1 addition & 0 deletions constants/index.ts
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ export const STAKING_BANK_STATIC_SBX = 'StakingBankStaticSbx';
export const STAKING_BANK_STATIC_PROD = 'StakingBankStaticProd';
export const STAKING_BANK_STATE = 'StakingBankState';
export const UMBRELLA_FEEDS = 'UmbrellaFeeds';
export const UMBRELLA_FEEDS_ARTIFACTS = 'contracts/onChainFeeds/UmbrellaFeeds.sol:UmbrellaFeeds';
export const UMBRELLA_FEEDS_READER_FACTORY = 'UmbrellaFeedsReaderFactory';
export const UMB = 'UMB';
export const UNISWAPV3_FETCHER_HELPER = 'UniswapV3FetcherHelper';
4 changes: 2 additions & 2 deletions test/UmbrellaFeeds.test.ts
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
import { toBytes32 } from '../scripts/utils/helpers';
import { UmbrellaFeeds, UmbrellaFeeds__factory } from '../typechain';

import { REGISTRY, ISTAKING_BANK, UMBRELLA_FEEDS } from '../constants';
import {REGISTRY, ISTAKING_BANK, UMBRELLA_FEEDS_ARTIFACTS } from '../constants';
import { DeviationSigner } from './utils/DeviationSigner';

use(waffleChai);
@@ -24,7 +24,7 @@ const setupForFeedsWithMocks = async (props: {
const { hre } = props;

const Registry = artifacts.readArtifactSync(REGISTRY);
const UmbrellaFeed = artifacts.readArtifactSync(UMBRELLA_FEEDS);
const UmbrellaFeed = artifacts.readArtifactSync(UMBRELLA_FEEDS_ARTIFACTS);
const StakingBank = artifacts.readArtifactSync(ISTAKING_BANK);

const requiredSignatures = props.requiredSignatures || 1;
5 changes: 4 additions & 1 deletion test/fetchers/UniswapV3FetchersHelpers.test.ts
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ import PriceDataStruct = UniswapV3FetcherHelper.PriceDataStruct;

use(waffleChai);

describe('UniswapV3FetchersHelpers', () => {
describe.skip('UniswapV3FetchersHelpers', () => {
const USDC_ETH_POOL_1 = '0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640';
const USDC_ETH_POOL_2 = '0x8ad599c3a0ff1de082011efddc58f1908eb6e6d8';
const WBTC_USDC_POOL = '0x99ac8ca7087fa4a2a1fb6357269965a2014abc35';
@@ -55,6 +55,9 @@ describe('UniswapV3FetchersHelpers', () => {
},
];

console.log(data);
console.log(contract.address);

const [[result]] = await contract.callStatic.getPrices(data);

expect(result.success).false;
4 changes: 2 additions & 2 deletions test/utils/DeviationSigner.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { HardhatRuntimeEnvironment } from 'hardhat/types';
import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
import { ethers, Wallet } from 'ethers';
import { UMBRELLA_FEEDS } from '../../constants';
import { UMBRELLA_FEEDS_ARTIFACTS } from '../../constants';
import { IUmbrellaFeeds } from '../../typechain';

type PriceDataStruct = IUmbrellaFeeds.PriceDataStruct;
@@ -37,7 +37,7 @@ export class DeviationSigner {

// eslint-disable-next-line @typescript-eslint/no-explicit-any
protected async priceDatasAbi(hre: HardhatRuntimeEnvironment): Promise<any> {
const artifacts = await hre.artifacts.readArtifact(UMBRELLA_FEEDS);
const artifacts = await hre.artifacts.readArtifact(UMBRELLA_FEEDS_ARTIFACTS);
const submitAbi = artifacts.abi.find((data: { name?: string }) => data?.name === 'update');
if (!submitAbi) throw new Error('missing submit in ABI');

Unchanged files with check annotations Beta

View file
contracts/BaseChain.sol
/// @param _blockId ID of submitted block
/// @return block data (root + timestamp)
function blocks(uint256 _blockId) external view returns (Block memory) {

Check warning on line 200 in contracts/BaseChain.sol

GitHub Actions / build (18.x) 

Function order is incorrect, external view function can not go after public pure function (line 193)
return Block(roots[_blockId], uint32(_blockId));
}
View file
contracts/Chain.sol
/// @return locations array of all validators locations
/// @return staked total UMB staked by validators
/// @return minSignatures `this.requiredSignatures`
function getStatus() external view virtual returns(

Check warning on line 136 in contracts/Chain.sol

GitHub Actions / build (18.x) 

Function order is incorrect, external view function can not go after external pure function (line 120)
uint256 blockNumber,
uint32 timePadding,
uint32 lastDataTimestamp,
View file
contracts/ForeignChain.sol
/// @return locations array will be always empty
/// @return staked total UMB staked by validators
/// @return minSignatures `this.requiredSignatures`
function getStatus() external view override returns(

Check warning on line 41 in contracts/ForeignChain.sol

GitHub Actions / build (18.x) 

Function order is incorrect, external view function can not go after external pure function (line 23)
uint256 blockNumber,
uint32 timePadding,
uint32 lastDataTimestamp,
View file
contracts/stakingBankStatic/StakingBankStatic.sol
function _assertValidSetup(uint256 _validatorsCount) internal view virtual{
address[] memory list = _addresses();
require(list.length == _validatorsCount);

Check warning on line 92 in contracts/stakingBankStatic/StakingBankStatic.sol

GitHub Actions / build (18.x) 

Provide an error message for require
for (uint256 i; i < _validatorsCount;) {
require(_isValidator(list[i]));

Check warning on line 95 in contracts/stakingBankStatic/StakingBankStatic.sol

GitHub Actions / build (18.x) 

Provide an error message for require
unchecked { i ++; }
}