Skip to content

Commit

Permalink
Merge pull request #536 from alephium/rhone-upgrade
Browse files Browse the repository at this point in the history
Update `common` to `Rhone`
  • Loading branch information
tdroxler authored May 15, 2024
2 parents 6fc715d + 1fdfa1b commit 336efb7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ object InputAddressUtil extends StrictLogging {
case protocol.vm.UnlockScript.P2SH(script, _) =>
val lockup = protocol.vm.LockupScript.p2sh(protocol.Hash.hash(script))
Some(protocol.model.Address.from(lockup))
case protocol.vm.UnlockScript.PoLW(pk) =>
Some(protocol.model.Address.p2pkh(pk))
case protocol.vm.UnlockScript.SameAsPrevious =>
None
case protocol.vm.UnlockScript.P2MPKH(_) =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ object GenCoreProtocol {
isPublic = true,
usePreapprovedAssets = false,
useContractAssets,
usePayToContractOnly = false,
argsLength = 0,
localsLength = 0,
returnLength = 0,
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import sbt._

object Version {
lazy val common = "2.11.0"
lazy val common = "2.14.2"

lazy val akka = "2.6.20"
lazy val rxJava = "3.1.6"
Expand Down

0 comments on commit 336efb7

Please sign in to comment.