Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
phearnot committed Sep 2, 2024
1 parent b712c86 commit 1812c5d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/publish-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ jobs:
pull: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
- uses: actions/attest-build-provenance@v1
with:
subject-name: ${{ env.IMAGE_NAME}}
Expand Down
12 changes: 9 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,16 @@ def universalDepMappings(deps: Seq[Attributed[File]]): Seq[(File, String)] =
dep <- deps
} yield dep.data -> ("lib/" + getJarFullFilename(dep))

Universal / mappings += {
val jar = (Compile / packageBin).value
val id = projectID.value
val art = (Compile / packageBin / artifact).value
jar -> ("lib/" + makeJarName(id.organization, id.name, id.revision, art.name, art.classifier))
}
Universal / mappings ++= universalDepMappings((Runtime / dependencyClasspath).value.filterNot { p =>
p.get(AttributeKey[ModuleID]("moduleID")).exists { m =>
m.organization == "org.scala-lang" ||
m.organization.startsWith("com.fasterxml.jackson")
p.get(AttributeKey[ModuleID]("moduleID")).exists { m => false
// m.organization == "org.scala-lang" ||
// m.organization.startsWith("com.fasterxml.jackson")
}
})

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/units/ELUpdater.scala
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class ELUpdater(
Proofs.empty,
blockchain.settings.addressSchemeCharacter.toByte
).signWith(invoker.privateKey)
logger.info(s"Invoking $contractAddress '${fc.function.funcName}' for block ${blockData.hash}->${blockData.parentHash}, txId=${tx.id()}")
logger.info(s"Invoking $contractAddress '${fc.function.funcName}' for block ${blockData.hash}->${blockData.parentHash}, txId=${tx.json()}")
cleanPriorityPool()

broadcastTx(tx).resultE match {
Expand Down

0 comments on commit 1812c5d

Please sign in to comment.