Merge branch 'main' into gabriela/fix-windows-apalache

CHANGELOG.md

@@ -7,6 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+## v0.22.0 -- 2024-09-09
+
+### Added
+
+- Calling `q::test`, `q::testOnce` and `q::lastTrace` on the REPL now works properly (#1495)
+
+### Changed
+
+- Performance of the REPL was drastically improved (#1495)
+- Error reporting was improved for many runtime errors (#1495)
+
+### Deprecated
+### Removed
+### Fixed
+
+- Sending SIGINT (hitting Ctrl+C) to the run and test commands now actually stops the execution (#1495)
+
+### Security
+
+## v0.21.2 -- 2024-09-09
+
 ### Added
 
 - In the `verify` command, add warning if `--out-itf` option contains `{test}` or `{seq}` as those have no effect since Apalache only produces a single trace (#1485)
@@ -32,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bumped GRPC message sizes to 1G (#1480)
 - Fix format of ITF trace emitted by `verify` command (#1448)
 - Relax uppercase check for types qualified with a namespace (#1494)
+- Fixed file loading from imports on Windows (#1498)
 
 ### Security
 

examples/cosmos/ics20/bank.qnt

@@ -14,6 +14,7 @@
  */
 
 module bank {
+  import basicSpells.* from "../../spells/basicSpells"
   import base.* from "./base"
 
   /* ***************************************************************************
@@ -48,7 +49,7 @@ module bank {
 
   // Get balances of all denominations in the given account `addr`.
   pure def getBalances(accounts: Accounts, addr: Address) : TokenBalances = {
-    if (accounts.keys().contains(addr)) {
+    if (accounts.has(addr)) {
       accounts.get(addr)
     } else {
       Map()
@@ -57,7 +58,7 @@ module bank {
 
   // Get the amount of tokens of denomination `denom` in `balances`.
   pure def getBalance(balances: TokenBalances, denom: Denomination): Amount = {
-    if (balances.keys().contains(denom)) balances.get(denom) else 0
+    if (balances.has(denom)) balances.get(denom) else 0
   }
 
   /* Return `accounts`, where `address` is updated to hold

examples/cosmos/ics20/base.qnt

@@ -36,18 +36,6 @@ module base {
     { baseDenom: baseDenom, path: [] }
   }
 
-  // TODO(#879): Remove and import ../../spells/basicSpells
-  // The following is only here to work around a failing integration test on Windows.
-
-  /// Test whether a key is present in a map
-  ///
-  /// - @param __map a map to query
-  /// - @param __key the key to look for
-  /// - @returns true if and only __map has an entry associated with __key
-  pure def has(__map: a -> b, __key: a): bool = {
-    __map.keys().contains(__key)
-  }
-
   /// Test whether a set is non-empty
   ///
   /// - @param __set a map to query

examples/cosmos/ics20/ics20.qnt

@@ -191,6 +191,7 @@ module ics20 {
 }
 
 module ics20Test {
+  import basicSpells.* from "../../spells/basicSpells"
   import base.* from "./base"
   import bank.getBalance from "./bank"
   import bank.getBalances from "./bank"