Decode gas and gasLimit in WCEthereumTransaction

app/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -13,3 +13,4 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

walletconnect/build.gradle

@@ -40,11 +40,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.squareup.okhttp3:okhttp:4.0.1'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.squareup.okhttp3:okhttp:4.7.2'
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation 'org.robolectric:robolectric:4.3'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

walletconnect/src/main/java/com/trustwallet/walletconnect/models/ethereum/WCEthereumTransaction.kt

@@ -5,6 +5,7 @@ data class WCEthereumTransaction(
     val to: String?,
     val nonce: String?,
     val gasPrice: String?,
+    val gas: String?,
     val gasLimit: String?,
     val value: String?,
     val data: String

walletconnect/src/test/java/com/trustwallet/walletconnect/models/ethereum/WCEthereumTransactionTests.kt

@@ -0,0 +1,33 @@
+package com.trustwallet.walletconnect.models.ethereum
+
+import com.github.salomonbrys.kotson.fromJson
+import com.google.gson.GsonBuilder
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+
+class WCEthereumTransactionTests {
+    private val gson = GsonBuilder()
+            .create()
+
+    @Test
+    fun test_parseCancelOrder() {
+        val jsonString = """
+        {
+            "from": "0xc36edf48e21cf395b206352a1819de658fd7f988",
+            "gas": "0x77fb",
+            "gasPrice": "0xb2d05e00",
+            "nonce": "0x64",
+            "to": "0x00000000000c2e074ec69a0dfb2997ba6c7d2e1e",
+            "value": "0x0",
+            "data": ""
+        }
+        """
+
+
+        val tx = gson.fromJson<WCEthereumTransaction>(jsonString)
+        assertEquals(tx.gas, "0x77fb")
+        assertNull(tx.gasLimit)
+    }
+
+}