ligo 1.6 and small changes

frankhillard · Nov 14, 2024 · 1721b68 · 1721b68
1 parent b5aadc0
commit 1721b68
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/lib/fa2.1/entrypoints/export_ticket.jsligo b/lib/fa2.1/entrypoints/export_ticket.jsligo
@@ -134,7 +134,7 @@ export const export_tickets = <A, L>(
             operations = list([...newOps, ...operations]);
             let ticketOps : list<ExportedTicket> = list([ticket]);
             let finalTicketOps : list<ExportTicketsTo> = list([{to_: request.to_, ticketsToExport: ticketOps}]);
-            const ticketReceiver: contract<list<ExportTicketsTo>> = Tezos.get_contract_with_error(Option.value_with_error("Option is None", op.destination), Errors.invalid_destination);
+            const ticketReceiver: contract<list<ExportTicketsTo>> = Tezos.get_contract_with_error(Option.value_with_error("option is None", op.destination), Errors.invalid_destination);
             operations = list([Tezos.Next.Operation.transaction(finalTicketOps, 0tez, ticketReceiver), ...operations]);
             finalStorage = newStorage;
          }

diff --git a/lib/fa2.1/entrypoints/lambda_export.jsligo b/lib/fa2.1/entrypoints/lambda_export.jsligo
@@ -117,7 +117,7 @@ export const lambda_export = <A, L>(
       ([[lt, l, s, ops], tk]) => {
          const [ticketOps, ticket, updatedLedger, updatedStorage] = create_ticket(s, tk, l);
          let combinedOps = list([...ops, ...ticketOps]);
-         return [list([ticket, ...lt]), updatedLedger, updatedStorage, combinedOps];
+         return [List.cons(ticket, lt), updatedLedger, updatedStorage, combinedOps];
       },
       [list([]), ledger, storage, finalOperations],
       ticketsToExport

diff --git a/lib/fa2/nft/extendable_nft.impl.mligo b/lib/fa2/nft/extendable_nft.impl.mligo
@@ -94,7 +94,7 @@ let remove_operator
 
 //module Ledger = struct
 let is_owner_of (ledger : ledger) (token_id : nat) (owner : address) : bool =
-  let current_owner: address = Option.value_with_error "Option is None" (Big_map.find_opt token_id ledger) in
+  let current_owner: address = Option.value_with_error "option is None" (Big_map.find_opt token_id ledger) in
   current_owner = owner
 
 let assert_owner_of (ledger : ledger) (token_id : nat) (owner : address) : unit =

diff --git a/lib/fa2/nft/nft.impl.jsligo b/lib/fa2/nft/nft.impl.jsligo
@@ -1,7 +1,7 @@
-#import "../common/assertions.jsligo" "Assertions"
+export #import "../common/assertions.jsligo" "Assertions"
 export #import "../common/errors.mligo" "Errors"
 export #import "../common/tzip12.datatypes.jsligo" "TZIP12"
-#import "../common/tzip16.datatypes.jsligo" "TZIP16"
+export #import "../common/tzip16.datatypes.jsligo" "TZIP16"
 
 #import "./extendable_nft.impl.jsligo" "NFTExtendable"
 

diff --git a/lib/fa2/nft/nft.impl.mligo b/lib/fa2/nft/nft.impl.mligo
@@ -1,7 +1,7 @@
-#import "../common/assertions.jsligo" "Assertions"
+[@public] #import "../common/assertions.jsligo" "Assertions"
 [@public] #import "../common/errors.mligo" "Errors"
 [@public] #import "../common/tzip12.datatypes.jsligo" "TZIP12"
-#import "../common/tzip16.datatypes.jsligo" "TZIP16"
+[@public] #import "../common/tzip16.datatypes.jsligo" "TZIP16"
 
 #import "./extendable_nft.impl.jsligo" "NFTExtendable"
 

diff --git a/ligo.json b/ligo.json
@@ -11,7 +11,7 @@
     "url": "git+ssh://[email protected]/ligolang/contract-catalogue.git"
   },
   "main": "lib/main.mligo",
-  "keywords": ["ligo", "ligo@^1.6.0", "tezos", "jsligo", "cameligo", "nft"],
+  "keywords": ["ligo", "ligo@^1.7.0", "tezos", "jsligo", "cameligo", "nft"],
   "author": "ligoLANG <https://ligolang.org/>",
   "license": "MIT",
   "bugs": {

diff --git a/test/fa2/nft/nft.test.mligo b/test/fa2/nft/nft.test.mligo
@@ -292,7 +292,7 @@ let _test_update_operator_remove_operator_and_transfer1 (contract: fa2_nft) =
 
   let storage = Test.Next.Typed_address.get_storage orig.taddr in
   let operator_tokens = Big_map.find_opt (owner4,op1) storage.operators in
-  let operator_tokens = Option.value_with_error "Option is None" operator_tokens in
+  let operator_tokens = Option.value_with_error "option is None" operator_tokens in
   Test.Next.Assert.assert (Test.Next.Compare.eq operator_tokens (Set.literal [5n]))
 let test_update_operator_remove_operator_and_transfer1 =