Skip to content

Commit

Permalink
Merge branch 'add-ERSN-tokenId' into 'dev'
Browse files Browse the repository at this point in the history
Add eRSN to main tokens

See merge request ergo/rosen-bridge/contract!105
  • Loading branch information
vorujack committed Jul 14, 2024
2 parents 8536b6c + c4f6858 commit c04ac80
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ network-general = {
RSN="8b08cdd5449a9592a9e79711d7d79249d7a03c535d17efaee83e216e80a44c4b"
RSNRatioNFT="e2ed4d64393222db666f20e67803e9e6fbe6d64531e14ff52ddd95615b0cbf17"
EmissionNFT="e2ed4d64393222db666f20e67803e9e6fbe6d64531e14ff52ddd95615b0cbf17"
ERSN="e2ed4d64393222db666f20e67803e9e6fbe6d64531e14ff52ddd95615b0cbf17"
}
ergo-network = {
node = "https://node.ergopool.io/"
Expand All @@ -30,6 +31,7 @@ network-general = {
RSN="cdf549fccbb09ab8f38ecbf9a5ed37c926707753adf8fed19b039684a0772bfe",
RSNRatioNFT="05690d3e7a8daae13495b32af8ab58aaec8a5435f5974f6adf17095d28cac1f5"
EmissionNFT="68e0238a06f5c61ab813a1f9f6eb0cdf9d02d2e8fc1dc4165b8ab37c731205a8"
ERSN="6210a801f4fbe487ca55594b0eaee96b9e440747b84f55d916d9c7dfdae5d622"
}
ergo-network = {
node = "https://node.ergopool.io/"
Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/helpers/Configs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ object Configs extends ConfigHelper {
readKeyDynamic(mainTokensConfig, "GuardNFT"),
readKeyDynamic(mainTokensConfig, "RSN"),
readKeyDynamic(mainTokensConfig, "RSNRatioNFT"),
readKeyDynamic(mainTokensConfig, "EmissionNFT")
readKeyDynamic(mainTokensConfig, "EmissionNFT"),
readKeyDynamic(mainTokensConfig, "ERSN")
)

// Prepare general network config
Expand Down
5 changes: 3 additions & 2 deletions src/main/scala/helpers/Models.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import io.circe.Json
import org.ergoplatform.ErgoAddressEncoder
import org.ergoplatform.appkit.ErgoClient

case class MainTokens(RepoNFT: String, GuardNFT: String, RSN: String, RSNRatioNFT: String, EmissionNFT: String) {
case class MainTokens(RepoNFT: String, GuardNFT: String, RSN: String, RSNRatioNFT: String, EmissionNFT: String, ERSN: String) {
def toJson(): Json = {
Json.fromFields(List(
("RepoNFT", Json.fromString(RepoNFT)),
("GuardNFT", Json.fromString(GuardNFT)),
("RSN", Json.fromString(RSN)),
("RSNRatioNFT", Json.fromString(RSNRatioNFT)),
("EmissionNFT", Json.fromString(EmissionNFT))
("EmissionNFT", Json.fromString(EmissionNFT)),
("ERSN", Json.fromString(ERSN)),
))
}
}
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ network-general = {
GuardNFT="3333333333333333333333333333333333333333333333333333333333333333"
RSN="1111111111111111111111111111111111111111111111111111111111111111"
EmissionNFT="8888888888888888888888888888888888888888888888888888888888888888"
ERSN="9999999999999999999999999999999999999999999999999999999999999999"
}
ergo-network = {
node = "https://node.ergopool.io/"
Expand Down

0 comments on commit c04ac80

Please sign in to comment.