Update deltaStalkEarnedPerSeason to int32 #1092
Conversation
| @@ -316,7 +316,7 @@ struct AssetSettings { | |||
| int96 milestoneStem; // │ 12 (30) | |||
| bytes1 encodeType; // │ 1 (31) | |||
| // one byte is left here. ──┘ 1 (32) | |||
| int24 deltaStalkEarnedPerSeason; // ────┐ 3 | |||
| int32 deltaStalkEarnedPerSeason; // ────┐ 3 | |||
There was a problem hiding this comment.
the comments should be updated based on this (i.e, this is now 4 bytes instead of 3), and the summation is now different.
There was a problem hiding this comment.
| @@ -458,19 +459,19 @@ library LibGerminate { | |||
| if (s.sys.silo.assetSettings[token].milestoneSeason < s.sys.season.current) { | |||
| prevStalkEarnedPerSeason = s.sys.silo.assetSettings[token].stalkEarnedPerSeason; | |||
| } else { | |||
| int24 deltaStalkEarnedPerSeason = s | |||
| int64 deltaStalkEarnedPerSeason = s | |||
There was a problem hiding this comment.
yes, a leftover from experimenting with different sizes: 9249efd#diff-d2261445685829aad9421eae03f9644ae9d11be5713ccc0870497a0be1e58d8aR462
| .sys | ||
| .silo | ||
| .assetSettings[token] | ||
| .deltaStalkEarnedPerSeason; | ||
| if (deltaStalkEarnedPerSeason >= 0) { | ||
| prevStalkEarnedPerSeason = | ||
| s.sys.silo.assetSettings[token].stalkEarnedPerSeason - | ||
| uint32(int32(deltaStalkEarnedPerSeason)); | ||
| uint32(uint64(deltaStalkEarnedPerSeason)); |
There was a problem hiding this comment.
why is this casted to a uint64, then a uint32?
There was a problem hiding this comment.
yes, a leftover from experimenting with different sizes: 9249efd#diff-d2261445685829aad9421eae03f9644ae9d11be5713ccc0870497a0be1e58d8aR470
| @@ -204,7 +204,7 @@ library LibWhitelist { | |||
|
|
|||
| // stalkEarnedPerSeason is set to int32 before casting down. | |||
| s.sys.silo.assetSettings[token].deltaStalkEarnedPerSeason = (int32(stalkEarnedPerSeason) - | |||
| int32(s.sys.silo.assetSettings[token].stalkEarnedPerSeason)).toInt24(); | |||
| int32(s.sys.silo.assetSettings[token].stalkEarnedPerSeason)).toInt32(); | |||
There was a problem hiding this comment.
surrounding the s.sys.silo.assetSettings[token].stalkEarnedPerSeason with a int32 and casting down to a toInt32 is unnecessary.
There was a problem hiding this comment.
Update deltaStalkEarnedPerSeason to int32 to prevent overflow on sunrise upon reseed.