Merge branch 'dev' into 'master'

Dev

See merge request ergo/rosen-bridge/contract!49

.github/workflows/release.yml

@@ -4,22 +4,21 @@ on:
   push:
     branches:
       - master
+    tags:
+      - '*'
   pull_request:
     types:
       - opened
       - synchronize
-  release:
-    types: [published]
-
 
 jobs:
   tests:
     name: Tests
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        scala: [2.12.7]
-        java: [[email protected]]
+        os: [ ubuntu-latest ]
+        scala: [ 2.12.7 ]
+        java: [ [email protected] ]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -52,9 +51,9 @@ jobs:
     needs: tests
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        scala: [2.12.7]
-        java: [[email protected]]
+        os: [ ubuntu-latest ]
+        scala: [ 2.12.7 ]
+        java: [ [email protected] ]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -80,42 +79,38 @@ jobs:
         run: |
           sbt ++${{ matrix.scala }} assembly
 
-      - name: RUN Jar File release
-        if: github.event_name == 'release'
+      - name: RUN Jar File for push to master
+        if: github.ref_type == 'branch'
+        id: set-version
         run: |
+          VERSION_STRING=$(sbt -Dsbt.supershell=false -error "print version")
+          APP_VERSION_STRING=$(echo "${VERSION_STRING:0:5}")-$(git rev-parse --short HEAD)
+          echo APP_VERSION=$APP_VERSION_STRING >> "$GITHUB_OUTPUT"
           ROSEN=$(find . -name 'contract-rosen-bridge-*.jar')
-          java -jar $ROSEN all --version ${{ github.event.release.tag_name }}
+          java -jar $ROSEN all --version $APP_VERSION_STRING
 
       - name: Upload JSON files
         uses: softprops/action-gh-release@v1
-        if: github.event_name == 'release'
-        with: 
+        if: github.ref_type == 'branch'
+        with:
+          tag_name: ${{ steps.build-app.outputs.APP_VERSION }}
+          prerelease: true
           files: |
             contracts-*.json
             tokensMap-*.json
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
-      - uses: dev-drprasad/[email protected]
-        if: github.event_name != 'release'
-        with:
-          delete_release: true
-          tag_name: Latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: RUN Jar File for push to master
-        if: github.event_name != 'release'
+      - name: RUN Jar File release
+        if: github.ref_type == 'tag'
         run: |
           ROSEN=$(find . -name 'contract-rosen-bridge-*.jar')
-          java -jar $ROSEN all --version Latest
+          java -jar $ROSEN all --version ${{ github.ref_name }}
 
       - name: Upload JSON files
         uses: softprops/action-gh-release@v1
-        if: github.event_name != 'release'
-        with: 
-          tag_name: Latest
+        if: github.ref_type == 'tag'
+        with:
           files: |
             contracts-*.json
             tokensMap-*.json

build.sbt

@@ -21,7 +21,7 @@ libraryDependencies ++= Seq(
 
 name := "contract"
 ThisBuild / scalaVersion := "2.12.7"
-ThisBuild / version := "0.1.0-SNAPSHOT"
+ThisBuild / version := "1.0.0"
 ThisBuild / organization := "rosen.bridge"
 ThisBuild / organizationName := "rosen-bridge"
 ThisBuild / publishMavenStyle := true

tokensMap/Ada.mainnet-public-soft-launch.json

@@ -14,7 +14,7 @@
     "assetName": "414441",
     "decimals": 6,
     "metaData": {
-      "type": "ADA",
+      "type": "native",
       "residency": "native"
     }
   }

tokensMap/Erg.mainnet-public-soft-launch.json

@@ -4,7 +4,7 @@
     "tokenName": "erg",
     "decimals": 9,
     "metaData": {
-      "type": "ERG",
+      "type": "native",
       "residency": "native"
     }
   },