Skip to content

Commit

Permalink
Merge pull request #1551 from Plutonomicon/koz/1472
Browse files Browse the repository at this point in the history
Replace Data.BigInt with JS.BigInt
  • Loading branch information
klntsky authored Nov 9, 2023
2 parents 73ea867 + fbf56b2 commit 6b76ffe
Show file tree
Hide file tree
Showing 115 changed files with 239 additions and 262 deletions.
2 changes: 1 addition & 1 deletion examples/AdditionalUtxos.purs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import Contract.Value (Value)
import Contract.Value (lovelaceValueOf) as Value
import Ctl.Examples.PlutusV2.Scripts.AlwaysSucceeds (alwaysSucceedsScriptV2)
import Data.Array (fromFoldable) as Array
import Data.BigInt (fromInt) as BigInt
import Data.Map (difference, filter, keys) as Map
import JS.BigInt (fromInt) as BigInt
import Test.QuickCheck (arbitrary)
import Test.QuickCheck.Gen (randomSampleOne)

Expand Down
2 changes: 1 addition & 1 deletion examples/AlwaysMints.purs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Contract.Transaction (awaitTxConfirmed, submitTxFromConstraints)
import Contract.TxConstraints as Constraints
import Contract.Value as Value
import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers
import Data.BigInt as BigInt
import JS.BigInt as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/AlwaysSucceeds.purs
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import Contract.Value as Value
import Contract.Wallet (ownStakePubKeyHashes)
import Control.Monad.Error.Class (liftMaybe)
import Data.Array (head)
import Data.BigInt as BigInt
import Data.Lens (view)
import Effect.Exception (error)
import JS.BigInt as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/BalanceTxConstraints.purs
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ import Ctl.Examples.AlwaysMints (alwaysMintsPolicy)
import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers
import Data.Array (head)
import Data.Array (sort) as Array
import Data.BigInt (BigInt, fromInt)
import Data.Map (keys, member) as Map
import Data.Set (findMin) as Set
import JS.BigInt (BigInt, fromInt)

newtype ContractParams = ContractParams
{ aliceKeyWallet :: KeyWallet
Expand Down
2 changes: 1 addition & 1 deletion examples/ChangeGeneration.purs
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import Contract.Value as Value
import Contract.Wallet (ownPaymentPubKeyHashes, ownStakePubKeyHashes)
import Ctl.Examples.AlwaysSucceeds as AlwaysSucceeds
import Data.Array (fold, length, replicate, take, zip)
import Data.BigInt (fromInt) as BigInt
import Data.Lens (to, (^.))
import Data.Maybe (Maybe(Just, Nothing))
import Data.Newtype (unwrap)
import Data.Tuple (Tuple(Tuple))
import JS.BigInt (fromInt) as BigInt
import Test.Spec.Assertions (shouldEqual)

-- | A contract that creates `outputsToScript` number of outputs at a script address,
Expand Down
4 changes: 2 additions & 2 deletions examples/ContractTestUtils.purs
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ import Contract.Wallet
)
import Ctl.Examples.Helpers (mustPayToPubKeyStakeAddress) as Helpers
import Data.Array (head)
import Data.BigInt (BigInt)
import Data.BigInt as BigInt
import Data.Lens (view)
import Effect.Exception (throw)
import JS.BigInt (BigInt)
import JS.BigInt as BigInt

