Merge branch 'development' of https://github.com/zugdev/ubiquity-dollar…

… into development
ubiquity · Sep 22, 2024 · c8a9b02 · c8a9b02
2 parents d133e8a + ee11e95
commit c8a9b02
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -41,6 +41,8 @@
 [submodule "packages/contracts/lib/aave-v3-core"]
 	path = packages/contracts/lib/aave-v3-core
 	url = https://github.com/aave/aave-v3-core
+	branch= master
 [submodule "packages/contracts/lib/aave-v3-periphery"]
 	path = packages/contracts/lib/aave-v3-periphery
 	url = https://github.com/aave/aave-v3-periphery
+	branch= master
diff --git a/packages/contracts/src/dollar/amo/AaveAmo.sol b/packages/contracts/src/dollar/amo/AaveAmo.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.19;
+pragma solidity 0.8.19;
 
 import {UbiquityAmoMinter} from "../core/UbiquityAmoMinter.sol";
 import {IAmo} from "../interfaces/IAmo.sol";

diff --git a/packages/contracts/src/dollar/core/UbiquityAmoMinter.sol b/packages/contracts/src/dollar/core/UbiquityAmoMinter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.19;
+pragma solidity 0.8.19;
 
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";

diff --git a/packages/contracts/src/dollar/interfaces/IAaveAmo.sol b/packages/contracts/src/dollar/interfaces/IAaveAmo.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.19;
+pragma solidity 0.8.19;
 
 interface IAaveAmo {
     /**

diff --git a/packages/contracts/src/dollar/interfaces/IAmo.sol b/packages/contracts/src/dollar/interfaces/IAmo.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.19;
+pragma solidity 0.8.19;
 
 interface IAmo {
     /**

diff --git a/packages/contracts/src/dollar/interfaces/IUbiquityAmoMinter.sol b/packages/contracts/src/dollar/interfaces/IUbiquityAmoMinter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.19;
+pragma solidity 0.8.19;
 
 interface IUbiquityAmoMinter {
     /**