@bananapus/core-v6 0.0.66 → 0.0.68
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -183,8 +183,10 @@ library CoreDeploymentLib {
|
|
|
183
183
|
{
|
|
184
184
|
string memory filePath = string.concat(path, projectName, "/", networkName, "/", contractName, ".json");
|
|
185
185
|
// forge-lint: disable-next-line(unsafe-cheatcode)
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
186
|
+
try vm.readFile(filePath) returns (string memory deploymentJson) {
|
|
187
|
+
return stdJson.readAddress({json: deploymentJson, key: ".address"});
|
|
188
|
+
} catch {
|
|
189
|
+
return address(0);
|
|
190
|
+
}
|
|
189
191
|
}
|
|
190
192
|
}
|
package/src/JBTerminalStore.sol
CHANGED
|
@@ -574,8 +574,8 @@ contract JBTerminalStore is IJBTerminalStore {
|
|
|
574
574
|
})
|
|
575
575
|
});
|
|
576
576
|
|
|
577
|
-
// If cross-currency conversion rounded to zero, return without consuming any surplus allowance.
|
|
578
|
-
if (usedAmount == 0) {
|
|
577
|
+
// If a non-zero cross-currency conversion rounded to zero, return without consuming any surplus allowance.
|
|
578
|
+
if (amount != 0 && currency != accountingContext.currency && usedAmount == 0) {
|
|
579
579
|
return (ruleset, 0);
|
|
580
580
|
}
|
|
581
581
|
|