AND-8713 Merge branch 'develop' into bugfix/AND-8713_fix_tron_and_sol…

…ana_send
tangem · Oct 10, 2024 · f38484f · f38484f
2 parents 4d7b91b + 339fd48
commit f38484f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -44,13 +44,13 @@ jobs:
         ./gradlew assembleAndroidTest
     - name: Run unit tests
       run: ./gradlew test
-    - name: Run Android tests
-      uses: reactivecircus/android-emulator-runner@v2
-      with:
-        api-level: 30
-        target: google_apis
-        arch: x86
-        script: ./gradlew connectedAndroidTest
+      #    - name: Run Android tests
+      #      uses: reactivecircus/android-emulator-runner@v2
+      #      with:
+      #        api-level: 30
+      #        target: google_apis
+      #        arch: x86
+      #        script: ./gradlew connectedAndroidTest
     - name: Build notification
       if: failure()
       uses: adamkdean/simple-slack-notify@master

diff --git a/...in/src/main/java/com/tangem/blockchain/blockchains/polkadot/PolkadotTransactionBuilder.kt b/...in/src/main/java/com/tangem/blockchain/blockchains/polkadot/PolkadotTransactionBuilder.kt
@@ -33,9 +33,12 @@ class PolkadotTransactionBuilder(private val blockchain: Blockchain) {
         Blockchain.AlephZero, Blockchain.AlephZeroTestnet,
         Blockchain.Joystream,
         Blockchain.Bittensor,
-        Blockchain.EnergyWebX,
         -> "0500".hexToBytes()
-        Blockchain.PolkadotTestnet, Blockchain.Kusama -> "0400".hexToBytes()
+        Blockchain.PolkadotTestnet,
+        Blockchain.Kusama,
+        -> "0400".hexToBytes()
+        Blockchain.EnergyWebX,
+        -> "0a07".hexToBytes()
         else -> error(
             "${blockchain.fullName} blockchain is not supported by ${this::class.simpleName}",
         )

diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/Blockchain.kt b/blockchain/src/main/java/com/tangem/blockchain/common/Blockchain.kt
@@ -218,7 +218,6 @@ enum class Blockchain(
         TON, TONTestnet,
         Bittensor,
         Sui, SuiTestnet,
-        EnergyWebX, EnergyWebXTestnet,
         Casper, CasperTestnet,
         -> 9
 
@@ -264,6 +263,7 @@ enum class Blockchain(
         Blast, BlastTestnet,
         Cyber, CyberTestnet,
         EnergyWebChain, EnergyWebChainTestnet,
+        EnergyWebX, EnergyWebXTestnet,
         Core, CoreTestnet,
         -> 18
 

diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/address/EstimationFeeAddressFactory.kt b/blockchain/src/main/java/com/tangem/blockchain/common/address/EstimationFeeAddressFactory.kt
@@ -141,7 +141,8 @@ class EstimationFeeAddressFactory {
             Blockchain.Sui,
             Blockchain.SuiTestnet,
             -> "0xbca45e36a271e106546c89984108685215724e488570a0049a187c473cd521bc"
-            Blockchain.EnergyWebX, Blockchain.EnergyWebXTestnet -> TODO("Need to generate")
+            Blockchain.EnergyWebX, Blockchain.EnergyWebXTestnet,
+            -> "5CogUCbb5PYYbEHhDVGDN6JRRYBkd4sFRVc4wwP8oy5Su34Z"
             Blockchain.Casper, Blockchain.CasperTestnet -> TODO("Need to generate") // AND-8615
         }
     }