fix(contracts): missing code coverage and logic bugs

[oXtxNt9U]

Summary

Checklist

• Documentation (if necessary)
• Tests (if necessary)
• Ready to be merged

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (develop@f8e628a). Learn more about missing BASE report.

Additional details and impacted files

@@            Coverage Diff             @@
##             develop     #952   +/-   ##
==========================================
  Coverage           ?   46.18%           
==========================================
  Files              ?     1331           
  Lines              ?    65348           
  Branches           ?     1459           
==========================================
  Hits               ?    30183           
  Misses             ?    35127           
  Partials           ?       38           

Flag	Coverage Δ
contracts	99.74% <100.00%> (?)
packages	45.86% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.