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.

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

Fix Convert's RemoveDeposit event #530

Merged
merged 3 commits into from
Jul 3, 2023

Conversation

silochad
Copy link
Contributor

@silochad silochad commented Jul 3, 2023

Before

$ node ./scripts/check-events.js

Searching:  contracts/beanstalk/**/*Facet.sol 23
Event mismatch {
  new: {
    indexed: false,
    internalType: 'int96',
    name: 'stem',
    type: 'int96'
  },
  existing: {
    indexed: false,
    internalType: 'int128',
    name: 'stem',
    type: 'int128'
  }
}

After

$ node ./scripts/check-events.js

Searching:  contracts/beanstalk/**/*Facet.sol 23
Map(46) {
  'Incentivization' => [ 'contracts/beanstalk/sun/SeasonFacet/SeasonFacet.sol' ],
  'Reward' => [ 'contracts/beanstalk/sun/SeasonFacet/SeasonFacet.sol' ],
  'SeasonOfPlenty' => [ 'contracts/beanstalk/sun/SeasonFacet/SeasonFacet.sol' ],
  'Soil' => [ 'contracts/beanstalk/sun/SeasonFacet/SeasonFacet.sol' ],
  'Sunrise' => [ 'contracts/beanstalk/sun/SeasonFacet/SeasonFacet.sol' ],
  'WeatherChange' => [ 'contracts/beanstalk/sun/SeasonFacet/SeasonFacet.sol' ],
  'DewhitelistToken' => [ 'contracts/beanstalk/silo/WhitelistFacet.sol' ],
  'UpdatedStalkPerBdvPerSeason' => [ 'contracts/beanstalk/silo/WhitelistFacet.sol' ],
  'WhitelistToken' => [ 'contracts/beanstalk/silo/WhitelistFacet.sol' ],
  'Convert' => [ 'contracts/beanstalk/silo/ConvertFacet.sol' ],
  'RemoveDeposit' => [
    'contracts/beanstalk/silo/ConvertFacet.sol',
    'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol'
  ],
  'RemoveDeposits' => [
    'contracts/beanstalk/silo/ConvertFacet.sol',
    'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol'
  ],
  'ApprovalForAll' => [ 'contracts/beanstalk/silo/ApprovalFacet.sol' ],
  'DepositApproval' => [ 'contracts/beanstalk/silo/ApprovalFacet.sol' ],
  'AddDeposit' => [ 'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol' ],
  'ClaimPlenty' => [ 'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol' ],
  'Plant' => [ 'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol' ],
  'RemoveWithdrawal' => [ 'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol' ],
  'RemoveWithdrawals' => [ 'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol' ],
  'StalkBalanceChanged' => [ 'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol' ],
  'TransferBatch' => [ 'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol' ],
  'TransferSingle' => [ 'contracts/beanstalk/silo/SiloFacet/SiloFacet.sol' ],
  'PlotTransfer' => [
    'contracts/beanstalk/market/MarketplaceFacet/MarketplaceFacet.sol'
  ],
  'PodApproval' => [
    'contracts/beanstalk/market/MarketplaceFacet/MarketplaceFacet.sol'
  ],
  'PodListingCancelled' => [
    'contracts/beanstalk/market/MarketplaceFacet/MarketplaceFacet.sol',
    'contracts/beanstalk/field/FieldFacet.sol'
  ],
  'PodListingCreated' => [
    'contracts/beanstalk/market/MarketplaceFacet/MarketplaceFacet.sol'
  ],
  'PodListingFilled' => [
    'contracts/beanstalk/market/MarketplaceFacet/MarketplaceFacet.sol'
  ],
  'PodOrderCancelled' => [
    'contracts/beanstalk/market/MarketplaceFacet/MarketplaceFacet.sol'
  ],
  'PodOrderCreated' => [
    'contracts/beanstalk/market/MarketplaceFacet/MarketplaceFacet.sol'
  ],
  'PodOrderFilled' => [
    'contracts/beanstalk/market/MarketplaceFacet/MarketplaceFacet.sol'
  ],
  'CompleteFundraiser' => [ 'contracts/beanstalk/field/FundraiserFacet.sol' ],
  'CreateFundraiser' => [ 'contracts/beanstalk/field/FundraiserFacet.sol' ],
  'FundFundraiser' => [ 'contracts/beanstalk/field/FundraiserFacet.sol' ],
  'Harvest' => [ 'contracts/beanstalk/field/FieldFacet.sol' ],
  'Sow' => [ 'contracts/beanstalk/field/FieldFacet.sol' ],
  'InternalBalanceChanged' => [ 'contracts/beanstalk/farm/TokenFacet.sol' ],
  'TokenApproval' => [ 'contracts/beanstalk/farm/TokenFacet.sol' ],
  'Pause' => [ 'contracts/beanstalk/diamond/PauseFacet.sol' ],
  'Unpause' => [ 'contracts/beanstalk/diamond/PauseFacet.sol' ],
  'OwnershipTransferred' => [ 'contracts/beanstalk/diamond/OwnershipFacet.sol' ],
  'DiamondCut' => [ 'contracts/beanstalk/diamond/DiamondCutFacet.sol' ],
  'AddUnripeToken' => [ 'contracts/beanstalk/barn/UnripeFacet.sol' ],
  'ChangeUnderlying' => [ 'contracts/beanstalk/barn/UnripeFacet.sol' ],
  'Chop' => [ 'contracts/beanstalk/barn/UnripeFacet.sol' ],
  'Pick' => [ 'contracts/beanstalk/barn/UnripeFacet.sol' ],
  'SetFertilizer' => [ 'contracts/beanstalk/barn/FertilizerFacet.sol' ]
}

@Brean0
Copy link
Contributor

Brean0 commented Jul 3, 2023

two view functions also used int128 instead of int96:

function seasonToStem(address token, uint32 season)
        public
        view
        returns (int128 stem)
 function stemTipForToken(address token)
    public
    view
    returns (int128 _stemTip)

fixed here: 554b782

@Brean0 Brean0 merged commit e70871f into grown-stalk-per-bdv Jul 3, 2023
1 check passed
@Brean0 Brean0 deleted the fix-convert-remove-deposit-event branch July 3, 2023 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants