Skip to content

Unite p2sAddress and p2shAddress routes (#2213) #2454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beejaygee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Unite p2sAddress and p2shAddress routes (#2213) #2454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 19 additions & 26 deletions src/main/scala/org/ergoplatform/http/api/ScriptApiRoute.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,37 +70,30 @@ case class ScriptApiRoute(readersHolder: ActorRef, ergoSettings: ErgoSettings)
onSuccess((readersHolder ? GetReaders).mapTo[Readers].map(r => op(r)))(toRoute)
}

// todo: unite p2sAddress and p2shAddress, https://github.com/ergoplatform/ergo/issues/2213
private def p2sAddressR: Route = (path("p2sAddress") & post & entity(as[CompileRequest])) { compileRequest =>
withWalletAndStateOp(r => (r.w.publicKeys(0, loadMaxKeys), r.s.stateContext.blockVersion)) { case (addrsF, bv) =>
onSuccess(addrsF) { addrs =>
val scriptVersion = Header.scriptFromBlockVersion(bv)
val treeVersion = compileRequest.treeVersion
VersionContext.withVersions(scriptVersion, treeVersion) {
compileSource(compileRequest.source, keysToEnv(addrs.map(_.pubkey)), treeVersion).map(Pay2SAddress.apply).fold(
e => BadRequest(e.getMessage),
address => ApiResponse(addressResponse(address))
)
/**
* Shared implementation behind `p2sAddressR` and `p2shAddressR`: compiles the submitted
* source against the requester's public keys and wraps the resulting `ErgoTree` with
* `wrapAddress`, differing only in whether the result is a P2S or P2SH address.
*/
private def compiledAddressR(wrapAddress: ErgoTree => ErgoAddress): Route =
(post & entity(as[CompileRequest])) { compileRequest =>
withWalletAndStateOp(r => (r.w.publicKeys(0, loadMaxKeys), r.s.stateContext.blockVersion)) { case (addrsF, bv) =>
onSuccess(addrsF) { addrs =>
val scriptVersion = Header.scriptFromBlockVersion(bv)
val treeVersion = compileRequest.treeVersion
VersionContext.withVersions(scriptVersion, treeVersion) {
compileSource(compileRequest.source, keysToEnv(addrs.map(_.pubkey)), treeVersion).map(wrapAddress).fold(
e => BadRequest(e.getMessage),
address => ApiResponse(addressResponse(address))
)
}
}
}
}
}

private def p2sAddressR: Route = path("p2sAddress") { compiledAddressR(Pay2SAddress.apply) }

private def p2shAddressR: Route = (path("p2shAddress") & post & entity(as[CompileRequest])) { compileRequest =>
withWalletAndStateOp(r => (r.w.publicKeys(0, loadMaxKeys), r.s.stateContext.blockVersion)) { case (addrsF, bv) =>
onSuccess(addrsF) { addrs =>
val scriptVersion = Header.scriptFromBlockVersion(bv)
val treeVersion = compileRequest.treeVersion
VersionContext.withVersions(scriptVersion, treeVersion) {
compileSource(compileRequest.source, keysToEnv(addrs.map(_.pubkey)), treeVersion).map(Pay2SHAddress.apply).fold(
e => BadRequest(e.getMessage),
address => ApiResponse(addressResponse(address))
)
}
}
}
}
private def p2shAddressR: Route = path("p2shAddress") { compiledAddressR(Pay2SHAddress.apply) }


private def executeWithContextR: Route =
Expand Down