Merge pull request #571 from HathorNetwork/release

Sync master branch with release

Author: pedroferreira1

.github/workflows/apidocs-upload.yml

@@ -103,7 +103,5 @@ jobs:
         run: |
           if [[ "${{ env.release_status }}" == "isRelease" ]]; then
             aws s3 cp index.html s3://${{ secrets.AWS_APIDOCS_BUCKET_NAME_PROD }}
-          else
-            aws s3 cp index.html s3://${{ secrets.AWS_APIDOCS_BUCKET_NAME_DEV }}
           fi
       

__tests__/integration/configuration/blueprints/authority.py

@@ -12,22 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from hathor.nanocontracts.blueprint import Blueprint
-from hathor.nanocontracts.context import Context
-from hathor.nanocontracts.exception import NCFail
-from hathor.nanocontracts.types import (
+from hathor import (
+    Blueprint,
+    Context,
     NCAction,
     NCDepositAction,
     NCGrantAuthorityAction,
     NCAcquireAuthorityAction,
     NCWithdrawalAction,
+    NCFail,
     TokenUid,
+    export,
     public,
 )
 
 class TooManyActions(NCFail):
     pass
 
+@export
 class AuthorityBlueprint(Blueprint):
     def _get_action(self, ctx: Context) -> NCAction:
         """Return the only action available; fails otherwise."""
@@ -82,7 +84,4 @@ def melt(self, ctx: Context, token_uid: TokenUid, amount: int) -> None:
 
     @public
     def revoke(self, ctx: Context, token_uid: TokenUid, revoke_mint: bool, revoke_melt: bool) -> None:
-        self.syscall.revoke_authorities(token_uid=token_uid, revoke_mint=revoke_mint, revoke_melt=revoke_melt)
-
-
-__blueprint__ = AuthorityBlueprint
+        self.syscall.revoke_authorities(token_uid=token_uid, revoke_mint=revoke_mint, revoke_melt=revoke_melt)

__tests__/integration/configuration/blueprints/bet.py

@@ -12,22 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from math import floor
 from typing import Optional, TypeAlias
 
-from hathor.nanocontracts.blueprint import Blueprint
-from hathor.nanocontracts.context import Context
-from hathor.nanocontracts.exception import NCFail
-from hathor.nanocontracts.types import (
+from hathor import (
     Address,
+    Blueprint,
+    Context,
     NCAction,
     NCDepositAction,
     NCWithdrawalAction,
+    NCFail,
     SignedData,
     Timestamp,
     TokenUid,
     TxOutputScript,
     public,
+    export,
     view,
 )
 
@@ -63,6 +63,7 @@ class InvalidOracleSignature(NCFail):
     pass
 
 
+@export
 class Bet(Blueprint):
     """Bet blueprint with final result provided by an oracle.
 
@@ -117,6 +118,11 @@ def initialize(self, ctx: Context, oracle_script: TxOutputScript, token_uid: Tok
         self.final_result = None
         self.total = Amount(0)
 
+        self.bets_total = {}
+        self.bets_address = {}
+        self.address_details = {}
+        self.withdrawals = {}
+
     @view
     def has_result(self) -> bool:
         """Return True if the final result has already been set."""
@@ -154,7 +160,7 @@ def bet(self, ctx: Context, address: Address, score: str) -> None:
         assert isinstance(action, NCDepositAction)
         self.fail_if_result_is_available()
         self.fail_if_invalid_token(action)
-        if ctx.timestamp > self.date_last_bet:
+        if ctx.block.timestamp > self.date_last_bet:
             raise TooLate(f'cannot place bets after {self.date_last_bet}')
         amount = Amount(action.amount)
         self.total = Amount(self.total + amount)
@@ -191,7 +197,9 @@ def withdraw(self, ctx: Context) -> None:
         assert isinstance(action, NCWithdrawalAction)
         self.fail_if_result_is_not_available()
         self.fail_if_invalid_token(action)
-        address = Address(ctx.caller_id)
+        caller_address = ctx.get_caller_address()
+        assert caller_address is not None
+        address = Address(caller_address)
         allowed = self.get_max_withdrawal(address)
         if action.amount > allowed:
             raise InsufficientBalance(f'withdrawal amount is greater than available (max: {allowed})')
@@ -217,7 +225,5 @@ def get_winner_amount(self, address: Address) -> Amount:
         if result_total == 0:
             return Amount(0)
         address_total = self.bets_address.get((self.final_result, address), 0)
-        percentage = address_total / result_total
-        return Amount(floor(percentage * self.total))
-
-__blueprint__ = Bet
+        winner_amount = Amount(address_total * self.total // result_total)
+        return winner_amount

__tests__/integration/configuration/privnet.yml

@@ -34,5 +34,6 @@ CHECKPOINTS: []
 
 ENABLE_NANO_CONTRACTS: enabled
 NC_ON_CHAIN_BLUEPRINT_RESTRICTED: false
+AVG_TIME_BETWEEN_BLOCKS: 5
 
 extends: mainnet.yml

__tests__/integration/docker-compose.yml

@@ -6,7 +6,7 @@ services:
 
   fullnode:
     image:
-      ${HATHOR_LIB_INTEGRATION_TESTS_FULLNODE_IMAGE:-hathornetwork/hathor-core:v0.65.0-alpha.3}
+      ${HATHOR_LIB_INTEGRATION_TESTS_FULLNODE_IMAGE:-hathornetwork/hathor-core:v0.67.0}
     command: [
       "run_node",
       "--listen", "tcp:40404",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "hathor-wallet-headless",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Hathor Wallet Headless, i.e., without graphical user interface",
   "main": "index.js",
   "engines": {
@@ -10,7 +10,7 @@
   "dependencies": {
     "@dinamonetworks/hsm-dinamo": "4.9.1",
     "@hathor/healthcheck-lib": "0.1.0",
-    "@hathor/wallet-lib": "2.8.2",
+    "@hathor/wallet-lib": "2.9.0",
     "axios": "1.7.7",
     "express": "4.18.2",
     "express-validator": "6.10.0",