Merge pull request #931 from IntersectMBO/fix-coin-serialisation

Fix conversion from Coin to BigInt (it was using Number)

Author: palas

cardano-wasm/example/example.js

@@ -27,6 +27,8 @@ function log(out) {
             output.innerText += "    " + key + ": " + text + "\n";
         }
         output.innerText += "  }\n";
+    } else if (typeof (out) == "bigint") {
+        output.innerText += "> " + out.toString() + "n\n";
     } else {
         output.innerText += "> " + JSON.stringify(out) + "\n";
     }

cardano-wasm/grpc-example/example.js

@@ -18,6 +18,8 @@ function log(out) {
       output.innerText += "    " + key + ": " + text + "\n";
     }
     output.innerText += "  }\n";
+  } else if (typeof (out) == "bigint") {
+    output.innerText += "> " + out.toString() + "n\n";
   } else {
     output.innerText += "> " + JSON.stringify(out) + "\n";
   }

cardano-wasm/js-test/basic-test.spec.ts

@@ -8,5 +8,5 @@ test('test output matches', async ({ page }) => {
   // Wait for the test to finish running (we signal this by creating a tag with id "finish-tag" and text "Finished test!")
   await expect(page.locator('#finish-tag')).toHaveText("Finished test!");
   // Check the output of the test (from the example folder), which is displayed in the code element with id "test-output". The output contains information about the various objects and results of trying some of the functions.
-  await expect(page.locator('#test-output')).toHaveText("> \"Api object:\"> [object] {    objectType: cardano-api    newConwayTx: async function(...args)    newGrpcConnection: async function(...args)    generatePaymentWallet: async function(...args)    restorePaymentWalletFromSigningKeyBech32: async function(...args)    generateTestnetPaymentWallet: async function(...args)    restoreTestnetPaymentWalletFromSigningKeyBech32: async function(...args)  }> \"Bech32 of address:\"> \"addr_test1vp93p9em3regvgylxuvet6fgr3e9sn259pcejgrk4ykystcs7v8j6\"> \"UnsignedTx object:\"> [object] {    objectType: UnsignedTx    addTxInput: function(txId,txIx)    addSimpleTxOut: function(destAddr,lovelaceAmount)    setFee: function(lovelaceAmount)    estimateMinFee: function(protocolParams,numKeyWitnesses,numByronKeyWitnesses,totalRefScriptSize)    signWithPaymentKey: function(signingKey)  }> \"Estimated fee:\"> 164005> \"SignedTx object:\"> [object] {    objectType: SignedTx    alsoSignWithPaymentKey: function(signingKey)    txToCbor: function()  }> \"Tx CBOR:\"> \"84a300d9010281825820be6efd42a3d7b9a00d09d77a5d41e55ceaf0bd093a8aa8a893ce70d9caafd97800018182581d6082935e44937e8b530f32ce672b5d600d0a286b4e8a52c6555f659b871a00989680021a000280a5a100d9010281825820adfc1c30385916da87db1ba3328f0690a57ebb2a6ac9f6f86b2d97f943adae005840a49259b5977aea523b46f01261fbff93e0899e8700319e11f5ab96b67eb628fca1a233ce2d50ee3227b591b84f27237d920d63974d65728362382f751c4d9400f5f6\"");
+  await expect(page.locator('#test-output')).toHaveText("> \"Api object:\"> [object] {    objectType: cardano-api    newConwayTx: async function(...args)    newGrpcConnection: async function(...args)    generatePaymentWallet: async function(...args)    restorePaymentWalletFromSigningKeyBech32: async function(...args)    generateTestnetPaymentWallet: async function(...args)    restoreTestnetPaymentWalletFromSigningKeyBech32: async function(...args)  }> \"Bech32 of address:\"> \"addr_test1vp93p9em3regvgylxuvet6fgr3e9sn259pcejgrk4ykystcs7v8j6\"> \"UnsignedTx object:\"> [object] {    objectType: UnsignedTx    addTxInput: function(txId,txIx)    addSimpleTxOut: function(destAddr,lovelaceAmount)    setFee: function(lovelaceAmount)    estimateMinFee: function(protocolParams,numKeyWitnesses,numByronKeyWitnesses,totalRefScriptSize)    signWithPaymentKey: function(signingKey)  }> \"Estimated fee:\"> 164005n> \"SignedTx object:\"> [object] {    objectType: SignedTx    alsoSignWithPaymentKey: function(signingKey)    txToCbor: function()  }> \"Tx CBOR:\"> \"84a300d9010281825820be6efd42a3d7b9a00d09d77a5d41e55ceaf0bd093a8aa8a893ce70d9caafd97800018182581d6082935e44937e8b530f32ce672b5d600d0a286b4e8a52c6555f659b871a00989680021a000280a5a100d9010281825820adfc1c30385916da87db1ba3328f0690a57ebb2a6ac9f6f86b2d97f943adae005840a49259b5977aea523b46f01261fbff93e0899e8700319e11f5ab96b67eb628fca1a233ce2d50ee3227b591b84f27237d920d63974d65728362382f751c4d9400f5f6\"");
 });

cardano-wasm/src/Cardano/Wasm/Internal/JavaScript/Bridge.hs

@@ -68,6 +68,10 @@ fromJSBigInt val = do
     [(n, "")] -> return n
     _ -> error ("Wrong format for argument when deserialising, expected integer but got: " ++ show str)
 
+-- | Convert a Haskell @String@ to a JavaScript @BigInt@ (@JSVal@).
+foreign import javascript unsafe "BigInt($1)"
+  js_toBigInt :: JSString -> IO JSVal
+
 -- | Convert a Haskell value with @ToJSON@ instance to a JavaScript object (@JSVal)
 jsonToJSVal :: Api.ToJSON a => a -> IO JSVal
 jsonToJSVal =
@@ -147,6 +151,10 @@ instance ToJSVal Wasm.GrpcObject JSGrpc where
   toJSVal :: Wasm.GrpcObject -> IO JSGrpc
   toJSVal (Wasm.GrpcObject client) = return client
 
+instance ToJSVal Ledger.Coin JSCoin where
+  toJSVal :: Ledger.Coin -> IO JSCoin
+  toJSVal (Ledger.Coin n) = js_toBigInt $ toJSString $ show n
+
 -- |  Type class that provides functions to convert values from JavaScript to Haskell.
 class FromJSVal jsType haskellType where
   fromJSVal :: HasCallStack => jsType -> IO haskellType