Skip to content

Commit

Permalink
update CHANGELOG.md (#93)
Browse files Browse the repository at this point in the history
  • Loading branch information
jankun4 authored Aug 14, 2024
1 parent 60d959d commit 38f4c17
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 13 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,18 @@ Changelog](https://keepachangelog.com/en/1.1.0).

# Unreleased

# v6.1.0

## Added

* Added `--network` paremeter which takes either `testnet` or `mainnet`
* Add CLI for reserve and illiquid circulation supply endpoints
* Obtain cardano-address via CHaP

## Changed
* Update ghc from 8.7 to 9.66
* Update plutus-tx from 1.0 to 1.27, and remove plutonic dependency
* Update ctl to version 8.6

# v6.0.0

Expand Down
2 changes: 1 addition & 1 deletion offchain/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sidechain-main-cli",
"type": "module",
"version": "6.0.0",
"version": "6.1.0",
"description": "",
"main": "index.js",
"directories": {
Expand Down
4 changes: 2 additions & 2 deletions offchain/src/TrustlessSidechain/Governance/MultiSig.purs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import Type.Row (type (+))
-- minting policy, changing the order of elements will change the hash of the
-- policy.
--
-- @since Unreleased
-- @since v6.1.0
newtype MultiSigGovParams = MultiSigGovParams
{ -- | Members of the governance
governanceMembers Array Ed25519KeyHash
Expand Down Expand Up @@ -86,7 +86,7 @@ instance Show MultiSigGovParams where
-- checking for approval from the governance or just burning unused tokens
-- generated during signature checks.
--
-- @since Unreleased
-- @since v6.1.0
data MultiSigGovRedeemer = MultiSignatureCheck | MultiSigTokenGC

derive instance Generic MultiSigGovRedeemer _
Expand Down
18 changes: 9 additions & 9 deletions onchain/src/TrustlessSidechain/Governance/MultiSig.hs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import TrustlessSidechain.Utils (currencySymbolValueOf)
-- minting policy, changing the order of elements will change the hash of the
-- policy.
--
-- @since Unreleased
-- @since v6.1.0
data MultiSigGovParams = MultiSigGovParams
{ governanceMembers :: [PubKeyHash]
-- ^ Members of the governance
Expand All @@ -35,40 +35,40 @@ data MultiSigGovParams = MultiSigGovParams
}
deriving (TSPrelude.Show, TSPrelude.Eq)

-- | @since Unreleased
-- | @since v6.1.0
instance ToData MultiSigGovParams where
{-# INLINEABLE toBuiltinData #-}
toBuiltinData (MultiSigGovParams {..}) =
productToData2 governanceMembers requiredSignatures

-- | @since Unreleased
-- | @since v6.1.0
instance FromData MultiSigGovParams where
{-# INLINEABLE fromBuiltinData #-}
fromBuiltinData = productFromData2 MultiSigGovParams

-- | @since Unreleased
-- | @since v6.1.0
instance UnsafeFromData MultiSigGovParams where
{-# INLINEABLE unsafeFromBuiltinData #-}
unsafeFromBuiltinData = productUnsafeFromData2 MultiSigGovParams

-- | @since Unreleased
-- | @since v6.1.0
makeHasField ''MultiSigGovParams

-- | Redemeer for the multi-sig governance policy that tells whether we are
-- checking for approval from the governance or just burning unused tokens
-- generated during signature checks.
--
-- @since Unreleased
-- @since v6.1.0
data MultiSigGovRedeemer = MultiSignatureCheck | MultiSigTokenGC
deriving (TSPrelude.Show, TSPrelude.Eq)

-- | @since Unreleased
-- | @since v6.1.0
instance ToData MultiSigGovRedeemer where
{-# INLINEABLE toBuiltinData #-}
toBuiltinData MultiSignatureCheck = toBuiltinData (0 :: Integer)
toBuiltinData MultiSigTokenGC = toBuiltinData (1 :: Integer)

-- | @since Unreleased
-- | @since v6.1.0
instance FromData MultiSigGovRedeemer where
{-# INLINEABLE fromBuiltinData #-}
fromBuiltinData x = do
Expand All @@ -78,7 +78,7 @@ instance FromData MultiSigGovRedeemer where
1 -> Just MultiSigTokenGC
_ -> Nothing

-- | @since Unreleased
-- | @since v6.1.0
instance UnsafeFromData MultiSigGovRedeemer where
{-# INLINEABLE unsafeFromBuiltinData #-}
unsafeFromBuiltinData x =
Expand Down
2 changes: 1 addition & 1 deletion onchain/trustless-sidechain.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: trustless-sidechain
version: 6.0.0
version: 6.1.0
synopsis: TODO
description: TODO
homepage: https://github.com/mlabs-haskell/trustless-sidechain
Expand Down

0 comments on commit 38f4c17

Please sign in to comment.