Merge FYEO fixes (#988)

* Make public initialize functions external (#953)

* Bump `solc` compiler versions to `0.8.16` (#952)

Co-authored-by: Asa Oines <asaoines@gmail.com>
pull/997/head
Yorke Rhodes 2 years ago committed by GitHub
parent 33f43fc65e
commit 4959f1ebb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      solidity/app/hardhat.config.ts
  2. 2
      solidity/core/contracts/Inbox.sol
  3. 2
      solidity/core/contracts/Outbox.sol
  4. 2
      solidity/core/hardhat.config.ts
  5. 2
      typescript/helloworld/hardhat.config.ts

@ -10,7 +10,7 @@ module.exports = {
solidity: { solidity: {
compilers: [ compilers: [
{ {
version: '0.8.13', version: '0.8.16',
}, },
{ {
version: '0.7.6', version: '0.7.6',

@ -66,7 +66,7 @@ contract Inbox is IInbox, ReentrancyGuardUpgradeable, Versioned, Mailbox {
// ============ Initializer ============ // ============ Initializer ============
function initialize(uint32 _remoteDomain, address _validatorManager) function initialize(uint32 _remoteDomain, address _validatorManager)
public external
initializer initializer
{ {
__ReentrancyGuard_init(); __ReentrancyGuard_init();

@ -86,7 +86,7 @@ contract Outbox is IOutbox, Versioned, MerkleTreeManager, Mailbox {
// ============ Initializer ============ // ============ Initializer ============
function initialize(address _validatorManager) public initializer { function initialize(address _validatorManager) external initializer {
__Mailbox_initialize(_validatorManager); __Mailbox_initialize(_validatorManager);
state = States.Active; state = States.Active;
} }

@ -9,7 +9,7 @@ import 'solidity-coverage';
*/ */
module.exports = { module.exports = {
solidity: { solidity: {
version: '0.8.13', version: '0.8.16',
settings: { settings: {
optimizer: { optimizer: {
enabled: true, enabled: true,

@ -11,7 +11,7 @@ module.exports = {
solidity: { solidity: {
compilers: [ compilers: [
{ {
version: '0.8.13', version: '0.8.16',
}, },
], ],
}, },

Loading…
Cancel
Save