type ContractParams =
{ receiverPkh :: PaymentPubKeyHash
Expand Down
4 changes: 2 additions & 2 deletions examples/ExUnits.purs
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import Contract.Value as Value
import Contract.Wallet (ownStakePubKeyHashes)
import Control.Monad.Error.Class (liftMaybe)
import Data.Array (head)
import Data.BigInt (BigInt)
import Data.BigInt as BigInt
import Data.Lens (view)
import Effect.Exception (error)
import JS.BigInt (BigInt)
import JS.BigInt as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/IncludeDatum.purs
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import Contract.Utxos (utxosAt)
import Contract.Value as Value
import Control.Monad.Error.Class (liftMaybe)
import Data.Array (head)
import Data.BigInt as BigInt
import Data.Lens (view)
import Effect.Exception (error)
import JS.BigInt as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
4 changes: 2 additions & 2 deletions examples/KeyWallet/Internal/Pkh2PkhContract.purs
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import Ctl.Examples.KeyWallet.Internal.Pkh2PkhHtmlForm
import Ctl.Internal.Deserialization.Keys (privateKeyFromBytes)
import Ctl.Internal.Serialization.Hash (ed25519KeyHashFromBech32)
import Ctl.Internal.Types.RawBytes (hexToRawBytes)
import Data.BigInt (BigInt)
import Data.BigInt (fromString) as BigInt
import Data.Log.Formatter.Pretty (prettyFormatter)
import Data.Log.Level (LogLevel)
import Data.Log.Message (Message)
import Effect.Class (class MonadEffect)
import Effect.Exception (Error, error, message)
import JS.BigInt (BigInt)
import JS.BigInt (fromString) as BigInt

runKeyWalletContract_
:: (PaymentPubKeyHash -> BigInt -> Unlock -> Contract Unit) -> Effect Unit
Expand Down
2 changes: 1 addition & 1 deletion examples/Lose7Ada.purs
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ import Contract.Utxos (utxosAt)
import Contract.Value as Value
import Contract.Wallet (getWalletBalance)
import Control.Monad.Error.Class (liftMaybe)
import Data.BigInt as BigInt
import Data.Foldable (fold)
import Data.Functor ((<$>))
import Data.Map as Map
import Effect.Exception (error)
import JS.BigInt as BigInt
import Test.Spec.Assertions (shouldEqual)

main :: Effect Unit
Expand Down
2 changes: 1 addition & 1 deletion examples/MintsMultipleTokens.purs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import Ctl.Examples.Helpers
( mkCurrencySymbol
, mkTokenName
) as Helpers
import Data.BigInt (fromInt) as BigInt
import Effect.Exception (error)
import JS.BigInt (fromInt) as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/MultipleRedeemers.purs
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ import Ctl.Examples.PlutusV2.ReferenceInputsAndScripts
( mintAlwaysMintsV2ToTheScript
)
import Ctl.Examples.PlutusV2.Scripts.AlwaysMints (alwaysMintsPolicyV2)
import Data.BigInt as BigInt
import Data.List as List
import Data.Map as Map
import Data.Traversable (sequence)
import Effect.Exception (error)
import JS.BigInt as BigInt

contract :: Contract Unit
contract = do
Expand Down
4 changes: 2 additions & 2 deletions examples/NativeScriptMints.purs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import Ctl.Examples.Helpers
, mustPayToPubKeyStakeAddress
) as Helpers
import Data.Array (head)
import Data.BigInt (BigInt)
import Data.BigInt as BigInt
import JS.BigInt (BigInt)
import JS.BigInt as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/OneShotMinting.purs
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ import Control.Monad.Error.Class (liftMaybe)
import Control.Monad.Trans.Class (lift)
import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers
import Data.Array (head, singleton) as Array
import Data.BigInt (BigInt)
import Data.Map (toUnfoldable) as Map
import Effect.Exception (error, throw)
import JS.BigInt (BigInt)

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/PaysWithDatum.purs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import Contract.Wallet
import Control.Monad.Trans.Class (lift)
import Ctl.Examples.Helpers (mustPayToPubKeyStakeAddressWithDatum)
import Data.Array (head)
import Data.BigInt (fromInt) as BigInt
import JS.BigInt (fromInt) as BigInt

type ContractResult =
{ address :: Address
Expand Down
2 changes: 1 addition & 1 deletion examples/Pkh2Pkh.purs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Contract.TxConstraints as Constraints
import Contract.Value as Value
import Contract.Wallet (ownPaymentPubKeyHashes, ownStakePubKeyHashes)
import Data.Array (head)
import Data.BigInt as BigInt
import JS.BigInt as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/PlutusV2/InlineDatum.purs
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import Contract.TxConstraints as Constraints
import Contract.Utxos (utxosAt)
import Contract.Value as Value
import Control.Monad.Error.Class (liftMaybe)
import Data.BigInt as BigInt
import Data.Map as Map
import Effect.Exception (error)
import JS.BigInt as BigInt
import Test.Spec.Assertions (shouldEqual)

main :: Effect Unit
Expand Down
2 changes: 1 addition & 1 deletion examples/PlutusV2/ReferenceInputs.purs
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ import Contract.Wallet
import Control.Monad.Trans.Class (lift)
import Ctl.Examples.Helpers (mustPayToPubKeyStakeAddress) as Helpers
import Data.Array (head) as Array
import Data.BigInt (fromInt) as BigInt
import Data.Lens.Getter ((^.))
import Data.Map (member, toUnfoldable) as Map
import Data.Set (member) as Set
import JS.BigInt (fromInt) as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/PlutusV2/ReferenceInputsAndScripts.purs
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ import Ctl.Examples.PlutusV2.Scripts.AlwaysMints
)
import Ctl.Examples.PlutusV2.Scripts.AlwaysSucceeds (alwaysSucceedsScriptV2)
import Data.Array (head)
import Data.BigInt (fromInt) as BigInt
import Data.Map (toUnfoldable) as Map
import JS.BigInt (fromInt) as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/PlutusV2/ReferenceScripts.purs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import Contract.Value (lovelaceValueOf) as Value
import Contract.Wallet (ownStakePubKeyHashes)
import Ctl.Examples.PlutusV2.Scripts.AlwaysSucceeds (alwaysSucceedsScriptV2)
import Data.Array (head)
import Data.BigInt (fromInt) as BigInt
import Data.Map (toUnfoldable) as Map
import JS.BigInt (fromInt) as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/SatisfiesAnyOf.purs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import Contract.PlutusData
import Contract.ScriptLookups as Lookups
import Contract.TxConstraints (TxConstraints)
import Contract.TxConstraints as Constraints
import Data.BigInt as BigInt
import JS.BigInt as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/SignMultiple.purs
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ import Contract.Wallet
)
import Control.Monad.Reader (asks)
import Data.Array (head)
import Data.BigInt as BigInt
import Data.Map (Map, filter)
import Data.Set (Set)
import Data.UInt (UInt)
import Effect.Ref as Ref
import JS.BigInt as BigInt

getLockedInputs
:: Contract (Map TransactionHash (Set UInt))
Expand Down
2 changes: 1 addition & 1 deletion examples/TxChaining.purs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import Contract.TxConstraints as Constraints
import Contract.Value as Value
import Contract.Wallet (ownPaymentPubKeyHashes)
import Data.Array (head)
import Data.BigInt as BigInt
import JS.BigInt as BigInt

main :: Effect Unit
main = example testnetNamiConfig
Expand Down
2 changes: 1 addition & 1 deletion examples/Utxos.purs
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import Contract.Wallet
import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers
import Ctl.Examples.PlutusV2.OneShotMinting (oneShotMintingPolicyScriptV2)
import Data.Array (head) as Array
import Data.BigInt (fromInt) as BigInt
import Data.Log.Tag (tag)
import Data.Map (toUnfoldable) as Map
import JS.BigInt (fromInt) as BigInt
import Test.QuickCheck.Arbitrary (arbitrary)
import Test.QuickCheck.Gen (randomSampleOne)

Expand Down
34 changes: 7 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,11 @@
"@mlabs-haskell/cardano-serialization-lib-gc-browser": "^1.0.6",
"@mlabs-haskell/cardano-serialization-lib-gc-nodejs": "^1.0.6",
"@mlabs-haskell/csl-gc-wrapper": "^1.0.1",
"@mlabs-haskell/json-bigint": " 1.0.0",
"@mlabs-haskell/json-bigint": "2.0.0",
"@noble/secp256k1": "^1.7.0",
"apply-args-browser": "0.0.1",
"apply-args-nodejs": "0.0.1",
"base64-js": "^1.5.1",
"big-integer": "1.6.51",
"bignumber.js": "^9.1.1",
"bip39": "^3.1.0",
"blakejs": "1.2.1",
Expand Down
10 changes: 7 additions & 3 deletions packages.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ let additions =
, "argonaut-core"
, "arrays"
, "bifunctors"
, "bigints"
, "bignumber"
, "const"
, "control"
, "effect"
Expand All @@ -127,6 +125,7 @@ let additions =
, "foldable-traversable"
, "foreign-object"
, "integers"
, "js-bigints"
, "lists"
, "maybe"
, "mote"
Expand All @@ -145,7 +144,7 @@ let additions =
, "untagged-union"
]
, repo = "https://github.com/mlabs-haskell/purescript-aeson.git"
, version = "e411566cf5e3adf05ea9ae866705886cfba4bfa6"
, version = "v2.0.0"
}
, bignumber =
{ dependencies =
Expand Down Expand Up @@ -249,6 +248,11 @@ let additions =
"https://github.com/mlabs-haskell/purescript-noble-secp256k1.git"
, version = "a3c0f67e9fdb0086016d7aebfad35d09a08b4ecd"
}
, js-bigints =
{ dependencies = [ "integers", "maybe", "prelude" ]
, repo = "https://github.com/purescript-contrib/purescript-js-bigints"
, version = "36a7d8ac75a7230043ae511f3145f9ed130954a9"
}
}

in upstream // additions
Loading

0 comments on commit 6b76ffe

Please sign in to comment.